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

Unified Diff: Source/core/rendering/RenderLayerCompositor.cpp

Issue 23819007: Have Node::document() return a reference instead of a pointer (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master Created 7 years, 4 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
« no previous file with comments | « Source/core/rendering/RenderLayerBacking.cpp ('k') | Source/core/rendering/RenderLayerFilterInfo.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderLayerCompositor.cpp
diff --git a/Source/core/rendering/RenderLayerCompositor.cpp b/Source/core/rendering/RenderLayerCompositor.cpp
index d3d203369b95fc7c92df4d1c9d723c1a2a85be29..472cd720786161a3c30e6c17040d0b6ef412d0cb 100644
--- a/Source/core/rendering/RenderLayerCompositor.cpp
+++ b/Source/core/rendering/RenderLayerCompositor.cpp
@@ -263,7 +263,7 @@ void RenderLayerCompositor::cacheAcceleratedCompositingFlags()
bool showRepaintCounter = false;
bool forceCompositingMode = false;
- if (Settings* settings = m_renderView->document()->settings()) {
+ if (Settings* settings = m_renderView->document().settings()) {
hasAcceleratedCompositing = settings->acceleratedCompositingEnabled();
// We allow the chrome to override the settings, in case the page is rendered
@@ -1203,7 +1203,7 @@ void RenderLayerCompositor::frameViewDidScroll()
bool scrollingCoordinatorHandlesOffset = false;
if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator()) {
- if (Settings* settings = m_renderView->document()->settings()) {
+ if (Settings* settings = m_renderView->document().settings()) {
if (isMainFrame() || settings->compositedScrollingForFramesEnabled())
scrollingCoordinatorHandlesOffset = scrollingCoordinator->scrollableAreaScrollLayerDidChange(frameView);
}
@@ -1907,7 +1907,7 @@ bool RenderLayerCompositor::requiresCompositingForTransition(RenderObject* rende
if (!(m_compositingTriggers & ChromeClient::AnimationTrigger))
return false;
- if (Settings* settings = m_renderView->document()->settings()) {
+ if (Settings* settings = m_renderView->document().settings()) {
if (!settings->acceleratedCompositingForTransitionEnabled())
return false;
}
@@ -2030,7 +2030,7 @@ bool RenderLayerCompositor::requiresCompositingForPosition(RenderObject* rendere
return false;
// FIXME: acceleratedCompositingForFixedPositionEnabled should probably be renamed acceleratedCompositingForViewportConstrainedPositionEnabled().
- if (Settings* settings = m_renderView->document()->settings()) {
+ if (Settings* settings = m_renderView->document().settings()) {
if (!settings->acceleratedCompositingForFixedPositionEnabled())
return false;
}
@@ -2169,7 +2169,7 @@ void RenderLayerCompositor::paintContents(const GraphicsLayer* graphicsLayer, Gr
bool RenderLayerCompositor::supportsFixedRootBackgroundCompositing() const
{
- if (Settings* settings = m_renderView->document()->settings()) {
+ if (Settings* settings = m_renderView->document().settings()) {
if (settings->acceleratedCompositingForFixedRootBackgroundEnabled())
return true;
}
@@ -2474,7 +2474,7 @@ void RenderLayerCompositor::attachRootLayer(RootLayerAttachment attachment)
case RootLayerAttachedViaEnclosingFrame: {
// The layer will get hooked up via RenderLayerBacking::updateGraphicsLayerConfiguration()
// for the frame's renderer in the parent document.
- m_renderView->document()->ownerElement()->scheduleLayerUpdate();
+ m_renderView->document().ownerElement()->scheduleLayerUpdate();
break;
}
}
@@ -2496,7 +2496,7 @@ void RenderLayerCompositor::detachRootLayer()
else
m_rootContentLayer->removeFromParent();
- if (HTMLFrameOwnerElement* ownerElement = m_renderView->document()->ownerElement())
+ if (HTMLFrameOwnerElement* ownerElement = m_renderView->document().ownerElement())
ownerElement->scheduleLayerUpdate();
break;
}
@@ -2522,7 +2522,7 @@ void RenderLayerCompositor::updateRootLayerAttachment()
bool RenderLayerCompositor::isMainFrame() const
{
- return !m_renderView->document()->ownerElement();
+ return !m_renderView->document().ownerElement();
}
// IFrames are special, because we hook compositing layers together across iframe boundaries
@@ -2541,7 +2541,7 @@ void RenderLayerCompositor::notifyIFramesOfCompositingChange()
// Compositing also affects the answer to RenderIFrame::requiresAcceleratedCompositing(), so
// we need to schedule a style recalc in our parent document.
- if (HTMLFrameOwnerElement* ownerElement = m_renderView->document()->ownerElement())
+ if (HTMLFrameOwnerElement* ownerElement = m_renderView->document().ownerElement())
ownerElement->scheduleLayerUpdate();
}
« no previous file with comments | « Source/core/rendering/RenderLayerBacking.cpp ('k') | Source/core/rendering/RenderLayerFilterInfo.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698