[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[weinig at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 1ef25ae51dce4ded279f1658a250b2fcfbc9144d
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Aug 1 21:05:48 2010 +0000

    Add ability to reset frame names for WebKitTestRunner
    https://bugs.webkit.org/show_bug.cgi?id=43316
    
    Reviewed by Anders Carlsson.
    
    WebKit2:
    
    * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
    (WKBundlePageClearMainFrameName):
    * WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h:
    * WebProcess/WebPage/WebPage.cpp:
    (WebKit::WebPage::clearMainFrameName):
    * WebProcess/WebPage/WebPage.h:
    
    WebKitTools:
    
    * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
    (WTR::InjectedBundle::reset):
    * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
    (WTR::InjectedBundlePage::reset):
    * WebKitTestRunner/InjectedBundle/InjectedBundlePage.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64445 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 0cb4919..07c2fce 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-01  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        Add ability to reset frame names for WebKitTestRunner
+        https://bugs.webkit.org/show_bug.cgi?id=43316
+
+        * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+        (WKBundlePageClearMainFrameName):
+        * WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::clearMainFrameName):
+        * WebProcess/WebPage/WebPage.h:
+
 2010-08-01  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
index ade7da4..dee1ec4 100644
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
@@ -75,3 +75,8 @@ bool WKBundlePageIsEditingCommandEnabled(WKBundlePageRef pageRef, WKStringRef na
 {
     return toWK(pageRef)->isEditingCommandEnabled(toWK(name)->string());
 }
+
+void WKBundlePageClearMainFrameName(WKBundlePageRef pageRef)
+{
+    toWK(pageRef)->clearMainFrameName();
+}
diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h
index 97ba128..93f3696 100644
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h
@@ -36,6 +36,7 @@ extern "C" {
 WK_EXPORT WKStringRef WKBundlePageCopyRenderTreeExternalRepresentation(WKBundlePageRef page);
 WK_EXPORT void WKBundlePageExecuteEditingCommand(WKBundlePageRef page, WKStringRef commandName, WKStringRef argument);
 WK_EXPORT bool WKBundlePageIsEditingCommandEnabled(WKBundlePageRef page, WKStringRef commandName);
+WK_EXPORT void WKBundlePageClearMainFrameName(WKBundlePageRef page);
 
 #ifdef __cplusplus
 }
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index ffd01d6..902833d 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -164,6 +164,11 @@ bool WebPage::isEditingCommandEnabled(const String& commandName)
     return m_mainFrame->coreFrame()->editor()->command(commandName).isEnabled();
 }
 
+void WebPage::clearMainFrameName()
+{
+    mainFrame()->coreFrame()->tree()->clearName();
+}
+
 #if USE(ACCELERATED_COMPOSITING)
 void WebPage::changeAcceleratedCompositingMode(WebCore::GraphicsLayer* layer)
 {
diff --git a/WebKit2/WebProcess/WebPage/WebPage.h b/WebKit2/WebProcess/WebPage/WebPage.h
index 3b68482..617e26e 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.h
+++ b/WebKit2/WebProcess/WebPage/WebPage.h
@@ -108,6 +108,7 @@ public:
     WebCore::String renderTreeExternalRepresentation() const;
     void executeEditingCommand(const WebCore::String& commandName, const WebCore::String& argument);
     bool isEditingCommandEnabled(const WebCore::String& commandName);
+    void clearMainFrameName();
 
 #if USE(ACCELERATED_COMPOSITING)
     void changeAcceleratedCompositingMode(WebCore::GraphicsLayer*);
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 878ab41..92f2e76 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-01  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        Add ability to reset frame names for WebKitTestRunner
+        https://bugs.webkit.org/show_bug.cgi?id=43316
+
+        * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+        (WTR::InjectedBundle::reset):
+        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+        (WTR::InjectedBundlePage::reset):
+        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.h:
+
 2010-08-01  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp
index 0daf954..8e661b7 100644
--- a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp
@@ -125,6 +125,7 @@ void InjectedBundle::reset()
     m_layoutTestController = LayoutTestController::create();
     WKBundleSetShouldTrackVisitedLinks(m_bundle, false);
     WKBundleRemoveAllVisitedLinks(m_bundle);
+    m_mainPage->reset();
 }
 
 void InjectedBundle::setShouldTrackVisitedLinks()
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
index f5570f6..2f3d5a2 100644
--- a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
@@ -155,6 +155,11 @@ InjectedBundlePage::~InjectedBundlePage()
 {
 }
 
+void InjectedBundlePage::reset()
+{
+    WKBundlePageClearMainFrameName(m_page);
+}
+
 // Loader Client Callbacks
 
 void InjectedBundlePage::_didStartProvisionalLoadForFrame(WKBundlePageRef page, WKBundleFrameRef frame, const void *clientInfo)
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h
index 1b67af0..f7d64f9 100644
--- a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h
@@ -40,6 +40,8 @@ public:
 
     bool isLoading() { return m_isLoading; }
 
+    void reset();
+
 private:
     // Loader Client
     static void _didStartProvisionalLoadForFrame(WKBundlePageRef, WKBundleFrameRef, const void* clientInfo);

-- 
WebKit Debian packaging