Title: [160050] trunk/Source
- Revision
- 160050
- Author
- [email protected]
- Date
- 2013-12-03 15:25:19 -0800 (Tue, 03 Dec 2013)
Log Message
Remove some iOS-related documentScale code
https://bugs.webkit.org/show_bug.cgi?id=125194
Source/WebCore:
Reviewed by Enrica Casucci.
Remove exports of nonexistent documentScale-related functions on Frame.
* WebCore.exp.in:
Source/WebKit2:
Reviewed by Enrica Casucci.
Upstream bits of removal of Frame::documentScale on iOS.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences): Whitespace.
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::didFinishZooming): Don't call setDocumentScale().
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h: Remove minimumDocumentScale().
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm: Ditto.
(WebKit::RemoteLayerTreeDrawingArea::RemoteLayerTreeDrawingArea): We delegate page scaling on iOS.
(WebKit::RemoteLayerTreeDrawingArea::setDeviceScaleFactor):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (160049 => 160050)
--- trunk/Source/WebCore/ChangeLog 2013-12-03 23:21:03 UTC (rev 160049)
+++ trunk/Source/WebCore/ChangeLog 2013-12-03 23:25:19 UTC (rev 160050)
@@ -1,3 +1,14 @@
+2013-12-03 Simon Fraser <[email protected]>
+
+ Remove some iOS-related documentScale code
+ https://bugs.webkit.org/show_bug.cgi?id=125194
+
+ Reviewed by Enrica Casucci.
+
+ Remove exports of nonexistent documentScale-related functions on Frame.
+
+ * WebCore.exp.in:
+
2013-12-03 Eric Carlson <[email protected]>
Fix regression caused by r158599
Modified: trunk/Source/WebCore/WebCore.exp.in (160049 => 160050)
--- trunk/Source/WebCore/WebCore.exp.in 2013-12-03 23:21:03 UTC (rev 160049)
+++ trunk/Source/WebCore/WebCore.exp.in 2013-12-03 23:25:19 UTC (rev 160050)
@@ -2313,7 +2313,6 @@
__ZN7WebCore5ColorC1EP7CGColor
__ZN7WebCore5EventC1ERKN3WTF12AtomicStringEbb
__ZN7WebCore5Frame15setTimersPausedEb
-__ZN7WebCore5Frame20documentScaleChangedEv
__ZN7WebCore5Frame20setViewportArgumentsERKNS_17ViewportArgumentsE
__ZN7WebCore5Frame21deepestNodeAtLocationEP7CGPoint
__ZN7WebCore5Frame21viewportOffsetChangedEv
@@ -2373,7 +2372,6 @@
__ZNK7WebCore17RenderTextControl23visiblePositionForIndexEi
__ZNK7WebCore4Node18rendererIsEditableENS0_13EditableLevelE
__ZNK7WebCore5Frame12updateLayoutEv
-__ZNK7WebCore5Frame13documentScaleEv
__ZNK7WebCore5Frame15innerLineHeightEP7DOMNode
__ZNK7WebCore5Frame15preferredHeightEv
__ZNK7WebCore5Frame16rectForSelectionERNS_16VisibleSelectionE
Modified: trunk/Source/WebKit2/ChangeLog (160049 => 160050)
--- trunk/Source/WebKit2/ChangeLog 2013-12-03 23:21:03 UTC (rev 160049)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-03 23:25:19 UTC (rev 160050)
@@ -1,3 +1,21 @@
+2013-12-03 Simon Fraser <[email protected]>
+
+ Remove some iOS-related documentScale code
+ https://bugs.webkit.org/show_bug.cgi?id=125194
+
+ Reviewed by Enrica Casucci.
+
+ Upstream bits of removal of Frame::documentScale on iOS.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences): Whitespace.
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::didFinishZooming): Don't call setDocumentScale().
+ * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h: Remove minimumDocumentScale().
+ * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm: Ditto.
+ (WebKit::RemoteLayerTreeDrawingArea::RemoteLayerTreeDrawingArea): We delegate page scaling on iOS.
+ (WebKit::RemoteLayerTreeDrawingArea::setDeviceScaleFactor):
+
2013-12-03 Anders Carlsson <[email protected]>
PageBannerClientImpl should be an API::Client
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (160049 => 160050)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-12-03 23:21:03 UTC (rev 160049)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-12-03 23:25:19 UTC (rev 160050)
@@ -2440,7 +2440,6 @@
settings.setInteractiveFormValidationEnabled(store.getBoolValueForKey(WebPreferencesKey::interactiveFormValidationEnabledKey()));
settings.setSpatialNavigationEnabled(store.getBoolValueForKey(WebPreferencesKey::spatialNavigationEnabledKey()));
-
#if ENABLE(SQL_DATABASE)
DatabaseManager::manager().setIsAvailable(store.getBoolValueForKey(WebPreferencesKey::databasesEnabledKey()));
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (160049 => 160050)
--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2013-12-03 23:21:03 UTC (rev 160049)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2013-12-03 23:25:19 UTC (rev 160050)
@@ -749,7 +749,6 @@
void WebPage::didFinishZooming(float newScale)
{
- m_page->mainFrame().setDocumentScale(newScale);
m_page->setPageScaleFactor(newScale, m_page->mainFrame().view()->scrollPosition());
}
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h (160049 => 160050)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h 2013-12-03 23:21:03 UTC (rev 160049)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h 2013-12-03 23:25:19 UTC (rev 160050)
@@ -74,7 +74,6 @@
virtual void didCommitChangesForLayer(const WebCore::GraphicsLayer*) const OVERRIDE { }
#if PLATFORM(IOS)
virtual void setDeviceScaleFactor(float) OVERRIDE;
- virtual float minimumDocumentScale() const OVERRIDE;
virtual bool allowCompositingLayerVisualDegradation() const OVERRIDE { return false; }
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (160049 => 160050)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2013-12-03 23:21:03 UTC (rev 160049)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2013-12-03 23:25:19 UTC (rev 160050)
@@ -44,6 +44,9 @@
, m_remoteLayerTreeContext(std::make_unique<RemoteLayerTreeContext>(webPage))
{
webPage->corePage()->settings().setForceCompositingMode(true);
+#if PLATFORM(IOS)
+ webPage->corePage()->settings().setDelegatesPageScaling(true);
+#endif
}
RemoteLayerTreeDrawingArea::~RemoteLayerTreeDrawingArea()
@@ -192,11 +195,6 @@
{
m_webPage->setDeviceScaleFactor(deviceScaleFactor);
}
-
-float RemoteLayerTreeDrawingArea::minimumDocumentScale() const
-{
- return m_webPage->corePage()->mainFrame().minimumDocumentScale();
-}
#endif
void RemoteLayerTreeDrawingArea::setLayerTreeStateIsFrozen(bool isFrozen)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
