Changeset 86305 in webkit


Ignore:
Timestamp:
May 11, 2011 8:55:12 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-05-11 Damian Kaleta <​dkaleta@apple.com>

Reviewed by Brady Eidson.

Need a new API that will try to restore the scrollbars' position, when navigating in the back/forward history
​https://bugs.webkit.org/show_bug.cgi?id=60674

  • WebCore.exp.in: Export restoreScrollPositionAndViewState()

2011-05-11 Damian Kaleta <​dkaleta@apple.com>

Reviewed by Brady Eidson.

Need a new API that will try to restore the scrollbars' position, when navigating in the back/forward history
​https://bugs.webkit.org/show_bug.cgi?id=60674

  • UIProcess/API/C/WKPage.cpp: (WKPageTryRestoreScrollPosition):
  • UIProcess/API/C/WKPage.h:
  • UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::tryRestoreScrollPosition):
  • UIProcess/WebPageProxy.h:
  • WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::tryRestoreScrollPosition):
  • WebProcess/WebPage/WebPage.h:
  • WebProcess/WebPage/WebPage.messages.in:
Location:
trunk/Source
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r86303 r86305  
     12011-05-11  Damian Kaleta  <dkaleta@apple.com>
     2
     3        Reviewed by Brady Eidson.
     4
     5        Need a new API that will try to restore the scrollbars' position, when navigating in the back/forward history
     6        https://bugs.webkit.org/show_bug.cgi?id=60674
     7
     8        * WebCore.exp.in: Export restoreScrollPositionAndViewState()
     9
    1102011-05-11  Levi Weintraub  <leviw@chromium.org>
    211

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

    r86205 r86305  
    496496__ZN7WebCore17GlyphPageTreeNode18treeGlyphPageCountEv
    497497__ZN7WebCore17HistoryController26saveDocumentAndScrollStateEv
     498__ZN7WebCore17HistoryController33restoreScrollPositionAndViewStateEv
    498499__ZN7WebCore17nameForCursorTypeENS_6Cursor4TypeE
    499500__ZN7WebCore17openTemporaryFileERKN3WTF6StringERi

  • trunk/Source/WebKit2/ChangeLog

    r86296 r86305  
     12011-05-11  Damian Kaleta  <dkaleta@apple.com>
     2
     3        Reviewed by Brady Eidson.
     4
     5        Need a new API that will try to restore the scrollbars' position, when navigating in the back/forward history
     6        https://bugs.webkit.org/show_bug.cgi?id=60674
     7
     8        * UIProcess/API/C/WKPage.cpp:
     9        (WKPageTryRestoreScrollPosition):
     10        * UIProcess/API/C/WKPage.h:
     11        * UIProcess/WebPageProxy.cpp:
     12        (WebKit::WebPageProxy::tryRestoreScrollPosition):
     13        * UIProcess/WebPageProxy.h:
     14        * WebProcess/WebPage/WebPage.cpp:
     15        (WebKit::WebPage::tryRestoreScrollPosition):
     16        * WebProcess/WebPage/WebPage.h:
     17        * WebProcess/WebPage/WebPage.messages.in:
     18
    1192011-05-11  Sam Weinig  <sam@webkit.org>
    220

  • trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp

    r85356 r86305  
    137137}
    138138
     139void WKPageTryRestoreScrollPosition(WKPageRef pageRef)
     140{
     141    toImpl(pageRef)->tryRestoreScrollPosition();
     142}
     143
    139144WKBackForwardListRef WKPageGetBackForwardList(WKPageRef pageRef)
    140145{

  • trunk/Source/WebKit2/UIProcess/API/C/WKPage.h

    r86231 r86305  
    287287WK_EXPORT bool WKPageCanGoBack(WKPageRef page);
    288288WK_EXPORT void WKPageGoToBackForwardListItem(WKPageRef page, WKBackForwardListItemRef item);
     289WK_EXPORT void WKPageTryRestoreScrollPosition(WKPageRef page);
    289290WK_EXPORT WKBackForwardListRef WKPageGetBackForwardList(WKPageRef page);
    290291

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

    r86240 r86305  
    517517}
    518518
     519void WebPageProxy::tryRestoreScrollPosition()
     520{
     521    if (!isValid())
     522        return;
     523
     524    process()->send(Messages::WebPage::TryRestoreScrollPosition(), m_pageID);
     525}
     526
    519527void WebPageProxy::didChangeBackForwardList(WebBackForwardListItem* added, Vector<RefPtr<APIObject> >* removed)
    520528{

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

    r86231 r86305  
    223223
    224224    void goToBackForwardItem(WebBackForwardListItem*);
     225    void tryRestoreScrollPosition();
    225226    void didChangeBackForwardList(WebBackForwardListItem* addedItem, Vector<RefPtr<APIObject> >* removedItems);
    226227    void shouldGoToBackForwardListItem(uint64_t itemID, bool& shouldGoToBackForwardListItem);

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

    r86183 r86305  
    582582}
    583583
     584void WebPage::tryRestoreScrollPosition()
     585{
     586    m_page->mainFrame()->loader()->history()->restoreScrollPositionAndViewState();
     587}
     588
    584589void WebPage::layoutIfNeeded()
    585590{

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

    r86103 r86305  
    464464    void goBack(uint64_t, const SandboxExtension::Handle&);
    465465    void goToBackForwardItem(uint64_t, const SandboxExtension::Handle&);
     466    void tryRestoreScrollPosition();
    466467    void setActive(bool);
    467468    void setFocused(bool);

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

    r85356 r86305  
    5050    GoForward(uint64_t backForwardItemID, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
    5151    GoToBackForwardItem(uint64_t backForwardItemID, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
     52    TryRestoreScrollPosition()
    5253    LoadHTMLString(WTF::String htmlString, WTF::String baseURL)
    5354    LoadAlternateHTMLString(WTF::String htmlString, WTF::String baseURL, WTF::String unreachableURL);
Note: See TracChangeset for help on using the changeset viewer.