Changeset 79586 in webkit


Ignore:
Timestamp:
Feb 24, 2011 10:07:54 AM (13 years ago)
Author:
atwilson@chromium.org
Message:

2011-02-24 Andrew Wilson <​atwilson@chromium.org>

Unreviewed, rolling out r79570.
​http://trac.webkit.org/changeset/79570
​https://bugs.webkit.org/show_bug.cgi?id=54874

Breaks chromium build because glue/mocks/mock_web_frame.h/cc
was not updated

  • WebCore.exp.in:

2011-02-24 Andrew Wilson <​atwilson@chromium.org>

Unreviewed, rolling out r79570.
​http://trac.webkit.org/changeset/79570
​https://bugs.webkit.org/show_bug.cgi?id=54874

Breaks chromium build because glue/mocks/mock_web_frame.h/cc
was not updated

  • public/WebFrame.h:
  • src/WebFrameImpl.cpp:
  • src/WebFrameImpl.h:

2011-02-24 Andrew Wilson <​atwilson@chromium.org>

Unreviewed, rolling out r79570.
​http://trac.webkit.org/changeset/79570
​https://bugs.webkit.org/show_bug.cgi?id=54874

Breaks chromium build because glue/mocks/mock_web_frame.h/cc
was not updated

  • WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
  • WebCoreSupport/DumpRenderTreeSupportGtk.h:

2011-02-24 Andrew Wilson <​atwilson@chromium.org>

Unreviewed, rolling out r79570.
​http://trac.webkit.org/changeset/79570
​https://bugs.webkit.org/show_bug.cgi?id=54874

Breaks chromium build because glue/mocks/mock_web_frame.h/cc
was not updated

  • WebView/WebFrame.mm:
  • WebView/WebFramePrivate.h:

2011-02-24 Andrew Wilson <​atwilson@chromium.org>

Unreviewed, rolling out r79570.
​http://trac.webkit.org/changeset/79570
​https://bugs.webkit.org/show_bug.cgi?id=54874

Breaks chromium build because glue/mocks/mock_web_frame.h/cc
was not updated

  • WebCoreSupport/DumpRenderTreeSupportQt.cpp:
  • WebCoreSupport/DumpRenderTreeSupportQt.h:

2011-02-24 Andrew Wilson <​atwilson@chromium.org>

Unreviewed, rolling out r79570.
​http://trac.webkit.org/changeset/79570
​https://bugs.webkit.org/show_bug.cgi?id=54874

Breaks chromium build because glue/mocks/mock_web_frame.h/cc
was not updated

  • Interfaces/IWebFramePrivate.idl:
  • Interfaces/WebKit.idl:
  • WebFrame.cpp:
  • WebFrame.h:

2011-02-24 Andrew Wilson <​atwilson@chromium.org>

Unreviewed, rolling out r79570.
​http://trac.webkit.org/changeset/79570
​https://bugs.webkit.org/show_bug.cgi?id=54874

Breaks chromium build because glue/mocks/mock_web_frame.h/cc
was not updated

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

2011-02-24 Andrew Wilson <​atwilson@chromium.org>

Unreviewed, rolling out r79570.
​http://trac.webkit.org/changeset/79570
​https://bugs.webkit.org/show_bug.cgi?id=54874

Breaks chromium build because glue/mocks/mock_web_frame.h/cc
was not updated

  • 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

    r79584 r79586  
     12011-02-24  Andrew Wilson  <atwilson@chromium.org>
     2
     3        Unreviewed, rolling out r79570.
     4        http://trac.webkit.org/changeset/79570
     5        https://bugs.webkit.org/show_bug.cgi?id=54874
     6
     7        Breaks chromium build because glue/mocks/mock_web_frame.h/cc
     8        was not updated
     9
     10        * WebCore.exp.in:
     11
    1122011-02-24  David Dorwin  <ddorwin@chromium.org>
    213

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

    r79570 r79586  
    179179__ZN7WebCore11FrameLoader4loadERKNS_15ResourceRequestEb
    180180__ZN7WebCore11FrameLoader6reloadEb
    181 __ZN7WebCore11FrameLoader9setOpenerEPNS_5FrameE
    182181__ZN7WebCore11Geolocation12setIsAllowedEb
    183182__ZN7WebCore11GeolocationD1Ev

  • trunk/Source/WebKit/chromium/ChangeLog

    r79584 r79586  
     12011-02-24  Andrew Wilson  <atwilson@chromium.org>
     2
     3        Unreviewed, rolling out r79570.
     4        http://trac.webkit.org/changeset/79570
     5        https://bugs.webkit.org/show_bug.cgi?id=54874
     6
     7        Breaks chromium build because glue/mocks/mock_web_frame.h/cc
     8        was not updated
     9
     10        * public/WebFrame.h:
     11        * src/WebFrameImpl.cpp:
     12        * src/WebFrameImpl.h:
     13
    1142011-02-24  David Dorwin  <ddorwin@chromium.org>
    215

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

    r79570 r79586  
    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 
    176172    // Returns the parent frame or 0 if this is a top-most frame.
    177173    virtual WebFrame* parent() const = 0;

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

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

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

    r79570 r79586  
    8181    virtual WebView* view() const;
    8282    virtual WebFrame* opener() const;
    83     virtual void clearOpener();
    8483    virtual WebFrame* parent() const;
    8584    virtual WebFrame* top() const;

  • trunk/Source/WebKit/gtk/ChangeLog

    r79570 r79586  
     12011-02-24  Andrew Wilson  <atwilson@chromium.org>
     2
     3        Unreviewed, rolling out r79570.
     4        http://trac.webkit.org/changeset/79570
     5        https://bugs.webkit.org/show_bug.cgi?id=54874
     6
     7        Breaks chromium build because glue/mocks/mock_web_frame.h/cc
     8        was not updated
     9
     10        * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
     11        * WebCoreSupport/DumpRenderTreeSupportGtk.h:
     12
    1132011-02-24  Vsevolod Vlasov  <vsevik@chromium.org>
    214

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

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

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

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

  • trunk/Source/WebKit/mac/ChangeLog

    r79570 r79586  
     12011-02-24  Andrew Wilson  <atwilson@chromium.org>
     2
     3        Unreviewed, rolling out r79570.
     4        http://trac.webkit.org/changeset/79570
     5        https://bugs.webkit.org/show_bug.cgi?id=54874
     6
     7        Breaks chromium build because glue/mocks/mock_web_frame.h/cc
     8        was not updated
     9
     10        * WebView/WebFrame.mm:
     11        * WebView/WebFramePrivate.h:
     12
    1132011-02-24  Vsevolod Vlasov  <vsevik@chromium.org>
    214

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

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

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

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

  • trunk/Source/WebKit/qt/ChangeLog

    r79570 r79586  
     12011-02-24  Andrew Wilson  <atwilson@chromium.org>
     2
     3        Unreviewed, rolling out r79570.
     4        http://trac.webkit.org/changeset/79570
     5        https://bugs.webkit.org/show_bug.cgi?id=54874
     6
     7        Breaks chromium build because glue/mocks/mock_web_frame.h/cc
     8        was not updated
     9
     10        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
     11        * WebCoreSupport/DumpRenderTreeSupportQt.h:
     12
    1132011-02-24  Vsevolod Vlasov  <vsevik@chromium.org>
    214

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

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

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

    r79570 r79586  
    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*);
    192191    static void addURLToRedirect(const QString& origin, const QString& destination);
    193192    static QStringList contextMenu(QWebPage*);

  • trunk/Source/WebKit/win/ChangeLog

    r79570 r79586  
     12011-02-24  Andrew Wilson  <atwilson@chromium.org>
     2
     3        Unreviewed, rolling out r79570.
     4        http://trac.webkit.org/changeset/79570
     5        https://bugs.webkit.org/show_bug.cgi?id=54874
     6
     7        Breaks chromium build because glue/mocks/mock_web_frame.h/cc
     8        was not updated
     9
     10        * Interfaces/IWebFramePrivate.idl:
     11        * Interfaces/WebKit.idl:
     12        * WebFrame.cpp:
     13        * WebFrame.h:
     14
    1152011-02-24  Vsevolod Vlasov  <vsevik@chromium.org>
    216

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

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

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

    r79570 r79586  
    302302    }
    303303}
    304 

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

    r79570 r79586  
    10341034}
    10351035
    1036 HRESULT 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 
    10451036// IWebDocumentText -----------------------------------------------------------
    10461037

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

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

  • trunk/Source/WebKit2/ChangeLog

    r79585 r79586  
     12011-02-24  Andrew Wilson  <atwilson@chromium.org>
     2
     3        Unreviewed, rolling out r79570.
     4        http://trac.webkit.org/changeset/79570
     5        https://bugs.webkit.org/show_bug.cgi?id=54874
     6
     7        Breaks chromium build because glue/mocks/mock_web_frame.h/cc
     8        was not updated
     9
     10        * WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
     11        * WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h:
     12
    1132011-02-23  Brian Weinstein  <bweinstein@apple.com>
    214

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

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

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

    r79570 r79586  
    4848WK_EXPORT unsigned WKBundleFrameGetPendingUnloadCount(WKBundleFrameRef frame);
    4949WK_EXPORT WKStringRef WKBundleFrameCopyLayerTreeAsText(WKBundleFrameRef frame);
    50 WK_EXPORT void WKBundleFrameClearOpener(WKBundleFrameRef frame);
    5150
    5251#ifdef __cplusplus

  • trunk/Tools/ChangeLog

    r79575 r79586  
     12011-02-24  Andrew Wilson  <atwilson@chromium.org>
     2
     3        Unreviewed, rolling out r79570.
     4        http://trac.webkit.org/changeset/79570
     5        https://bugs.webkit.org/show_bug.cgi?id=54874
     6
     7        Breaks chromium build because glue/mocks/mock_web_frame.h/cc
     8        was not updated
     9
     10        * DumpRenderTree/chromium/TestShell.cpp:
     11        (TestShell::resetTestController):
     12        * DumpRenderTree/gtk/DumpRenderTree.cpp:
     13        (resetDefaultsToConsistentValues):
     14        * DumpRenderTree/mac/DumpRenderTree.mm:
     15        (resetWebViewToConsistentStateBeforeTesting):
     16        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
     17        (WebCore::DumpRenderTree::resetToConsistentStateBeforeTesting):
     18        * DumpRenderTree/win/DumpRenderTree.cpp:
     19        (resetWebViewToConsistentStateBeforeTesting):
     20        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
     21        (WTR::InjectedBundlePage::reset):
     22
    1232011-02-24  Mahesh Kulkarni  <mahesh.kulkarni@nokia.com>
    224

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

    r79570 r79586  
    228228    if (m_drtDevToolsClient)
    229229        m_drtDevToolsClient->reset();
    230     webView()->mainFrame()->clearOpener();
    231230}
    232231

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

    r79570 r79586  
    464464    if (axController)
    465465        axController->resetToConsistentState();
    466 
    467     DumpRenderTreeSupportGtk::clearOpener(mainFrame);
    468466}
    469467

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

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

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

    r79570 r79586  
    581581    setlocale(LC_ALL, "");
    582582#endif
    583 
    584     DumpRenderTreeSupportQt::clearOpener(m_page->mainFrame());
    585583}
    586584

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

    r79570 r79586  
    896896
    897897    sharedFrameLoadDelegate->resetToConsistentState();
    898 
    899     COMPtr<IWebFramePrivate> framePrivate;
    900     if (SUCCEEDED(frame->QueryInterface(&framePrivate)))
    901         framePrivate->clearOpener();
    902898}
    903899

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

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