[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[japhet at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 19f6175991344744be8bb318d85e3dc8c4c91509
Author: japhet at chromium.org <japhet at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 12 19:24:01 2009 +0000

    2009-11-12  Nate Chapin  <japhet at chromium.org>
    
            Unreviewed, Chromium build fix.
    
            Add new accessibility enum values to Chromium enums from
            http://trac.webkit.org/changeset/50865 and
            http://trac.webkit.org/changeset/50883.
    
            https://bugs.webkit.org/show_bug.cgi?id=31424
    
            * public/WebAccessibilityRole.h:
            (WebKit::):
            * src/AssertMatchingEnums.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50889 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 0d09f81..1d7a502 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2009-11-12  Nate Chapin  <japhet at chromium.org>
+
+        Unreviewed, Chromium build fix.
+
+        Add new accessibility enum values to Chromium enums from
+        http://trac.webkit.org/changeset/50865 and
+        http://trac.webkit.org/changeset/50883.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31424
+
+        * public/WebAccessibilityRole.h:
+        (WebKit::):
+        * src/AssertMatchingEnums.cpp:
+
 2009-11-12  Nicolas Weber  <thakis at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKit/chromium/public/WebAccessibilityRole.h b/WebKit/chromium/public/WebAccessibilityRole.h
index 491db79..d1c8b19 100644
--- a/WebKit/chromium/public/WebAccessibilityRole.h
+++ b/WebKit/chromium/public/WebAccessibilityRole.h
@@ -105,6 +105,8 @@ enum WebAccessibilityRole {
     WebAccessibilityRoleTab,
     WebAccessibilityRoleTabList,
     WebAccessibilityRoleTabPanel,
+    WebAccessibilityRoleTreeRole,
+    WebAccessibilityRoleTreeItemRole,
 
     WebAccessibilityRoleLandmarkApplication,
     WebAccessibilityRoleLandmarkBanner,
@@ -114,6 +116,9 @@ enum WebAccessibilityRole {
     WebAccessibilityRoleLandmarkNavigation,
     WebAccessibilityRoleLandmarkSearch,
 
+    WebAccessibilityRoleApplicationAlert,
+    WebAccessibilityRoleApplicationAlertDialog,
+    WebAccessibilityRoleApplicationDialog,
     WebAccessibilityRoleApplicationLog,
     WebAccessibilityRoleApplicationMarquee,
     WebAccessibilityRoleApplicationStatus,
diff --git a/WebKit/chromium/src/AssertMatchingEnums.cpp b/WebKit/chromium/src/AssertMatchingEnums.cpp
index 408bd56..418f052 100644
--- a/WebKit/chromium/src/AssertMatchingEnums.cpp
+++ b/WebKit/chromium/src/AssertMatchingEnums.cpp
@@ -121,6 +121,8 @@ COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleIgnored, IgnoredRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleTab, TabRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleTabList, TabListRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleTabPanel, TabPanelRole);
+COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleTreeRole, TreeRole);
+COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleTreeItemRole, TreeItemRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleLandmarkApplication, LandmarkApplicationRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleLandmarkBanner, LandmarkBannerRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleLandmarkComplementary, LandmarkComplementaryRole);
@@ -128,6 +130,9 @@ COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleLandmarkContentInfo, LandmarkCo
 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleLandmarkMain, LandmarkMainRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleLandmarkNavigation, LandmarkNavigationRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleLandmarkSearch, LandmarkSearchRole);
+COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleApplicationAlert, ApplicationAlertRole);
+COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleApplicationAlertDialog, ApplicationAlertDialogRole);
+COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleApplicationDialog, ApplicationDialogRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleApplicationLog, ApplicationLogRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleApplicationMarquee, ApplicationMarqueeRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleApplicationStatus, ApplicationStatusRole);

-- 
WebKit Debian packaging