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

[barraclough at apple.com]

The following commit has been merged in the debian/experimental branch:
commit b2dff803d18d0ab47300b4c4400474e6cee10a86
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 10 01:42:05 2010 +0000

    Speculative chromium build fix III.
    
    * DumpRenderTree/chromium/MockSpellCheck.h:
    * DumpRenderTree/chromium/NotificationPresenter.h:
    * DumpRenderTree/chromium/WebViewHost.h:
    (WebViewHost::addClearHeader):
    (WebViewHost::clearHeaders):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65028 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index c72d0e4..21f647f 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-09  Gavin Barraclough  <barraclough at apple.com>
+
+        Speculative chromium build fix III.
+
+        * DumpRenderTree/chromium/MockSpellCheck.h:
+        * DumpRenderTree/chromium/NotificationPresenter.h:
+        * DumpRenderTree/chromium/WebViewHost.h:
+        (WebViewHost::addClearHeader):
+        (WebViewHost::clearHeaders):
+
 2010-08-09  Ojan Vafai  <ojan at chromium.org>
 
         Reviewed by Tony Chang.
diff --git a/WebKitTools/DumpRenderTree/chromium/MockSpellCheck.h b/WebKitTools/DumpRenderTree/chromium/MockSpellCheck.h
index 8c2ba92..c680340 100644
--- a/WebKitTools/DumpRenderTree/chromium/MockSpellCheck.h
+++ b/WebKitTools/DumpRenderTree/chromium/MockSpellCheck.h
@@ -73,7 +73,7 @@ private:
     bool initializeIfNeeded();
 
     // A table that consists of misspelled words.
-    HashMap<WebCore::String, bool> m_misspelledWords;
+    HashMap<WTF::String, bool> m_misspelledWords;
 
     // A flag representing whether or not this object is initialized.
     bool m_initialized;
diff --git a/WebKitTools/DumpRenderTree/chromium/NotificationPresenter.h b/WebKitTools/DumpRenderTree/chromium/NotificationPresenter.h
index f30862f..5c7a400 100644
--- a/WebKitTools/DumpRenderTree/chromium/NotificationPresenter.h
+++ b/WebKitTools/DumpRenderTree/chromium/NotificationPresenter.h
@@ -61,10 +61,10 @@ private:
     TestShell* m_shell;
 
     // Set of allowed origins.
-    HashSet<WebCore::String> m_allowedOrigins;
+    HashSet<WTF::String> m_allowedOrigins;
 
     // Map of active replacement IDs to the titles of those notifications
-    HashMap<WebCore::String, WebCore::String> m_replacements;
+    HashMap<WTF::String, WTF::String> m_replacements;
 };
 
 #endif // NotificationPresenter_h
diff --git a/WebKitTools/DumpRenderTree/chromium/WebViewHost.h b/WebKitTools/DumpRenderTree/chromium/WebViewHost.h
index c175e61..d95c59f 100644
--- a/WebKitTools/DumpRenderTree/chromium/WebViewHost.h
+++ b/WebKitTools/DumpRenderTree/chromium/WebViewHost.h
@@ -85,8 +85,8 @@ class WebViewHost : public WebKit::WebViewClient, public WebKit::WebFrameClient,
     void loadURLForFrame(const WebKit::WebURL&, const WebKit::WebString& frameName);
     TestNavigationController* navigationController() { return m_navigationController.get(); }
 
-    void addClearHeader(const WebCore::String& header) { m_clearHeaders.add(header); }
-    const HashSet<WebCore::String>& clearHeaders() const { return m_clearHeaders; }
+    void addClearHeader(const WTF::String& header) { m_clearHeaders.add(header); }
+    const HashSet<WTF::String>& clearHeaders() const { return m_clearHeaders; }
 
     // NavigationHost
     virtual bool navigate(const TestNavigationEntry&, bool reload);
@@ -262,7 +262,7 @@ private:
     bool m_selectTrailingWhitespaceEnabled;
 
     // Set of headers to clear in willSendRequest.
-    HashSet<WebCore::String> m_clearHeaders;
+    HashSet<WTF::String> m_clearHeaders;
 
     // true if we should block any redirects
     bool m_blocksRedirects;

-- 
WebKit Debian packaging