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

[dglazkov at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit afcde6ea568f902bc4dee80bf2521568768ecf6e
Author: dglazkov at chromium.org <dglazkov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 15 18:14:45 2009 +0000

    2009-12-15  Dimitri Glazkov  <dglazkov at chromium.org>
    
            Unreviewed, build fix.
    
            [Chromium] Add TreeGridRole to catch up with
            http://trac.webkit.org/changeset/52159.
    
            * public/WebAccessibilityRole.h:
            (WebKit::): Added WebAccessibilityRoleTreeGrid.
            * src/AssertMatchingEnums.cpp: Added matching compile assert.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52161 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index d5a6581..4fff364 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2009-12-15  Dimitri Glazkov  <dglazkov at chromium.org>
+
+        Unreviewed, build fix.
+
+        [Chromium] Add TreeGridRole to catch up with
+        http://trac.webkit.org/changeset/52159.
+
+        * public/WebAccessibilityRole.h:
+        (WebKit::): Added WebAccessibilityRoleTreeGrid.
+        * src/AssertMatchingEnums.cpp: Added matching compile assert.
+
 2009-12-15  Jian Li  <jianli at chromium.org>
 
         Reviewed by Dmitry Titov.
diff --git a/WebKit/chromium/public/WebAccessibilityRole.h b/WebKit/chromium/public/WebAccessibilityRole.h
index e836c56..b9aeba4 100644
--- a/WebKit/chromium/public/WebAccessibilityRole.h
+++ b/WebKit/chromium/public/WebAccessibilityRole.h
@@ -106,6 +106,7 @@ enum WebAccessibilityRole {
     WebAccessibilityRoleTabList,
     WebAccessibilityRoleTabPanel,
     WebAccessibilityRoleTreeRole,
+    WebAccessibilityRoleTreeGrid,
     WebAccessibilityRoleTreeItemRole,
     WebAccessibilityRoleDirectory,
 
diff --git a/WebKit/chromium/src/AssertMatchingEnums.cpp b/WebKit/chromium/src/AssertMatchingEnums.cpp
index 35e2057..39a54e5 100644
--- a/WebKit/chromium/src/AssertMatchingEnums.cpp
+++ b/WebKit/chromium/src/AssertMatchingEnums.cpp
@@ -126,6 +126,7 @@ 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(WebAccessibilityRoleTreeGrid, TreeGridRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleTreeItemRole, TreeItemRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleDirectory, DirectoryRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleLandmarkApplication, LandmarkApplicationRole);

-- 
WebKit Debian packaging