Diff
Modified: trunk/Source/WebCore/ChangeLog (158128 => 158129)
--- trunk/Source/WebCore/ChangeLog 2013-10-28 21:09:07 UTC (rev 158128)
+++ trunk/Source/WebCore/ChangeLog 2013-10-28 21:19:27 UTC (rev 158129)
@@ -1,3 +1,21 @@
+2013-10-28 Benjamin Poulain <[email protected]>
+
+ Rename applyPageScaleFactorInCompositor to delegatesPageScaling
+ https://bugs.webkit.org/show_bug.cgi?id=123417
+
+ Reviewed by Simon Fraser.
+
+ * page/Frame.cpp:
+ (WebCore::Frame::frameScaleFactor):
+ * page/FrameView.cpp:
+ (WebCore::FrameView::visibleContentScaleFactor):
+ * page/Page.cpp:
+ (WebCore::Page::setPageScaleFactor):
+ * page/Settings.in:
+ * platform/ScrollView.h:
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::addToOverlapMap):
+
2013-10-28 Myles C. Maxfield <[email protected]>
Parsing support for -webkit-text-decoration-skip: ink
Modified: trunk/Source/WebCore/page/Frame.cpp (158128 => 158129)
--- trunk/Source/WebCore/page/Frame.cpp 2013-10-28 21:09:07 UTC (rev 158128)
+++ trunk/Source/WebCore/page/Frame.cpp 2013-10-28 21:19:27 UTC (rev 158129)
@@ -901,7 +901,7 @@
Page* page = this->page();
// Main frame is scaled with respect to he container but inner frames are not scaled with respect to the main frame.
- if (!page || &page->mainFrame() != this || settings().applyPageScaleFactorInCompositor())
+ if (!page || &page->mainFrame() != this || settings().delegatesPageScaling())
return 1;
return page->pageScaleFactor();
Modified: trunk/Source/WebCore/page/FrameView.cpp (158128 => 158129)
--- trunk/Source/WebCore/page/FrameView.cpp 2013-10-28 21:09:07 UTC (rev 158128)
+++ trunk/Source/WebCore/page/FrameView.cpp 2013-10-28 21:19:27 UTC (rev 158129)
@@ -3050,7 +3050,7 @@
float FrameView::visibleContentScaleFactor() const
{
- if (!frame().isMainFrame() || !frame().settings().applyPageScaleFactorInCompositor())
+ if (!frame().isMainFrame() || !frame().settings().delegatesPageScaling())
return 1;
return frame().page()->pageScaleFactor();
Modified: trunk/Source/WebCore/page/Page.cpp (158128 => 158129)
--- trunk/Source/WebCore/page/Page.cpp 2013-10-28 21:09:07 UTC (rev 158128)
+++ trunk/Source/WebCore/page/Page.cpp 2013-10-28 21:19:27 UTC (rev 158129)
@@ -746,7 +746,7 @@
if (scale == m_pageScaleFactor) {
if (view && (view->scrollPosition() != origin || view->delegatesScrolling())) {
- if (!m_settings->applyPageScaleFactorInCompositor())
+ if (!m_settings->delegatesPageScaling())
document->updateLayoutIgnorePendingStylesheets();
view->setScrollPosition(origin);
}
@@ -755,7 +755,7 @@
m_pageScaleFactor = scale;
- if (!m_settings->applyPageScaleFactorInCompositor()) {
+ if (!m_settings->delegatesPageScaling()) {
if (document->renderView())
document->renderView()->setNeedsLayout();
@@ -773,7 +773,7 @@
view->setViewportConstrainedObjectsNeedLayout();
if (view && view->scrollPosition() != origin) {
- if (!m_settings->applyPageScaleFactorInCompositor() && document->renderView() && document->renderView()->needsLayout() && view->didFirstLayout())
+ if (!m_settings->delegatesPageScaling() && document->renderView() && document->renderView()->needsLayout() && view->didFirstLayout())
view->layout();
view->setScrollPosition(origin);
}
Modified: trunk/Source/WebCore/page/Settings.in (158128 => 158129)
--- trunk/Source/WebCore/page/Settings.in 2013-10-28 21:09:07 UTC (rev 158128)
+++ trunk/Source/WebCore/page/Settings.in 2013-10-28 21:19:27 UTC (rev 158129)
@@ -173,7 +173,7 @@
diagnosticLoggingEnabled initial=false
applyDeviceScaleFactorInCompositor initial=true
-applyPageScaleFactorInCompositor initial=false
+delegatesPageScaling initial=false
plugInSnapshottingEnabled initial=false
snapshotAllPlugIns initial=false
autostartOriginPlugInSnapshottingEnabled initial=true
Modified: trunk/Source/WebCore/platform/ScrollView.h (158128 => 158129)
--- trunk/Source/WebCore/platform/ScrollView.h 2013-10-28 21:09:07 UTC (rev 158128)
+++ trunk/Source/WebCore/platform/ScrollView.h 2013-10-28 21:19:27 UTC (rev 158129)
@@ -148,7 +148,7 @@
virtual int visibleHeight() const OVERRIDE { return visibleContentRect().height(); }
// visibleContentRect().size() is computed from unscaledVisibleContentSize() divided by the value of visibleContentScaleFactor.
- // visibleContentScaleFactor is usually 1, except when the setting applyPageScaleFactorInCompositor is true and the
+ // visibleContentScaleFactor is usually 1, except when the setting delegatesPageScaling is true and the
// ScrollView is the main frame; in that case, visibleContentScaleFactor is equal to the page's pageScaleFactor.
// Ports that don't use pageScaleFactor can treat unscaledVisibleContentSize and visibleContentRect().size() as equivalent.
IntSize unscaledVisibleContentSize(VisibleContentRectIncludesScrollbars = ExcludeScrollbars) const;
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (158128 => 158129)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2013-10-28 21:09:07 UTC (rev 158128)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2013-10-28 21:19:27 UTC (rev 158129)
@@ -873,7 +873,7 @@
IntRect clipRect = pixelSnappedIntRect(layer.backgroundClipRect(RenderLayer::ClipRectsContext(&rootRenderLayer(), 0, AbsoluteClipRects)).rect()); // FIXME: Incorrect for CSS regions.
const Settings& settings = m_renderView.frameView().frame().settings();
- if (!settings.applyPageScaleFactorInCompositor())
+ if (!settings.delegatesPageScaling())
clipRect.scale(pageScaleFactor());
clipRect.intersect(layerBounds);
overlapMap.add(&layer, clipRect);
Modified: trunk/Source/WebKit2/ChangeLog (158128 => 158129)
--- trunk/Source/WebKit2/ChangeLog 2013-10-28 21:09:07 UTC (rev 158128)
+++ trunk/Source/WebKit2/ChangeLog 2013-10-28 21:19:27 UTC (rev 158129)
@@ -1,3 +1,13 @@
+2013-10-28 Benjamin Poulain <[email protected]>
+
+ Rename applyPageScaleFactorInCompositor to delegatesPageScaling
+ https://bugs.webkit.org/show_bug.cgi?id=123417
+
+ Reviewed by Simon Fraser.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::setUseFixedLayout):
+
2013-10-28 Myles C. Maxfield <[email protected]>
Parsing support for -webkit-text-decoration-skip: ink
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (158128 => 158129)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-10-28 21:09:07 UTC (rev 158128)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-10-28 21:19:27 UTC (rev 158129)
@@ -1238,7 +1238,7 @@
#if USE(COORDINATED_GRAPHICS)
m_page->settings().setAcceleratedCompositingForFixedPositionEnabled(fixed);
m_page->settings().setFixedPositionCreatesStackingContext(fixed);
- m_page->settings().setApplyPageScaleFactorInCompositor(fixed);
+ m_page->settings().setDelegatesPageScaling(fixed);
m_page->settings().setScrollingCoordinatorEnabled(fixed);
#endif
