Changeset 75662 in webkit


Ignore:
Timestamp:
Jan 12, 2011 5:34:01 PM (13 years ago)
Author:
Beth Dakin
Message:

Add-on for https://bugs.webkit.org/show_bug.cgi?id=52309
Expose fixed layout through WebKit SPI
-and corresponding-
<rdar://problem/8844464>

Reviewed by Anders Carlsson.

Source/WebCore:

And now with getters!

  • WebCore.exp.in:

WebKit/mac:

And now with getters!

  • WebView/WebView.mm:

(-[WebView _useFixedLayout]):
(-[WebView _fixedLayoutSize]):

  • WebView/WebViewPrivate.h:

WebKit2:

And now with getters!

  • UIProcess/API/C/WKPage.cpp:

(WKPageUseFixedLayout):
(WKPageFixedLayoutSize):

  • UIProcess/API/C/WKPage.h:
  • UIProcess/WebPageProxy.h:

(WebKit::WebPageProxy::useFixedLayout):
(WebKit::WebPageProxy::fixedLayoutSize):

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r75661 r75662  
     12011-01-12  Beth Dakin  <bdakin@apple.com>
     2
     3        Reviewed by Anders Carlsson.
     4
     5        Add-on for https://bugs.webkit.org/show_bug.cgi?id=52309
     6        Expose fixed layout through WebKit SPI
     7        -and corresponding-
     8        <rdar://problem/8844464>
     9
     10        And now with getters!
     11        * WebCore.exp.in:
     12
    1132011-01-12  Sam Weinig  <sam@webkit.org>
    214
  • trunk/Source/WebCore/WebCore.exp.in

    r75635 r75662  
    949949__ZNK7WebCore10ScrollView12documentViewEv
    950950__ZNK7WebCore10ScrollView14scrollbarModesERNS_13ScrollbarModeES2_
     951__ZNK7WebCore10ScrollView14useFixedLayoutEv
     952__ZNK7WebCore10ScrollView15fixedLayoutSizeEv
    951953__ZNK7WebCore10ScrollView16contentsToWindowERKNS_7IntRectE
    952954__ZNK7WebCore10ScrollView16contentsToWindowERKNS_8IntPointE
  • trunk/WebKit/mac/ChangeLog

    r75635 r75662  
     12011-01-12  Beth Dakin  <bdakin@apple.com>
     2
     3        Reviewed by Anders Carlsson.
     4
     5        Add-on for https://bugs.webkit.org/show_bug.cgi?id=52309
     6        Expose fixed layout through WebKit SPI
     7        -and corresponding-
     8        <rdar://problem/8844464>
     9
     10        And now with getters!
     11        * WebView/WebView.mm:
     12        (-[WebView _useFixedLayout]):
     13        (-[WebView _fixedLayoutSize]):
     14        * WebView/WebViewPrivate.h:
     15
    1162011-01-12  Beth Dakin  <bdakin@apple.com>
    217
  • trunk/WebKit/mac/WebView/WebView.mm

    r75635 r75662  
    26832683}
    26842684
     2685- (BOOL)_useFixedLayout
     2686{
     2687    Frame* coreFrame = [self _mainCoreFrame];
     2688    if (!coreFrame)
     2689        return NO;
     2690   
     2691    FrameView* view = coreFrame->view();
     2692    if (!view)
     2693        return NO;
     2694   
     2695    return view->useFixedLayout();
     2696}
     2697
     2698- (NSSize)_fixedLayoutSize
     2699{
     2700    Frame* coreFrame = [self _mainCoreFrame];
     2701    if (!coreFrame)
     2702        return IntSize();
     2703   
     2704    FrameView* view = coreFrame->view();
     2705    if (!view)
     2706        return IntSize();
     2707
     2708    return view->fixedLayoutSize();
     2709}
     2710
    26852711- (NSUInteger)markAllMatchesForText:(NSString *)string caseSensitive:(BOOL)caseFlag highlight:(BOOL)highlight limit:(NSUInteger)limit
    26862712{
  • trunk/WebKit/mac/WebView/WebViewPrivate.h

    r75635 r75662  
    551551- (void)_setFixedLayoutSize:(NSSize)size;
    552552
     553- (BOOL)_useFixedLayout;
     554- (NSSize)_fixedLayoutSize;
     555
    553556// Deprecated. Use the methods in pending public above instead.
    554557- (WebNSUInteger)markAllMatchesForText:(NSString *)string caseSensitive:(BOOL)caseFlag highlight:(BOOL)highlight limit:(WebNSUInteger)limit;
  • trunk/WebKit2/ChangeLog

    r75661 r75662  
     12011-01-12  Beth Dakin  <bdakin@apple.com>
     2
     3        Reviewed by Anders Carlsson.
     4
     5        Add-on for https://bugs.webkit.org/show_bug.cgi?id=52309
     6        Expose fixed layout through WebKit SPI
     7        -and corresponding-
     8        <rdar://problem/8844464>
     9
     10        And now with getters!
     11        * UIProcess/API/C/WKPage.cpp:
     12        (WKPageUseFixedLayout):
     13        (WKPageFixedLayoutSize):
     14        * UIProcess/API/C/WKPage.h:
     15        * UIProcess/WebPageProxy.h:
     16        (WebKit::WebPageProxy::useFixedLayout):
     17        (WebKit::WebPageProxy::fixedLayoutSize):
     18
    1192011-01-12  Sam Weinig  <sam@webkit.org>
    220
  • trunk/WebKit2/UIProcess/API/C/WKPage.cpp

    r75635 r75662  
    276276}
    277277
     278bool WKPageUseFixedLayout(WKPageRef pageRef)
     279{
     280    return toImpl(pageRef)->useFixedLayout();
     281}
     282
     283WKSize WKPageFixedLayoutSize(WKPageRef pageRef)
     284{
     285    return toAPI(toImpl(pageRef)->fixedLayoutSize());
     286}
     287
    278288double WKPageGetViewScaleFactor(WKPageRef pageRef)
    279289{
  • trunk/WebKit2/UIProcess/API/C/WKPage.h

    r75635 r75662  
    310310WK_EXPORT void WKPageSetUseFixedLayout(WKPageRef page, bool fixed);
    311311WK_EXPORT void WKPageSetFixedLayoutSize(WKPageRef page, WKSize size);
     312WK_EXPORT bool WKPageUseFixedLayout(WKPageRef pageRef);
     313WK_EXPORT WKSize WKPageFixedLayoutSize(WKPageRef pageRef);
    312314
    313315WK_EXPORT void WKPageFindString(WKPageRef page, WKStringRef string, WKFindOptions findOptions, unsigned maxMatchCount);
  • trunk/WebKit2/UIProcess/WebPageProxy.h

    r75657 r75662  
    246246    void setUseFixedLayout(bool);
    247247    void setFixedLayoutSize(const WebCore::IntSize&);
     248    bool useFixedLayout() const { return m_useFixedLayout; };
     249    const WebCore::IntSize& fixedLayoutSize() const { return m_fixedLayoutSize; };
     250
    248251#if PLATFORM(MAC)
    249252    void sendAccessibilityPresenterToken(const CoreIPC::DataReference&);
Note: See TracChangeset for help on using the changeset viewer.