Title: [154531] trunk/Source/WebCore
- Revision
- 154531
- Author
- [email protected]
- Date
- 2013-08-23 16:19:21 -0700 (Fri, 23 Aug 2013)
Log Message
Simplify some Settings access where we have a Frame in reach.
<http://webkit.org/b/120239>
Reviewed by Anders Carlsson.
In three cases where we can grab at a Frame, we can reach all the way to some Settings
without having to use pointers.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::didBeginDocument):
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::addToOverlapMap):
(WebCore::RenderLayerCompositor::requiresCompositingForPosition):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (154530 => 154531)
--- trunk/Source/WebCore/ChangeLog 2013-08-23 23:15:03 UTC (rev 154530)
+++ trunk/Source/WebCore/ChangeLog 2013-08-23 23:19:21 UTC (rev 154531)
@@ -1,3 +1,19 @@
+2013-08-23 Andreas Kling <[email protected]>
+
+ Simplify some Settings access where we have a Frame in reach.
+ <http://webkit.org/b/120239>
+
+ Reviewed by Anders Carlsson.
+
+ In three cases where we can grab at a Frame, we can reach all the way to some Settings
+ without having to use pointers.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::didBeginDocument):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::addToOverlapMap):
+ (WebCore::RenderLayerCompositor::requiresCompositingForPosition):
+
2013-08-23 Jer Noble <[email protected]>
REGRESSION (r150516): Media controls are messed up on right-to-left webpages
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (154530 => 154531)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2013-08-23 23:15:03 UTC (rev 154530)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2013-08-23 23:19:21 UTC (rev 154531)
@@ -669,11 +669,9 @@
updateFirstPartyForCookies();
m_frame.document()->initContentSecurityPolicy();
- Settings* settings = m_frame.document()->settings();
- if (settings) {
- m_frame.document()->cachedResourceLoader()->setImagesEnabled(settings->areImagesEnabled());
- m_frame.document()->cachedResourceLoader()->setAutoLoadImages(settings->loadsImagesAutomatically());
- }
+ const Settings& settings = m_frame.settings();
+ m_frame.document()->cachedResourceLoader()->setImagesEnabled(settings.areImagesEnabled());
+ m_frame.document()->cachedResourceLoader()->setAutoLoadImages(settings.loadsImagesAutomatically());
if (m_documentLoader) {
String dnsPrefetchControl = m_documentLoader->response().httpHeaderField("X-DNS-Prefetch-Control");
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (154530 => 154531)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2013-08-23 23:15:03 UTC (rev 154530)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2013-08-23 23:19:21 UTC (rev 154531)
@@ -876,9 +876,9 @@
}
IntRect clipRect = pixelSnappedIntRect(layer->backgroundClipRect(RenderLayer::ClipRectsContext(rootRenderLayer(), 0, AbsoluteClipRects)).rect()); // FIXME: Incorrect for CSS regions.
- if (Settings* settings = m_renderView.document()->settings())
- if (!settings->applyPageScaleFactorInCompositor())
- clipRect.scale(pageScaleFactor());
+ const Settings& settings = m_renderView.frameView().frame().settings();
+ if (!settings.applyPageScaleFactorInCompositor())
+ clipRect.scale(pageScaleFactor());
clipRect.intersect(layerBounds);
overlapMap.add(layer, clipRect);
}
@@ -2260,10 +2260,9 @@
return false;
// FIXME: acceleratedCompositingForFixedPositionEnabled should probably be renamed acceleratedCompositingForViewportConstrainedPositionEnabled().
- if (Settings* settings = m_renderView.document()->settings()) {
- if (!settings->acceleratedCompositingForFixedPositionEnabled())
- return false;
- }
+ const Settings& settings = m_renderView.frameView().frame().settings();
+ if (!settings.acceleratedCompositingForFixedPositionEnabled())
+ return false;
if (isSticky)
return hasCoordinatedScrolling() && isViewportConstrainedFixedOrStickyLayer(layer);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
