Changeset 79764 in webkit


Ignore:
Timestamp:
Feb 26, 2011 12:16:26 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-02-26 Vsevolod Vlasov <​vsevik@chromium.org>

Reviewed by Pavel Feldman.

DumpRenderTree should reset frame opener between tests.
​https://bugs.webkit.org/show_bug.cgi?id=54874

No new tests. (no code affected, just exporting a method for DumpRenderTree use)

  • WebCore.exp.in:

2011-02-26 Vsevolod Vlasov <​vsevik@chromium.org>

Reviewed by Pavel Feldman.

DumpRenderTree should reset frame opener between tests.
​https://bugs.webkit.org/show_bug.cgi?id=54874

Added clearOpener method to WebFrame.

  • public/WebFrame.h:
  • src/WebFrameImpl.cpp: (WebKit::WebFrameImpl::clearOpener):
  • src/WebFrameImpl.h:

2011-02-26 Vsevolod Vlasov <​vsevik@chromium.org>

Reviewed by Pavel Feldman.

DumpRenderTree should reset frame opener between tests.
​https://bugs.webkit.org/show_bug.cgi?id=54874

Added clearOpener method to DumpRenderTreeSupportGTK.

  • WebCoreSupport/DumpRenderTreeSupportGtk.cpp: (DumpRenderTreeSupportGtk::clearOpener):
  • WebCoreSupport/DumpRenderTreeSupportGtk.h:

2011-02-26 Vsevolod Vlasov <​vsevik@chromium.org>

Reviewed by Pavel Feldman.

DumpRenderTree should reset frame opener between tests.
​https://bugs.webkit.org/show_bug.cgi?id=54874

Added clearOpener method to WebFramePrivate.

  • WebView/WebFrame.mm: (-[WebFrame _clearOpener]):
  • WebView/WebFramePrivate.h:

2011-02-26 Vsevolod Vlasov <​vsevik@chromium.org>

Reviewed by Pavel Feldman.

DumpRenderTree should reset frame opener between tests.
​https://bugs.webkit.org/show_bug.cgi?id=54874

Added clearOpener method to DumpRenderTreeSupportQT.

  • WebCoreSupport/DumpRenderTreeSupportQt.cpp: (DumpRenderTreeSupportQt::clearOpener):
  • WebCoreSupport/DumpRenderTreeSupportQt.h:

2011-02-26 Vsevolod Vlasov <​vsevik@chromium.org>

Reviewed by Pavel Feldman.

DumpRenderTree should reset frame opener between tests.
​https://bugs.webkit.org/show_bug.cgi?id=54874

Added clearOpener method to IWebFramePrivate.
Touched WebKit.idl to trigger build scripts.

  • Interfaces/IWebFramePrivate.idl:
  • Interfaces/WebKit.idl:
  • WebFrame.cpp: (WebFrame::clearOpener):
  • WebFrame.h:

2011-02-26 Vsevolod Vlasov <​vsevik@chromium.org>

Reviewed by Pavel Feldman.

DumpRenderTree should reset frame opener between tests.
​https://bugs.webkit.org/show_bug.cgi?id=54874

Added clearOpener method to WKBundleWebFramePrivate.

  • WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp: (WKBundleFrameClearOpener):
  • WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h:

2011-02-26 Vsevolod Vlasov <​vsevik@chromium.org>

Reviewed by Pavel Feldman.

DumpRenderTree should reset frame opener between tests.
​https://bugs.webkit.org/show_bug.cgi?id=54874

Added clearOpener() calls between tests.
Some tests are using window.open() to change current window location.
This changes window.opener property whose nullity is checked before
showing xml viewer.

  • DumpRenderTree/chromium/TestShell.cpp: (TestShell::resetTestController):
  • DumpRenderTree/gtk/DumpRenderTree.cpp: (resetDefaultsToConsistentValues):
  • DumpRenderTree/mac/DumpRenderTree.mm: (resetWebViewToConsistentStateBeforeTesting):
  • DumpRenderTree/qt/DumpRenderTreeQt.cpp: (WebCore::DumpRenderTree::resetToConsistentStateBeforeTesting):
  • DumpRenderTree/win/DumpRenderTree.cpp: (resetWebViewToConsistentStateBeforeTesting):
  • WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp: (WTR::InjectedBundlePage::reset):
Location:
trunk
Files:
30 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r79762 r79764  
     12011-02-26  Vsevolod Vlasov  <vsevik@chromium.org>
     2
     3        Reviewed by Pavel Feldman.
     4
     5        DumpRenderTree should reset frame opener between tests.
     6        https://bugs.webkit.org/show_bug.cgi?id=54874
     7
     8        No new tests. (no code affected, just exporting a method for DumpRenderTree use)
     9
     10        * WebCore.exp.in:
     11
    1122011-02-26  Chang Shu  <chang.shu@nokia.com>
    213

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

    r79722 r79764  
    179179__ZN7WebCore11FrameLoader4loadERKNS_15ResourceRequestEb
    180180__ZN7WebCore11FrameLoader6reloadEb
     181__ZN7WebCore11FrameLoader9setOpenerEPNS_5FrameE
    181182__ZN7WebCore11Geolocation12setIsAllowedEb
    182183__ZN7WebCore11GeolocationD1Ev

  • trunk/Source/WebKit/chromium/ChangeLog

    r79719 r79764  
     12011-02-26  Vsevolod Vlasov  <vsevik@chromium.org>
     2
     3        Reviewed by Pavel Feldman.
     4
     5        DumpRenderTree should reset frame opener between tests.
     6        https://bugs.webkit.org/show_bug.cgi?id=54874
     7
     8        Added clearOpener method to WebFrame.
     9
     10        * public/WebFrame.h:
     11        * src/WebFrameImpl.cpp:
     12        (WebKit::WebFrameImpl::clearOpener):
     13        * src/WebFrameImpl.h:
     14
    1152011-02-25  Tony Chang  <tony@chromium.org>
    216

  • trunk/Source/WebKit/chromium/public/WebFrame.h

    r79586 r79764  
    170170    virtual WebFrame* opener() const = 0;
    171171
     172    // Reset the frame that opened this frame to 0.
     173    // This is executed between layout tests runs
     174    virtual void clearOpener() = 0;
     175
    172176    // Returns the parent frame or 0 if this is a top-most frame.
    173177    virtual WebFrame* parent() const = 0;

  • trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp

    r79586 r79764  
    580580}
    581581
     582void WebFrameImpl::clearOpener()
     583{
     584    m_frame->loader()->setOpener(0);
     585}
     586
    582587WebFrame* WebFrameImpl::opener() const
    583588{

  • trunk/Source/WebKit/chromium/src/WebFrameImpl.h

    r79586 r79764  
    8181    virtual WebView* view() const;
    8282    virtual WebFrame* opener() const;
     83    virtual void clearOpener();
    8384    virtual WebFrame* parent() const;
    8485    virtual WebFrame* top() const;

  • trunk/Source/WebKit/gtk/ChangeLog

    r79589 r79764  
     12011-02-26  Vsevolod Vlasov  <vsevik@chromium.org>
     2
     3        Reviewed by Pavel Feldman.
     4
     5        DumpRenderTree should reset frame opener between tests.
     6        https://bugs.webkit.org/show_bug.cgi?id=54874
     7
     8        Added clearOpener method to DumpRenderTreeSupportGTK.
     9
     10        * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
     11        (DumpRenderTreeSupportGtk::clearOpener):
     12        * WebCoreSupport/DumpRenderTreeSupportGtk.h:
     13
    1142011-02-24  Peter Kasting  <pkasting@google.com>
    215

  • trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp

    r79586 r79764  
    634634}
    635635
     636void DumpRenderTreeSupportGtk::clearOpener(WebKitWebFrame* frame)
     637{
     638    Frame* coreFrame = core(frame);
     639    if (coreFrame)
     640        coreFrame->loader()->setOpener(0);
     641}
     642
    636643unsigned int DumpRenderTreeSupportGtk::workerThreadCount()
    637644{

  • trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h

    r79586 r79764  
    6161    static void dumpConfigurationForViewport(WebKitWebView* webView, gint availableWidth, gint availableHeight);
    6262
     63    static void clearOpener(WebKitWebFrame*);
     64
    6365    // FIXME: Move these to webkitwebframe.h once their API has been discussed.
    6466    static GSList* getFrameChildren(WebKitWebFrame*);

  • trunk/Source/WebKit/mac/ChangeLog

    r79667 r79764  
     12011-02-26  Vsevolod Vlasov  <vsevik@chromium.org>
     2
     3        Reviewed by Pavel Feldman.
     4
     5        DumpRenderTree should reset frame opener between tests.
     6        https://bugs.webkit.org/show_bug.cgi?id=54874
     7
     8        Added clearOpener method to WebFramePrivate.
     9
     10        * WebView/WebFrame.mm:
     11        (-[WebFrame _clearOpener]):
     12        * WebView/WebFramePrivate.h:
     13
    1142011-02-25  Mark Rowe  <mrowe@apple.com>
    215

  • trunk/Source/WebKit/mac/WebView/WebFrame.mm

    r79586 r79764  
    13751375}
    13761376
     1377- (void)_clearOpener
     1378{
     1379    Frame* coreFrame = _private->coreFrame;
     1380    if (coreFrame)
     1381        coreFrame->loader()->setOpener(0);
     1382}
     1383
    13771384@end
    13781385

  • trunk/Source/WebKit/mac/WebView/WebFramePrivate.h

    r79586 r79764  
    146146- (id)accessibilityRoot;
    147147
     148// Clears frame opener. This is executed between layout tests runs
     149- (void)_clearOpener;
     150
     151
    148152@end

  • trunk/Source/WebKit/qt/ChangeLog

    r79690 r79764  
     12011-02-26  Vsevolod Vlasov  <vsevik@chromium.org>
     2
     3        Reviewed by Pavel Feldman.
     4
     5        DumpRenderTree should reset frame opener between tests.
     6        https://bugs.webkit.org/show_bug.cgi?id=54874
     7
     8        Added clearOpener method to DumpRenderTreeSupportQT.
     9
     10        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
     11        (DumpRenderTreeSupportQt::clearOpener):
     12        * WebCoreSupport/DumpRenderTreeSupportQt.h:
     13
    1142011-02-25  Andras Becsi  <abecsi@webkit.org>
    215

  • trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp

    r79586 r79764  
    915915}
    916916
     917void DumpRenderTreeSupportQt::clearOpener(QWebFrame* frame)
     918{
     919    WebCore::Frame* coreFrame = QWebFramePrivate::core(frame);
     920    coreFrame->loader()->setOpener(0);
     921}
     922
    917923void DumpRenderTreeSupportQt::addURLToRedirect(const QString& origin, const QString& destination)
    918924{

  • trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h

    r79586 r79764  
    189189    static QVariantList nodesFromRect(const QWebElement& document, int x, int y, unsigned top, unsigned right, unsigned bottom, unsigned left, bool ignoreClipping);
    190190    static QString responseMimeType(QWebFrame*);
     191    static void clearOpener(QWebFrame*);
    191192    static void addURLToRedirect(const QString& origin, const QString& destination);
    192193    static QStringList contextMenu(QWebPage*);

  • trunk/Source/WebKit/win/ChangeLog

    r79589 r79764  
     12011-02-26  Vsevolod Vlasov  <vsevik@chromium.org>
     2
     3        Reviewed by Pavel Feldman.
     4
     5        DumpRenderTree should reset frame opener between tests.
     6        https://bugs.webkit.org/show_bug.cgi?id=54874
     7
     8        Added clearOpener method to IWebFramePrivate.
     9        Touched WebKit.idl to trigger build scripts.
     10
     11        * Interfaces/IWebFramePrivate.idl:
     12        * Interfaces/WebKit.idl:
     13        * WebFrame.cpp:
     14        (WebFrame::clearOpener):
     15        * WebFrame.h:
     16
    1172011-02-24  Peter Kasting  <pkasting@google.com>
    218

  • trunk/Source/WebKit/win/Interfaces/IWebFramePrivate.idl

    r79586 r79764  
    120120
    121121    HRESULT hasSpellingMarker([in] UINT from, [in] UINT length, [out, retval] BOOL* result);
     122   
     123    HRESULT clearOpener();
    122124}

  • trunk/Source/WebKit/win/Interfaces/WebKit.idl

    r79586 r79764  
    302302    }
    303303}
     304

  • trunk/Source/WebKit/win/WebFrame.cpp

    r79586 r79764  
    10341034}
    10351035
     1036HRESULT STDMETHODCALLTYPE WebFrame::clearOpener()
     1037{
     1038    HRESULT hr = S_OK;
     1039    if (Frame* coreFrame = core(this))
     1040        coreFrame->loader()->setOpener(0);
     1041
     1042    return hr;
     1043}
     1044
    10361045// IWebDocumentText -----------------------------------------------------------
    10371046

  • trunk/Source/WebKit/win/WebFrame.h

    r79586 r79764  
    278278        /* [in] */ UINT length,
    279279        /* [retval][out] */ BOOL *result);
     280
     281    virtual HRESULT STDMETHODCALLTYPE clearOpener();
    280282
    281283    // IWebDocumentText

  • trunk/Source/WebKit2/ChangeLog

    r79752 r79764  
     12011-02-26  Vsevolod Vlasov  <vsevik@chromium.org>
     2
     3        Reviewed by Pavel Feldman.
     4
     5        DumpRenderTree should reset frame opener between tests.
     6        https://bugs.webkit.org/show_bug.cgi?id=54874
     7
     8        Added clearOpener method to WKBundleWebFramePrivate.
     9
     10        * WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
     11        (WKBundleFrameClearOpener):
     12        * WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h:
     13
    1142011-02-25  Anders Carlsson  <andersca@apple.com>
    215

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp

    r79586 r79764  
    165165}
    166166
     167void WKBundleFrameClearOpener(WKBundleFrameRef frameRef)
     168{
     169    Frame* coreFrame = toImpl(frameRef)->coreFrame();
     170    if (coreFrame)
     171        coreFrame->loader()->setOpener(0);
     172}
     173
    167174WKStringRef WKBundleFrameCopyLayerTreeAsText(WKBundleFrameRef frameRef)
    168175{

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h

    r79586 r79764  
    4848WK_EXPORT unsigned WKBundleFrameGetPendingUnloadCount(WKBundleFrameRef frame);
    4949WK_EXPORT WKStringRef WKBundleFrameCopyLayerTreeAsText(WKBundleFrameRef frame);
     50WK_EXPORT void WKBundleFrameClearOpener(WKBundleFrameRef frame);
    5051
    5152#ifdef __cplusplus

  • trunk/Tools/ChangeLog

    r79761 r79764  
     12011-02-26  Vsevolod Vlasov  <vsevik@chromium.org>
     2
     3        Reviewed by Pavel Feldman.
     4
     5        DumpRenderTree should reset frame opener between tests.
     6        https://bugs.webkit.org/show_bug.cgi?id=54874
     7
     8        Added clearOpener() calls between tests.
     9        Some tests are using window.open() to change current window location.
     10        This changes window.opener property whose nullity is checked before
     11        showing xml viewer.
     12
     13        * DumpRenderTree/chromium/TestShell.cpp:
     14        (TestShell::resetTestController):
     15        * DumpRenderTree/gtk/DumpRenderTree.cpp:
     16        (resetDefaultsToConsistentValues):
     17        * DumpRenderTree/mac/DumpRenderTree.mm:
     18        (resetWebViewToConsistentStateBeforeTesting):
     19        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
     20        (WebCore::DumpRenderTree::resetToConsistentStateBeforeTesting):
     21        * DumpRenderTree/win/DumpRenderTree.cpp:
     22        (resetWebViewToConsistentStateBeforeTesting):
     23        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
     24        (WTR::InjectedBundlePage::reset):
     25
    1262011-02-25  Lukasz Slachciak  <l.slachciak@samsung.com>
    227

  • trunk/Tools/DumpRenderTree/chromium/TestShell.cpp

    r79586 r79764  
    228228    if (m_drtDevToolsClient)
    229229        m_drtDevToolsClient->reset();
     230    webView()->mainFrame()->clearOpener();
    230231}
    231232

  • trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp

    r79586 r79764  
    464464    if (axController)
    465465        axController->resetToConsistentState();
     466
     467    DumpRenderTreeSupportGtk::clearOpener(mainFrame);
    466468}
    467469

  • trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

    r79586 r79764  
    10381038    // Clear the contents of the general pasteboard
    10391039    [[NSPasteboard generalPasteboard] declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:nil];
     1040
     1041    [mainFrame _clearOpener];
    10401042}
    10411043

  • trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

    r79586 r79764  
    581581    setlocale(LC_ALL, "");
    582582#endif
     583
     584    DumpRenderTreeSupportQt::clearOpener(m_page->mainFrame());
    583585}
    584586

  • trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp

    r79695 r79764  
    896896
    897897    sharedFrameLoadDelegate->resetToConsistentState();
     898
     899    COMPtr<IWebFramePrivate> framePrivate;
     900    if (SUCCEEDED(frame->QueryInterface(&framePrivate)))
     901        framePrivate->clearOpener();
    898902}
    899903

  • trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

    r79586 r79764  
    257257
    258258    m_previousTestBackForwardListItem = adoptWK(WKBundleBackForwardListCopyItemAtIndex(WKBundlePageGetBackForwardList(m_page), 0));
     259
     260    WKBundleFrameClearOpener(WKBundlePageGetMainFrame(m_page));
    259261}
    260262
Note: See TracChangeset for help on using the changeset viewer.