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

[kseo at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 6d8b3528cfd43e755ffea626f929ef4f14615a30
Author: kseo at webkit.org <kseo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 25 17:13:07 2010 +0000

    Unreviewed build fix for r70095.
    
    Provide platformDefaultLanguage().
    
    * platform/brew/LanguageBrew.cpp: Added.
    (WebCore::platformDefaultLanguage):
    * platform/brew/LocalizedStringsBrew.cpp:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70461 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 444b0ac..dc66ebb 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-25  Kwang Yul Seo  <skyul at company100.net>
+
+        Unreviewed build fix for r70095.
+
+        Provide platformDefaultLanguage().
+
+        * platform/brew/LanguageBrew.cpp: Added.
+        (WebCore::platformDefaultLanguage):
+        * platform/brew/LocalizedStringsBrew.cpp:
+
 2010-10-25  Patrick Gansterer  <paroga at webkit.org>
 
         Reviewed by David Kilzer.
diff --git a/WebCore/platform/brew/LanguageBrew.cpp b/WebCore/platform/brew/LanguageBrew.cpp
new file mode 100644
index 0000000..ce41973
--- /dev/null
+++ b/WebCore/platform/brew/LanguageBrew.cpp
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2010 Company 100, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "Language.h"
+
+#include "NotImplemented.h"
+#include "PlatformString.h"
+
+namespace WebCore {
+
+String platformDefaultLanguage()
+{
+    notImplemented();
+    return String();
+}
+
+}
diff --git a/WebCore/platform/brew/LocalizedStringsBrew.cpp b/WebCore/platform/brew/LocalizedStringsBrew.cpp
index 2dfd12b..7c6c564 100644
--- a/WebCore/platform/brew/LocalizedStringsBrew.cpp
+++ b/WebCore/platform/brew/LocalizedStringsBrew.cpp
@@ -46,11 +46,6 @@ String resetButtonDefaultLabel()
     return "Reset";
 }
 
-String defaultLanguage()
-{
-    return "en";
-}
-
 String searchableIndexIntroduction()
 {
     return "Searchable Index";

-- 
WebKit Debian packaging