Fixed the paint supression to track only render-blocking stylesheets

third_party/WebKit/Source/core/dom/Document.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
@@ skipping 2271 matching lines @@
   Markers().InvalidateRectsForAllMarkers();
 
   // The layout system may perform layouts with pending stylesheets. When
   // recording first layout time, we ignore these layouts, since painting is
   // suppressed for them. We're interested in tracking the time of the
   // first real or 'paintable' layout.
   // TODO(esprehn): This doesn't really make sense, why not track the first
   // beginFrame? This will catch the first layout in a page that does lots
   // of layout thrashing even though that layout might not be followed by
   // a paint for many seconds.
-  if (IsRenderingReady() && body() &&
-      !GetStyleEngine().HasPendingScriptBlockingSheets()) {
+  if (IsRenderingReady() && body() && !HasPendingRenderBlockingSheets()) {
     if (!document_timing_.FirstLayout())
       document_timing_.MarkFirstLayout();
   }
 
   root_scroller_controller_->DidUpdateLayout();
 }
 
 void Document::ClearFocusedElementSoon() {
   if (!clear_focused_element_timer_.IsActive())
     clear_focused_element_timer_.StartOneShot(0, BLINK_FROM_HERE);
 }
 
 void Document::ClearFocusedElementTimerFired(TimerBase*) {
   UpdateStyleAndLayoutTree();
 
   if (focused_element_ && !focused_element_->IsFocusable())
     focused_element_->blur();
 }
 
 // FIXME: This is a bad idea and needs to be removed eventually.
 // Other browsers load stylesheets before they continue parsing the web page.
 // Since we don't, we can run JavaScript code that needs answers before the
 // stylesheets are loaded. Doing a layout ignoring the pending stylesheets
 // lets us get reasonable answers. The long term solution to this problem is
 // to instead suspend JavaScript execution.
 void Document::UpdateStyleAndLayoutTreeIgnorePendingStylesheets() {
   StyleEngine::IgnoringPendingStylesheet ignoring(GetStyleEngine());
 
-  if (GetStyleEngine().HasPendingScriptBlockingSheets()) {
+  if (HasPendingRenderBlockingSheets()) {
     // FIXME: We are willing to attempt to suppress painting with outdated style
     // info only once.  Our assumption is that it would be dangerous to try to
     // stop it a second time, after page content has already been loaded and
     // displayed with accurate style information. (Our suppression involves
     // blanking the whole page at the moment. If it were more refined, we might
     // be able to do something better.) It's worth noting though that this
     // entire method is a hack, since what we really want to do is suspend JS
     // instead of doing a layout with inaccurate information.
     HTMLElement* body_element = body();
     if (body_element && !body_element->GetLayoutObject() &&
@@ skipping 1715 matching lines @@
   EnsureStyleResolver().ClearResizedForViewportUnits();
 }
 
 void Document::StyleResolverMayHaveChanged() {
   if (HasNodesWithPlaceholderStyle()) {
     SetNeedsStyleRecalc(kSubtreeStyleChange,
                         StyleChangeReasonForTracing::Create(
                             StyleChangeReason::kCleanupPlaceholderStyles));
   }
 
-  if (DidLayoutWithPendingStylesheets() &&
-      !GetStyleEngine().HasPendingScriptBlockingSheets()) {
+  if (DidLayoutWithPendingStylesheets() && !HasPendingRenderBlockingSheets()) {
     // We need to manually repaint because we avoid doing all repaints in layout
     // or style recalc while sheets are still loading to avoid FOUC.
     pending_sheet_layout_ = kIgnoreLayoutWithPendingSheets;
 
     DCHECK(!GetLayoutViewItem().IsNull() || ImportsController());
     if (!GetLayoutViewItem().IsNull())
       GetLayoutViewItem().InvalidatePaintForViewAndCompositedLayers();
   }
 }
 
@@ skipping 2358 matching lines @@
     // change active state.
     if (element == ancestor_element)
       saw_common_ancestor = true;
     if (allow_active_changes)
       element->SetActive(true);
     if (!saw_common_ancestor || element == hover_element_)
       element->SetHovered(true);
   }
 }
 
+bool Document::HasPendingRenderBlockingSheets() const {
+  if (RuntimeEnabledFeatures::cssInBodyDoesNotBlockPaintEnabled())
+    return style_engine_->HasPendingRenderBlockingSheets();
+  return style_engine_->HasPendingScriptBlockingSheets();
+}
+
 bool Document::HaveScriptBlockingStylesheetsLoaded() const {
   return style_engine_->HaveScriptBlockingStylesheetsLoaded();
 }
 
 bool Document::HaveRenderBlockingStylesheetsLoaded() const {
   if (RuntimeEnabledFeatures::cssInBodyDoesNotBlockPaintEnabled())
     return style_engine_->HaveRenderBlockingStylesheetsLoaded();
   return style_engine_->HaveScriptBlockingStylesheetsLoaded();
 }
 
@@ skipping 342 matching lines @@
 }
 
 void showLiveDocumentInstances() {
   WeakDocumentSet& set = liveDocumentSet();
   fprintf(stderr, "There are %u documents currently alive:\n", set.size());
   for (blink::Document* document : set)
     fprintf(stderr, "- Document %p URL: %s\n", document,
             document->Url().GetString().Utf8().data());
 }
 #endif