[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[jhoneycutt at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 8fac2a371becffac0e954fbb9431adeac58f1d16
Author: jhoneycutt at apple.com <jhoneycutt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 20 02:27:30 2010 +0000

    Chromium build fix.
    
    * public/WebAccessibilityRole.h:
    (WebKit::):
    Correct enum names.
    
    * src/LocalizedStrings.cpp:
    (WebCore::AXMenuListPopupActionVerb):
    Stubbed.
    (WebCore::AXMenuListActionVerb):
    Stubbed.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53515 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 1d72702..ec7c8ed 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -4,6 +4,20 @@
 
         * public/WebAccessibilityRole.h:
         (WebKit::):
+        Correct enum names.
+
+        * src/LocalizedStrings.cpp:
+        (WebCore::AXMenuListPopupActionVerb):
+        Stubbed.
+        (WebCore::AXMenuListActionVerb):
+        Stubbed.
+
+2010-01-19  Jon Honeycutt  <jhoneycutt at apple.com>
+
+        Chromium build fix.
+
+        * public/WebAccessibilityRole.h:
+        (WebKit::):
 
         * src/AssertMatchingEnums.cpp:
 
diff --git a/WebKit/chromium/public/WebAccessibilityRole.h b/WebKit/chromium/public/WebAccessibilityRole.h
index 863e1f6..ec041e0 100644
--- a/WebKit/chromium/public/WebAccessibilityRole.h
+++ b/WebKit/chromium/public/WebAccessibilityRole.h
@@ -112,8 +112,8 @@ enum WebAccessibilityRole {
     WebAccessibilityRoleEditableText,
 
     WebAccessibilityRoleListItem,
-    WebAccessibilityMenuListPopupRole,
-    WebAccessibilityMenuListOptionRole,
+    WebAccessibilityRoleMenuListPopup,
+    WebAccessibilityRoleMenuListOption,
 
     WebAccessibilityRoleLandmarkApplication,
     WebAccessibilityRoleLandmarkBanner,
diff --git a/WebKit/chromium/src/LocalizedStrings.cpp b/WebKit/chromium/src/LocalizedStrings.cpp
index 1121931..4e01848 100644
--- a/WebKit/chromium/src/LocalizedStrings.cpp
+++ b/WebKit/chromium/src/LocalizedStrings.cpp
@@ -165,6 +165,16 @@ String AXLinkActionVerb()
     return query(WebLocalizedString::AXLinkActionVerb);
 }
 
+String AXMenuListPopupActionVerb()
+{
+    return String();
+}
+
+String AXMenuListActionVerb()
+{
+    return String();
+}
+
 String multipleFileUploadText(unsigned numberOfFiles)
 {
     return query(WebLocalizedString::MultipleFileUploadText, numberOfFiles);

-- 
WebKit Debian packaging