Skip to content
Permalink
Browse files
2010-03-07 Kent Tamura <tkent@chromium.org>
        Reviewed by Dimitri Glazkov.

        [DRT/Chromium] Add AccessibilityController and AccessibilityUIElement
        https://bugs.webkit.org/show_bug.cgi?id=35774

        Add AccessibilityController and AccessibilityUIElement classes,
        which are going to be used by DumpRenderTree Chromium port. These
        files are based on:
        - src/webkit/tools/test_shell/accessibility_controller.{cc,h} and
        - src/webkit/tools/test_shell/accessibility_ui_element.{cc,h}
        of Chromium rev.40492.

        * DumpRenderTree/chromium/AccessibilityController.cpp: Added.
        * DumpRenderTree/chromium/AccessibilityController.h: Added.
        * DumpRenderTree/chromium/AccessibilityUIElement.cpp: Added.
        * DumpRenderTree/chromium/AccessibilityUIElement.h: Added.

Canonical link: https://commits.webkit.org/46952@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@55655 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
tkent-google committed Mar 8, 2010
1 parent dcb829c commit febd81f6334678eed3d26cf44570d3d91290413c
Showing 5 changed files with 938 additions and 0 deletions.
@@ -1,3 +1,22 @@
2010-03-07 Kent Tamura <tkent@chromium.org>

Reviewed by Dimitri Glazkov.

[DRT/Chromium] Add AccessibilityController and AccessibilityUIElement
https://bugs.webkit.org/show_bug.cgi?id=35774

Add AccessibilityController and AccessibilityUIElement classes,
which are going to be used by DumpRenderTree Chromium port. These
files are based on:
- src/webkit/tools/test_shell/accessibility_controller.{cc,h} and
- src/webkit/tools/test_shell/accessibility_ui_element.{cc,h}
of Chromium rev.40492.

* DumpRenderTree/chromium/AccessibilityController.cpp: Added.
* DumpRenderTree/chromium/AccessibilityController.h: Added.
* DumpRenderTree/chromium/AccessibilityUIElement.cpp: Added.
* DumpRenderTree/chromium/AccessibilityUIElement.h: Added.

2010-03-06 Hironori Bono <hbono@chromium.org>

Reviewed by Eric Seidel.
@@ -0,0 +1,119 @@
/*
* Copyright (C) 2010 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

#include "config.h"
#include "AccessibilityController.h"

#include "TestShell.h"
#include "public/WebAccessibilityCache.h"
#include "public/WebAccessibilityObject.h"
#include "public/WebFrame.h"
#include "public/WebString.h"
#include "public/WebView.h"

using namespace WebKit;

AccessibilityController::AccessibilityController(TestShell* shell)
: m_shell(shell)
{

bindMethod("logFocusEvents",
&AccessibilityController::logFocusEventsCallback);
bindMethod("logScrollingStartEvents",
&AccessibilityController::logScrollingStartEventsCallback);

bindProperty("focusedElement",
&AccessibilityController::focusedElementGetterCallback);
bindProperty("rootElement",
&AccessibilityController::rootElementGetterCallback);

bindFallbackMethod(&AccessibilityController::fallbackCallback);
}

void AccessibilityController::bindToJavascript(WebFrame* frame, const WebString& classname)
{
WebAccessibilityCache::enableAccessibility();
CppBoundClass::bindToJavascript(frame, classname);
}

void AccessibilityController::reset()
{
m_rootElement = WebAccessibilityObject();
m_focusedElement = WebAccessibilityObject();
m_elements.clear();
}

void AccessibilityController::setFocusedElement(const WebAccessibilityObject& focusedElement)
{
m_focusedElement = focusedElement;
}

AccessibilityUIElement* AccessibilityController::getFocusedElement()
{
if (m_focusedElement.isNull())
m_focusedElement = m_shell->webView()->accessibilityObject();
return m_elements.create(m_focusedElement);
}

AccessibilityUIElement* AccessibilityController::getRootElement()
{
if (m_rootElement.isNull())
m_rootElement = m_shell->webView()->accessibilityObject();
return m_elements.createRoot(m_rootElement);
}

void AccessibilityController::logFocusEventsCallback(const CppArgumentList&, CppVariant* result)
{
// As of r49031, this is not being used upstream.
result->setNull();
}

void AccessibilityController::logScrollingStartEventsCallback(const CppArgumentList&, CppVariant* result)
{
// As of r49031, this is not being used upstream.
result->setNull();
}

void AccessibilityController::focusedElementGetterCallback(CppVariant* result)
{
result->set(*(getFocusedElement()->getAsCppVariant()));
}

void AccessibilityController::rootElementGetterCallback(CppVariant* result)
{
result->set(*(getRootElement()->getAsCppVariant()));
}

void AccessibilityController::fallbackCallback(const CppArgumentList&, CppVariant* result)
{
printf("CONSOLE MESSAGE: JavaScript ERROR: unknown method called on "
"AccessibilityController\n");
result->setNull();
}
@@ -0,0 +1,73 @@
/*
* Copyright (C) 2010 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

#ifndef AccessibilityController_h
#define AccessibilityController_h

#include "AccessibilityUIElement.h"
#include "CppBoundClass.h"

namespace WebKit {
class WebAccessibilityObject;
class WebFrame;
}

class TestShell;

class AccessibilityController : public CppBoundClass {
public:
explicit AccessibilityController(TestShell*);

// Shadow to include accessibility initialization.
void bindToJavascript(WebKit::WebFrame*, const WebKit::WebString& classname);
void reset();

void setFocusedElement(const WebKit::WebAccessibilityObject&);
AccessibilityUIElement* getFocusedElement();
AccessibilityUIElement* getRootElement();

private:
// Bound methods and properties
void logFocusEventsCallback(const CppArgumentList&, CppVariant*);
void logScrollingStartEventsCallback(const CppArgumentList&, CppVariant*);
void fallbackCallback(const CppArgumentList&, CppVariant*);

void focusedElementGetterCallback(CppVariant*);
void rootElementGetterCallback(CppVariant*);

WebKit::WebAccessibilityObject m_focusedElement;
WebKit::WebAccessibilityObject m_rootElement;

AccessibilityUIElementList m_elements;

TestShell* m_shell;
};

#endif // AccessibilityController_h

0 comments on commit febd81f

Please sign in to comment.