Add a test that confirms there's no crash on accessing properties of...

Add a test that confirms there's no crash on accessing properties of AccesibilityObject at the initial state BUG=351195 Review URL: https://codereview.chromium.org/216343002 git-svn-id: svn://svn.chromium.org/blink/trunk@170340 bbb929c8-8fbe-4397-9dbb-9b2b20218538

Add a test that confirms there's no crash on accessing properties of...
Add a test that confirms there's no crash on accessing properties of AccesibilityObject at the initial state BUG=351195 Review URL: https://codereview.chromium.org/216343002 git-svn-id: svn://svn.chromium.org/blink/trunk@170340 bbb929c8-8fbe-4397-9dbb-9b2b20218538
5d5c49be · hajimehoshi@chromium.org · ea67eb70 · 5d5c49be · 5d5c49be · 5d5c49be
Commit 5d5c49be authored Mar 28, 2014 by hajimehoshi@chromium.org
4 changed files
--- a/third_party/WebKit/LayoutTests/accessibility/crash-on-accessing-properties-at-initial-state-expected.txt
+++ b/third_party/WebKit/LayoutTests/accessibility/crash-on-accessing-properties-at-initial-state-expected.txt
+This tests that there's no crash when accessising any properties at the initial state.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
--- a/third_party/WebKit/LayoutTests/accessibility/crash-on-accessing-properties-at-initial-state.html
+++ b/third_party/WebKit/LayoutTests/accessibility/crash-on-accessing-properties-at-initial-state.html
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test.js"></script>
+</head>
+<body id="body">
+<script>
+
+    description("This tests that there's no crash when accessising any properties at the initial state.");
+
+    function enumelateProperties(value) {
+       if (typeof(value) !== 'object')
+           return;
+       for (var key in value)
+           enumelateProperties(value[key]);
+    }
+
+    if (window.accessibilityController)
+        enumelateProperties(window.accessibilityController);
+
+</script>
+</body>
+</html>
--- a/third_party/WebKit/LayoutTests/fast/dom/Window/resources/window-property-collector.js
+++ b/third_party/WebKit/LayoutTests/fast/dom/Window/resources/window-property-collector.js
@@ -20,10 +20,15 @@ function emitExpectedResult(path, expected)
    if (path[0] == 'internals'
        || path[0] == 'propertiesToVerify' // Skip the list we're building...
        || path[0] == 'clientInformation' // Just an alias for navigator.
-        // Skip testRunner since they are only for testing.
-        || path[0] == 'testRunner'
-        || path[0] == 'eventSender' // Skip eventSender since they are only for testing.
-        || path[0] == 'layoutTestController') { // Just an alias for testRunner.
+        || path[0] == 'testRunner' // Skip testRunner since they are only for testing.
+        || path[0] == 'layoutTestController' // Just an alias for testRunner.
+        || path[0] == 'eventSender') { // Skip eventSender since they are only for testing.
+        return;
+    }
+
+    // Skip the properties which are hard to expect a stable result.
+    if (path[0] == 'accessibilityController' // we can hardly estimate the states of the cached WebAXObjects.
+        || path[0] == 'localStorage') { // local storage is not reliably cleared between tests.
        return;
    }

@@ -75,16 +80,6 @@ function collectPropertiesHelper(object, path)
        throw 'Error: probably looping';

    for (var property in object) {
-        // Skip the properties which are hard to expect a stable result.
-        // As for 'accessibilityController', we can hardly estimate the states
-        // of the cached WebAXObjects.
-        // FIXME: We can't access accessibilityController's properties here
-        // because some property accesses might crash (crbug/351195).
-        if (property == 'accessibilityController')
-            continue;
-        // As for 'localStorage', local storage is not reliably cleared between tests.
-        if (property == 'localStorage')
-            continue;
        path.push(property);
        var type = typeof(object[property]);
        if (type == "object") {

--- a/third_party/WebKit/Source/core/accessibility/AXRenderObject.cpp
+++ b/third_party/WebKit/Source/core/accessibility/AXRenderObject.cpp
@@ -797,7 +797,8 @@ String AXRenderObject::text() const

 int AXRenderObject::textLength() const
 {
-    ASSERT(isTextControl());
+    if (!isTextControl())
+        return -1;

    if (isPasswordField())
        return -1; // need to return something distinct from 0
@@ -1568,7 +1569,8 @@ Widget* AXRenderObject::widgetForAttachmentView() const

 AXObject::PlainTextRange AXRenderObject::selectedTextRange() const
 {
-    ASSERT(isTextControl());
+    if (!isTextControl())
+        return PlainTextRange();

    if (isPasswordField())
        return PlainTextRange();