Clear the main frame's name between tests to get more consistent test…

… results when running the WebKit tests with --nthly. Reviewed by Dan Bernstein. * DumpRenderTree/mac/DumpRenderTree.mm: (resetWebViewToConsistentStateBeforeTesting): * DumpRenderTree/win/DumpRenderTree.cpp: (resetWebViewToConsistentStateBeforeTesting): Add SPI to WebView to allow DRT to clear the main frame's name between tests. * Interfaces/IWebViewPrivate.idl: * WebView.cpp: (WebView::clearMainFrameName): * WebView.h: Add SPI to WebView to allow DRT to clear the main frame's name between tests. * WebView/WebView.mm: (-[WebView _clearMainFrameName]): * WebView/WebViewPrivate.h: Add a means of clearing a FrameTree's name. * WebCore.base.exp: * page/FrameTree.cpp: (WebCore::FrameTree::clearName): * page/FrameTree.h: Update test results now that frame tree names are cleared between tests. * fast/events/onunload-clears-onbeforeunload-expected.txt: * fast/events/onunload-expected.txt: * fast/events/onunload-not-on-body-expected.txt: * fast/events/onunload-window-property-expected.txt: * fast/forms/button-state-restore-expected.txt: * fast/forms/form-and-frame-interaction-retains-values-expected.txt: Canonical link: https://commits.webkit.org/28931@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@36652 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Sep 19, 2008 · a6d5c3f7ed80f7f27f42afa94c1119ccb3e11e48 · a6d5c3f
1 parent 9c5d9c1
commit a6d5c3f7ed80f7f27f42afa94c1119ccb3e11e48
Showing 21 changed files with 95 additions and 12 deletions.
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2008-09-18  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Update test results now that frame tree names are cleared between tests.
+
+        * fast/events/onunload-clears-onbeforeunload-expected.txt:
+        * fast/events/onunload-expected.txt:
+        * fast/events/onunload-not-on-body-expected.txt:
+        * fast/events/onunload-window-property-expected.txt:
+        * fast/forms/button-state-restore-expected.txt:
+        * fast/forms/form-and-frame-interaction-retains-values-expected.txt:
+
 2008-09-18  Collin Jackson  <collinj@webkit.org>
 
         Reviewed by Antti Koivisto and Mark Rowe.

diff --git a/LayoutTests/fast/events/onunload-clears-onbeforeunload-expected.txt b/LayoutTests/fast/events/onunload-clears-onbeforeunload-expected.txt
@@ -1,4 +1,4 @@
-main frame "1" - has 1 onunload handler(s)
+main frame - has 1 onunload handler(s)
 ALERT: before unload
 ALERT: unload
 If you didn't hit an assert you PASS.
diff --git a/LayoutTests/fast/events/onunload-expected.txt b/LayoutTests/fast/events/onunload-expected.txt
@@ -1,3 +1,3 @@
-main frame "1" - has 1 onunload handler(s)
+main frame - has 1 onunload handler(s)
 ALERT: unload
 You should have seen an unload alert appear.
diff --git a/LayoutTests/fast/events/onunload-not-on-body-expected.txt b/LayoutTests/fast/events/onunload-not-on-body-expected.txt
@@ -1,3 +1,3 @@
-frame "<!--framePath /1/<!--frame2-->-->" - has 1 onunload handler(s)
+frame "<!--framePath //<!--frame2-->-->" - has 1 onunload handler(s)
 ALERT: unload
 you should only see one unload alert appear.
diff --git a/LayoutTests/fast/events/onunload-window-property-expected.txt b/LayoutTests/fast/events/onunload-window-property-expected.txt
@@ -1,3 +1,3 @@
-main frame "1" - has 1 onunload handler(s)
+main frame - has 1 onunload handler(s)
 ALERT: unload
 You should have seen an unload alert appear.
diff --git a/LayoutTests/fast/forms/button-state-restore-expected.txt b/LayoutTests/fast/forms/button-state-restore-expected.txt
@@ -1,5 +1,5 @@
-main frame "1" - has 1 onunload handler(s)
-main frame "1" - has 1 onunload handler(s)
+main frame - has 1 onunload handler(s)
+main frame - has 1 onunload handler(s)
 This is a test for http://bugs.webkit.org/show_bug.cgi?id=14400 Assertion failure (SHOULD NEVER BE REACHED) going back on YouTube.
 
 Test result: PASS

diff --git a/LayoutTests/fast/forms/form-and-frame-interaction-retains-values-expected.txt b/LayoutTests/fast/forms/form-and-frame-interaction-retains-values-expected.txt
@@ -1,7 +1,7 @@
 
 
 --------
-Frame: '<!--framePath /1/<!--frame1-->-->'
+Frame: '<!--framePath //<!--frame1-->-->'
 --------
 PASS
 
@@ -13,6 +13,6 @@ In this test the main page is loaded in a frameset, which sets the value of an i
 
 
 --------
-Frame: '<!--framePath /1/submitted/<!--frame0-->-->'
+Frame: '<!--framePath //submitted/<!--frame0-->-->'
 --------
 
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2008-09-18  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Add a means of clearing a FrameTree's name.
+
+        * WebCore.base.exp:
+        * page/FrameTree.cpp:
+        (WebCore::FrameTree::clearName):
+        * page/FrameTree.h:
+
 2008-09-18  David Hyatt  <hyatt@apple.com>
 
         Eliminate addToSuperview from Widget, since it was only called

diff --git a/WebCore/WebCore.base.exp b/WebCore/WebCore.base.exp
@@ -535,12 +535,13 @@ __ZN7WebCore6StringC1ERKN3JSC7UStringE
 __ZN7WebCore6Widget14invalidateRectERKNS_7IntRectE
 __ZN7WebCore6Widget16removeFromParentEv
 __ZN7WebCore6Widget16setFrameGeometryERKNS_7IntRectE
-__ZNK7WebCore6Widget13frameGeometryEv
-__ZN7WebCore6Widget9setParentEPNS_10ScrollViewE
+__ZN7WebCore6Widget20retainPlatformWidgetEv
+__ZN7WebCore6Widget21releasePlatformWidgetEv
 __ZN7WebCore6Widget4hideEv
 __ZN7WebCore6Widget4showEv
 __ZN7WebCore6Widget5paintEPNS_15GraphicsContextERKNS_7IntRectE
 __ZN7WebCore6Widget8setFocusEv
+__ZN7WebCore6Widget9setParentEPNS_10ScrollViewE
 __ZN7WebCore6WidgetC1EP6NSView
 __ZN7WebCore6WidgetC2EP6NSView
 __ZN7WebCore6WidgetD2Ev
@@ -604,6 +605,7 @@ __ZN7WebCore9FontCache21inactiveFontDataCountEv
 __ZN7WebCore9FontCache21purgeInactiveFontDataEi
 __ZN7WebCore9FrameTree11appendChildEN3WTF10PassRefPtrINS_5FrameEEE
 __ZN7WebCore9FrameTree7setNameERKNS_12AtomicStringE
+__ZN7WebCore9FrameTree9clearNameEv
 __ZN7WebCore9FrameView12setMediaTypeERKNS_6StringE
 __ZN7WebCore9FrameView14adjustViewSizeEv
 __ZN7WebCore9FrameView14initScrollbarsEv
@@ -832,9 +834,8 @@ __ZNK7WebCore6String6lengthEv
 __ZNK7WebCore6String7isEmptyEv
 __ZNK7WebCore6String9substringEjj
 __ZNK7WebCore6StringcvN3JSC7UStringEEv
+__ZNK7WebCore6Widget13frameGeometryEv
 __ZNK7WebCore6Widget14windowClipRectEv
-__ZN7WebCore6Widget20retainPlatformWidgetEv
-__ZN7WebCore6Widget21releasePlatformWidgetEv
 __ZNK7WebCore7Element12getAttributeERKNS_13QualifiedNameE
 __ZNK7WebCore7IntRectcv7_NSRectEv
 __ZNK7WebCore8Document11completeURLERKNS_6StringE

diff --git a/WebCore/page/FrameTree.cpp b/WebCore/page/FrameTree.cpp
@@ -48,6 +48,11 @@ void FrameTree::setName(const AtomicString& name)
     m_name = parent()->tree()->uniqueChildName(name);
 }
 
+void FrameTree::clearName()
+{
+    m_name = AtomicString();
+}
+
 Frame* FrameTree::parent(bool checkForDisconnectedFrame) const 
 { 
     if (checkForDisconnectedFrame && m_thisFrame->isDisconnected())

diff --git a/WebCore/page/FrameTree.h b/WebCore/page/FrameTree.h
@@ -39,6 +39,7 @@ namespace WebCore {
 
         const AtomicString& name() const { return m_name; }
         void setName(const AtomicString&);
+        void clearName();
         Frame* parent(bool checkForDisconnectedFrame = false) const;
         void setParent(Frame* parent) { m_parent = parent; }
 

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
@@ -1,3 +1,13 @@
+2008-09-18  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Add SPI to WebView to allow DRT to clear the main frame's name between tests.
+
+        * WebView/WebView.mm:
+        (-[WebView _clearMainFrameName]):
+        * WebView/WebViewPrivate.h:
+
 2008-09-18  Darin Adler  <darin@apple.com>
 
         Reviewed by Sam Weinig.

diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
@@ -1707,6 +1707,11 @@ - (void)_setCustomHTMLTokenizerChunkSize:(int)chunkSize
     return _private->page->setCustomHTMLTokenizerChunkSize(chunkSize);
 }
 
+- (void)_clearMainFrameName
+{
+    _private->page->mainFrame()->tree()->clearName();
+}
+
 @end
 
 @implementation _WebSafeForwarder

diff --git a/WebKit/mac/WebView/WebViewPrivate.h b/WebKit/mac/WebView/WebViewPrivate.h
@@ -371,6 +371,7 @@ Could be worth adding to the API.
 
 // SPI for DumpRenderTree
 - (void)_executeCoreCommandByName:(NSString *)name value:(NSString *)value;
+- (void)_clearMainFrameName;
 
 - (void)_setCustomHTMLTokenizerTimeDelay:(double)timeDelay;
 - (void)_setCustomHTMLTokenizerChunkSize:(int)chunkSize;

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
@@ -1,3 +1,14 @@
+2008-09-18  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Add SPI to WebView to allow DRT to clear the main frame's name between tests.
+
+        * Interfaces/IWebViewPrivate.idl:
+        * WebView.cpp:
+        (WebView::clearMainFrameName):
+        * WebView.h:
+
 2008-09-16  Alp Toker  <alp@nuanti.com>
 
         Suggested by Dave Hyatt.

diff --git a/WebKit/win/Interfaces/IWebViewPrivate.idl b/WebKit/win/Interfaces/IWebViewPrivate.idl
@@ -122,6 +122,7 @@ interface IWebViewPrivate : IUnknown
 
     // SPI for DumpRenderTree
     HRESULT executeCoreCommandByName([in] BSTR name, [in] BSTR value);
+    HRESULT clearMainFrameName();
 
     HRESULT windowAncestryDidChange();
 

diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
@@ -2835,6 +2835,13 @@ HRESULT STDMETHODCALLTYPE WebView::executeCoreCommandByName(BSTR bName, BSTR bVa
     return S_OK;
 }
 
+HRESULT STDMETHODCALLTYPE WebView::clearMainFrameName()
+{
+    m_page->mainFrame()->tree()->clearName();
+
+    return S_OK;
+}
+
 HRESULT STDMETHODCALLTYPE WebView::markAllMatchesForText(
     BSTR str, BOOL caseSensitive, BOOL highlight, UINT limit, UINT* matches)
 {

diff --git a/WebKit/win/WebView.h b/WebKit/win/WebView.h
@@ -598,6 +598,8 @@ class WebView
 
     virtual HRESULT STDMETHODCALLTYPE executeCoreCommandByName(BSTR name, BSTR value);
 
+    virtual HRESULT STDMETHODCALLTYPE clearMainFrameName();
+
     virtual HRESULT STDMETHODCALLTYPE markAllMatchesForText(
         BSTR search, BOOL caseSensitive, BOOL highlight, UINT limit, UINT* matches);
 

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2008-09-18  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Clear the main frame's name between tests to get more consistent test results
+        when running the WebKit tests with --nthly.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (resetWebViewToConsistentStateBeforeTesting):
+        * DumpRenderTree/win/DumpRenderTree.cpp:
+        (resetWebViewToConsistentStateBeforeTesting):
+
 2008-09-18  Stephanie Lewis  <slewis@apple.com>
 
         Really fix tiger jsc tests.

diff --git a/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm b/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
@@ -945,6 +945,7 @@ static void resetWebViewToConsistentStateBeforeTesting()
     [webView setTabKeyCyclesThroughElements:YES];
     [webView setPolicyDelegate:nil];
     [webView _setDashboardBehavior:WebDashboardBehaviorUseBackwardCompatibilityMode to:NO];
+    [webView _clearMainFrameName];
 
     WebPreferences *preferences = [webView preferences];
     [preferences setPrivateBrowsingEnabled:NO];

diff --git a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
@@ -665,6 +665,8 @@ static void resetWebViewToConsistentStateBeforeTesting()
     HWND viewWindow;
     if (SUCCEEDED(webViewPrivate->viewWindow(reinterpret_cast<OLE_HANDLE*>(&viewWindow))) && viewWindow)
         SetFocus(viewWindow);
+
+    webViewPrivate->clearMainFrameName();
 }
 
 static void runTest(const char* pathOrURL)