Changeset 150898 in webkit

Timestamp:

May 29, 2013 9:04:12 AM (11 years ago)

Author:

Simon Fraser

Message:

Fix the firing of m_paintRelatedMilestonesTimer
​https://bugs.webkit.org/show_bug.cgi?id=116919

Reviewed by Tim Horton.

r150671 intended to change things so that paint-related milestones
only fire when painting has actually happened, so that WebKit clients
are notified when we actually have bits to present.

However, it made an incorrect assumption that painting would happen
inside of flushCompositingState(). This is not the case; flushCompositingState()
will just dirty CALayers, and later on Core Animation will ask us to paint them.

This incorrect assumption meant that we would never start the
m_paintRelatedMilestonesTimer, so never fire the milestones.

Fix by starting the m_paintRelatedMilestonesTimer via the RenderLayerBacking
paintContents call back. At this time we know we're painting, so we can both
set the FrameView's last paint time, and start up the timer. We also only
want to start the timer if there are pending milestones.

• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::paintIntoLayer):
(WebCore::RenderLayerBacking::paintContents):

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::flushPendingLayerChanges):
(WebCore::RenderLayerCompositor::didPaintBacking):

• rendering/RenderLayerCompositor.h:

(RenderLayerCompositor):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayerBacking.cpp (modified) (3 diffs)
• rendering/RenderLayerCompositor.cpp (modified) (3 diffs)
• rendering/RenderLayerCompositor.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-29  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix the firing of m_paintRelatedMilestonesTimer
+        https://bugs.webkit.org/show_bug.cgi?id=116919
+
+        Reviewed by Tim Horton.
+
+        r150671 intended to change things so that paint-related milestones
+        only fire when painting has actually happened, so that WebKit clients
+        are notified when we actually have bits to present.
+        
+        However, it made an incorrect assumption that painting would happen
+        inside of flushCompositingState(). This is not the case; flushCompositingState()
+        will just dirty CALayers, and later on Core Animation will ask us to paint them.
+        
+        This incorrect assumption meant that we would never start the
+        m_paintRelatedMilestonesTimer, so never fire the milestones.
+        
+        Fix by starting the m_paintRelatedMilestonesTimer via the RenderLayerBacking
+        paintContents call back. At this time we know we're painting, so we can both
+        set the FrameView's last paint time, and start up the timer. We also only
+        want to start the timer if there are pending milestones.
+
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::paintIntoLayer):
+        (WebCore::RenderLayerBacking::paintContents):
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::flushPendingLayerChanges):
+        (WebCore::RenderLayerCompositor::didPaintBacking):
+        * rendering/RenderLayerCompositor.h:
+        (RenderLayerCompositor):
+
 2013-05-29  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -59 +59 @@
 #include "StyleResolver.h"
 #include "TiledBacking.h"
-#include <wtf/CurrentTime.h>
 #include <wtf/text/StringBuilder.h>
 
@@ -1979 +1978 @@
         m_owningLayer->paintLayerContents(context, paintingInfo, paintFlags | RenderLayer::PaintLayerPaintingOverlayScrollbars);
 
+    compositor()->didPaintBacking(this);
+
     ASSERT(!m_owningLayer->m_usedTransparency);
 }
@@ -2018 +2019 @@
         // We have to use the same root as for hit testing, because both methods can compute and cache clipRects.
         paintIntoLayer(graphicsLayer, &context, dirtyRect, PaintBehaviorNormal, paintingPhase);
-
-        if (m_usingTiledCacheLayer)
-            renderer()->frame()->view()->setLastPaintTime(currentTime());
 
         InspectorInstrumentation::didPaint(renderer(), &context, clip);

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -60 +60 @@
 #include "TiledBacking.h"
 #include "TransformState.h"
+#include <wtf/CurrentTime.h>
 #include <wtf/TemporaryChange.h>
 
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
 #include "HTMLMediaElement.h"
-#endif
-
-#if !LOG_DISABLED
-#include <wtf/CurrentTime.h>
 #endif
 
@@ -374 +371 @@
     m_flushingLayers = false;
 
-    if (!m_paintRelatedMilestonesTimer.isActive() && frameView->hasEverPainted())
-        m_paintRelatedMilestonesTimer.startOneShot(0);
-
     if (!m_viewportConstrainedLayersNeedingUpdate.isEmpty()) {
         HashSet<RenderLayer*>::const_iterator end = m_viewportConstrainedLayersNeedingUpdate.end();
@@ -395 +389 @@
     if (backing->backgroundLayerPaintsFixedRootBackground() && graphicsLayer == backing->backgroundLayer())
         fixedRootBackgroundLayerChanged();
+}
+
+void RenderLayerCompositor::didPaintBacking(RenderLayerBacking*)
+{
+    FrameView* frameView = m_renderView->frameView();
+    
+    frameView->setLastPaintTime(currentTime());
+    
+    if (frameView->milestonesPendingPaint() && !m_paintRelatedMilestonesTimer.isActive())
+        m_paintRelatedMilestonesTimer.startOneShot(0);
 }
 

trunk/Source/WebCore/rendering/RenderLayerCompositor.h

@@ -282 +282 @@
     void setLayerFlushThrottlingEnabled(bool);
     void disableLayerFlushThrottlingTemporarilyForInteraction();
+    
+    void didPaintBacking(RenderLayerBacking*);
 
 private: