WebKit Update 43832:43833

Compensating for the effect of moving all a11y-related files to WebCore/accessibility:

http://trac.webkit.org/changeset/43835

R=levin
BUG=0
TEST=no code changes, so expect test no regressions.

Review URL: http://codereview.chromium.org/115494

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16341 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 49 insertions, 48 deletions

diff --git a/DEPS b/DEPS
index daa364a..de818df 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
 vars = {
   "webkit_trunk":
     "http://svn.webkit.org/repository/webkit/trunk",
-  "webkit_revision": "43832",
+  "webkit_revision": "43833",
 }
 
 
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 3f6d4db..470c13d 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -28,7 +28,8 @@
       'USE_SYSTEM_MALLOC=1',
     ],
     'webcore_include_dirs': [
-      'pending',
+      '../third_party/WebKit/WebCore/accessibility',
+      '../third_party/WebKit/WebCore/accessibility/chromium',
       '../third_party/WebKit/WebCore/bindings/v8',
       '../third_party/WebKit/WebCore/bindings/v8/custom',
       '../third_party/WebKit/WebCore/css',
@@ -1155,6 +1156,52 @@
         # ForwardingHeaders, bindings, bridge, icu, and wml subdirectories.
         # Exclusions are handled in the sources! and sources/ sections that
         # follow, some within conditions sections.
+        '../third_party/WebKit/WebCore/accessibility/AXObjectCache.cpp',
+        '../third_party/WebKit/WebCore/accessibility/AXObjectCache.h',
+        '../third_party/WebKit/WebCore/accessibility/AccessibilityAriaGrid.cpp',
+        '../third_party/WebKit/WebCore/accessibility/AccessibilityAriaGrid.h',
+        '../third_party/WebKit/WebCore/accessibility/AccessibilityAriaGridCell.cpp',
+        '../third_party/WebKit/WebCore/accessibility/AccessibilityAriaGridCell.h',
+        '../third_party/WebKit/WebCore/accessibility/AccessibilityAriaGridRow.cpp',
+        '../third_party/WebKit/WebCore/accessibility/AccessibilityAriaGridRow.h',
+        '../third_party/WebKit/WebCore/accessibility/AccessibilityImageMapLink.cpp',
+        '../third_party/WebKit/WebCore/accessibility/AccessibilityImageMapLink.h',
+        '../third_party/WebKit/WebCore/accessibility/AccessibilityList.cpp',
+        '../third_party/WebKit/WebCore/accessibility/AccessibilityList.h',
+        '../third_party/WebKit/WebCore/accessibility/AccessibilityListBox.cpp',
+        '../third_party/WebKit/WebCore/accessibility/AccessibilityListBox.h',
+        '../third_party/WebKit/WebCore/accessibility/AccessibilityListBoxOption.cpp',
+        '../third_party/WebKit/WebCore/accessibility/AccessibilityListBoxOption.h',
+        '../third_party/WebKit/WebCore/accessibility/AccessibilityObject.cpp',
+        '../third_party/WebKit/WebCore/accessibility/AccessibilityObject.h',
+        '../third_party/WebKit/WebCore/accessibility/AccessibilityRenderObject.cpp',
+        '../third_party/WebKit/WebCore/accessibility/AccessibilityRenderObject.h',
+        '../third_party/WebKit/WebCore/accessibility/AccessibilityTable.cpp',
+        '../third_party/WebKit/WebCore/accessibility/AccessibilityTable.h',
+        '../third_party/WebKit/WebCore/accessibility/AccessibilityTableCell.cpp',
+        '../third_party/WebKit/WebCore/accessibility/AccessibilityTableCell.h',
+        '../third_party/WebKit/WebCore/accessibility/AccessibilityTableColumn.cpp',
+        '../third_party/WebKit/WebCore/accessibility/AccessibilityTableColumn.h',
+        '../third_party/WebKit/WebCore/accessibility/AccessibilityTableHeaderContainer.cpp',
+        '../third_party/WebKit/WebCore/accessibility/AccessibilityTableHeaderContainer.h',
+        '../third_party/WebKit/WebCore/accessibility/AccessibilityTableRow.cpp',
+        '../third_party/WebKit/WebCore/accessibility/AccessibilityTableRow.h',
+        '../third_party/WebKit/WebCore/accessibility/chromium/AXObjectCacheChromium.cpp',
+        '../third_party/WebKit/WebCore/accessibility/chromium/AccessibilityObjectChromium.cpp',
+        '../third_party/WebKit/WebCore/accessibility/chromium/AccessibilityObjectWrapper.h',
+        '../third_party/WebKit/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp',
+        '../third_party/WebKit/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp',
+        '../third_party/WebKit/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp',
+        '../third_party/WebKit/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.h',
+        '../third_party/WebKit/WebCore/accessibility/qt/AccessibilityObjectQt.cpp',
+        '../third_party/WebKit/WebCore/accessibility/mac/AXObjectCacheMac.mm',
+        '../third_party/WebKit/WebCore/accessibility/mac/AccessibilityObjectMac.mm',
+        '../third_party/WebKit/WebCore/accessibility/mac/AccessibilityObjectWrapper.h',
+        '../third_party/WebKit/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm',
+        '../third_party/WebKit/WebCore/accessibility/win/AXObjectCacheWin.cpp',
+        '../third_party/WebKit/WebCore/accessibility/win/AccessibilityObjectWin.cpp',
+        '../third_party/WebKit/WebCore/accessibility/win/AccessibilityObjectWrapperWin.h',
+        '../third_party/WebKit/WebCore/accessibility/wx/AccessibilityObjectWx.cpp',
         '../third_party/WebKit/WebCore/css/CSSBorderImageValue.cpp',
         '../third_party/WebKit/WebCore/css/CSSBorderImageValue.h',
         '../third_party/WebKit/WebCore/css/CSSCanvasValue.cpp',
@@ -1915,25 +1962,14 @@
         '../third_party/WebKit/WebCore/page/animation/ImplicitAnimation.h',
         '../third_party/WebKit/WebCore/page/animation/KeyframeAnimation.cpp',
         '../third_party/WebKit/WebCore/page/animation/KeyframeAnimation.h',
-        '../third_party/WebKit/WebCore/page/chromium/AXObjectCacheChromium.cpp',
-        '../third_party/WebKit/WebCore/page/chromium/AccessibilityObjectChromium.cpp',
-        '../third_party/WebKit/WebCore/page/chromium/AccessibilityObjectWrapper.h',
         '../third_party/WebKit/WebCore/page/chromium/ChromeClientChromium.h',
         '../third_party/WebKit/WebCore/page/chromium/DragControllerChromium.cpp',
         '../third_party/WebKit/WebCore/page/chromium/EventHandlerChromium.cpp',
         '../third_party/WebKit/WebCore/page/chromium/FrameChromium.cpp',
         '../third_party/WebKit/WebCore/page/chromium/FrameChromium.h',
-        '../third_party/WebKit/WebCore/page/gtk/AXObjectCacheAtk.cpp',
-        '../third_party/WebKit/WebCore/page/gtk/AccessibilityObjectAtk.cpp',
-        '../third_party/WebKit/WebCore/page/gtk/AccessibilityObjectWrapperAtk.cpp',
-        '../third_party/WebKit/WebCore/page/gtk/AccessibilityObjectWrapperAtk.h',
         '../third_party/WebKit/WebCore/page/gtk/DragControllerGtk.cpp',
         '../third_party/WebKit/WebCore/page/gtk/EventHandlerGtk.cpp',
         '../third_party/WebKit/WebCore/page/gtk/FrameGtk.cpp',
-        '../third_party/WebKit/WebCore/page/mac/AXObjectCacheMac.mm',
-        '../third_party/WebKit/WebCore/page/mac/AccessibilityObjectMac.mm',
-        '../third_party/WebKit/WebCore/page/mac/AccessibilityObjectWrapper.h',
-        '../third_party/WebKit/WebCore/page/mac/AccessibilityObjectWrapper.mm',
         '../third_party/WebKit/WebCore/page/mac/ChromeMac.mm',
         '../third_party/WebKit/WebCore/page/mac/DragControllerMac.mm',
         '../third_party/WebKit/WebCore/page/mac/EventHandlerMac.mm',
@@ -1945,13 +1981,9 @@
         '../third_party/WebKit/WebCore/page/mac/WebCoreViewFactory.m',
         '../third_party/WebKit/WebCore/page/mac/WebDashboardRegion.h',
         '../third_party/WebKit/WebCore/page/mac/WebDashboardRegion.m',
-        '../third_party/WebKit/WebCore/page/qt/AccessibilityObjectQt.cpp',
         '../third_party/WebKit/WebCore/page/qt/DragControllerQt.cpp',
         '../third_party/WebKit/WebCore/page/qt/EventHandlerQt.cpp',
         '../third_party/WebKit/WebCore/page/qt/FrameQt.cpp',
-        '../third_party/WebKit/WebCore/page/win/AXObjectCacheWin.cpp',
-        '../third_party/WebKit/WebCore/page/win/AccessibilityObjectWin.cpp',
-        '../third_party/WebKit/WebCore/page/win/AccessibilityObjectWrapperWin.h',
         '../third_party/WebKit/WebCore/page/win/DragControllerWin.cpp',
         '../third_party/WebKit/WebCore/page/win/EventHandlerWin.cpp',
         '../third_party/WebKit/WebCore/page/win/FrameCGWin.cpp',
@@ -1959,39 +1991,8 @@
         '../third_party/WebKit/WebCore/page/win/FrameWin.cpp',
         '../third_party/WebKit/WebCore/page/win/FrameWin.h',
         '../third_party/WebKit/WebCore/page/win/PageWin.cpp',
-        '../third_party/WebKit/WebCore/page/wx/AccessibilityObjectWx.cpp',
         '../third_party/WebKit/WebCore/page/wx/DragControllerWx.cpp',
         '../third_party/WebKit/WebCore/page/wx/EventHandlerWx.cpp',
-        '../third_party/WebKit/WebCore/page/AXObjectCache.cpp',
-        '../third_party/WebKit/WebCore/page/AXObjectCache.h',
-        '../third_party/WebKit/WebCore/page/AccessibilityAriaGrid.cpp',
-        '../third_party/WebKit/WebCore/page/AccessibilityAriaGrid.h',
-        '../third_party/WebKit/WebCore/page/AccessibilityAriaGridCell.cpp',
-        '../third_party/WebKit/WebCore/page/AccessibilityAriaGridCell.h',
-        '../third_party/WebKit/WebCore/page/AccessibilityAriaGridRow.cpp',
-        '../third_party/WebKit/WebCore/page/AccessibilityAriaGridRow.h',
-        '../third_party/WebKit/WebCore/page/AccessibilityImageMapLink.cpp',
-        '../third_party/WebKit/WebCore/page/AccessibilityImageMapLink.h',
-        '../third_party/WebKit/WebCore/page/AccessibilityList.cpp',
-        '../third_party/WebKit/WebCore/page/AccessibilityList.h',
-        '../third_party/WebKit/WebCore/page/AccessibilityListBox.cpp',
-        '../third_party/WebKit/WebCore/page/AccessibilityListBox.h',
-        '../third_party/WebKit/WebCore/page/AccessibilityListBoxOption.cpp',
-        '../third_party/WebKit/WebCore/page/AccessibilityListBoxOption.h',
-        '../third_party/WebKit/WebCore/page/AccessibilityObject.cpp',
-        '../third_party/WebKit/WebCore/page/AccessibilityObject.h',
-        '../third_party/WebKit/WebCore/page/AccessibilityRenderObject.cpp',
-        '../third_party/WebKit/WebCore/page/AccessibilityRenderObject.h',
-        '../third_party/WebKit/WebCore/page/AccessibilityTable.cpp',
-        '../third_party/WebKit/WebCore/page/AccessibilityTable.h',
-        '../third_party/WebKit/WebCore/page/AccessibilityTableCell.cpp',
-        '../third_party/WebKit/WebCore/page/AccessibilityTableCell.h',
-        '../third_party/WebKit/WebCore/page/AccessibilityTableColumn.cpp',
-        '../third_party/WebKit/WebCore/page/AccessibilityTableColumn.h',
-        '../third_party/WebKit/WebCore/page/AccessibilityTableHeaderContainer.cpp',
-        '../third_party/WebKit/WebCore/page/AccessibilityTableHeaderContainer.h',
-        '../third_party/WebKit/WebCore/page/AccessibilityTableRow.cpp',
-        '../third_party/WebKit/WebCore/page/AccessibilityTableRow.h',
         '../third_party/WebKit/WebCore/page/BarInfo.cpp',
         '../third_party/WebKit/WebCore/page/BarInfo.h',
         '../third_party/WebKit/WebCore/page/Chrome.cpp',