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

[jianli at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 344ba6df1f13c48fb7be0fcc503a3b66725e94f5
Author: jianli at chromium.org <jianli at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 10 20:56:57 2010 +0000

    More chromium build fix.
    
    * DumpRenderTree/chromium/MockSpellCheck.cpp:
    (MockSpellCheck::spellCheckWord):
    (MockSpellCheck::initializeIfNeeded):
    * DumpRenderTree/chromium/NotificationPresenter.cpp:
    (NotificationPresenter::grantPermission):
    (NotificationPresenter::show):
    (NotificationPresenter::checkPermission):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65092 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f00221f..e8ff7b9 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,17 @@
 2010-08-10  Jian Li  <jianli at chromium.org>
 
+        More chromium build fix.
+
+        * DumpRenderTree/chromium/MockSpellCheck.cpp:
+        (MockSpellCheck::spellCheckWord):
+        (MockSpellCheck::initializeIfNeeded):
+        * DumpRenderTree/chromium/NotificationPresenter.cpp:
+        (NotificationPresenter::grantPermission):
+        (NotificationPresenter::show):
+        (NotificationPresenter::checkPermission):
+
+2010-08-10  Jian Li  <jianli at chromium.org>
+
         Chromium build fix.
 
         * DumpRenderTree/chromium/MockSpellCheck.cpp:
diff --git a/WebKitTools/DumpRenderTree/chromium/MockSpellCheck.cpp b/WebKitTools/DumpRenderTree/chromium/MockSpellCheck.cpp
index 5c3e2a4..0bf3802 100644
--- a/WebKitTools/DumpRenderTree/chromium/MockSpellCheck.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/MockSpellCheck.cpp
@@ -31,13 +31,12 @@
 #include "config.h"
 #include "MockSpellCheck.h"
 
-#include "PlatformString.h"
 #include <wtf/ASCIICType.h>
 #include <wtf/Assertions.h>
+#include <wtf/text/WTFString.h>
 
 #include "public/WebString.h"
 
-using namespace WebCore;
 using namespace WebKit;
 
 MockSpellCheck::MockSpellCheck()
@@ -61,7 +60,7 @@ bool MockSpellCheck::spellCheckWord(const WebString& text, int* misspelledOffset
 
     // Convert to a String because we store String instances in
     // m_misspelledWords and WebString has no find().
-    const String stringText(text.data(), text.length());
+    const WTF::String stringText(text.data(), text.length());
 
     // Extract the first possible English word from the given string.
     // The given string may include non-ASCII characters or numbers. So, we
@@ -84,7 +83,7 @@ bool MockSpellCheck::spellCheckWord(const WebString& text, int* misspelledOffset
     // extracted word if this word is a known misspelled word.
     // (See the comment in MockSpellCheck::initializeIfNeeded() why we use a
     // misspelled-word table.)
-    String word = stringText.substring(wordOffset, wordLength);
+    WTF::String word = stringText.substring(wordOffset, wordLength);
     if (!m_misspelledWords.contains(word))
         return true;
 
@@ -139,7 +138,7 @@ bool MockSpellCheck::initializeIfNeeded()
 
     m_misspelledWords.clear();
     for (size_t i = 0; i < arraysize(misspelledWords); ++i)
-        m_misspelledWords.add(String::fromUTF8(misspelledWords[i]), false);
+        m_misspelledWords.add(WTF::String::fromUTF8(misspelledWords[i]), false);
 
     // Mark as initialized to prevent this object from being initialized twice
     // or more.
diff --git a/WebKitTools/DumpRenderTree/chromium/NotificationPresenter.cpp b/WebKitTools/DumpRenderTree/chromium/NotificationPresenter.cpp
index b7bb685..95353a7 100644
--- a/WebKitTools/DumpRenderTree/chromium/NotificationPresenter.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/NotificationPresenter.cpp
@@ -31,8 +31,8 @@
 #include "config.h"
 #include "NotificationPresenter.h"
 
-#include "PlatformString.h"
 #include <wtf/text/CString.h>
+#include <wtf/text/WTFString.h>
 
 #include "googleurl/src/gurl.h"
 #include "public/WebNotification.h"
@@ -41,28 +41,27 @@
 #include "public/WebString.h"
 #include "public/WebURL.h"
 
-using namespace WebCore;
 using namespace WebKit;
 
 void NotificationPresenter::grantPermission(const WebString& origin)
 {
     // Make sure it's in the form of an origin.
     GURL url(origin);
-    m_allowedOrigins.add(String(url.GetOrigin().spec().c_str()));
+    m_allowedOrigins.add(WTF::String(url.GetOrigin().spec().c_str()));
 }
 
 // The output from all these methods matches what DumpRenderTree produces.
 bool NotificationPresenter::show(const WebNotification& notification)
 {
     if (!notification.replaceId().isEmpty()) {
-        String replaceId(notification.replaceId().data(), notification.replaceId().length());
+        WTF::String replaceId(notification.replaceId().data(), notification.replaceId().length());
         if (m_replacements.find(replaceId) != m_replacements.end())
             printf("REPLACING NOTIFICATION %s\n",
                    m_replacements.find(replaceId)->second.utf8().data());
 
         WebString identifier = notification.isHTML() ?
             notification.url().spec().utf16() : notification.title();
-        m_replacements.set(replaceId, String(identifier.data(), identifier.length()));
+        m_replacements.set(replaceId, WTF::String(identifier.data(), identifier.length()));
     }
 
     if (notification.isHTML()) {
@@ -105,7 +104,7 @@ void NotificationPresenter::objectDestroyed(const WebKit::WebNotification& notif
 WebNotificationPresenter::Permission NotificationPresenter::checkPermission(const WebURL& url)
 {
     // Check with the layout test controller
-    String origin = String(static_cast<GURL>(url).GetOrigin().spec().c_str());
+    WTF::String origin = WTF::String(static_cast<GURL>(url).GetOrigin().spec().c_str());
     bool allowed = m_allowedOrigins.find(origin) != m_allowedOrigins.end();
     return allowed ? WebNotificationPresenter::PermissionAllowed
         : WebNotificationPresenter::PermissionDenied;

-- 
WebKit Debian packaging