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

[bweinstein at apple.com]

The following commit has been merged in the debian/experimental branch:
commit b0a37b0b71da2520e67010c2fc4b41596e3a05b3
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 13 04:41:20 2010 +0000

    WebKit2: Implement WebInspector::localizedStringsURL on Windows
    https://bugs.webkit.org/show_bug.cgi?id=50896
    
    Reviewed by Tim Hatcher.
    
    Find the localized strings file using CFBundleCopyResourceURL.
    
    * WebProcess/WebPage/win/WebInspectorWin.cpp:
    (WebKit::WebInspector::localizedStringsURL):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73884 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index e46a9d9..2370c8c 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-12  Brian Weinstein  <bweinstein at apple.com>
+
+        Reviewed by Tim Hatcher.
+
+        WebKit2: Implement WebInspector::localizedStringsURL on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=50896
+        
+        Find the localized strings file using CFBundleCopyResourceURL.
+
+        * WebProcess/WebPage/win/WebInspectorWin.cpp:
+        (WebKit::WebInspector::localizedStringsURL):
+
 2010-12-12  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Anders Carlsson.
diff --git a/WebKit2/WebProcess/WebPage/win/WebInspectorWin.cpp b/WebKit2/WebProcess/WebPage/win/WebInspectorWin.cpp
index 99aa1eb..4c30b8b 100644
--- a/WebKit2/WebProcess/WebPage/win/WebInspectorWin.cpp
+++ b/WebKit2/WebProcess/WebPage/win/WebInspectorWin.cpp
@@ -27,17 +27,18 @@
 
 #if ENABLE(INSPECTOR)
 
+#include <wtf/RetainPtr.h>
 #include <wtf/text/WTFString.h>
 
-#define DISABLE_NOT_IMPLEMENTED_WARNINGS 1
-#include "NotImplemented.h"
-
 namespace WebKit {
 
 String WebInspector::localizedStringsURL() const
 {
-    notImplemented();
-    return String();
+    RetainPtr<CFURLRef> localizedStringsURLRef(AdoptCF, CFBundleCopyResourceURL(CFBundleGetBundleWithIdentifier(CFSTR("com.apple.WebKit")), CFSTR("localizedStrings"), CFSTR("js"), 0));
+    if (!localizedStringsURLRef)
+        return String();
+
+    return String(CFURLGetString(localizedStringsURLRef.get()));
 }
 
 } // namespace WebKit

-- 
WebKit Debian packaging