[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[mjs at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 62b20f469ac6052061e974e3e41d5e52aa27c5df
Author: mjs at apple.com <mjs at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 29 02:25:32 2011 +0000

    2011-01-28  Maciej Stachowiak  <mjs at apple.com>
    
            Reviewed by Darin Adler.
    
            WebKitTestRunner needs layoutTestController.setPOSIXLocale
            https://bugs.webkit.org/show_bug.cgi?id=42682
    
            * platform/mac-wk2/Skipped:
    2011-01-28  Maciej Stachowiak  <mjs at apple.com>
    
            Reviewed by Darin Adler.
    
            WebKitTestRunner needs layoutTestController.setPOSIXLocale
            https://bugs.webkit.org/show_bug.cgi?id=42682
    
            * WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl:
            * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
            (WTR::InjectedBundle::resetLocalSettings):
            (WTR::InjectedBundle::didReceiveMessage):
            * WebKitTestRunner/InjectedBundle/InjectedBundle.h:
            * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
            (WTR::LayoutTestController::setPOSIXLocale):
            * WebKitTestRunner/InjectedBundle/LayoutTestController.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77042 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index cecebec..eddc5e5 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-28  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin Adler.
+
+        WebKitTestRunner needs layoutTestController.setPOSIXLocale
+        https://bugs.webkit.org/show_bug.cgi?id=42682
+
+        * platform/mac-wk2/Skipped:
+
 2011-01-28  Ryosuke Niwa  <rniwa at webkit.org>
 
         Unreviewed; Fixed Chromium test expectation.
diff --git a/LayoutTests/platform/mac-wk2/Skipped b/LayoutTests/platform/mac-wk2/Skipped
index a6d11b4..be2fc7c 100644
--- a/LayoutTests/platform/mac-wk2/Skipped
+++ b/LayoutTests/platform/mac-wk2/Skipped
@@ -1572,11 +1572,6 @@ http/tests/security/local-user-CSS-from-remote.html
 # <https://bugs.webkit.org/show_bug.cgi?id=42679> 
 fast/loader/user-stylesheet-fast-path.html
 
-# WebKitTestRunner needs layoutTestController.setPOSIXLocale
-# <https://bugs.webkit.org/show_bug.cgi?id=42682>
-fast/css/opacity-float.html
-fast/js/navigator-language.html
-
 # WebKitTestRunner needs layoutTestController.setCacheModel
 # <https://bugs.webkit.org/show_bug.cgi?id=42684>
 fast/dom/HTMLScriptElement/nested-execution.html
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 8b3a599..9aa18ef 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,19 @@
+2011-01-28  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin Adler.
+
+        WebKitTestRunner needs layoutTestController.setPOSIXLocale
+        https://bugs.webkit.org/show_bug.cgi?id=42682
+
+        * WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl:
+        * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+        (WTR::InjectedBundle::resetLocalSettings):
+        (WTR::InjectedBundle::didReceiveMessage):
+        * WebKitTestRunner/InjectedBundle/InjectedBundle.h:
+        * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
+        (WTR::LayoutTestController::setPOSIXLocale):
+        * WebKitTestRunner/InjectedBundle/LayoutTestController.h:
+
 2011-01-28  Dirk Pranke  <dpranke at chromium.org>
  
          Reviewed by Mihai Parparita.
diff --git a/Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl b/Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl
index be4fd2e..162431e 100644
--- a/Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl
+++ b/Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl
@@ -85,6 +85,8 @@ module WTR {
         void closeWebInspector();
         void evaluateInWebInspector(in long callID, in DOMString script);
         void setTimelineProfilingEnabled(in boolean enabled);
+
+        void setPOSIXLocale(in DOMString locale);
     };
 
 }
diff --git a/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp b/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp
index 972a606..d042431 100644
--- a/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp
+++ b/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp
@@ -118,6 +118,11 @@ InjectedBundlePage* InjectedBundle::page() const
     return m_pages[0].get();
 }
 
+void InjectedBundle::resetLocalSettings()
+{
+    setlocale(LC_ALL, "");
+}
+
 void InjectedBundle::didReceiveMessage(WKStringRef messageName, WKTypeRef messageBody)
 {
     if (WKStringIsEqualToUTF8CString(messageName, "BeginTest")) {
@@ -131,6 +136,9 @@ void InjectedBundle::didReceiveMessage(WKStringRef messageName, WKTypeRef messag
         return;
     } else if (WKStringIsEqualToUTF8CString(messageName, "Reset")) {
         m_state = Idle;
+
+        resetLocalSettings();
+
         return;
     }
 
diff --git a/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h b/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h
index 9778441..741ade4 100644
--- a/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h
+++ b/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h
@@ -82,6 +82,8 @@ private:
     void didInitializePageGroup(WKBundlePageGroupRef);
     void didReceiveMessage(WKStringRef messageName, WKTypeRef messageBody);
 
+    void resetLocalSettings();
+
     void beginTesting();
 
     WKBundleRef m_bundle;
diff --git a/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp b/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp
index 3c58b26..2c2566c 100644
--- a/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp
+++ b/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp
@@ -371,4 +371,11 @@ void LayoutTestController::evaluateScriptInIsolatedWorld(JSContextRef context, u
     JSEvaluateScript(jsContext, script, 0, 0, 0, 0); 
 }
 
+void LayoutTestController::setPOSIXLocale(JSStringRef locale)
+{
+    char localeBuf[32];
+    JSStringGetUTF8CString(locale, localeBuf, sizeof(localeBuf));
+    setlocale(LC_ALL, localeBuf);
+}
+
 } // namespace WTR
diff --git a/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h b/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h
index 447e871..0c4a70d 100644
--- a/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h
+++ b/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h
@@ -131,6 +131,8 @@ public:
     void evaluateInWebInspector(long callId, JSStringRef script);
     void setTimelineProfilingEnabled(bool);
 
+    void setPOSIXLocale(JSStringRef);
+
 private:
     static const double waitToDumpWatchdogTimerInterval;
 

-- 
WebKit Debian packaging