diff options
Diffstat (limited to 'chromium/third_party/blink/renderer/core/style/fill_layer.cc')
| -rw-r--r-- | chromium/third_party/blink/renderer/core/style/fill_layer.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/chromium/third_party/blink/renderer/core/style/fill_layer.cc b/chromium/third_party/blink/renderer/core/style/fill_layer.cc index a8c40abff33..7097e9966cd 100644 --- a/chromium/third_party/blink/renderer/core/style/fill_layer.cc +++ b/chromium/third_party/blink/renderer/core/style/fill_layer.cc @@ -21,7 +21,8 @@ #include "third_party/blink/renderer/core/style/fill_layer.h" -#include "third_party/blink/renderer/core/layout/layout_object.h" +#include "third_party/blink/renderer/core/css/css_value.h" +#include "third_party/blink/renderer/core/style/computed_style.h" #include "third_party/blink/renderer/core/style/data_equivalency.h" #include "third_party/blink/renderer/platform/wtf/size_assertions.h" @@ -80,7 +81,7 @@ FillLayer::FillLayer(EFillLayerType type, bool use_initial_values) any_layer_uses_content_box_(false), any_layer_has_image_(false), any_layer_has_url_image_(false), - any_layer_has_local_attachment_image_(false), + any_layer_has_local_attachment_(false), any_layer_has_fixed_attachment_image_(false), any_layer_has_default_attachment_image_(false), cached_properties_computed_(false) {} @@ -118,7 +119,7 @@ FillLayer::FillLayer(const FillLayer& o) any_layer_uses_content_box_(false), any_layer_has_image_(false), any_layer_has_url_image_(false), - any_layer_has_local_attachment_image_(false), + any_layer_has_local_attachment_(false), any_layer_has_fixed_attachment_image_(false), any_layer_has_default_attachment_image_(false), cached_properties_computed_(false) {} @@ -350,8 +351,7 @@ void FillLayer::ComputeCachedProperties() const { any_layer_has_image_ = !!GetImage(); any_layer_has_url_image_ = any_layer_has_image_ && GetImage()->CssValue()->MayContainUrl(); - any_layer_has_local_attachment_image_ = - any_layer_has_image_ && Attachment() == EFillAttachment::kLocal; + any_layer_has_local_attachment_ = Attachment() == EFillAttachment::kLocal; any_layer_has_fixed_attachment_image_ = any_layer_has_image_ && Attachment() == EFillAttachment::kFixed; any_layer_has_default_attachment_image_ = @@ -365,8 +365,7 @@ void FillLayer::ComputeCachedProperties() const { any_layer_uses_content_box_ |= next_->any_layer_uses_content_box_; any_layer_has_image_ |= next_->any_layer_has_image_; any_layer_has_url_image_ |= next_->any_layer_has_url_image_; - any_layer_has_local_attachment_image_ |= - next_->any_layer_has_local_attachment_image_; + any_layer_has_local_attachment_ |= next_->any_layer_has_local_attachment_; any_layer_has_fixed_attachment_image_ |= next_->any_layer_has_fixed_attachment_image_; any_layer_has_default_attachment_image_ |= @@ -396,7 +395,7 @@ bool FillLayer::ImageIsOpaque(const Document& document, // checking for IsEmpty. return image_->KnownToBeOpaque(document, style) && !image_ - ->ImageSize(document, style.EffectiveZoom(), FloatSize(), + ->ImageSize(style.EffectiveZoom(), FloatSize(), kRespectImageOrientation) .IsEmpty(); } |