summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/core/css/resolver/element_style_resources.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/blink/renderer/core/css/resolver/element_style_resources.cc')
-rw-r--r--chromium/third_party/blink/renderer/core/css/resolver/element_style_resources.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/chromium/third_party/blink/renderer/core/css/resolver/element_style_resources.cc b/chromium/third_party/blink/renderer/core/css/resolver/element_style_resources.cc
index c1ea3013309..8cf83d116c4 100644
--- a/chromium/third_party/blink/renderer/core/css/resolver/element_style_resources.cc
+++ b/chromium/third_party/blink/renderer/core/css/resolver/element_style_resources.cc
@@ -25,12 +25,13 @@
#include "third_party/blink/renderer/core/css/css_gradient_value.h"
#include "third_party/blink/renderer/core/css/css_image_value.h"
+#include "third_party/blink/renderer/core/css/css_property_names.h"
#include "third_party/blink/renderer/core/css/css_uri_value.h"
-#include "third_party/blink/renderer/core/css_property_names.h"
#include "third_party/blink/renderer/core/dom/document.h"
#include "third_party/blink/renderer/core/dom/element.h"
#include "third_party/blink/renderer/core/dom/tree_scope.h"
#include "third_party/blink/renderer/core/frame/local_frame.h"
+#include "third_party/blink/renderer/core/frame/settings.h"
#include "third_party/blink/renderer/core/html/lazy_load_image_observer.h"
#include "third_party/blink/renderer/core/style/computed_style.h"
#include "third_party/blink/renderer/core/style/content_data.h"
@@ -44,7 +45,7 @@
#include "third_party/blink/renderer/core/style/style_pending_image.h"
#include "third_party/blink/renderer/core/svg/svg_resource.h"
#include "third_party/blink/renderer/core/svg/svg_tree_scope_resources.h"
-#include "third_party/blink/renderer/platform/length.h"
+#include "third_party/blink/renderer/platform/geometry/length.h"
#include "third_party/blink/renderer/platform/loader/fetch/fetch_parameters.h"
#include "third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h"
@@ -203,7 +204,9 @@ void ElementStyleResources::LoadPendingImages(ComputedStyle* style) {
FetchParameters::ImageRequestOptimization
image_request_optimization = FetchParameters::kNone;
if (!BackgroundLayerMayBeSprite(*background_layer)) {
- if (element_->GetDocument()
+ if (element_->GetDocument().GetSettings() &&
+ element_->GetDocument().GetSettings()->GetLazyLoadEnabled() &&
+ element_->GetDocument()
.GetFrame()
->IsLazyLoadingImageAllowed()) {
image_request_optimization = FetchParameters::kDeferImageLoad;