| Index: Source/platform/graphics/GraphicsLayer.cpp
|
| diff --git a/Source/platform/graphics/GraphicsLayer.cpp b/Source/platform/graphics/GraphicsLayer.cpp
|
| index 2adb26d6a3579e12040413890df180bf4d98a20d..13149b3d2dea1d2afd2c14447349d46f5236c117 100644
|
| --- a/Source/platform/graphics/GraphicsLayer.cpp
|
| +++ b/Source/platform/graphics/GraphicsLayer.cpp
|
| @@ -137,7 +137,7 @@ GraphicsLayer::~GraphicsLayer()
|
| removeAllChildren();
|
| removeFromParent();
|
|
|
| - resetTrackedRepaints();
|
| + resetTrackedPaintInvalidations();
|
| ASSERT(!m_parent);
|
| }
|
|
|
| @@ -430,14 +430,14 @@ WebLayer* GraphicsLayer::contentsLayerIfRegistered()
|
| return m_contentsLayer;
|
| }
|
|
|
| -void GraphicsLayer::resetTrackedRepaints()
|
| +void GraphicsLayer::resetTrackedPaintInvalidations()
|
| {
|
| repaintRectMap().remove(this);
|
| }
|
|
|
| void GraphicsLayer::addRepaintRect(const FloatRect& repaintRect)
|
| {
|
| - if (m_client->isTrackingRepaints()) {
|
| + if (m_client->isTrackingPaintInvalidations()) {
|
| FloatRect largestRepaintRect(FloatPoint(), m_size);
|
| largestRepaintRect.intersect(repaintRect);
|
| RepaintMap::iterator repaintIt = repaintRectMap().find(this);
|
| @@ -610,7 +610,7 @@ PassRefPtr<JSONObject> GraphicsLayer::layerTreeAsJSON(LayerTreeFlags flags, Rend
|
| if (m_replicatedLayer)
|
| json->setString("replicatedLayer", flags & LayerTreeIncludesDebugInfo ? pointerAsString(m_replicatedLayer) : "");
|
|
|
| - if ((flags & LayerTreeIncludesRepaintRects) && repaintRectMap().contains(this) && !repaintRectMap().get(this).isEmpty()) {
|
| + if ((flags & LayerTreeIncludesPaintInvalidationRects) && repaintRectMap().contains(this) && !repaintRectMap().get(this).isEmpty()) {
|
| Vector<FloatRect> repaintRectsCopy = repaintRectMap().get(this);
|
| std::sort(repaintRectsCopy.begin(), repaintRectsCopy.end(), &compareFloatRects);
|
| RefPtr<JSONArray> repaintRectsJSON = adoptRef(new JSONArray);
|
|
|