[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 63e73e795caa158380062d81b90275347fd4085b
Author: jhoneycutt at apple.com <jhoneycutt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 20 02:03:19 2010 +0000

    Chromium build fix.
    
    WebCore:
    
    * accessibility/chromium/AccessibilityObjectChromium.cpp:
    (WebCore::AccessibilityObject::accessibilityPlatformIncludesObject):
    Call correct function.
    
    WebKit/chromium:
    
    * public/WebAccessibilityRole.h:
    (WebKit::):
    
    * src/AssertMatchingEnums.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53513 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e296c10..42f6910 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-19  Jon Honeycutt  <jhoneycutt at apple.com>
+
+        Chromium build fix.
+
+        * accessibility/chromium/AccessibilityObjectChromium.cpp:
+        (WebCore::AccessibilityObject::accessibilityPlatformIncludesObject):
+        Call correct function.
+
 2010-01-17  Jon Honeycutt  <jhoneycutt at apple.com>
 
         MSAA: The child <option> elements of a non-multiple <select> are not
diff --git a/WebCore/accessibility/chromium/AccessibilityObjectChromium.cpp b/WebCore/accessibility/chromium/AccessibilityObjectChromium.cpp
index 0d711a0..6749f77 100644
--- a/WebCore/accessibility/chromium/AccessibilityObjectChromium.cpp
+++ b/WebCore/accessibility/chromium/AccessibilityObjectChromium.cpp
@@ -36,7 +36,7 @@ bool AccessibilityObject::accessibilityIgnoreAttachment() const
 
 AccessibilityObjectPlatformInclusion AccessibilityObject::accessibilityPlatformIncludesObject() const
 {
-    if (AccessibilityMenuListPopup() || isMenuListOption())
+    if (isMenuListPopup() || isMenuListOption())
         return IgnoreObject;
 
     return DefaultBehavior;
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index f6b9eb7..1d72702 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-19  Jon Honeycutt  <jhoneycutt at apple.com>
+
+        Chromium build fix.
+
+        * public/WebAccessibilityRole.h:
+        (WebKit::):
+
+        * src/AssertMatchingEnums.cpp:
+
 2010-01-18  Jonathan Dixon  <joth at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKit/chromium/public/WebAccessibilityRole.h b/WebKit/chromium/public/WebAccessibilityRole.h
index 2b130c6..863e1f6 100644
--- a/WebKit/chromium/public/WebAccessibilityRole.h
+++ b/WebKit/chromium/public/WebAccessibilityRole.h
@@ -112,6 +112,8 @@ enum WebAccessibilityRole {
     WebAccessibilityRoleEditableText,
 
     WebAccessibilityRoleListItem,
+    WebAccessibilityMenuListPopupRole,
+    WebAccessibilityMenuListOptionRole,
 
     WebAccessibilityRoleLandmarkApplication,
     WebAccessibilityRoleLandmarkBanner,
diff --git a/WebKit/chromium/src/AssertMatchingEnums.cpp b/WebKit/chromium/src/AssertMatchingEnums.cpp
index 390daf9..1d2948f 100644
--- a/WebKit/chromium/src/AssertMatchingEnums.cpp
+++ b/WebKit/chromium/src/AssertMatchingEnums.cpp
@@ -116,6 +116,8 @@ COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleWebArea, WebAreaRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleHeading, HeadingRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleListBox, ListBoxRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleListBoxOption, ListBoxOptionRole);
+COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleMenuListOption, MenuListOptionRole);
+COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleMenuListPopup, MenuListPopupRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleTableHeaderContainer, TableHeaderContainerRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleDefinitionListTerm, DefinitionListTermRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleDefinitionListDefinition, DefinitionListDefinitionRole);

-- 
WebKit Debian packaging