Diff
Modified: trunk/Source/WebKit2/ChangeLog (176307 => 176308)
--- trunk/Source/WebKit2/ChangeLog 2014-11-19 05:12:53 UTC (rev 176307)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-19 05:13:54 UTC (rev 176308)
@@ -1,3 +1,49 @@
+2014-11-18 Benjamin Poulain <[email protected]>
+
+ [WK2] Remove the minimalUI code from the UIProcess
+ https://bugs.webkit.org/show_bug.cgi?id=138819
+
+ Reviewed by Sam Weinig.
+
+ It looks like the only interface we have to keep alive is
+ [WKWebView _overrideLayoutParametersWithMinimumLayoutSize:minimumLayoutSizeForMinimalUI:maximumUnobscuredSizeOverride:].
+
+ Clean up everything else, it is a pile of useless code.
+
+ * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _didCommitLoadForMainFrame]):
+ (-[WKWebView _didCommitLayerTree:]):
+ (-[WKWebView _frameOrBoundsChanged]):
+ (-[WKWebView _didRelaunchProcess]):
+ (-[WKWebView _beginAnimatedResizeWithUpdates:]):
+ (-[WKWebView _overrideLayoutParametersWithMinimumLayoutSize:minimumLayoutSizeForMinimalUI:maximumUnobscuredSizeOverride:]):
+ (-[WKWebView _overrideLayoutParametersWithMinimumLayoutSize:maximumUnobscuredSizeOverride:]):
+ (-[WKWebView _setUsesMinimalUI:]): Deleted.
+ (-[WKWebView _usesMinimalUI]): Deleted.
+ (activeMinimumLayoutSizeForMinimalUI): Deleted.
+ (-[WKWebView _setMinimumLayoutSizeOverrideForMinimalUI:]): Deleted.
+ * UIProcess/API/Cocoa/WKWebViewInternal.h:
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ * UIProcess/API/ios/WKViewIOS.mm:
+ (-[WKView _frameOrBoundsChanged]):
+ * UIProcess/PageClient.h:
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * UIProcess/ios/PageClientImplIOS.h:
+ * UIProcess/ios/PageClientImplIOS.mm:
+ (WebKit::PageClientImpl::setUsesMinimalUI): Deleted.
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::dynamicViewportSizeUpdate):
+ (WebKit::WebPageProxy::setViewportConfigurationMinimumLayoutSizeForMinimalUI): Deleted.
+ (WebKit::WebPageProxy::setUsesMinimalUI): Deleted.
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::viewportPropertiesDidChange):
+ (WebKit::WebPage::dynamicViewportSizeUpdate):
+ (WebKit::WebPage::setViewportConfigurationMinimumLayoutSizeForMinimalUI): Deleted.
+
2014-11-18 Conrad Shultz <[email protected]>
Unreviewed. Revision to the build fix in r176304.
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h (176307 => 176308)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h 2014-11-19 05:12:53 UTC (rev 176307)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h 2014-11-19 05:13:54 UTC (rev 176308)
@@ -49,7 +49,6 @@
#if TARGET_OS_IPHONE
- (NSArray *)_webView:(WKWebView *)webView actionsForElement:(_WKActivatedElementInfo *)element defaultActions:(NSArray *)defaultActions;
- (void)_webView:(WKWebView *)webView didNotHandleTapAsClickAtPoint:(CGPoint)point;
-- (void)_webView:(WKWebView *)webView usesMinimalUI:(BOOL)wantMinimalUI;
- (BOOL)_webView:(WKWebView *)webView shouldRequestGeolocationAuthorizationForURL:(NSURL *)url isMainFrame:(BOOL)isMainFrame mainFrameURL:(NSURL *)mainFrameURL;
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (176307 => 176308)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-11-19 05:12:53 UTC (rev 176307)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-11-19 05:13:54 UTC (rev 176308)
@@ -161,12 +161,8 @@
BOOL _overridesMinimumLayoutSize;
CGSize _minimumLayoutSizeOverride;
- BOOL _overridesMinimumLayoutSizeForMinimalUI;
- CGSize _minimumLayoutSizeOverrideForMinimalUI;
BOOL _overridesMaximumUnobscuredSize;
CGSize _maximumUnobscuredSizeOverride;
- BOOL _usesMinimalUI;
- BOOL _needsToNotifyDelegateAboutMinimalUI;
CGRect _inputViewBounds;
CGFloat _viewportMetaTagWidth;
@@ -749,17 +745,6 @@
[_scrollView setBackgroundColor:uiBackgroundColor.get()];
}
-- (void)_setUsesMinimalUI:(BOOL)usesMinimalUI
-{
- _usesMinimalUI = usesMinimalUI;
- _needsToNotifyDelegateAboutMinimalUI = YES;
-}
-
-- (BOOL)_usesMinimalUI
-{
- return _usesMinimalUI;
-}
-
- (CGPoint)_adjustedContentOffset:(CGPoint)point
{
CGPoint result = point;
@@ -813,7 +798,6 @@
_hasCommittedLoadForMainFrame = YES;
_needsResetViewStateAfterCommitLoadForMainFrame = YES;
- _usesMinimalUI = NO;
}
static CGPoint contentOffsetBoundedInValidRange(UIScrollView *scrollView, CGPoint contentOffset)
@@ -874,14 +858,6 @@
if (_gestureController)
_gestureController->setRenderTreeSize(layerTreeTransaction.renderTreeSize());
- if (_needsToNotifyDelegateAboutMinimalUI || _needsResetViewStateAfterCommitLoadForMainFrame) {
- _needsToNotifyDelegateAboutMinimalUI = NO;
-
- auto delegate = _uiDelegate->delegate();
- if ([delegate respondsToSelector:@selector(_webView:usesMinimalUI:)])
- [static_cast<id <WKUIDelegatePrivate>>(delegate.get()) _webView:self usesMinimalUI:_usesMinimalUI];
- }
-
if (_needsResetViewStateAfterCommitLoadForMainFrame && layerTreeTransaction.transactionID() >= _firstPaintAfterCommitLoadTransactionID) {
_needsResetViewStateAfterCommitLoadForMainFrame = NO;
[_scrollView setContentOffset:[self _adjustedContentOffset:CGPointZero]];
@@ -1396,8 +1372,6 @@
if (_dynamicViewportUpdateMode == DynamicViewportUpdateMode::NotResizing) {
if (!_overridesMinimumLayoutSize)
_page->setViewportConfigurationMinimumLayoutSize(WebCore::FloatSize(bounds.size));
- if (!_overridesMinimumLayoutSizeForMinimalUI)
- _page->setViewportConfigurationMinimumLayoutSizeForMinimalUI(WebCore::FloatSize(bounds.size));
if (!_overridesMaximumUnobscuredSize)
_page->setMaximumUnobscuredSize(WebCore::FloatSize(bounds.size));
if (WebKit::DrawingAreaProxy* drawingArea = _page->drawingArea())
@@ -1712,11 +1686,6 @@
return WebCore::FloatSize(webView->_overridesMinimumLayoutSize ? webView->_minimumLayoutSizeOverride : bounds.size);
}
-static WebCore::FloatSize activeMinimumLayoutSizeForMinimalUI(WKWebView *webView, WebCore::FloatSize minimumLayoutSize)
-{
- return webView->_overridesMinimumLayoutSizeForMinimalUI ? WebCore::FloatSize(webView->_minimumLayoutSizeOverrideForMinimalUI) : minimumLayoutSize;
-}
-
static WebCore::FloatSize activeMaximumUnobscuredSize(WKWebView *webView, const CGRect& bounds)
{
return WebCore::FloatSize(webView->_overridesMaximumUnobscuredSize ? webView->_maximumUnobscuredSizeOverride : bounds.size);
@@ -1734,7 +1703,6 @@
CGRect bounds = self.bounds;
WebCore::FloatSize minimalLayoutSize = activeMinimumLayoutSize(self, bounds);
_page->setViewportConfigurationMinimumLayoutSize(minimalLayoutSize);
- _page->setViewportConfigurationMinimumLayoutSizeForMinimalUI(activeMinimumLayoutSizeForMinimalUI(self, minimalLayoutSize));
_page->setMaximumUnobscuredSize(activeMaximumUnobscuredSize(self, bounds));
#endif
}
@@ -2117,17 +2085,6 @@
_page->setViewportConfigurationMinimumLayoutSize(WebCore::FloatSize(minimumLayoutSizeOverride));
}
-- (void)_setMinimumLayoutSizeOverrideForMinimalUI:(CGSize)size
-{
- _overridesMinimumLayoutSizeForMinimalUI = YES;
- if (CGSizeEqualToSize(_minimumLayoutSizeOverrideForMinimalUI, size))
- return;
-
- _minimumLayoutSizeOverrideForMinimalUI = size;
- if (_dynamicViewportUpdateMode == DynamicViewportUpdateMode::NotResizing)
- _page->setViewportConfigurationMinimumLayoutSizeForMinimalUI(WebCore::FloatSize(size));
-}
-
- (UIEdgeInsets)_obscuredInsets
{
return _obscuredInsets;
@@ -2226,7 +2183,6 @@
_dynamicViewportUpdateMode = DynamicViewportUpdateMode::ResizingWithAnimation;
WebCore::FloatSize oldMinimumLayoutSize = activeMinimumLayoutSize(self, oldBounds);
- WebCore::FloatSize oldMinimumLayoutSizeForMinimalUI = activeMinimumLayoutSizeForMinimalUI(self, oldMinimumLayoutSize);
WebCore::FloatSize oldMaximumUnobscuredSize = activeMaximumUnobscuredSize(self, oldBounds);
int32_t oldOrientation = activeOrientation(self);
UIEdgeInsets oldObscuredInsets = _obscuredInsets;
@@ -2235,21 +2191,17 @@
CGRect newBounds = self.bounds;
WebCore::FloatSize newMinimumLayoutSize = activeMinimumLayoutSize(self, newBounds);
- WebCore::FloatSize newMinimumLayoutSizeForMinimalUI = activeMinimumLayoutSizeForMinimalUI(self, newMinimumLayoutSize);
WebCore::FloatSize newMaximumUnobscuredSize = activeMaximumUnobscuredSize(self, newBounds);
int32_t newOrientation = activeOrientation(self);
UIEdgeInsets newObscuredInsets = _obscuredInsets;
CGRect futureUnobscuredRectInSelfCoordinates = UIEdgeInsetsInsetRect(newBounds, _obscuredInsets);
ASSERT_WITH_MESSAGE(!(_overridesMinimumLayoutSize && newMinimumLayoutSize.isEmpty()), "Clients controlling the layout size should maintain a valid layout size to minimize layouts.");
- ASSERT_WITH_MESSAGE(!(_overridesMinimumLayoutSizeForMinimalUI && newMinimumLayoutSizeForMinimalUI.isEmpty()), "Clients controlling the layout size should maintain a valid layout size for minimal UI to minimize layouts.");
- if (CGRectIsEmpty(newBounds) || newMinimumLayoutSize.isEmpty() || newMinimumLayoutSizeForMinimalUI.isEmpty() || CGRectIsEmpty(futureUnobscuredRectInSelfCoordinates)) {
+ if (CGRectIsEmpty(newBounds) || newMinimumLayoutSize.isEmpty() || CGRectIsEmpty(futureUnobscuredRectInSelfCoordinates)) {
_dynamicViewportUpdateMode = DynamicViewportUpdateMode::NotResizing;
[self _frameOrBoundsChanged];
if (_overridesMinimumLayoutSize)
_page->setViewportConfigurationMinimumLayoutSize(WebCore::FloatSize(newMinimumLayoutSize));
- if (_overridesMinimumLayoutSizeForMinimalUI)
- _page->setViewportConfigurationMinimumLayoutSizeForMinimalUI(WebCore::FloatSize(newMinimumLayoutSizeForMinimalUI));
if (_overridesMaximumUnobscuredSize)
_page->setMaximumUnobscuredSize(WebCore::FloatSize(newMaximumUnobscuredSize));
if (_overridesInterfaceOrientation)
@@ -2260,7 +2212,6 @@
if (CGRectEqualToRect(oldBounds, newBounds)
&& oldMinimumLayoutSize == newMinimumLayoutSize
- && oldMinimumLayoutSizeForMinimalUI == newMinimumLayoutSizeForMinimalUI
&& oldMaximumUnobscuredSize == newMaximumUnobscuredSize
&& oldOrientation == newOrientation
&& UIEdgeInsetsEqualToEdgeInsets(oldObscuredInsets, newObscuredInsets)) {
@@ -2321,7 +2272,7 @@
CGRect visibleRectInContentCoordinates = [self convertRect:newBounds toView:_contentView.get()];
CGRect unobscuredRectInContentCoordinates = [self convertRect:futureUnobscuredRectInSelfCoordinates toView:_contentView.get()];
- _page->dynamicViewportSizeUpdate(newMinimumLayoutSize, newMinimumLayoutSizeForMinimalUI, newMaximumUnobscuredSize, visibleRectInContentCoordinates, unobscuredRectInContentCoordinates, futureUnobscuredRectInSelfCoordinates, targetScale, newOrientation);
+ _page->dynamicViewportSizeUpdate(newMinimumLayoutSize, newMaximumUnobscuredSize, visibleRectInContentCoordinates, unobscuredRectInContentCoordinates, futureUnobscuredRectInSelfCoordinates, targetScale, newOrientation);
if (WebKit::DrawingAreaProxy* drawingArea = _page->drawingArea())
drawingArea->setSize(WebCore::IntSize(newBounds.size), WebCore::IntSize(), WebCore::IntSize());
}
@@ -2416,15 +2367,13 @@
- (void)_overrideLayoutParametersWithMinimumLayoutSize:(CGSize)minimumLayoutSize minimumLayoutSizeForMinimalUI:(CGSize)minimumLayoutSizeForMinimalUI maximumUnobscuredSizeOverride:(CGSize)maximumUnobscuredSizeOverride
{
- [self _setMinimumLayoutSizeOverride:minimumLayoutSize];
- [self _setMinimumLayoutSizeOverrideForMinimalUI:minimumLayoutSizeForMinimalUI];
- [self _setMaximumUnobscuredSizeOverride:maximumUnobscuredSizeOverride];
+ UNUSED_PARAM(minimumLayoutSizeForMinimalUI);
+ [self _overrideLayoutParametersWithMinimumLayoutSize:minimumLayoutSize maximumUnobscuredSizeOverride:maximumUnobscuredSizeOverride];
}
- (void)_overrideLayoutParametersWithMinimumLayoutSize:(CGSize)minimumLayoutSize maximumUnobscuredSizeOverride:(CGSize)maximumUnobscuredSizeOverride
{
[self _setMinimumLayoutSizeOverride:minimumLayoutSize];
- [self _setMinimumLayoutSizeOverrideForMinimalUI:minimumLayoutSize];
[self _setMaximumUnobscuredSizeOverride:maximumUnobscuredSizeOverride];
}
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h (176307 => 176308)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2014-11-19 05:12:53 UTC (rev 176307)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2014-11-19 05:13:54 UTC (rev 176308)
@@ -67,9 +67,6 @@
}
#if PLATFORM(IOS)
-
-@property (nonatomic, setter=_setUsesMinimalUI:) BOOL _usesMinimalUI;
-
- (void)_processDidExit;
- (void)_didCommitLoadForMainFrame;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (176307 => 176308)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-11-19 05:12:53 UTC (rev 176307)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-11-19 05:13:54 UTC (rev 176308)
@@ -139,6 +139,8 @@
- (void)_snapshotRect:(CGRect)rectInViewCoordinates intoImageOfWidth:(CGFloat)imageWidth completionHandler:(void(^)(CGImageRef))completionHandler;
+// Deprecated: Use [_overrideLayoutParametersWithMinimumLayoutSize:maximumUnobscuredSizeOverride:] instead.
+// This function is kept for binary compatibility with iOS 8.0, it can be removed after the bincompat window.
- (void)_overrideLayoutParametersWithMinimumLayoutSize:(CGSize)minimumLayoutSize minimumLayoutSizeForMinimalUI:(CGSize)minimumLayoutSizeForMinimalUI maximumUnobscuredSizeOverride:(CGSize)maximumUnobscuredSizeOverride;
- (void)_overrideLayoutParametersWithMinimumLayoutSize:(CGSize)minimumLayoutSize maximumUnobscuredSizeOverride:(CGSize)maximumUnobscuredSizeOverride;
Modified: trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm (176307 => 176308)
--- trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm 2014-11-19 05:12:53 UTC (rev 176307)
+++ trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm 2014-11-19 05:13:54 UTC (rev 176308)
@@ -247,7 +247,6 @@
WebPageProxy* webPageProxy = [_contentView page];
WebCore::FloatSize size(bounds.size);
webPageProxy->setViewportConfigurationMinimumLayoutSize(size);
- webPageProxy->setViewportConfigurationMinimumLayoutSizeForMinimalUI(size);
webPageProxy->setMaximumUnobscuredSize(size);
[_scrollView setFrame:bounds];
Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (176307 => 176308)
--- trunk/Source/WebKit2/UIProcess/PageClient.h 2014-11-19 05:12:53 UTC (rev 176307)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2014-11-19 05:13:54 UTC (rev 176308)
@@ -274,7 +274,6 @@
virtual void showPlaybackTargetPicker(bool hasVideo, const WebCore::IntRect& elementRect) = 0;
virtual void zoomToRect(WebCore::FloatRect, double minimumScale, double maximumScale) = 0;
virtual void didChangeViewportMetaTagWidth(float) = 0;
- virtual void setUsesMinimalUI(bool) = 0;
virtual double minimumZoomScale() const = 0;
virtual WebCore::FloatSize contentsSize() const = 0;
virtual void overflowScrollViewWillStartPanGesture() = 0;
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (176307 => 176308)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-11-19 05:12:53 UTC (rev 176307)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-11-19 05:13:54 UTC (rev 176308)
@@ -407,11 +407,10 @@
void overflowScrollWillStartScroll();
void overflowScrollDidEndScroll();
- void dynamicViewportSizeUpdate(const WebCore::FloatSize& minimumLayoutSize, const WebCore::FloatSize& minimumLayoutSizeForMinimalUI, const WebCore::FloatSize& maximumUnobscuredSize, const WebCore::FloatRect& targetExposedContentRect, const WebCore::FloatRect& targetUnobscuredRect, const WebCore::FloatRect& targetUnobscuredRectInScrollViewCoordinates, double targetScale, int32_t deviceOrientation);
+ void dynamicViewportSizeUpdate(const WebCore::FloatSize& minimumLayoutSize, const WebCore::FloatSize& maximumUnobscuredSize, const WebCore::FloatRect& targetExposedContentRect, const WebCore::FloatRect& targetUnobscuredRect, const WebCore::FloatRect& targetUnobscuredRectInScrollViewCoordinates, double targetScale, int32_t deviceOrientation);
void synchronizeDynamicViewportUpdate();
void setViewportConfigurationMinimumLayoutSize(const WebCore::FloatSize&);
- void setViewportConfigurationMinimumLayoutSizeForMinimalUI(const WebCore::FloatSize&);
void setMaximumUnobscuredSize(const WebCore::FloatSize&);
void setDeviceOrientation(int32_t);
int32_t deviceOrientation() const { return m_deviceOrientation; }
@@ -451,7 +450,6 @@
void commitPotentialTapFailed();
void didNotHandleTapAsClick(const WebCore::IntPoint&);
void viewportMetaTagWidthDidChange(float width);
- void setUsesMinimalUI(bool);
void didFinishDrawingPagesToPDF(const IPC::DataReference&);
void contentSizeCategoryDidChange(const String& contentSizeCategory);
#endif
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (176307 => 176308)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-11-19 05:12:53 UTC (rev 176307)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-11-19 05:13:54 UTC (rev 176308)
@@ -186,7 +186,6 @@
CommitPotentialTapFailed()
DidNotHandleTapAsClick(WebCore::IntPoint point)
ViewportMetaTagWidthDidChange(float width)
- SetUsesMinimalUI(bool usesMinimalUI)
DidFinishDrawingPagesToPDF(IPC::DataReference pdfData)
#endif
#if PLATFORM(GTK)
Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h (176307 => 176308)
--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2014-11-19 05:12:53 UTC (rev 176307)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2014-11-19 05:13:54 UTC (rev 176308)
@@ -128,7 +128,6 @@
virtual bool handleRunOpenPanel(WebPageProxy*, WebFrameProxy*, WebOpenPanelParameters*, WebOpenPanelResultListenerProxy*) override;
virtual void didChangeViewportMetaTagWidth(float) override;
- virtual void setUsesMinimalUI(bool) override;
virtual double minimumZoomScale() const override;
virtual WebCore::FloatSize contentsSize() const override;
Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (176307 => 176308)
--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2014-11-19 05:12:53 UTC (rev 176307)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2014-11-19 05:13:54 UTC (rev 176308)
@@ -252,11 +252,6 @@
[m_webView _setViewportMetaTagWidth:newWidth];
}
-void PageClientImpl::setUsesMinimalUI(bool usesMinimalUI)
-{
- [m_webView _setUsesMinimalUI:usesMinimalUI];
-}
-
double PageClientImpl::minimumZoomScale() const
{
if (UIScrollView *scroller = [m_webView scrollView])
Modified: trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (176307 => 176308)
--- trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2014-11-19 05:12:53 UTC (rev 176307)
+++ trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2014-11-19 05:13:54 UTC (rev 176308)
@@ -261,14 +261,14 @@
m_pageClient.overflowScrollDidEndScroll();
}
-void WebPageProxy::dynamicViewportSizeUpdate(const FloatSize& minimumLayoutSize, const WebCore::FloatSize& minimumLayoutSizeForMinimalUI, const WebCore::FloatSize& maximumUnobscuredSize, const FloatRect& targetExposedContentRect, const FloatRect& targetUnobscuredRect, const FloatRect& targetUnobscuredRectInScrollViewCoordinates, double targetScale, int32_t deviceOrientation)
+void WebPageProxy::dynamicViewportSizeUpdate(const FloatSize& minimumLayoutSize, const WebCore::FloatSize& maximumUnobscuredSize, const FloatRect& targetExposedContentRect, const FloatRect& targetUnobscuredRect, const FloatRect& targetUnobscuredRectInScrollViewCoordinates, double targetScale, int32_t deviceOrientation)
{
if (!isValid())
return;
m_dynamicViewportSizeUpdateWaitingForTarget = true;
m_dynamicViewportSizeUpdateWaitingForLayerTreeCommit = true;
- m_process->send(Messages::WebPage::DynamicViewportSizeUpdate(minimumLayoutSize, minimumLayoutSizeForMinimalUI, maximumUnobscuredSize, targetExposedContentRect, targetUnobscuredRect, targetUnobscuredRectInScrollViewCoordinates, targetScale, deviceOrientation), m_pageID);
+ m_process->send(Messages::WebPage::DynamicViewportSizeUpdate(minimumLayoutSize, maximumUnobscuredSize, targetExposedContentRect, targetUnobscuredRect, targetUnobscuredRectInScrollViewCoordinates, targetScale, deviceOrientation), m_pageID);
}
void WebPageProxy::synchronizeDynamicViewportUpdate()
@@ -313,11 +313,6 @@
m_process->send(Messages::WebPage::SetViewportConfigurationMinimumLayoutSize(size), m_pageID);
}
-void WebPageProxy::setViewportConfigurationMinimumLayoutSizeForMinimalUI(const WebCore::FloatSize& size)
-{
- m_process->send(Messages::WebPage::SetViewportConfigurationMinimumLayoutSizeForMinimalUI(size), m_pageID);
-}
-
void WebPageProxy::setMaximumUnobscuredSize(const WebCore::FloatSize& size)
{
m_process->send(Messages::WebPage::SetMaximumUnobscuredSize(size), m_pageID);
@@ -819,11 +814,6 @@
m_pageClient.didChangeViewportMetaTagWidth(width);
}
-void WebPageProxy::setUsesMinimalUI(bool usesMinimalUI)
-{
- m_pageClient.setUsesMinimalUI(usesMinimalUI);
-}
-
void WebPageProxy::didFinishDrawingPagesToPDF(const IPC::DataReference& pdfData)
{
m_pageClient.didFinishDrawingPagesToPDF(pdfData);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (176307 => 176308)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-11-19 05:12:53 UTC (rev 176307)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-11-19 05:13:54 UTC (rev 176308)
@@ -755,10 +755,9 @@
#if PLATFORM(IOS)
void setViewportConfigurationMinimumLayoutSize(const WebCore::FloatSize&);
- void setViewportConfigurationMinimumLayoutSizeForMinimalUI(const WebCore::FloatSize&);
void setMaximumUnobscuredSize(const WebCore::FloatSize&);
void setDeviceOrientation(int32_t);
- void dynamicViewportSizeUpdate(const WebCore::FloatSize& minimumLayoutSize, const WebCore::FloatSize& minimumLayoutSizeForMinimalUI, const WebCore::FloatSize& maximumUnobscuredSize, const WebCore::FloatRect& targetExposedContentRect, const WebCore::FloatRect& targetUnobscuredRect, const WebCore::FloatRect& targetUnobscuredRectInScrollViewCoordinates, double scale, int32_t deviceOrientation);
+ void dynamicViewportSizeUpdate(const WebCore::FloatSize& minimumLayoutSize, const WebCore::FloatSize& maximumUnobscuredSize, const WebCore::FloatRect& targetExposedContentRect, const WebCore::FloatRect& targetUnobscuredRect, const WebCore::FloatRect& targetUnobscuredRectInScrollViewCoordinates, double scale, int32_t deviceOrientation);
void synchronizeDynamicViewportUpdate(double& newTargetScale, WebCore::FloatPoint& newScrollPosition, uint64_t& nextValidLayerTreeTransactionID);
void updateVisibleContentRects(const VisibleContentRectUpdateInfo&, double oldestTimestamp);
bool scaleWasSetByUIProcess() const { return m_scaleWasSetByUIProcess; }
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (176307 => 176308)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-11-19 05:12:53 UTC (rev 176307)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-11-19 05:13:54 UTC (rev 176308)
@@ -44,10 +44,9 @@
WheelEventSyncForTesting(WebKit::WebWheelEvent event) -> (bool handled)
#if PLATFORM(IOS)
SetViewportConfigurationMinimumLayoutSize(WebCore::FloatSize size)
- SetViewportConfigurationMinimumLayoutSizeForMinimalUI(WebCore::FloatSize size)
SetMaximumUnobscuredSize(WebCore::FloatSize size)
SetDeviceOrientation(int32_t deviceOrientation)
- DynamicViewportSizeUpdate(WebCore::FloatSize minimumLayoutSize, WebCore::FloatSize minimumLayoutSizeForMinimalUI, WebCore::FloatSize maximumUnobscuredSize, WebCore::FloatRect targetExposedContentRect, WebCore::FloatRect targetUnobscuredRect, WebCore::FloatRect targetUnobscuredRectInScrollViewCoordinates, double scale, int32_t deviceOrientation)
+ DynamicViewportSizeUpdate(WebCore::FloatSize minimumLayoutSize, WebCore::FloatSize maximumUnobscuredSize, WebCore::FloatRect targetExposedContentRect, WebCore::FloatRect targetUnobscuredRect, WebCore::FloatRect targetUnobscuredRectInScrollViewCoordinates, double scale, int32_t deviceOrientation)
SynchronizeDynamicViewportUpdate() -> (double newTargetScale, WebCore::FloatPoint newScrollPosition, uint64_t nextValidLayerTreeTransactionID)
HandleTap(WebCore::IntPoint point)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (176307 => 176308)
--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-11-19 05:12:53 UTC (rev 176307)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-11-19 05:13:54 UTC (rev 176308)
@@ -140,14 +140,10 @@
return;
float oldWidth = m_viewportConfiguration.viewportArguments().width;
- bool wasUsingMinimalUI = m_viewportConfiguration.usesMinimalUI();
m_viewportConfiguration.setViewportArguments(viewportArguments);
viewportConfigurationChanged();
- if (wasUsingMinimalUI != m_viewportConfiguration.usesMinimalUI())
- send(Messages::WebPageProxy::SetUsesMinimalUI(m_viewportConfiguration.usesMinimalUI()));
-
if (oldWidth != viewportArguments.width)
send(Messages::WebPageProxy::ViewportMetaTagWidthDidChange(viewportArguments.width));
}
@@ -2191,13 +2187,6 @@
viewportConfigurationChanged();
}
-void WebPage::setViewportConfigurationMinimumLayoutSizeForMinimalUI(const FloatSize& size)
-{
- resetTextAutosizingBeforeLayoutIfNeeded(m_viewportConfiguration.minimumLayoutSizeForMinimalUI(), size);
- m_viewportConfiguration.setMinimumLayoutSizeForMinimalUI(size);
- viewportConfigurationChanged();
-}
-
void WebPage::setMaximumUnobscuredSize(const FloatSize& maximumUnobscuredSize)
{
m_maximumUnobscuredSize = maximumUnobscuredSize;
@@ -2232,7 +2221,7 @@
}
}
-void WebPage::dynamicViewportSizeUpdate(const FloatSize& minimumLayoutSize, const FloatSize& minimumLayoutSizeForMinimalUI, const WebCore::FloatSize& maximumUnobscuredSize, const FloatRect& targetExposedContentRect, const FloatRect& targetUnobscuredRect, const WebCore::FloatRect& targetUnobscuredRectInScrollViewCoordinates, double targetScale, int32_t deviceOrientation)
+void WebPage::dynamicViewportSizeUpdate(const FloatSize& minimumLayoutSize, const WebCore::FloatSize& maximumUnobscuredSize, const FloatRect& targetExposedContentRect, const FloatRect& targetUnobscuredRect, const WebCore::FloatRect& targetUnobscuredRectInScrollViewCoordinates, double targetScale, int32_t deviceOrientation)
{
TemporaryChange<bool> dynamicSizeUpdateGuard(m_inDynamicSizeUpdate, true);
// FIXME: this does not handle the cases where the content would change the content size or scroll position from _javascript_.
@@ -2269,9 +2258,7 @@
}
resetTextAutosizingBeforeLayoutIfNeeded(m_viewportConfiguration.minimumLayoutSize(), minimumLayoutSize);
- resetTextAutosizingBeforeLayoutIfNeeded(m_viewportConfiguration.minimumLayoutSizeForMinimalUI(), minimumLayoutSizeForMinimalUI);
m_viewportConfiguration.setMinimumLayoutSize(minimumLayoutSize);
- m_viewportConfiguration.setMinimumLayoutSizeForMinimalUI(minimumLayoutSizeForMinimalUI);
IntSize newLayoutSize = m_viewportConfiguration.layoutSize();
setFixedLayoutSize(newLayoutSize);
