Changeset 162538 in webkit
- Timestamp:
- Jan 22, 2014 11:21:55 AM (10 years ago)
- Location:
- trunk
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r162537 r162538 1 2014-01-22 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org> 2 3 [EFL][GTK] Get EFL and GTK compiling with ACCESSIBILITY disabled 4 https://bugs.webkit.org/show_bug.cgi?id=127119 5 6 Reviewed by Mario Sanchez Prada. 7 8 At build time, the compiler was not able to determine which Timer's constructor to call in AXObjectCache when 9 ACCESSIBILITY is not enabled, fixing that. 10 Also guarding some members in AccessibilityObject that are only being used by EFL and GTK with ACCESSIBILITY. 11 12 * accessibility/AXObjectCache.h: 13 (WebCore::AXObjectCache::AXObjectCache): 14 * accessibility/AccessibilityObject.h: 15 1 16 2014-01-22 Peter Molnar <pmolnar.u-szeged@partner.samsung.com> 2 17 -
trunk/Source/WebCore/accessibility/AXObjectCache.h
r162132 r162538 265 265 inline AccessibilityObjectInclusion AXComputedObjectAttributeCache::getIgnored(AXID) const { return DefaultBehavior; } 266 266 inline void AXComputedObjectAttributeCache::setIgnored(AXID, AccessibilityObjectInclusion) { } 267 inline AXObjectCache::AXObjectCache(Document& document) : m_document(document), m_notificationPostTimer(this, 0) { }267 inline AXObjectCache::AXObjectCache(Document& document) : m_document(document), m_notificationPostTimer(this, (Timer<AXObjectCache>::TimerFiredFunction) nullptr) { } 268 268 inline AXObjectCache::~AXObjectCache() { } 269 269 inline AccessibilityObject* AXObjectCache::focusedUIElementForPage(const Page*) { return 0; } -
trunk/Source/WebCore/accessibility/AccessibilityObject.h
r161309 r162538 925 925 bool isOnscreen() const; 926 926 927 #if PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))927 #if (PLATFORM(GTK) || PLATFORM(EFL)) && HAVE(ACCESSIBILITY) 928 928 bool allowsTextRanges() const; 929 929 unsigned getLengthForTextRange() const; -
trunk/Source/WebKit/gtk/ChangeLog
r162264 r162538 1 2014-01-22 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org> 2 3 [EFL][GTK] Get EFL and GTK compiling with ACCESSIBILITY disabled 4 https://bugs.webkit.org/show_bug.cgi?id=127119 5 6 Reviewed by Mario Sanchez Prada. 7 8 Guarding ACCESSIBILITY code with HAVE(ACCESSIBILITY). 9 10 * webkit/webkitwebview.cpp: 11 (webkit_web_view_class_init): 12 1 13 2014-01-18 Brian Burg <bburg@apple.com> 2 14 -
trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp
r162069 r162538 1418 1418 } 1419 1419 1420 #if HAVE(ACCESSIBILITY) 1420 1421 static AtkObject* webkit_web_view_get_accessible(GtkWidget* widget) 1421 1422 { … … 1449 1450 return axRoot; 1450 1451 } 1452 #endif 1451 1453 1452 1454 static double screenDPI(GdkScreen* screen) … … 3108 3110 widgetClass->focus_in_event = webkit_web_view_focus_in_event; 3109 3111 widgetClass->focus_out_event = webkit_web_view_focus_out_event; 3112 #if HAVE(ACCESSIBILITY) 3110 3113 widgetClass->get_accessible = webkit_web_view_get_accessible; 3114 #endif 3111 3115 widgetClass->screen_changed = webkit_web_view_screen_changed; 3112 3116 #if ENABLE(DRAG_SUPPORT) -
trunk/Source/WebKit2/ChangeLog
r162536 r162538 1 2014-01-22 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org> 2 3 [EFL][GTK] Get EFL and GTK compiling with ACCESSIBILITY disabled 4 https://bugs.webkit.org/show_bug.cgi?id=127119 5 6 Reviewed by Mario Sanchez Prada. 7 8 Guarding ACCESSIBILITY code with HAVE(ACCESSIBILITY). 9 10 * WebProcess/WebPage/WebPage.cpp: 11 (WebKit::WebPage::WebPage): 12 * WebProcess/WebPage/WebPage.h: 13 * WebProcess/WebPage/gtk/WebPageGtk.cpp: 14 (WebKit::WebPage::platformInitialize): 15 1 16 2014-01-22 Martin Robinson <mrobinson@igalia.com> 2 17 -
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
r162467 r162538 249 249 , m_keyboardEventBeingInterpreted(0) 250 250 , m_viewGestureGeometryCollector(*this) 251 #elif PLATFORM(GTK) 251 #elif PLATFORM(GTK) && HAVE(ACCESSIBILITY) 252 252 , m_accessibilityObject(0) 253 253 #endif -
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h
r162467 r162538 949 949 #elif HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL)) 950 950 GRefPtr<WebPageAccessibilityObject> m_accessibilityObject; 951 952 #if USE(TEXTURE_MAPPER_GL) 951 #endif 952 953 #if PLATFORM(GTK) && USE(TEXTURE_MAPPER_GL) 953 954 // Our view's window in the UI process. 954 955 uint64_t m_nativeWindowHandle; 955 #endif956 956 #endif 957 957 -
trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp
r158002 r162538 50 50 void WebPage::platformInitialize() 51 51 { 52 #if HAVE(ACCESSIBILITY) 52 53 // Create the accessible object (the plug) that will serve as the 53 54 // entry point to the Web process, and send a message to the UI … … 57 58 GOwnPtr<gchar> plugID(atk_plug_get_id(ATK_PLUG(m_accessibilityObject.get()))); 58 59 send(Messages::WebPageProxy::BindAccessibilityTree(String(plugID.get()))); 60 #endif 59 61 60 62 #if USE(TEXTURE_MAPPER_GL) … … 63 65 } 64 66 67 #if HAVE(ACCESSIBILITY) 65 68 void WebPage::updateAccessibilityTree() 66 69 { … … 70 73 webPageAccessibilityObjectRefresh(m_accessibilityObject.get()); 71 74 } 75 #endif 72 76 73 77 void WebPage::platformPreferencesDidChange(const WebPreferencesStore&) -
trunk/Tools/ChangeLog
r162516 r162538 1 2014-01-22 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org> 2 3 [EFL][GTK] Get EFL and GTK compiling with ACCESSIBILITY disabled 4 https://bugs.webkit.org/show_bug.cgi?id=127119 5 6 Reviewed by Mario Sanchez Prada. 7 8 Guarding ACCESSIBILITY code in DumpRenderTree and WebKitTestRunner with HAVE(ACCESSIBILITY). 9 10 * DumpRenderTree/efl/DumpRenderTreeChrome.cpp: 11 * DumpRenderTree/gtk/AccessibilityControllerGtk.cpp: 12 * DumpRenderTree/gtk/DumpRenderTree.cpp: 13 (resetDefaultsToConsistentValues): 14 (webViewWindowObjectCleared): 15 (main): 16 * WebKitTestRunner/InjectedBundle/AccessibilityController.cpp: 17 (WTR::AccessibilityController::platformName): 18 * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp: 19 (WTR::AccessibilityUIElement::isIndeterminate): 20 1 21 2014-01-22 Carlos Garcia Campos <cgarcia@igalia.com> 2 22 -
trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp
r161134 r162538 34 34 #include "EventSender.h" 35 35 #include "GCController.h" 36 #include "JSRetainPtr.h" 36 37 #include "URL.h" 37 38 #include "NotImplemented.h" -
trunk/Tools/DumpRenderTree/gtk/AccessibilityControllerGtk.cpp
r145014 r162538 26 26 27 27 #include "config.h" 28 29 #if HAVE(ACCESSIBILITY) 30 28 31 #include "AccessibilityController.h" 29 32 … … 73 76 74 77 } 78 79 #endif // HAVE(ACCESSIBILITY) -
trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
r160434 r162538 82 82 static int useTimeoutWatchdog = 1; 83 83 84 #if HAVE(ACCESSIBILITY) 84 85 AccessibilityController* axController = 0; 86 #endif 85 87 RefPtr<TestRunner> gTestRunner; 86 88 static GCController* gcController = 0; … … 530 532 DumpRenderTreeSupportGtk::setSerializeHTTPLoads(false); 531 533 534 #if HAVE(ACCESSIBILITY) 532 535 if (axController) 533 536 axController->resetToConsistentState(); 537 #endif 534 538 535 539 DumpRenderTreeSupportGtk::clearOpener(mainFrame); … … 922 926 ASSERT(!exception); 923 927 928 #if HAVE(ACCESSIBILITY) 924 929 axController->makeWindowObject(context, windowObject, &exception); 925 930 ASSERT(!exception); 931 #endif 926 932 927 933 addControllerToWindow(context, windowObject, "eventSender", makeEventSender(context, !webkit_web_frame_get_parent(frame))); … … 1525 1531 1526 1532 gcController = new GCController(); 1533 #if HAVE(ACCESSIBILITY) 1527 1534 axController = new AccessibilityController(); 1535 #endif 1528 1536 1529 1537 if (useLongRunningServerMode(argc, argv)) { … … 1539 1547 gcController = 0; 1540 1548 1549 #if HAVE(ACCESSIBILITY) 1541 1550 delete axController; 1542 1551 axController = 0; 1552 #endif 1543 1553 1544 1554 gtk_widget_destroy(window); -
trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp
r159181 r162538 94 94 void AccessibilityController::logAccessibilityEvents() { } 95 95 void AccessibilityController::resetToConsistentState() { } 96 JSRetainPtr<JSStringRef> AccessibilityController::platformName() { return JSRetainPtr<JSStringRef>(Adopt, JSStringCreateWithUTF8CString("")); } 96 97 #endif 97 98 -
trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp
r160316 r162538 130 130 bool AccessibilityUIElement::isExpanded() const { return false; } 131 131 bool AccessibilityUIElement::isChecked() const { return false; } 132 bool AccessibilityUIElement::isIndeterminate() const { return false; } 132 133 bool AccessibilityUIElement::isVisible() const { return false; } 133 134 bool AccessibilityUIElement::isOffScreen() const { return false; }
Note: See TracChangeset
for help on using the changeset viewer.