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):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@160050 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 64dd899f
2013-12-03 Simon Fraser <simon.fraser@apple.com>
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 <eric.carlson@apple.com>
Fix regression caused by r158599
......@@ -2313,7 +2313,6 @@ __ZN7WebCore4Node23compareDocumentPositionEPS0_
__ZN7WebCore5ColorC1EP7CGColor
__ZN7WebCore5EventC1ERKN3WTF12AtomicStringEbb
__ZN7WebCore5Frame15setTimersPausedEb
__ZN7WebCore5Frame20documentScaleChangedEv
__ZN7WebCore5Frame20setViewportArgumentsERKNS_17ViewportArgumentsE
__ZN7WebCore5Frame21deepestNodeAtLocationEP7CGPoint
__ZN7WebCore5Frame21viewportOffsetChangedEv
......@@ -2373,7 +2372,6 @@ __ZNK7WebCore17RenderTextControl22textFormControlElementEv
__ZNK7WebCore17RenderTextControl23visiblePositionForIndexEi
__ZNK7WebCore4Node18rendererIsEditableENS0_13EditableLevelE
__ZNK7WebCore5Frame12updateLayoutEv
__ZNK7WebCore5Frame13documentScaleEv
__ZNK7WebCore5Frame15innerLineHeightEP7DOMNode
__ZNK7WebCore5Frame15preferredHeightEv
__ZNK7WebCore5Frame16rectForSelectionERNS_16VisibleSelectionE
......
2013-12-03 Simon Fraser <simon.fraser@apple.com>
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 <andersca@apple.com>
PageBannerClientImpl should be an API::Client
......
......@@ -2440,7 +2440,6 @@ void WebPage::updatePreferences(const WebPreferencesStore& store)
settings.setInteractiveFormValidationEnabled(store.getBoolValueForKey(WebPreferencesKey::interactiveFormValidationEnabledKey()));
settings.setSpatialNavigationEnabled(store.getBoolValueForKey(WebPreferencesKey::spatialNavigationEnabledKey()));
#if ENABLE(SQL_DATABASE)
DatabaseManager::manager().setIsAvailable(store.getBoolValueForKey(WebPreferencesKey::databasesEnabledKey()));
#endif
......
......@@ -749,7 +749,6 @@ void WebPage::didFinishScrolling(const WebCore::FloatPoint& contentOffset)
void WebPage::didFinishZooming(float newScale)
{
m_page->mainFrame().setDocumentScale(newScale);
m_page->setPageScaleFactor(newScale, m_page->mainFrame().view()->scrollPosition());
}
......
......@@ -74,7 +74,6 @@ private:
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
......
......@@ -44,6 +44,9 @@ RemoteLayerTreeDrawingArea::RemoteLayerTreeDrawingArea(WebPage* webPage, const W
, 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 @@ void RemoteLayerTreeDrawingArea::setDeviceScaleFactor(float deviceScaleFactor)
{
m_webPage->setDeviceScaleFactor(deviceScaleFactor);
}
float RemoteLayerTreeDrawingArea::minimumDocumentScale() const
{
return m_webPage->corePage()->mainFrame().minimumDocumentScale();
}
#endif
void RemoteLayerTreeDrawingArea::setLayerTreeStateIsFrozen(bool isFrozen)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment