Index: third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp |
diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp |
index fe76a63614b9016ca49950efab9374ee4d8b1172..0a581115a49d2b1bb6ff4d44ca6183bb24e1d12a 100644 |
--- a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp |
+++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp |
@@ -139,7 +139,7 @@ GraphicsLayer::GraphicsLayer(GraphicsLayerClient* client) |
, m_contentsLayer(0) |
, m_contentsLayerId(0) |
, m_scrollableArea(nullptr) |
- , m_3dRenderingContext(0) |
+ , m_renderingContext3d(0) |
{ |
#if ENABLE(ASSERT) |
if (m_client) |
@@ -518,7 +518,7 @@ void GraphicsLayer::setupContentsLayer(WebLayer* contentsLayer) |
WebLayer* borderWebLayer = m_contentsClippingMaskLayer ? m_contentsClippingMaskLayer->platformLayer() : 0; |
m_contentsLayer->setMaskLayer(borderWebLayer); |
- m_contentsLayer->setRenderingContext(m_3dRenderingContext); |
+ m_contentsLayer->setRenderingContext(m_renderingContext3d); |
} |
void GraphicsLayer::clearContentsLayerIfUnregistered() |
@@ -727,11 +727,11 @@ std::unique_ptr<JSONObject> GraphicsLayer::layerTreeAsJSONInternal(LayerTreeFlag |
if (!m_shouldFlattenTransform) |
json->setBoolean("shouldFlattenTransform", m_shouldFlattenTransform); |
- if (m_3dRenderingContext) { |
- RenderingContextMap::const_iterator it = renderingContextMap.find(m_3dRenderingContext); |
+ if (m_renderingContext3d) { |
+ RenderingContextMap::const_iterator it = renderingContextMap.find(m_renderingContext3d); |
int contextId = renderingContextMap.size() + 1; |
if (it == renderingContextMap.end()) |
- renderingContextMap.set(m_3dRenderingContext, contextId); |
+ renderingContextMap.set(m_renderingContext3d, contextId); |
else |
contextId = it->value; |
@@ -948,14 +948,14 @@ void GraphicsLayer::setShouldFlattenTransform(bool shouldFlatten) |
void GraphicsLayer::setRenderingContext(int context) |
{ |
- if (m_3dRenderingContext == context) |
+ if (m_renderingContext3d == context) |
return; |
- m_3dRenderingContext = context; |
+ m_renderingContext3d = context; |
m_layer->layer()->setRenderingContext(context); |
if (m_contentsLayer) |
- m_contentsLayer->setRenderingContext(m_3dRenderingContext); |
+ m_contentsLayer->setRenderingContext(m_renderingContext3d); |
} |
void GraphicsLayer::setMasksToBounds(bool masksToBounds) |