Changeset 163839 in webkit


Ignore:
Timestamp:
Feb 10, 2014 5:10:18 PM (10 years ago)
Author:
benjamin@webkit.org
Message:

[WK2] Add support for image document viewport configuration
​https://bugs.webkit.org/show_bug.cgi?id=128565

Patch by Benjamin Poulain <​bpoulain@apple.com> on 2014-02-10
Reviewed by Simon Fraser.

Source/WebCore:

Add proper default settings for displaying images.

  • WebCore.exp.in:
  • page/ViewportConfiguration.cpp:

(WebCore::ViewportConfiguration::imageDocumentParameters):
(WebCore::ViewportConfiguration::textDocumentParameters):

  • page/ViewportConfiguration.h:

Source/WebKit2:

  • UIProcess/API/ios/PageClientImplIOS.mm:

(WebKit::PageClientImpl::screenToWindow):
(WebKit::PageClientImpl::windowToScreen):
Add the implementation for ImageDocument.

  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::didCommitLoad):
Use the right default settings when dealing with image documents.

Location:
trunk/Source
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r163828 r163839  
     12014-02-10  Benjamin Poulain  <bpoulain@apple.com>
     2
     3        [WK2] Add support for image document viewport configuration
     4        https://bugs.webkit.org/show_bug.cgi?id=128565
     5
     6        Reviewed by Simon Fraser.
     7
     8        Add proper default settings for displaying images.
     9
     10        * WebCore.exp.in:
     11        * page/ViewportConfiguration.cpp:
     12        (WebCore::ViewportConfiguration::imageDocumentParameters):
     13        (WebCore::ViewportConfiguration::textDocumentParameters):
     14        * page/ViewportConfiguration.h:
     15
    1162014-02-10  Brendan Long  <b.long@cablelabs.com>
    217

  • trunk/Source/WebCore/WebCore.exp.in

    r163739 r163839  
    851851__ZN7WebCore21ViewportConfiguration15setContentsSizeERKNS_7IntSizeE
    852852__ZN7WebCore21ViewportConfiguration17webpageParametersEv
    853 __ZN7WebCore21ViewportConfiguration19plainTextParametersEv
    854853__ZN7WebCore21ViewportConfiguration20setMinimumLayoutSizeERKNS_7IntSizeE
    855854__ZN7WebCore21ViewportConfiguration20setViewportArgumentsERKNS_17ViewportArgumentsE
     855__ZN7WebCore21ViewportConfiguration22textDocumentParametersEv
     856__ZN7WebCore21ViewportConfiguration23imageDocumentParametersEv
    856857__ZN7WebCore21ViewportConfiguration23setDefaultConfigurationERKNS0_10ParametersE
    857858__ZN7WebCore21WindowsLatin1EncodingEv

  • trunk/Source/WebCore/page/ViewportConfiguration.cpp

    r163654 r163839  
    152152}
    153153
    154 ViewportConfiguration::Parameters ViewportConfiguration::plainTextParameters()
     154ViewportConfiguration::Parameters ViewportConfiguration::textDocumentParameters()
    155155{
    156156    Parameters parameters;
    … …  
    166166    parameters.allowsUserScaling = true;
    167167    parameters.minimumScale = 0.25;
     168    parameters.maximumScale = 5;
     169    return parameters;
     170}
     171
     172ViewportConfiguration::Parameters ViewportConfiguration::imageDocumentParameters()
     173{
     174    Parameters parameters;
     175    parameters.width = 980;
     176    parameters.widthIsSet = true;
     177    parameters.allowsUserScaling = true;
     178    parameters.minimumScale = 0.01;
    168179    parameters.maximumScale = 5;
    169180    return parameters;

  • trunk/Source/WebCore/page/ViewportConfiguration.h

    r163654 r163839  
    8484
    8585    static Parameters webpageParameters();
    86     static Parameters plainTextParameters();
     86    static Parameters textDocumentParameters();
     87    static Parameters imageDocumentParameters();
    8788
    8889private:

  • trunk/Source/WebKit2/ChangeLog

    r163837 r163839  
     12014-02-10  Benjamin Poulain  <bpoulain@apple.com>
     2
     3        [WK2] Add support for image document viewport configuration
     4        https://bugs.webkit.org/show_bug.cgi?id=128565
     5
     6        Reviewed by Simon Fraser.
     7
     8        * UIProcess/API/ios/PageClientImplIOS.mm:
     9        (WebKit::PageClientImpl::screenToWindow):
     10        (WebKit::PageClientImpl::windowToScreen):
     11        Add the implementation for ImageDocument.
     12
     13        * WebProcess/WebPage/WebPage.cpp:
     14        (WebKit::WebPage::didCommitLoad):
     15        Use the right default settings when dealing with image documents.
     16
    1172014-02-10  Simon Fraser  <simon.fraser@apple.com>
    218

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

    r163666 r163839  
    261261IntPoint PageClientImpl::screenToWindow(const IntPoint& point)
    262262{
    263     notImplemented();
    264     return IntPoint();
     263    return IntPoint([m_view convertPoint:point fromView:nil]);
    265264}
    266265
    267266IntRect PageClientImpl::windowToScreen(const IntRect& rect)
    268267{
    269     notImplemented();
    270     return IntRect();
     268    return enclosingIntRect([m_view convertRect:rect toView:nil]);
    271269}
    272270

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

    r163821 r163839  
    39583958    m_userHasChangedPageScaleFactor = false;
    39593959
    3960     if (frame->coreFrame()->document()->isTextDocument())
    3961         m_viewportConfiguration.setDefaultConfiguration(ViewportConfiguration::plainTextParameters());
     3960    Document* document = frame->coreFrame()->document();
     3961    if (document->isImageDocument())
     3962        m_viewportConfiguration.setDefaultConfiguration(ViewportConfiguration::imageDocumentParameters());
     3963    else if (document->isTextDocument())
     3964        m_viewportConfiguration.setDefaultConfiguration(ViewportConfiguration::textDocumentParameters());
    39623965    else
    39633966        m_viewportConfiguration.setDefaultConfiguration(ViewportConfiguration::webpageParameters());
Note: See TracChangeset for help on using the changeset viewer.