[webkit-changes] [134959] trunk/Source/WebCore

Fri, 16 Nov 2012 09:33:18 -0800

Title: [134959] trunk/Source/WebCore
Revision
134959
Author
dglaz...@chromium.org
Date
2012-11-16 09:34:53 -0800 (Fri, 16 Nov 2012)

Log Message

[Chromium] Land a proper fix for r134939.

* WebCore.gyp/WebCore.gyp: Added exclusion for "atk".
* WebCore.gypi: Put the accessibility/atk directory back into WebCore.gypi.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (134958 => 134959)


--- trunk/Source/WebCore/ChangeLog	2012-11-16 17:19:27 UTC (rev 134958)
+++ trunk/Source/WebCore/ChangeLog	2012-11-16 17:34:53 UTC (rev 134959)
@@ -1,5 +1,12 @@
 2012-11-16  Dimitri Glazkov  <dglaz...@chromium.org>
 
+        [Chromium] Land a proper fix for r134939.
+
+        * WebCore.gyp/WebCore.gyp: Added exclusion for "atk".
+        * WebCore.gypi: Put the accessibility/atk directory back into WebCore.gypi.
+
+2012-11-16  Dimitri Glazkov  <dglaz...@chromium.org>
+
         [Chromium] Just yank the whole accessibility/atk dir out of WebCore.gypi.
 
 2012-11-16  Dimitri Glazkov  <dglaz...@chromium.org>

Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (134958 => 134959)


--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp	2012-11-16 17:19:27 UTC (rev 134958)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp	2012-11-16 17:34:53 UTC (rev 134959)
@@ -2070,7 +2070,7 @@
         ['exclude', 'bridge/jni/jsc/'],
 
         # FIXME: Figure out how to store these patterns in a variable.
-        ['exclude', '(cairo|ca|cf|cg|curl|efl|freetype|gstreamer|gtk|linux|mac|opengl|openvg|opentype|pango|posix|qt|soup|svg|symbian|texmap|iphone|win|wince|wx)/'],
+        ['exclude', '(atk|cairo|ca|cf|cg|curl|efl|freetype|gstreamer|gtk|linux|mac|opengl|openvg|opentype|pango|posix|qt|soup|svg|symbian|texmap|iphone|win|wince|wx)/'],
         ['exclude', '(?<!Chromium)(Cairo|CF|CG|Curl|Gtk|JSC|Linux|Mac|OpenType|POSIX|Posix|Qt|Safari|Soup|Symbian|Win|WinCE|Wx)\\.(cpp|mm?)$'],
 
         ['exclude', 'AllInOne\\.cpp$'],

Modified: trunk/Source/WebCore/WebCore.gypi (134958 => 134959)


--- trunk/Source/WebCore/WebCore.gypi	2012-11-16 17:19:27 UTC (rev 134958)
+++ trunk/Source/WebCore/WebCore.gypi	2012-11-16 17:34:53 UTC (rev 134959)
@@ -1890,6 +1890,36 @@
             'accessibility/chromium/AXObjectCacheChromium.cpp',
             'accessibility/chromium/AccessibilityObjectChromium.cpp',
             'accessibility/efl/AccessibilityObjectEfl.cpp',
+            'accessibility/gtk/AXObjectCacheAtk.cpp',
+            'accessibility/atk/AccessibilityObjectAtk.cpp',
+            'accessibility/atk/WebKitAccessibleHyperlink.cpp',
+            'accessibility/atk/WebKitAccessibleHyperlink.h',
+            'accessibility/atk/WebKitAccessibleInterfaceAction.cpp',
+            'accessibility/atk/WebKitAccessibleInterfaceAction.h',
+            'accessibility/atk/WebKitAccessibleInterfaceComponent.cpp',
+            'accessibility/atk/WebKitAccessibleInterfaceComponent.h',
+            'accessibility/atk/WebKitAccessibleInterfaceDocument.cpp',
+            'accessibility/atk/WebKitAccessibleInterfaceDocument.h',
+            'accessibility/atk/WebKitAccessibleInterfaceEditableText.cpp',
+            'accessibility/atk/WebKitAccessibleInterfaceEditableText.h',
+            'accessibility/atk/WebKitAccessibleInterfaceHyperlinkImpl.cpp',
+            'accessibility/atk/WebKitAccessibleInterfaceHyperlinkImpl.h',
+            'accessibility/atk/WebKitAccessibleInterfaceHypertext.cpp',
+            'accessibility/atk/WebKitAccessibleInterfaceHypertext.h',
+            'accessibility/atk/WebKitAccessibleInterfaceImage.cpp',
+            'accessibility/atk/WebKitAccessibleInterfaceImage.h',
+            'accessibility/atk/WebKitAccessibleInterfaceSelection.cpp',
+            'accessibility/atk/WebKitAccessibleInterfaceSelection.h',
+            'accessibility/atk/WebKitAccessibleInterfaceTable.cpp',
+            'accessibility/atk/WebKitAccessibleInterfaceTable.h',
+            'accessibility/atk/WebKitAccessibleInterfaceText.cpp',
+            'accessibility/atk/WebKitAccessibleInterfaceText.h',
+            'accessibility/atk/WebKitAccessibleInterfaceValue.cpp',
+            'accessibility/atk/WebKitAccessibleInterfaceValue.h',
+            'accessibility/atk/WebKitAccessibleUtil.cpp',
+            'accessibility/atk/WebKitAccessibleUtil.h',
+            'accessibility/atk/WebKitAccessibleWrapperAtk.cpp',
+            'accessibility/atk/WebKitAccessibleWrapperAtk.h',
             'accessibility/mac/AXObjectCacheMac.mm',
             'accessibility/mac/AccessibilityObjectMac.mm',
             'accessibility/mac/WebAccessibilityObjectWrapper.h',

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to