Index: third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp |
diff --git a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp |
index d61ec02d198ed490b539551d63177555d9def36d..05aa2d91dc1426a54dd50f418efaa2ce9db56a94 100644 |
--- a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp |
+++ b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp |
@@ -52,6 +52,7 @@ |
#include "core/paint/PaintInfo.h" |
#include "core/paint/PaintLayerPainter.h" |
#include "core/paint/PaintLayerStackingNodeIterator.h" |
+#include "core/paint/PaintTiming.h" |
#include "core/paint/ScrollableAreaPainter.h" |
#include "core/paint/TransformRecorder.h" |
#include "core/plugins/PluginView.h" |
@@ -2358,21 +2359,26 @@ void CompositedLayerMapping::notifyAnimationStarted(const GraphicsLayer*, double |
void CompositedLayerMapping::notifyFirstPaint() |
{ |
- // TODO(ksakamoto): This shouldn't be reported to Document. crbug.com/544811 |
- if (Node* node = layoutObject()->node()) |
- node->document().markFirstPaint(); |
+ if (PaintTiming* timing = m_owningLayer.paintTiming()) { |
+ if (timing->firstPaint() == 0) |
+ timing->markFirstPaint(); |
+ } |
} |
void CompositedLayerMapping::notifyFirstTextPaint() |
{ |
- if (Node* node = layoutObject()->node()) |
- node->document().markFirstTextPaint(); |
+ if (PaintTiming* timing = m_owningLayer.paintTiming()) { |
+ if (timing->firstTextPaint() == 0) |
+ timing->markFirstTextPaint(); |
+ } |
} |
void CompositedLayerMapping::notifyFirstImagePaint() |
{ |
- if (Node* node = layoutObject()->node()) |
- node->document().markFirstImagePaint(); |
+ if (PaintTiming* timing = m_owningLayer.paintTiming()) { |
+ if (timing->firstImagePaint() == 0) |
+ timing->markFirstImagePaint(); |
+ } |
} |
IntRect CompositedLayerMapping::pixelSnappedCompositedBounds() const |