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

ukai at chromium.org ukai at chromium.org
Thu Apr 8 00:39:39 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit cb6c2efa4cd96b9edcd6497b8f375d39d81119d9
Author: ukai at chromium.org <ukai at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 17 07:17:55 2009 +0000

    Unreviewed, build fix.
    
    [Chromium] Add EditableTextRole to catch up with
    http://trac.webkit.org/changeset/52233
    
    * public/WebAccessibilityRole.h:
    (WebKit::): Added WebAccessibilityRoleEditableText
    * src/AssertMatchingEnums.cpp: Added matching compile assert.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52237 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 5c86e8f..9857b9c 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2009-12-16  Fumitoshi Ukai  <ukai at chromium.org>
+
+        Unreviewed, build fix.
+
+        [Chromium] Add EditableTextRole to catch up with
+        http://trac.webkit.org/changeset/52233
+
+        * public/WebAccessibilityRole.h:
+        (WebKit::): Added WebAccessibilityRoleEditableText
+        * src/AssertMatchingEnums.cpp: Added matching compile assert.
+
 2009-12-15  Kenneth Russell  <kbr at google.com>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/public/WebAccessibilityRole.h b/WebKit/chromium/public/WebAccessibilityRole.h
index b9aeba4..f25ff63 100644
--- a/WebKit/chromium/public/WebAccessibilityRole.h
+++ b/WebKit/chromium/public/WebAccessibilityRole.h
@@ -109,6 +109,7 @@ enum WebAccessibilityRole {
     WebAccessibilityRoleTreeGrid,
     WebAccessibilityRoleTreeItemRole,
     WebAccessibilityRoleDirectory,
+    WebAccessibilityRoleEditableText,
 
     WebAccessibilityRoleLandmarkApplication,
     WebAccessibilityRoleLandmarkBanner,
diff --git a/WebKit/chromium/src/AssertMatchingEnums.cpp b/WebKit/chromium/src/AssertMatchingEnums.cpp
index 39a54e5..9e39ec6 100644
--- a/WebKit/chromium/src/AssertMatchingEnums.cpp
+++ b/WebKit/chromium/src/AssertMatchingEnums.cpp
@@ -129,6 +129,7 @@ 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(WebAccessibilityRoleEditableText, EditableTextRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleLandmarkApplication, LandmarkApplicationRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleLandmarkBanner, LandmarkBannerRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleLandmarkComplementary, LandmarkComplementaryRole);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list