Title: [100549] trunk
- Revision
- 100549
- Author
- [email protected]
- Date
- 2011-11-16 19:06:36 -0800 (Wed, 16 Nov 2011)
Log Message
[Qt] Fix build after WTR AX support
https://bugs.webkit.org/show_bug.cgi?id=72560
Reviewed by Geoffrey Garen.
Source/WebKit2:
* WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
(WKAccessibilityRootObject):
(WKAccessibilityFocusedObject):
Tools:
* WebKitTestRunner/InjectedBundle/DerivedSources.pri:
* WebKitTestRunner/InjectedBundle/Target.pri:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (100548 => 100549)
--- trunk/Source/WebKit2/ChangeLog 2011-11-17 02:58:59 UTC (rev 100548)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-17 03:06:36 UTC (rev 100549)
@@ -1,3 +1,14 @@
+2011-11-16 Caio Marcelo de Oliveira Filho <[email protected]>
+
+ [Qt] Fix build after WTR AX support
+ https://bugs.webkit.org/show_bug.cgi?id=72560
+
+ Reviewed by Geoffrey Garen.
+
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+ (WKAccessibilityRootObject):
+ (WKAccessibilityFocusedObject):
+
2011-11-11 Adrienne Walker <[email protected]>
[chromium] Expose mock scrollbars to window.internals
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp (100548 => 100549)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2011-11-17 02:58:59 UTC (rev 100548)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2011-11-17 03:06:36 UTC (rev 100549)
@@ -132,6 +132,7 @@
void* WKAccessibilityRootObject(WKBundlePageRef pageRef)
{
+#if HAVE(ACCESSIBILITY)
if (!pageRef)
return 0;
@@ -150,10 +151,14 @@
return 0;
return root->wrapper();
+#else
+ return 0;
+#endif
}
void* WKAccessibilityFocusedObject(WKBundlePageRef pageRef)
{
+#if HAVE(ACCESSIBILITY)
if (!pageRef)
return 0;
@@ -168,6 +173,9 @@
return 0;
return focusedObject->wrapper();
+#else
+ return 0;
+#endif
}
void WKBundlePageStopLoading(WKBundlePageRef pageRef)
Modified: trunk/Tools/ChangeLog (100548 => 100549)
--- trunk/Tools/ChangeLog 2011-11-17 02:58:59 UTC (rev 100548)
+++ trunk/Tools/ChangeLog 2011-11-17 03:06:36 UTC (rev 100549)
@@ -1,3 +1,13 @@
+2011-11-16 Caio Marcelo de Oliveira Filho <[email protected]>
+
+ [Qt] Fix build after WTR AX support
+ https://bugs.webkit.org/show_bug.cgi?id=72560
+
+ Reviewed by Geoffrey Garen.
+
+ * WebKitTestRunner/InjectedBundle/DerivedSources.pri:
+ * WebKitTestRunner/InjectedBundle/Target.pri:
+
2011-11-16 Tony Chang <[email protected]>
repurpose the flexbox bot for grid layout
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/DerivedSources.pri (100548 => 100549)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/DerivedSources.pri 2011-11-17 02:58:59 UTC (rev 100548)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/DerivedSources.pri 2011-11-17 03:06:36 UTC (rev 100549)
@@ -14,6 +14,10 @@
load(features)
IDL_BINDINGS += \
+ Bindings/AccessibilityController.idl \
+ Bindings/AccessibilityTextMarker.idl \
+ Bindings/AccessibilityTextMarkerRange.idl \
+ Bindings/AccessibilityUIElement.idl \
Bindings/EventSendingController.idl \
Bindings/GCController.idl \
Bindings/LayoutTestController.idl \
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri (100548 => 100549)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2011-11-17 02:58:59 UTC (rev 100548)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2011-11-17 03:06:36 UTC (rev 100549)
@@ -10,6 +10,10 @@
mac:debug_and_release:TARGET = $$qtLibraryTarget($$TARGET)
SOURCES += \
+ AccessibilityController.cpp \
+ AccessibilityTextMarker.cpp \
+ AccessibilityTextMarkerRange.cpp \
+ AccessibilityUIElement.cpp \
InjectedBundle.cpp \
InjectedBundle.h \
InjectedBundleMain.cpp \
@@ -32,6 +36,10 @@
include(DerivedSources.pri)
HEADERS += \
+ AccessibilityController.h \
+ AccessibilityTextMarker.h \
+ AccessibilityTextMarkerRange.h \
+ AccessibilityUIElement.h \
ActivateFonts.h \
EventSendingController.h \
GCController.h \
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
