Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1261)

Unified Diff: Source/core/platform/graphics/GraphicsLayer.cpp

Issue 16799005: Insert pinch zoom virtual viewport layers to graphics layer tree. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Address James' comments, add WebLayerTreeView function interface. Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/platform/graphics/GraphicsLayer.cpp
diff --git a/Source/core/platform/graphics/GraphicsLayer.cpp b/Source/core/platform/graphics/GraphicsLayer.cpp
index dc61fd0eac9a4bd370f9c0d947fdf0fb703582d0..097787676a68cd0476b077e01084e90d9d718ba6 100644
--- a/Source/core/platform/graphics/GraphicsLayer.cpp
+++ b/Source/core/platform/graphics/GraphicsLayer.cpp
@@ -720,7 +720,7 @@ void GraphicsLayer::resetTrackedRepaints()
void GraphicsLayer::addRepaintRect(const FloatRect& repaintRect)
{
- if (m_client->isTrackingRepaints()) {
+ if (m_client && m_client->isTrackingRepaints()) {
jamesr 2013/06/17 20:42:10 you don't need this change, do you?
wjmaclean 2013/06/17 22:09:04 No, I guess not. :-)
FloatRect largestRepaintRect(FloatPoint(), m_size);
largestRepaintRect.intersect(repaintRect);
RepaintMap::iterator repaintIt = repaintRectMap().find(this);
@@ -936,7 +936,8 @@ void GraphicsLayer::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
info.addMember(m_maskLayer, "maskLayer");
info.addMember(m_replicaLayer, "replicaLayer");
info.addMember(m_replicatedLayer, "replicatedLayer");
- info.ignoreMember(m_client);
+ if (m_client)
jamesr 2013/06/17 20:42:10 ditto
wjmaclean 2013/06/17 22:09:04 Done.
+ info.ignoreMember(m_client);
info.addMember(m_name, "name");
info.addMember(m_nameBase, "nameBase");
info.addMember(m_layer, "layer");

Powered by Google App Engine
This is Rietveld 408576698