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

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 88d72b1da20b324f3c4a8d9b0d5c66ba56edbea4
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 3 17:17:26 2010 +0000

    Compile out two Mac-only localized strings on non-Mac platforms
    
    Fixes <http://webkit.org/b/43433> copyImageUnknownFileLabel and
    AXARIAContentGroupText should only be compiled on Mac
    
    Reviewed by Anders Carlsson.
    
    WebCore:
    
    * platform/LocalizationStrategy.h:
    * platform/LocalizedStrings.h:
    Wrapped copyImageUnknownFileLabel and AXARIAContentGroupText in
    PLATFORM(MAC).
    
    WebKit2:
    
    * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
    * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
    Wrapped copyImageUnknownFileLabel and AXARIAContentGroupText in
    PLATFORM(MAC).
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64563 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 16ef7c5..c50518d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-03  Adam Roben  <aroben at apple.com>
+
+        Compile out two Mac-only localized strings on non-Mac platforms
+
+        Fixes <http://webkit.org/b/43433> copyImageUnknownFileLabel and
+        AXARIAContentGroupText should only be compiled on Mac
+
+        Reviewed by Anders Carlsson.
+
+        * platform/LocalizationStrategy.h:
+        * platform/LocalizedStrings.h:
+        Wrapped copyImageUnknownFileLabel and AXARIAContentGroupText in
+        PLATFORM(MAC).
+
 2010-08-03  Kevin Ollivier  <kevino at theolliviers.com>
 
         [wx] Build fix, don't build some DOM bindings we don't use.
diff --git a/WebCore/platform/LocalizationStrategy.h b/WebCore/platform/LocalizationStrategy.h
index 9bde316..741fbbd 100644
--- a/WebCore/platform/LocalizationStrategy.h
+++ b/WebCore/platform/LocalizationStrategy.h
@@ -41,7 +41,10 @@ public:
     virtual String submitButtonDefaultLabel() = 0;
     virtual String fileButtonChooseFileLabel() = 0;
     virtual String fileButtonNoFileSelectedLabel() = 0;
+
+#if PLATFORM(MAC)
     virtual String copyImageUnknownFileLabel() = 0;
+#endif
 
 #if ENABLE(CONTEXT_MENUS)
     virtual String contextMenuItemTagOpenLinkInNewWindow() = 0;
@@ -122,7 +125,10 @@ public:
     virtual String AXHeadingText() = 0;
     virtual String AXDefinitionListTermText() = 0;
     virtual String AXDefinitionListDefinitionText() = 0;
+
+#if PLATFORM(MAC)
     virtual String AXARIAContentGroupText(const String& ariaType) = 0;
+#endif
     
     virtual String AXButtonActionVerb() = 0;
     virtual String AXRadioButtonActionVerb() = 0;
diff --git a/WebCore/platform/LocalizedStrings.h b/WebCore/platform/LocalizedStrings.h
index 56d44b3..ddc4869 100644
--- a/WebCore/platform/LocalizedStrings.h
+++ b/WebCore/platform/LocalizedStrings.h
@@ -37,7 +37,11 @@ namespace WebCore {
     String submitButtonDefaultLabel();
     String fileButtonChooseFileLabel();
     String fileButtonNoFileSelectedLabel();
+
+#if PLATFORM(MAC)
     String copyImageUnknownFileLabel();
+#endif
+
 #if ENABLE(CONTEXT_MENUS)
     String contextMenuItemTagOpenLinkInNewWindow();
     String contextMenuItemTagDownloadLinkToDisk();
@@ -117,7 +121,10 @@ namespace WebCore {
     String AXHeadingText();
     String AXDefinitionListTermText();
     String AXDefinitionListDefinitionText();
+
+#if PLATFORM(MAC)
     String AXARIAContentGroupText(const String& ariaType);
+#endif
     
     String AXButtonActionVerb();
     String AXRadioButtonActionVerb();
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index d0bcdb4..fca10eb 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-03  Adam Roben  <aroben at apple.com>
+
+        Compile out two Mac-only localized strings on non-Mac platforms
+
+        Fixes <http://webkit.org/b/43433> copyImageUnknownFileLabel and
+        AXARIAContentGroupText should only be compiled on Mac
+
+        Reviewed by Anders Carlsson.
+
+        * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+        * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
+        Wrapped copyImageUnknownFileLabel and AXARIAContentGroupText in
+        PLATFORM(MAC).
+
 2010-08-03  Balazs Kelemen  <kb at inf.u-szeged.hu>
 
         [Qt] Unreviewed typo fix in the WebKit2/DerivedSources.pro project file.
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp b/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
index c52cdb2..9494875 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
@@ -141,10 +141,12 @@ String WebPlatformStrategies::fileButtonNoFileSelectedLabel()
     return UI_STRING("no file selected", "text to display in file button used in HTML forms when no file is selected");
 }
 
+#if PLATFORM(MAC)
 String WebPlatformStrategies::copyImageUnknownFileLabel()
 {
     return UI_STRING("unknown", "Unknown filename");
 }
+#endif
 
 #if ENABLE(CONTEXT_MENUS)
 
@@ -522,6 +524,7 @@ String WebPlatformStrategies::AXDefinitionListDefinitionText()
     return UI_STRING("definition", "definition phrase");
 }
 
+#if PLATFORM(MAC)
 String WebPlatformStrategies::AXARIAContentGroupText(const String& ariaType)
 {
     if (ariaType == "ARIAApplicationAlert")
@@ -568,6 +571,7 @@ String WebPlatformStrategies::AXARIAContentGroupText(const String& ariaType)
         return UI_STRING("math", "An ARIA accessibility group that contains mathematical symbols.");
     return String();
 }
+#endif
 
 String WebPlatformStrategies::AXButtonActionVerb()
 {
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h b/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h
index 02818c7..0868572 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h
+++ b/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h
@@ -58,7 +58,9 @@ private:
     virtual WebCore::String submitButtonDefaultLabel();
     virtual WebCore::String fileButtonChooseFileLabel();
     virtual WebCore::String fileButtonNoFileSelectedLabel();
+#if PLATFORM(MAC)
     virtual WebCore::String copyImageUnknownFileLabel();
+#endif
 #if ENABLE(CONTEXT_MENUS)
     virtual WebCore::String contextMenuItemTagOpenLinkInNewWindow();
     virtual WebCore::String contextMenuItemTagDownloadLinkToDisk();
@@ -136,7 +138,9 @@ private:
     virtual WebCore::String AXHeadingText();
     virtual WebCore::String AXDefinitionListTermText();
     virtual WebCore::String AXDefinitionListDefinitionText();
+#if PLATFORM(MAC)
     virtual WebCore::String AXARIAContentGroupText(const WebCore::String& ariaType);
+#endif
     virtual WebCore::String AXButtonActionVerb();
     virtual WebCore::String AXRadioButtonActionVerb();
     virtual WebCore::String AXTextFieldActionVerb();

-- 
WebKit Debian packaging