diff options
Diffstat (limited to 'chromium/third_party/blink/renderer/core/layout/layout_image_resource_style_image.cc')
-rw-r--r-- | chromium/third_party/blink/renderer/core/layout/layout_image_resource_style_image.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/chromium/third_party/blink/renderer/core/layout/layout_image_resource_style_image.cc b/chromium/third_party/blink/renderer/core/layout/layout_image_resource_style_image.cc index ed8c3dfe576..db5476d73ee 100644 --- a/chromium/third_party/blink/renderer/core/layout/layout_image_resource_style_image.cc +++ b/chromium/third_party/blink/renderer/core/layout/layout_image_resource_style_image.cc @@ -28,6 +28,7 @@ #include "third_party/blink/renderer/core/layout/layout_image_resource_style_image.h" +#include "third_party/blink/renderer/core/layout/layout_list_marker_image.h" #include "third_party/blink/renderer/core/layout/layout_replaced.h" #include "third_party/blink/renderer/core/style/style_fetched_image.h" @@ -70,9 +71,12 @@ scoped_refptr<Image> LayoutImageResourceStyleImage::GetImage( FloatSize LayoutImageResourceStyleImage::ImageSize(float multiplier) const { // TODO(davve): Find out the correct default object size in this context. - return ImageSizeWithDefaultSize(multiplier, - LayoutSize(LayoutReplaced::kDefaultWidth, - LayoutReplaced::kDefaultHeight)); + LayoutSize default_size = + layout_object_->IsListMarkerImage() + ? ToLayoutListMarkerImage(layout_object_)->DefaultSize() + : LayoutSize(LayoutReplaced::kDefaultWidth, + LayoutReplaced::kDefaultHeight); + return ImageSizeWithDefaultSize(multiplier, default_size); } FloatSize LayoutImageResourceStyleImage::ImageSizeWithDefaultSize( @@ -82,7 +86,7 @@ FloatSize LayoutImageResourceStyleImage::ImageSizeWithDefaultSize( layout_object_->GetDocument(), multiplier, default_size, LayoutObject::ShouldRespectImageOrientation(layout_object_)); } -void LayoutImageResourceStyleImage::Trace(Visitor* visitor) { +void LayoutImageResourceStyleImage::Trace(Visitor* visitor) const { visitor->Trace(style_image_); LayoutImageResource::Trace(visitor); } |