https://bugs.webkit.org/show_bug.cgi?id=127119
Reviewed by Mario Sanchez Prada.
Source/WebCore:
At build time, the compiler was not able to determine which Timer's constructor to call in AXObjectCache when
ACCESSIBILITY is not enabled, fixing that.
Also guarding some members in AccessibilityObject that are only being used by EFL and GTK with ACCESSIBILITY.
* accessibility/AXObjectCache.h:
(WebCore::AXObjectCache::AXObjectCache):
* accessibility/AccessibilityObject.h:
Source/WebKit/gtk:
Guarding ACCESSIBILITY code with HAVE(ACCESSIBILITY).
* webkit/webkitwebview.cpp:
(webkit_web_view_class_init):
Source/WebKit2:
Guarding ACCESSIBILITY code with HAVE(ACCESSIBILITY).
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/gtk/WebPageGtk.cpp:
(WebKit::WebPage::platformInitialize):
Tools:
Guarding ACCESSIBILITY code in DumpRenderTree and WebKitTestRunner with HAVE(ACCESSIBILITY).
* DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
* DumpRenderTree/gtk/AccessibilityControllerGtk.cpp:
* DumpRenderTree/gtk/DumpRenderTree.cpp:
(resetDefaultsToConsistentValues):
(webViewWindowObjectCleared):
(main):
* WebKitTestRunner/InjectedBundle/AccessibilityController.cpp:
(WTR::AccessibilityController::platformName):
* WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:
(WTR::AccessibilityUIElement::isIndeterminate):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@162538
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2014-01-22 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
+
+ [EFL][GTK] Get EFL and GTK compiling with ACCESSIBILITY disabled
+ https://bugs.webkit.org/show_bug.cgi?id=127119
+
+ Reviewed by Mario Sanchez Prada.
+
+ At build time, the compiler was not able to determine which Timer's constructor to call in AXObjectCache when
+ ACCESSIBILITY is not enabled, fixing that.
+ Also guarding some members in AccessibilityObject that are only being used by EFL and GTK with ACCESSIBILITY.
+
+ * accessibility/AXObjectCache.h:
+ (WebCore::AXObjectCache::AXObjectCache):
+ * accessibility/AccessibilityObject.h:
+
2014-01-22 Peter Molnar <pmolnar.u-szeged@partner.samsung.com>
Refactor calculation of hasRx and hasRy values in SVGPathData
#if !HAVE(ACCESSIBILITY)
inline AccessibilityObjectInclusion AXComputedObjectAttributeCache::getIgnored(AXID) const { return DefaultBehavior; }
inline void AXComputedObjectAttributeCache::setIgnored(AXID, AccessibilityObjectInclusion) { }
-inline AXObjectCache::AXObjectCache(Document& document) : m_document(document), m_notificationPostTimer(this, 0) { }
+inline AXObjectCache::AXObjectCache(Document& document) : m_document(document), m_notificationPostTimer(this, (Timer<AXObjectCache>::TimerFiredFunction) nullptr) { }
inline AXObjectCache::~AXObjectCache() { }
inline AccessibilityObject* AXObjectCache::focusedUIElementForPage(const Page*) { return 0; }
inline AccessibilityObject* AXObjectCache::get(RenderObject*) { return 0; }
virtual AccessibilityRole buttonRoleType() const;
bool isOnscreen() const;
-#if PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
+#if (PLATFORM(GTK) || PLATFORM(EFL)) && HAVE(ACCESSIBILITY)
bool allowsTextRanges() const;
unsigned getLengthForTextRange() const;
#else
+2014-01-22 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
+
+ [EFL][GTK] Get EFL and GTK compiling with ACCESSIBILITY disabled
+ https://bugs.webkit.org/show_bug.cgi?id=127119
+
+ Reviewed by Mario Sanchez Prada.
+
+ Guarding ACCESSIBILITY code with HAVE(ACCESSIBILITY).
+
+ * webkit/webkitwebview.cpp:
+ (webkit_web_view_class_init):
+
2014-01-18 Brian Burg <bburg@apple.com>
Web Inspector: Page should use std::unique_ptr for InspectorController
return TRUE;
}
+#if HAVE(ACCESSIBILITY)
static AtkObject* webkit_web_view_get_accessible(GtkWidget* widget)
{
WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
return axRoot;
}
+#endif
static double screenDPI(GdkScreen* screen)
{
widgetClass->grab_focus = webkit_web_view_grab_focus;
widgetClass->focus_in_event = webkit_web_view_focus_in_event;
widgetClass->focus_out_event = webkit_web_view_focus_out_event;
+#if HAVE(ACCESSIBILITY)
widgetClass->get_accessible = webkit_web_view_get_accessible;
+#endif
widgetClass->screen_changed = webkit_web_view_screen_changed;
#if ENABLE(DRAG_SUPPORT)
widgetClass->drag_end = webkit_web_view_drag_end;
+2014-01-22 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
+
+ [EFL][GTK] Get EFL and GTK compiling with ACCESSIBILITY disabled
+ https://bugs.webkit.org/show_bug.cgi?id=127119
+
+ Reviewed by Mario Sanchez Prada.
+
+ Guarding ACCESSIBILITY code with HAVE(ACCESSIBILITY).
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/gtk/WebPageGtk.cpp:
+ (WebKit::WebPage::platformInitialize):
+
2014-01-22 Martin Robinson <mrobinson@igalia.com>
[GTK][CMake] Add support for building the NetworkProcess
, m_hasCachedWindowFrame(false)
, m_keyboardEventBeingInterpreted(0)
, m_viewGestureGeometryCollector(*this)
-#elif PLATFORM(GTK)
+#elif PLATFORM(GTK) && HAVE(ACCESSIBILITY)
, m_accessibilityObject(0)
#endif
, m_setCanStartMediaTimer(RunLoop::main(), this, &WebPage::setCanStartMediaTimerFired)
#elif HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
GRefPtr<WebPageAccessibilityObject> m_accessibilityObject;
+#endif
-#if USE(TEXTURE_MAPPER_GL)
+#if PLATFORM(GTK) && USE(TEXTURE_MAPPER_GL)
// Our view's window in the UI process.
uint64_t m_nativeWindowHandle;
#endif
-#endif
#if !PLATFORM(IOS)
RefPtr<PageBanner> m_headerBanner;
void WebPage::platformInitialize()
{
+#if HAVE(ACCESSIBILITY)
// Create the accessible object (the plug) that will serve as the
// entry point to the Web process, and send a message to the UI
// process to connect the two worlds through the accessibility
m_accessibilityObject = adoptGRef(webPageAccessibilityObjectNew(this));
GOwnPtr<gchar> plugID(atk_plug_get_id(ATK_PLUG(m_accessibilityObject.get())));
send(Messages::WebPageProxy::BindAccessibilityTree(String(plugID.get())));
+#endif
#if USE(TEXTURE_MAPPER_GL)
m_nativeWindowHandle = 0;
#endif
}
+#if HAVE(ACCESSIBILITY)
void WebPage::updateAccessibilityTree()
{
if (!m_accessibilityObject)
webPageAccessibilityObjectRefresh(m_accessibilityObject.get());
}
+#endif
void WebPage::platformPreferencesDidChange(const WebPreferencesStore&)
{
+2014-01-22 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
+
+ [EFL][GTK] Get EFL and GTK compiling with ACCESSIBILITY disabled
+ https://bugs.webkit.org/show_bug.cgi?id=127119
+
+ Reviewed by Mario Sanchez Prada.
+
+ Guarding ACCESSIBILITY code in DumpRenderTree and WebKitTestRunner with HAVE(ACCESSIBILITY).
+
+ * DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
+ * DumpRenderTree/gtk/AccessibilityControllerGtk.cpp:
+ * DumpRenderTree/gtk/DumpRenderTree.cpp:
+ (resetDefaultsToConsistentValues):
+ (webViewWindowObjectCleared):
+ (main):
+ * WebKitTestRunner/InjectedBundle/AccessibilityController.cpp:
+ (WTR::AccessibilityController::platformName):
+ * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:
+ (WTR::AccessibilityUIElement::isIndeterminate):
+
2014-01-22 Carlos Garcia Campos <cgarcia@igalia.com>
#include "EditingCallbacks.h"
#include "EventSender.h"
#include "GCController.h"
+#include "JSRetainPtr.h"
#include "URL.h"
#include "NotImplemented.h"
#include "TestRunner.h"
*/
#include "config.h"
+
+#if HAVE(ACCESSIBILITY)
+
#include "AccessibilityController.h"
#include "AccessibilityCallbacks.h"
return 0;
}
+
+#endif // HAVE(ACCESSIBILITY)
static int dumpTree = 1;
static int useTimeoutWatchdog = 1;
+#if HAVE(ACCESSIBILITY)
AccessibilityController* axController = 0;
+#endif
RefPtr<TestRunner> gTestRunner;
static GCController* gcController = 0;
static WebKitWebView* webView;
DumpRenderTreeSupportGtk::setDefersLoading(webView, false);
DumpRenderTreeSupportGtk::setSerializeHTTPLoads(false);
+#if HAVE(ACCESSIBILITY)
if (axController)
axController->resetToConsistentState();
+#endif
DumpRenderTreeSupportGtk::clearOpener(mainFrame);
DumpRenderTreeSupportGtk::setTracksRepaints(mainFrame, false);
gcController->makeWindowObject(context, windowObject, &exception);
ASSERT(!exception);
+#if HAVE(ACCESSIBILITY)
axController->makeWindowObject(context, windowObject, &exception);
ASSERT(!exception);
+#endif
addControllerToWindow(context, windowObject, "eventSender", makeEventSender(context, !webkit_web_frame_get_parent(frame)));
addControllerToWindow(context, windowObject, "textInputController", makeTextInputController(context));
setDefaultsToConsistentStateValuesForTesting();
gcController = new GCController();
+#if HAVE(ACCESSIBILITY)
axController = new AccessibilityController();
+#endif
if (useLongRunningServerMode(argc, argv)) {
printSeparators = true;
delete gcController;
gcController = 0;
+#if HAVE(ACCESSIBILITY)
delete axController;
axController = 0;
+#endif
gtk_widget_destroy(window);
PassRefPtr<AccessibilityUIElement> AccessibilityController::accessibleElementById(JSStringRef attribute) { return nullptr; }
void AccessibilityController::logAccessibilityEvents() { }
void AccessibilityController::resetToConsistentState() { }
+JSRetainPtr<JSStringRef> AccessibilityController::platformName() { return JSRetainPtr<JSStringRef>(Adopt, JSStringCreateWithUTF8CString("")); }
#endif
#if !HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::selectedChildAtIndex(unsigned) const { return 0; }
bool AccessibilityUIElement::isExpanded() const { return false; }
bool AccessibilityUIElement::isChecked() const { return false; }
+bool AccessibilityUIElement::isIndeterminate() const { return false; }
bool AccessibilityUIElement::isVisible() const { return false; }
bool AccessibilityUIElement::isOffScreen() const { return false; }
bool AccessibilityUIElement::isCollapsed() const { return false; }