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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 848a20f29889d445f1bf5b217237be3f36e85f08
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 11 05:02:01 2010 +0000

    2010-08-10  Ryuan Choi  <ryuan.choi at samsung.com>
    
            Unreviewed build fix.
    
            [EFL]REGRESSION(65021) need to fix build break
            https://bugs.webkit.org/show_bug.cgi?id=43767
    
            Remove AtomicStringWTF and change namespace TextCaseInsensitive.
    
            * ewk/ewk_frame.cpp:
            (ewk_frame_plugin_create):
            * ewk/ewk_view.cpp:
            (ewk_view_text_search):
            (ewk_view_text_matches_mark):
            (ewk_view_setting_font_cursive_set):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65122 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index 0a627e7..02c96ee 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,19 @@
+2010-08-10  Ryuan Choi  <ryuan.choi at samsung.com>
+
+        Unreviewed build fix.
+
+        [EFL]REGRESSION(65021) need to fix build break
+        https://bugs.webkit.org/show_bug.cgi?id=43767
+
+        Remove AtomicStringWTF and change namespace TextCaseInsensitive.
+
+        * ewk/ewk_frame.cpp:
+        (ewk_frame_plugin_create):
+        * ewk/ewk_view.cpp:
+        (ewk_view_text_search):
+        (ewk_view_text_matches_mark):
+        (ewk_view_setting_font_cursive_set):
+
 2010-08-06  Gavin Barraclough  <barraclough at apple.com>
 
         Rubber stamped by Sam Weinig
diff --git a/WebKit/efl/ewk/ewk_frame.cpp b/WebKit/efl/ewk/ewk_frame.cpp
index fcf5ed3..296c261 100644
--- a/WebKit/efl/ewk/ewk_frame.cpp
+++ b/WebKit/efl/ewk/ewk_frame.cpp
@@ -1946,7 +1946,7 @@ void ewk_frame_force_layout(Evas_Object* o)
         view->forceLayout(true);
 }
 
-WTF::PassRefPtr<WebCore::Widget> ewk_frame_plugin_create(Evas_Object* o, const WebCore::IntSize& pluginSize, WebCore::HTMLPlugInElement* element, const WebCore::KURL& url, const WTF::Vector<WTF::String>& paramNames, const WTF::Vector<WTF::String>& paramValues, const WTF::StringWTF::String& mimeType, bool loadManually)
+WTF::PassRefPtr<WebCore::Widget> ewk_frame_plugin_create(Evas_Object* o, const WebCore::IntSize& pluginSize, WebCore::HTMLPlugInElement* element, const WebCore::KURL& url, const WTF::Vector<WTF::String>& paramNames, const WTF::Vector<WTF::String>& paramValues, const WTF::String& mimeType, bool loadManually)
 {
     return 0;
 }
diff --git a/WebKit/efl/ewk/ewk_view.cpp b/WebKit/efl/ewk/ewk_view.cpp
index c030c1c..f6310d5 100644
--- a/WebKit/efl/ewk/ewk_view.cpp
+++ b/WebKit/efl/ewk/ewk_view.cpp
@@ -1318,13 +1318,13 @@ Eina_Bool ewk_view_text_search(const Evas_Object* o, const char* string, Eina_Bo
     EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(string, EINA_FALSE);
-    WebCore::TextCaseSensitivity sensitive;
+    WTF::TextCaseSensitivity sensitive;
     WebCore::FindDirection direction;
 
     if (case_sensitive)
-        sensitive = WebCore::TextCaseSensitive;
+        sensitive = WTF::TextCaseSensitive;
     else
-        sensitive = WebCore::TextCaseInsensitive;
+        sensitive = WTF::TextCaseInsensitive;
 
     if (forward)
         direction = WebCore::FindDirectionForward;
@@ -1350,12 +1350,12 @@ unsigned int ewk_view_text_matches_mark(Evas_Object* o, const char* string, Eina
     EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, 0);
     EINA_SAFETY_ON_NULL_RETURN_VAL(string, 0);
-    WebCore::TextCaseSensitivity sensitive;
+    WTF::TextCaseSensitivity sensitive;
 
     if (case_sensitive)
-        sensitive = WebCore::TextCaseSensitive;
+        sensitive = WTF::TextCaseSensitive;
     else
-        sensitive = WebCore::TextCaseInsensitive;
+        sensitive = WTF::TextCaseInsensitive;
 
     return priv->page->markAllMatchesForText(WTF::String::fromUTF8(string), sensitive, highlight, limit);
 }
@@ -2528,7 +2528,7 @@ Eina_Bool ewk_view_setting_font_cursive_set(Evas_Object* o, const char* family)
     EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     if (eina_stringshare_replace(&priv->settings.font_cursive, family)) {
-        WTF::AtomicStringWTF::AtomicString s = WTF::String::fromUTF8(family);
+        WTF::AtomicString s = WTF::String::fromUTF8(family);
         priv->page_settings->setCursiveFontFamily(s);
     }
     return EINA_TRUE;

-- 
WebKit Debian packaging