Changeset 135619 in webkit


Ignore:
Timestamp:
Nov 23, 2012 8:47:57 AM (11 years ago)
Author:
commit-queue@webkit.org
Message:

[EFL][GTK] Adapt accessibility feature to WebKitTestRunner.
https://bugs.webkit.org/show_bug.cgi?id=100757

Patch by Mateusz Leszko <m.leszko@samsung.com> on 2012-11-23
Reviewed by Laszlo Gombos.

Tools:

Allow to build accessibility feature in WebkitTestRunner for EFL Platform.
Updating CMake files due to changes from Bug 99011.

  • WebKitTestRunner/InjectedBundle/AccessibilityController.cpp:

(WTR::AccessibilityController::AccessibilityController):
(WTR):

  • WebKitTestRunner/InjectedBundle/AccessibilityController.h:

(AccessibilityController):

  • WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:

(WTR):

  • WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:

(AccessibilityUIElement):

  • WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp: - Removed gtk/gtk.h dependency.
  • WebKitTestRunner/PlatformEfl.cmake: - Adding atk includes.

LayoutTests:

Unskipping EFL Accessiblity tests for wk2.

  • platform/efl-wk1/TestExpectations:
  • platform/efl/TestExpectations:
Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r135617 r135619  
     12012-11-23  Mateusz Leszko  <m.leszko@samsung.com>
     2
     3        [EFL][GTK] Adapt accessibility feature to WebKitTestRunner.
     4        https://bugs.webkit.org/show_bug.cgi?id=100757
     5
     6        Reviewed by Laszlo Gombos.
     7
     8        Unskipping EFL Accessiblity tests for wk2.
     9
     10        * platform/efl-wk1/TestExpectations:
     11        * platform/efl/TestExpectations:
     12
    1132012-11-23  Robert Kroeger  <rjkroege@chromium.org>
    214
  • trunk/LayoutTests/platform/efl-wk1/TestExpectations

    r135595 r135619  
    5454http/tests/xmlhttprequest/failed-auth.html
    5555http/tests/xmlhttprequest/remember-bad-password.html
     56
     57# The EFL port has no support for accessibility features in efl-wk1
     58Bug(EFL) accessibility [ Skip ]
     59webkit.org/b/98895 perf/accessibility-title-ui-element.html [ Skip ]
    5660
    5761#////////////////////////////////////////////////////////////////////////////////////////
  • trunk/LayoutTests/platform/efl/TestExpectations

    r135595 r135619  
    611611# EFL port does not implement DeviceMotion
    612612webkit.org/b/95300 fast/dom/DeviceMotion [ Skip ]
    613 
    614 # The EFL port has no support for accessibility features
    615 Bug(EFL) accessibility [ Skip ]
    616 webkit.org/b/98895 perf/accessibility-title-ui-element.html [ Skip ]
    617613
    618614# Taken from Chromium, this test verifies that a mismatch reftest will fail if both results are the
  • trunk/Tools/ChangeLog

    r135603 r135619  
     12012-11-23  Mateusz Leszko  <m.leszko@samsung.com>
     2
     3        [EFL][GTK] Adapt accessibility feature to WebKitTestRunner.
     4        https://bugs.webkit.org/show_bug.cgi?id=100757
     5
     6        Reviewed by Laszlo Gombos.
     7
     8        Allow to build accessibility feature in WebkitTestRunner for EFL Platform.
     9        Updating CMake files due to changes from Bug 99011.
     10
     11        * WebKitTestRunner/InjectedBundle/AccessibilityController.cpp:
     12        (WTR::AccessibilityController::AccessibilityController):
     13        (WTR):
     14        * WebKitTestRunner/InjectedBundle/AccessibilityController.h:
     15        (AccessibilityController):
     16        * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:
     17        (WTR):
     18        * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
     19        (AccessibilityUIElement):
     20        * WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp: - Removed gtk/gtk.h dependency.
     21        * WebKitTestRunner/PlatformEfl.cmake: - Adding atk includes.
     22
    1232012-11-16  Yury Semikhatsky  <yurys@chromium.org>
    224
  • trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp

    r129308 r135619  
    4545
    4646AccessibilityController::AccessibilityController()
    47 #if PLATFORM(GTK)
     47#if PLATFORM(GTK) || PLATFORM(EFL)
    4848    : m_stateChangeListenerId(0)
    4949    , m_focusEventListenerId(0)
     
    110110#endif
    111111
    112 #if !PLATFORM(GTK)
     112#if !PLATFORM(GTK) && !PLATFORM(EFL)
    113113void AccessibilityController::logAccessibilityEvents() { }
    114114void AccessibilityController::resetToConsistentState() { }
  • trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h

    r129308 r135619  
    6969#endif
    7070
    71 #if PLATFORM(GTK)
     71#if PLATFORM(GTK) || PLATFORM(EFL)
    7272    unsigned m_stateChangeListenerId;
    7373    unsigned m_focusEventListenerId;
  • trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp

    r122940 r135619  
    5353    return m_element;           
    5454}
    55    
     55
    5656// Unsupported methods on various platforms. As they're implemented on other platforms this list should be modified.
    57 #if !PLATFORM(MAC) && !PLATFORM(GTK)
     57#if !PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(EFL)
    5858AccessibilityUIElement::AccessibilityUIElement(PlatformUIElement) { }
    5959AccessibilityUIElement::AccessibilityUIElement(const AccessibilityUIElement&) { }
  • trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h

    r122940 r135619  
    5050
    5151typedef COMPtr<IAccessible> PlatformUIElement;
    52 #elif PLATFORM(GTK)
     52#elif PLATFORM(GTK) || PLATFORM(EFL)
    5353#include <atk/atk.h>
    5454typedef AtkObject* PlatformUIElement;
     
    246246#endif
    247247
    248 #if PLATFORM(MAC) || PLATFORM(GTK)
     248#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL)
    249249    void getChildren(Vector<RefPtr<AccessibilityUIElement> >&);
    250250    void getChildrenWithRange(Vector<RefPtr<AccessibilityUIElement> >&, unsigned location, unsigned length);
  • trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp

    r135485 r135619  
    3232#include <JavaScriptCore/JSStringRef.h>
    3333#include <atk/atk.h>
    34 #include <gtk/gtk.h>
    3534#include <wtf/Assertions.h>
    3635#include <wtf/gobject/GOwnPtr.h>
  • trunk/Tools/WebKitTestRunner/PlatformEfl.cmake

    r132350 r135619  
    2222    ${WEBKIT2_DIR}/UIProcess/API/efl
    2323    "${WTF_DIR}/wtf/gobject"
    24 
     24    ${ATK_INCLUDE_DIRS}
    2525    ${CAIRO_INCLUDE_DIRS}
    2626    ${ECORE_INCLUDE_DIRS}
     
    3232
    3333LIST(APPEND WebKitTestRunner_LIBRARIES
     34    ${ATK_LIBRARIES}
    3435    ${CAIRO_LIBRARIES}
    3536    ${ECORE_LIBRARIES}
     
    5657    ${TOOLS_DIR}/DumpRenderTree/efl/FontManagement.cpp
    5758
     59    ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityControllerAtk.cpp
     60    ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityUIElementAtk.cpp
    5861    ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/efl/ActivateFontsEfl.cpp
    5962    ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/efl/InjectedBundleEfl.cpp
Note: See TracChangeset for help on using the changeset viewer.