⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 176308 in webkit


Ignore:
Timestamp:
Nov 18, 2014, 9:13:54 PM (12 years ago)
Author:
benjamin@webkit.org
Message:

[WK2] Remove the minimalUI code from the UIProcess
​https://bugs.webkit.org/show_bug.cgi?id=138819

Patch by Benjamin Poulain <​bpoulain@apple.com> on 2014-11-18
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.

Location:
trunk/Source/WebKit2
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r176306 r176308  
     12014-11-18  Benjamin Poulain  <bpoulain@apple.com>
     2
     3        [WK2] Remove the minimalUI code from the UIProcess
     4        https://bugs.webkit.org/show_bug.cgi?id=138819
     5
     6        Reviewed by Sam Weinig.
     7
     8        It looks like the only interface we have to keep alive is
     9        [WKWebView _overrideLayoutParametersWithMinimumLayoutSize:minimumLayoutSizeForMinimalUI:maximumUnobscuredSizeOverride:].
     10
     11        Clean up everything else, it is a pile of useless code.
     12
     13        * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
     14        * UIProcess/API/Cocoa/WKWebView.mm:
     15        (-[WKWebView _didCommitLoadForMainFrame]):
     16        (-[WKWebView _didCommitLayerTree:]):
     17        (-[WKWebView _frameOrBoundsChanged]):
     18        (-[WKWebView _didRelaunchProcess]):
     19        (-[WKWebView _beginAnimatedResizeWithUpdates:]):
     20        (-[WKWebView _overrideLayoutParametersWithMinimumLayoutSize:minimumLayoutSizeForMinimalUI:maximumUnobscuredSizeOverride:]):
     21        (-[WKWebView _overrideLayoutParametersWithMinimumLayoutSize:maximumUnobscuredSizeOverride:]):
     22        (-[WKWebView _setUsesMinimalUI:]): Deleted.
     23        (-[WKWebView _usesMinimalUI]): Deleted.
     24        (activeMinimumLayoutSizeForMinimalUI): Deleted.
     25        (-[WKWebView _setMinimumLayoutSizeOverrideForMinimalUI:]): Deleted.
     26        * UIProcess/API/Cocoa/WKWebViewInternal.h:
     27        * UIProcess/API/Cocoa/WKWebViewPrivate.h:
     28        * UIProcess/API/ios/WKViewIOS.mm:
     29        (-[WKView _frameOrBoundsChanged]):
     30        * UIProcess/PageClient.h:
     31        * UIProcess/WebPageProxy.h:
     32        * UIProcess/WebPageProxy.messages.in:
     33        * UIProcess/ios/PageClientImplIOS.h:
     34        * UIProcess/ios/PageClientImplIOS.mm:
     35        (WebKit::PageClientImpl::setUsesMinimalUI): Deleted.
     36        * UIProcess/ios/WebPageProxyIOS.mm:
     37        (WebKit::WebPageProxy::dynamicViewportSizeUpdate):
     38        (WebKit::WebPageProxy::setViewportConfigurationMinimumLayoutSizeForMinimalUI): Deleted.
     39        (WebKit::WebPageProxy::setUsesMinimalUI): Deleted.
     40        * WebProcess/WebPage/WebPage.h:
     41        * WebProcess/WebPage/WebPage.messages.in:
     42        * WebProcess/WebPage/ios/WebPageIOS.mm:
     43        (WebKit::WebPage::viewportPropertiesDidChange):
     44        (WebKit::WebPage::dynamicViewportSizeUpdate):
     45        (WebKit::WebPage::setViewportConfigurationMinimumLayoutSizeForMinimalUI): Deleted.
     46
    1472014-11-18  Conrad Shultz  <conrad_shultz@apple.com>
    248

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h

    r173851 r176308  
    5050- (NSArray *)_webView:(WKWebView *)webView actionsForElement:(_WKActivatedElementInfo *)element defaultActions:(NSArray *)defaultActions;
    5151- (void)_webView:(WKWebView *)webView didNotHandleTapAsClickAtPoint:(CGPoint)point;
    52 - (void)_webView:(WKWebView *)webView usesMinimalUI:(BOOL)wantMinimalUI;
    5352- (BOOL)_webView:(WKWebView *)webView shouldRequestGeolocationAuthorizationForURL:(NSURL *)url isMainFrame:(BOOL)isMainFrame mainFrameURL:(NSURL *)mainFrameURL;
    5453#endif

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

    r176283 r176308  
    162162    BOOL _overridesMinimumLayoutSize;
    163163    CGSize _minimumLayoutSizeOverride;
    164     BOOL _overridesMinimumLayoutSizeForMinimalUI;
    165     CGSize _minimumLayoutSizeOverrideForMinimalUI;
    166164    BOOL _overridesMaximumUnobscuredSize;
    167165    CGSize _maximumUnobscuredSizeOverride;
    168     BOOL _usesMinimalUI;
    169     BOOL _needsToNotifyDelegateAboutMinimalUI;
    170166    CGRect _inputViewBounds;
    171167    CGFloat _viewportMetaTagWidth;
    … …  
    750746}
    751747
    752 - (void)_setUsesMinimalUI:(BOOL)usesMinimalUI
    753 {
    754     _usesMinimalUI = usesMinimalUI;
    755     _needsToNotifyDelegateAboutMinimalUI = YES;
    756 }
    757 
    758 - (BOOL)_usesMinimalUI
    759 {
    760     return _usesMinimalUI;
    761 }
    762 
    763748- (CGPoint)_adjustedContentOffset:(CGPoint)point
    764749{
    … …  
    814799    _hasCommittedLoadForMainFrame = YES;
    815800    _needsResetViewStateAfterCommitLoadForMainFrame = YES;
    816     _usesMinimalUI = NO;
    817801}
    818802
    … …  
    874858    if (_gestureController)
    875859        _gestureController->setRenderTreeSize(layerTreeTransaction.renderTreeSize());
    876 
    877     if (_needsToNotifyDelegateAboutMinimalUI || _needsResetViewStateAfterCommitLoadForMainFrame) {
    878         _needsToNotifyDelegateAboutMinimalUI = NO;
    879 
    880         auto delegate = _uiDelegate->delegate();
    881         if ([delegate respondsToSelector:@selector(_webView:usesMinimalUI:)])
    882             [static_cast<id <WKUIDelegatePrivate>>(delegate.get()) _webView:self usesMinimalUI:_usesMinimalUI];
    883     }
    884860
    885861    if (_needsResetViewStateAfterCommitLoadForMainFrame && layerTreeTransaction.transactionID() >= _firstPaintAfterCommitLoadTransactionID) {
    … …  
    13971373        if (!_overridesMinimumLayoutSize)
    13981374            _page->setViewportConfigurationMinimumLayoutSize(WebCore::FloatSize(bounds.size));
    1399         if (!_overridesMinimumLayoutSizeForMinimalUI)
    1400             _page->setViewportConfigurationMinimumLayoutSizeForMinimalUI(WebCore::FloatSize(bounds.size));
    14011375        if (!_overridesMaximumUnobscuredSize)
    14021376            _page->setMaximumUnobscuredSize(WebCore::FloatSize(bounds.size));
    … …  
    17131687}
    17141688
    1715 static WebCore::FloatSize activeMinimumLayoutSizeForMinimalUI(WKWebView *webView, WebCore::FloatSize minimumLayoutSize)
    1716 {
    1717     return webView->_overridesMinimumLayoutSizeForMinimalUI ? WebCore::FloatSize(webView->_minimumLayoutSizeOverrideForMinimalUI) : minimumLayoutSize;
    1718 }
    1719 
    17201689static WebCore::FloatSize activeMaximumUnobscuredSize(WKWebView *webView, const CGRect& bounds)
    17211690{
    … …  
    17351704    WebCore::FloatSize minimalLayoutSize = activeMinimumLayoutSize(self, bounds);
    17361705    _page->setViewportConfigurationMinimumLayoutSize(minimalLayoutSize);
    1737     _page->setViewportConfigurationMinimumLayoutSizeForMinimalUI(activeMinimumLayoutSizeForMinimalUI(self, minimalLayoutSize));
    17381706    _page->setMaximumUnobscuredSize(activeMaximumUnobscuredSize(self, bounds));
    17391707#endif
    … …  
    21182086}
    21192087
    2120 - (void)_setMinimumLayoutSizeOverrideForMinimalUI:(CGSize)size
    2121 {
    2122     _overridesMinimumLayoutSizeForMinimalUI = YES;
    2123     if (CGSizeEqualToSize(_minimumLayoutSizeOverrideForMinimalUI, size))
    2124         return;
    2125 
    2126     _minimumLayoutSizeOverrideForMinimalUI = size;
    2127     if (_dynamicViewportUpdateMode == DynamicViewportUpdateMode::NotResizing)
    2128         _page->setViewportConfigurationMinimumLayoutSizeForMinimalUI(WebCore::FloatSize(size));
    2129 }
    2130 
    21312088- (UIEdgeInsets)_obscuredInsets
    21322089{
    … …  
    22272184
    22282185    WebCore::FloatSize oldMinimumLayoutSize = activeMinimumLayoutSize(self, oldBounds);
    2229     WebCore::FloatSize oldMinimumLayoutSizeForMinimalUI = activeMinimumLayoutSizeForMinimalUI(self, oldMinimumLayoutSize);
    22302186    WebCore::FloatSize oldMaximumUnobscuredSize = activeMaximumUnobscuredSize(self, oldBounds);
    22312187    int32_t oldOrientation = activeOrientation(self);
    … …  
    22362192    CGRect newBounds = self.bounds;
    22372193    WebCore::FloatSize newMinimumLayoutSize = activeMinimumLayoutSize(self, newBounds);
    2238     WebCore::FloatSize newMinimumLayoutSizeForMinimalUI = activeMinimumLayoutSizeForMinimalUI(self, newMinimumLayoutSize);
    22392194    WebCore::FloatSize newMaximumUnobscuredSize = activeMaximumUnobscuredSize(self, newBounds);
    22402195    int32_t newOrientation = activeOrientation(self);
    … …  
    22432198
    22442199    ASSERT_WITH_MESSAGE(!(_overridesMinimumLayoutSize && newMinimumLayoutSize.isEmpty()), "Clients controlling the layout size should maintain a valid layout size to minimize layouts.");
    2245     ASSERT_WITH_MESSAGE(!(_overridesMinimumLayoutSizeForMinimalUI && newMinimumLayoutSizeForMinimalUI.isEmpty()), "Clients controlling the layout size should maintain a valid layout size for minimal UI to minimize layouts.");
    2246     if (CGRectIsEmpty(newBounds) || newMinimumLayoutSize.isEmpty() || newMinimumLayoutSizeForMinimalUI.isEmpty() || CGRectIsEmpty(futureUnobscuredRectInSelfCoordinates)) {
     2200    if (CGRectIsEmpty(newBounds) || newMinimumLayoutSize.isEmpty() || CGRectIsEmpty(futureUnobscuredRectInSelfCoordinates)) {
    22472201        _dynamicViewportUpdateMode = DynamicViewportUpdateMode::NotResizing;
    22482202        [self _frameOrBoundsChanged];
    22492203        if (_overridesMinimumLayoutSize)
    22502204            _page->setViewportConfigurationMinimumLayoutSize(WebCore::FloatSize(newMinimumLayoutSize));
    2251         if (_overridesMinimumLayoutSizeForMinimalUI)
    2252             _page->setViewportConfigurationMinimumLayoutSizeForMinimalUI(WebCore::FloatSize(newMinimumLayoutSizeForMinimalUI));
    22532205        if (_overridesMaximumUnobscuredSize)
    22542206            _page->setMaximumUnobscuredSize(WebCore::FloatSize(newMaximumUnobscuredSize));
    … …  
    22612213    if (CGRectEqualToRect(oldBounds, newBounds)
    22622214        && oldMinimumLayoutSize == newMinimumLayoutSize
    2263         && oldMinimumLayoutSizeForMinimalUI == newMinimumLayoutSizeForMinimalUI
    22642215        && oldMaximumUnobscuredSize == newMaximumUnobscuredSize
    22652216        && oldOrientation == newOrientation
    … …  
    23222273    CGRect unobscuredRectInContentCoordinates = [self convertRect:futureUnobscuredRectInSelfCoordinates toView:_contentView.get()];
    23232274
    2324     _page->dynamicViewportSizeUpdate(newMinimumLayoutSize, newMinimumLayoutSizeForMinimalUI, newMaximumUnobscuredSize, visibleRectInContentCoordinates, unobscuredRectInContentCoordinates, futureUnobscuredRectInSelfCoordinates, targetScale, newOrientation);
     2275    _page->dynamicViewportSizeUpdate(newMinimumLayoutSize, newMaximumUnobscuredSize, visibleRectInContentCoordinates, unobscuredRectInContentCoordinates, futureUnobscuredRectInSelfCoordinates, targetScale, newOrientation);
    23252276    if (WebKit::DrawingAreaProxy* drawingArea = _page->drawingArea())
    23262277        drawingArea->setSize(WebCore::IntSize(newBounds.size), WebCore::IntSize(), WebCore::IntSize());
    … …  
    24172368- (void)_overrideLayoutParametersWithMinimumLayoutSize:(CGSize)minimumLayoutSize minimumLayoutSizeForMinimalUI:(CGSize)minimumLayoutSizeForMinimalUI maximumUnobscuredSizeOverride:(CGSize)maximumUnobscuredSizeOverride
    24182369{
     2370    UNUSED_PARAM(minimumLayoutSizeForMinimalUI);
     2371    [self _overrideLayoutParametersWithMinimumLayoutSize:minimumLayoutSize maximumUnobscuredSizeOverride:maximumUnobscuredSizeOverride];
     2372}
     2373
     2374- (void)_overrideLayoutParametersWithMinimumLayoutSize:(CGSize)minimumLayoutSize maximumUnobscuredSizeOverride:(CGSize)maximumUnobscuredSizeOverride
     2375{
    24192376    [self _setMinimumLayoutSizeOverride:minimumLayoutSize];
    2420     [self _setMinimumLayoutSizeOverrideForMinimalUI:minimumLayoutSizeForMinimalUI];
    2421     [self _setMaximumUnobscuredSizeOverride:maximumUnobscuredSizeOverride];
    2422 }
    2423 
    2424 - (void)_overrideLayoutParametersWithMinimumLayoutSize:(CGSize)minimumLayoutSize maximumUnobscuredSizeOverride:(CGSize)maximumUnobscuredSizeOverride
    2425 {
    2426     [self _setMinimumLayoutSizeOverride:minimumLayoutSize];
    2427     [self _setMinimumLayoutSizeOverrideForMinimalUI:minimumLayoutSize];
    24282377    [self _setMaximumUnobscuredSizeOverride:maximumUnobscuredSizeOverride];
    24292378}

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h

    r175980 r176308  
    6868
    6969#if PLATFORM(IOS)
    70 
    71 @property (nonatomic, setter=_setUsesMinimalUI:) BOOL _usesMinimalUI;
    72 
    7370- (void)_processDidExit;
    7471

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h

    r176175 r176308  
    140140- (void)_snapshotRect:(CGRect)rectInViewCoordinates intoImageOfWidth:(CGFloat)imageWidth completionHandler:(void(^)(CGImageRef))completionHandler;
    141141
     142// Deprecated: Use [_overrideLayoutParametersWithMinimumLayoutSize:maximumUnobscuredSizeOverride:] instead.
     143// This function is kept for binary compatibility with iOS 8.0, it can be removed after the bincompat window.
    142144- (void)_overrideLayoutParametersWithMinimumLayoutSize:(CGSize)minimumLayoutSize minimumLayoutSizeForMinimalUI:(CGSize)minimumLayoutSizeForMinimalUI maximumUnobscuredSizeOverride:(CGSize)maximumUnobscuredSizeOverride;
    143145

  • trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm

    r171086 r176308  
    248248    WebCore::FloatSize size(bounds.size);
    249249    webPageProxy->setViewportConfigurationMinimumLayoutSize(size);
    250     webPageProxy->setViewportConfigurationMinimumLayoutSizeForMinimalUI(size);
    251250    webPageProxy->setMaximumUnobscuredSize(size);
    252251

  • trunk/Source/WebKit2/UIProcess/PageClient.h

    r176164 r176308  
    275275    virtual void zoomToRect(WebCore::FloatRect, double minimumScale, double maximumScale) = 0;
    276276    virtual void didChangeViewportMetaTagWidth(float) = 0;
    277     virtual void setUsesMinimalUI(bool) = 0;
    278277    virtual double minimumZoomScale() const = 0;
    279278    virtual WebCore::FloatSize contentsSize() const = 0;

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r176220 r176308  
    408408    void overflowScrollDidEndScroll();
    409409
    410     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);
     410    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);
    411411    void synchronizeDynamicViewportUpdate();
    412412
    413413    void setViewportConfigurationMinimumLayoutSize(const WebCore::FloatSize&);
    414     void setViewportConfigurationMinimumLayoutSizeForMinimalUI(const WebCore::FloatSize&);
    415414    void setMaximumUnobscuredSize(const WebCore::FloatSize&);
    416415    void setDeviceOrientation(int32_t);
    … …  
    452451    void didNotHandleTapAsClick(const WebCore::IntPoint&);
    453452    void viewportMetaTagWidthDidChange(float width);
    454     void setUsesMinimalUI(bool);
    455453    void didFinishDrawingPagesToPDF(const IPC::DataReference&);
    456454    void contentSizeCategoryDidChange(const String& contentSizeCategory);

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in

    r176164 r176308  
    187187    DidNotHandleTapAsClick(WebCore::IntPoint point)
    188188    ViewportMetaTagWidthDidChange(float width)
    189     SetUsesMinimalUI(bool usesMinimalUI)
    190189    DidFinishDrawingPagesToPDF(IPC::DataReference pdfData)
    191190#endif

  • trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h

    r175476 r176308  
    129129    virtual bool handleRunOpenPanel(WebPageProxy*, WebFrameProxy*, WebOpenPanelParameters*, WebOpenPanelResultListenerProxy*) override;
    130130    virtual void didChangeViewportMetaTagWidth(float) override;
    131     virtual void setUsesMinimalUI(bool) override;
    132131    virtual double minimumZoomScale() const override;
    133132    virtual WebCore::FloatSize contentsSize() const override;

  • trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm

    r175980 r176308  
    253253}
    254254
    255 void PageClientImpl::setUsesMinimalUI(bool usesMinimalUI)
    256 {
    257     [m_webView _setUsesMinimalUI:usesMinimalUI];
    258 }
    259 
    260255double PageClientImpl::minimumZoomScale() const
    261256{

  • trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm

    r176164 r176308  
    262262}
    263263
    264 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)
     264void WebPageProxy::dynamicViewportSizeUpdate(const FloatSize& minimumLayoutSize, const WebCore::FloatSize& maximumUnobscuredSize, const FloatRect& targetExposedContentRect, const FloatRect& targetUnobscuredRect, const FloatRect& targetUnobscuredRectInScrollViewCoordinates,  double targetScale, int32_t deviceOrientation)
    265265{
    266266    if (!isValid())
    … …  
    269269    m_dynamicViewportSizeUpdateWaitingForTarget = true;
    270270    m_dynamicViewportSizeUpdateWaitingForLayerTreeCommit = true;
    271     m_process->send(Messages::WebPage::DynamicViewportSizeUpdate(minimumLayoutSize, minimumLayoutSizeForMinimalUI, maximumUnobscuredSize, targetExposedContentRect, targetUnobscuredRect, targetUnobscuredRectInScrollViewCoordinates, targetScale, deviceOrientation), m_pageID);
     271    m_process->send(Messages::WebPage::DynamicViewportSizeUpdate(minimumLayoutSize, maximumUnobscuredSize, targetExposedContentRect, targetUnobscuredRect, targetUnobscuredRectInScrollViewCoordinates, targetScale, deviceOrientation), m_pageID);
    272272}
    273273
    … …  
    314314}
    315315
    316 void WebPageProxy::setViewportConfigurationMinimumLayoutSizeForMinimalUI(const WebCore::FloatSize& size)
    317 {
    318     m_process->send(Messages::WebPage::SetViewportConfigurationMinimumLayoutSizeForMinimalUI(size), m_pageID);
    319 }
    320 
    321316void WebPageProxy::setMaximumUnobscuredSize(const WebCore::FloatSize& size)
    322317{
    … …  
    820815}
    821816
    822 void WebPageProxy::setUsesMinimalUI(bool usesMinimalUI)
    823 {
    824     m_pageClient.setUsesMinimalUI(usesMinimalUI);
    825 }
    826 
    827817void WebPageProxy::didFinishDrawingPagesToPDF(const IPC::DataReference& pdfData)
    828818{

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

    r176221 r176308  
    756756#if PLATFORM(IOS)
    757757    void setViewportConfigurationMinimumLayoutSize(const WebCore::FloatSize&);
    758     void setViewportConfigurationMinimumLayoutSizeForMinimalUI(const WebCore::FloatSize&);
    759758    void setMaximumUnobscuredSize(const WebCore::FloatSize&);
    760759    void setDeviceOrientation(int32_t);
    761     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);
     760    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);
    762761    void synchronizeDynamicViewportUpdate(double& newTargetScale, WebCore::FloatPoint& newScrollPosition, uint64_t& nextValidLayerTreeTransactionID);
    763762    void updateVisibleContentRects(const VisibleContentRectUpdateInfo&, double oldestTimestamp);

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in

    r176221 r176308  
    4545#if PLATFORM(IOS)
    4646    SetViewportConfigurationMinimumLayoutSize(WebCore::FloatSize size)
    47     SetViewportConfigurationMinimumLayoutSizeForMinimalUI(WebCore::FloatSize size)
    4847    SetMaximumUnobscuredSize(WebCore::FloatSize size)
    4948    SetDeviceOrientation(int32_t deviceOrientation)
    50     DynamicViewportSizeUpdate(WebCore::FloatSize minimumLayoutSize, WebCore::FloatSize minimumLayoutSizeForMinimalUI,  WebCore::FloatSize maximumUnobscuredSize, WebCore::FloatRect targetExposedContentRect, WebCore::FloatRect targetUnobscuredRect, WebCore::FloatRect targetUnobscuredRectInScrollViewCoordinates, double scale, int32_t deviceOrientation)
     49    DynamicViewportSizeUpdate(WebCore::FloatSize minimumLayoutSize, WebCore::FloatSize maximumUnobscuredSize, WebCore::FloatRect targetExposedContentRect, WebCore::FloatRect targetUnobscuredRect, WebCore::FloatRect targetUnobscuredRectInScrollViewCoordinates, double scale, int32_t deviceOrientation)
    5150    SynchronizeDynamicViewportUpdate() -> (double newTargetScale, WebCore::FloatPoint newScrollPosition, uint64_t nextValidLayerTreeTransactionID)
    5251

  • trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm

    r175797 r176308  
    141141
    142142    float oldWidth = m_viewportConfiguration.viewportArguments().width;
    143     bool wasUsingMinimalUI = m_viewportConfiguration.usesMinimalUI();
    144143
    145144    m_viewportConfiguration.setViewportArguments(viewportArguments);
    146145    viewportConfigurationChanged();
    147 
    148     if (wasUsingMinimalUI != m_viewportConfiguration.usesMinimalUI())
    149         send(Messages::WebPageProxy::SetUsesMinimalUI(m_viewportConfiguration.usesMinimalUI()));
    150146
    151147    if (oldWidth != viewportArguments.width)
    … …  
    21922188}
    21932189
    2194 void WebPage::setViewportConfigurationMinimumLayoutSizeForMinimalUI(const FloatSize& size)
    2195 {
    2196     resetTextAutosizingBeforeLayoutIfNeeded(m_viewportConfiguration.minimumLayoutSizeForMinimalUI(), size);
    2197     m_viewportConfiguration.setMinimumLayoutSizeForMinimalUI(size);
    2198     viewportConfigurationChanged();
    2199 }
    2200 
    22012190void WebPage::setMaximumUnobscuredSize(const FloatSize& maximumUnobscuredSize)
    22022191{
    … …  
    22332222}
    22342223
    2235 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)
     2224void WebPage::dynamicViewportSizeUpdate(const FloatSize& minimumLayoutSize, const WebCore::FloatSize& maximumUnobscuredSize, const FloatRect& targetExposedContentRect, const FloatRect& targetUnobscuredRect, const WebCore::FloatRect& targetUnobscuredRectInScrollViewCoordinates, double targetScale, int32_t deviceOrientation)
    22362225{
    22372226    TemporaryChange<bool> dynamicSizeUpdateGuard(m_inDynamicSizeUpdate, true);
    … …  
    22702259
    22712260    resetTextAutosizingBeforeLayoutIfNeeded(m_viewportConfiguration.minimumLayoutSize(), minimumLayoutSize);
    2272     resetTextAutosizingBeforeLayoutIfNeeded(m_viewportConfiguration.minimumLayoutSizeForMinimalUI(), minimumLayoutSizeForMinimalUI);
    22732261    m_viewportConfiguration.setMinimumLayoutSize(minimumLayoutSize);
    2274     m_viewportConfiguration.setMinimumLayoutSizeForMinimalUI(minimumLayoutSizeForMinimalUI);
    22752262    IntSize newLayoutSize = m_viewportConfiguration.layoutSize();
    22762263
Note: See TracChangeset for help on using the changeset viewer.