Title: [138121] trunk
Revision
138121
Author
loi...@chromium.org
Date
2012-12-18 23:36:39 -0800 (Tue, 18 Dec 2012)

Log Message

Unreviewed, rolling out r138061.
https://bugs.webkit.org/show_bug.cgi?id=105396

Original patch:
http://trac.webkit.org/changeset/138061
https://bugs.webkit.org/show_bug.cgi?id=97359

It is crashing on Debug bots

Source/WebKit/chromium:

* public/WebAccessibilityObject.h:
(WebAccessibilityObject):
* src/WebAccessibilityObject.cpp:

Tools:

* DumpRenderTree/chromium/TestRunner/src/AccessibilityUIElementChromium.cpp:
(WebTestRunner::AccessibilityUIElement::AccessibilityUIElement):
(WebTestRunner::AccessibilityUIElement::elementAtPointCallback):
* DumpRenderTree/chromium/TestRunner/src/AccessibilityUIElementChromium.h:
(AccessibilityUIElement):

LayoutTests:

* accessibility/svg-bounds.html:
* accessibility/svg-remote-element-expected.txt:
* accessibility/svg-remote-element.html:
* platform/chromium/TestExpectations:
* platform/chromium/accessibility/svg-bounds-expected.txt: Copied from LayoutTests/accessibility/svg-bounds-expected.txt.
* platform/mac/accessibility/svg-bounds-expected.txt: Renamed from LayoutTests/accessibility/svg-bounds-expected.txt.
* platform/mac/accessibility/svg-remote-element-expected.txt: Copied from LayoutTests/accessibility/svg-remote-element-expected.txt.

Modified Paths

Added Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (138120 => 138121)


--- trunk/LayoutTests/ChangeLog	2012-12-19 07:33:00 UTC (rev 138120)
+++ trunk/LayoutTests/ChangeLog	2012-12-19 07:36:39 UTC (rev 138121)
@@ -1,3 +1,22 @@
+2012-12-18  Ilya Tikhonovsky  <loi...@chromium.org>
+
+        Unreviewed, rolling out r138061.
+        https://bugs.webkit.org/show_bug.cgi?id=105396
+
+        Original patch:
+        http://trac.webkit.org/changeset/138061
+        https://bugs.webkit.org/show_bug.cgi?id=97359
+
+        It is crashing on Debug bots
+
+        * accessibility/svg-bounds.html:
+        * accessibility/svg-remote-element-expected.txt:
+        * accessibility/svg-remote-element.html:
+        * platform/chromium/TestExpectations:
+        * platform/chromium/accessibility/svg-bounds-expected.txt: Copied from LayoutTests/accessibility/svg-bounds-expected.txt.
+        * platform/mac/accessibility/svg-bounds-expected.txt: Renamed from LayoutTests/accessibility/svg-bounds-expected.txt.
+        * platform/mac/accessibility/svg-remote-element-expected.txt: Copied from LayoutTests/accessibility/svg-remote-element-expected.txt.
+
 2012-12-18  Csaba Osztrogonác  <o...@webkit.org>
 
         Unreviewed gardening, skip a new failing test.

Deleted: trunk/LayoutTests/accessibility/svg-bounds-expected.txt (138120 => 138121)


--- trunk/LayoutTests/accessibility/svg-bounds-expected.txt	2012-12-19 07:33:00 UTC (rev 138120)
+++ trunk/LayoutTests/accessibility/svg-bounds-expected.txt	2012-12-19 07:36:39 UTC (rev 138121)
@@ -1,44 +0,0 @@
-Test
-This test ensures the accessibility bounds of embedded SVG objects are correct.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-container location: (607, 107)
-Face role: AXRole: AXButton
-Face label: AXDescription: face
-FaceX: 0
-FaceY: 0
-
-
-Eye role: AXRole: AXButton
-Eye label: AXDescription: left-eye
-EyeX: 103
-EyeY: 148
-
-
-Nose role: AXRole: AXButton
-Nose label: AXDescription: nose
-NoseX: 193
-NoseY: 206
-
-
-Mouth role: AXRole: AXButton
-Mouth label: AXDescription: smile
-MouthX: 115
-MouthY: 275
-
-
-Text role: AXRole: AXStaticText
-TextX/10: 15
-TextY/10: 11
-
-
-Image role: AXRole: AXImage
-Image label: AXDescription: Test Image
-ImageX: 21
-ImageY: 21
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

Modified: trunk/LayoutTests/accessibility/svg-bounds.html (138120 => 138121)


--- trunk/LayoutTests/accessibility/svg-bounds.html	2012-12-19 07:33:00 UTC (rev 138120)
+++ trunk/LayoutTests/accessibility/svg-bounds.html	2012-12-19 07:36:39 UTC (rev 138121)
@@ -3,17 +3,17 @@
 <body>
 <script src=""
 
-<div id="container" style="position: relative; top: 100px; left: 600px; width:400px; height: 400px;" role="group" tabindex="0">
+<div id="container" style="position: relative; top: 1000px; left: 1000px; width:400px; height: 400px;" role="group" tabindex="0">
 
-<svg role="group" id="svgroot">
+<svg>
 
   <circle role="button" aria-label="face" id="face" r="200" cx="200" cy="200" stroke="red" stroke-width="1" fill="yellow" />
   <ellipse role="button" aria-label="left-eye" id="left-eye" cx="120" cy="180" rx="18" ry="33" fill="black"/>
   <ellipse role="button" aria-label="right-eye" id="right-eye" cx="280" cy="120" rx="18" ry="33" fill="black"/>
   <ellipse role="button" aria-label="nose" id="nose" cx="200" cy="220" rx="8" ry="15" fill="black"/>
   <path role="button" aria-label="smile" id="smile" stroke-width="10" stroke="black" fill="none" stroke-linecap="round" d="M120,280 Q200,330 290,280"/>
-  <text x="150" y="130" fill="red">Test</text>  
-  <image x="20" y="20" width="300" height="80" aria-label="Test Image" xlink:href="" />
+  <text x="0" y="15" fill="red">Test</text>  
+  <image x="20" y="20" width="300" height="80" aria-label="Test Image" xlink:href="" />
 
 </svg>
 </div>
@@ -37,7 +37,7 @@
 if (window.testRunner && window.accessibilityController) {
     window.testRunner.dumpAsText();
  
-    var container = accessibilityController.accessibleElementById("svgroot");
+    var container = accessibilityController.rootElement.childAtIndex(0).childAtIndex(0);
 
     var x = pageX(container) - 1;
     var y = pageY(container) - 1;
@@ -69,15 +69,13 @@
     debug('Mouth role: ' + mouth.role);
     debug('Mouth label: ' + mouth.description);
     debug('MouthX: ' + (pageX(mouth) - x));
-    debug('MouthY: ' + Math.floor(Math.abs(pageY(mouth) - y)));
+    debug('MouthY: ' + Math.abs(pageY(mouth) - y));
     debug('<br>');
 
-    // Text varies by about 1 - 2 pixels depending on the platform,
-    // so just print the text coordinates divided by 10.
     var text = container.childAtIndex(5).childAtIndex(0);
     debug('Text role: ' + text.role);
-    debug('TextX/10: ' + Math.floor((pageX(text) - x) / 10));
-    debug('TextY/10: ' + Math.floor(Math.abs(pageY(text) - y) / 10));
+    debug('TextX: ' + (pageX(text) - x));
+    debug('TextY: ' + Math.abs(pageY(text) - y));
     debug('<br>');
 
     var image = container.childAtIndex(6);

Modified: trunk/LayoutTests/accessibility/svg-remote-element-expected.txt (138120 => 138121)


--- trunk/LayoutTests/accessibility/svg-remote-element-expected.txt	2012-12-19 07:33:00 UTC (rev 138120)
+++ trunk/LayoutTests/accessibility/svg-remote-element-expected.txt	2012-12-19 07:36:39 UTC (rev 138121)
@@ -1,10 +1,15 @@
 
+
+
 This test ensures that accessibility elements can be created out of what a remote SVG image defines.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-container location: (7, 7)
+PASS successfullyParsed is true
+
+TEST COMPLETE
+container location: (7, 43)
 Face role: AXRole: AXButton
 Face label: AXDescription: face
 FaceX: 0
@@ -26,10 +31,7 @@
 Mouth role: AXRole: AXButton
 Mouth label: AXDescription: smile
 MouthX: 115
-MouthY: 275
+MouthY: 274.5
 
 
-PASS successfullyParsed is true
 
-TEST COMPLETE
-

Modified: trunk/LayoutTests/accessibility/svg-remote-element.html (138120 => 138121)


--- trunk/LayoutTests/accessibility/svg-remote-element.html	2012-12-19 07:33:00 UTC (rev 138120)
+++ trunk/LayoutTests/accessibility/svg-remote-element.html	2012-12-19 07:36:39 UTC (rev 138121)
@@ -3,13 +3,14 @@
 <body>
 <script src=""
 
+<br><br>
+
 <img tabindex="0" id="svg-image" src="" alt="interactive SVG" >
 
 <div id="console"></div>
 <script>
 
 description("This test ensures that accessibility elements can be created out of what a remote SVG image defines.")
-window.jsTestIsAsync = true;
 
 // Return the page's relative coordinates. If we rely on the x() or y() of the accessibility object, then
 // accessibility transforms are applied that fail because there is no window available
@@ -22,6 +23,7 @@
 }
 
 if (window.accessibilityController) {
+    window.testRunner.waitUntilDone();
     document.getElementById("svg-image").addEventListener("load", runAXTest);
 }
 
@@ -58,10 +60,10 @@
     debug('Mouth role: ' + mouth.role);
     debug('Mouth label: ' + mouth.description);
     debug('MouthX: ' + (pageX(mouth) - x));
-    debug('MouthY: ' + Math.floor(Math.abs(pageY(mouth) - y)));
+    debug('MouthY: ' + Math.abs(pageY(mouth) - y));
     debug('<br>');
 
-    finishJSTest();
+    window.testRunner.notifyDone();
 }
 
 </script>

Modified: trunk/LayoutTests/platform/chromium/TestExpectations (138120 => 138121)


--- trunk/LayoutTests/platform/chromium/TestExpectations	2012-12-19 07:33:00 UTC (rev 138120)
+++ trunk/LayoutTests/platform/chromium/TestExpectations	2012-12-19 07:36:39 UTC (rev 138121)
@@ -1392,6 +1392,7 @@
 crbug.com/10322 accessibility/aria-labelledby-overrides-label.html [ Skip ]
 crbug.com/10322 accessibility/aria-menubar-menuitems.html [ Skip ]
 crbug.com/10322 accessibility/aria-tables.html [ Skip ]
+crbug.com/10322 accessibility/aria-text-role.html [ Skip ]
 crbug.com/10322 accessibility/aria-used-on-image-maps.html [ Skip ]
 crbug.com/10322 accessibility/deleting-iframe-destroys-axcache.html [ Skip ]
 crbug.com/10322 accessibility/document-attributes.html [ Skip ]
@@ -1399,6 +1400,7 @@
 crbug.com/10322 accessibility/image-map-update-parent-crash.html [ Skip ]
 crbug.com/10322 accessibility/image-map2.html [ Skip ]
 crbug.com/10322 accessibility/internal-link-anchors2.html [ Skip ]
+crbug.com/10322 accessibility/label-for-control-hittest.html [ Skip ]
 crbug.com/10322 accessibility/language-attribute.html [ Skip ]
 crbug.com/10322 accessibility/lists.html [ Skip ]
 crbug.com/10322 accessibility/media-element.html [ Skip ]
@@ -1417,6 +1419,8 @@
 crbug.com/10322 accessibility/transformed-element.html [ Skip ]
 crbug.com/10322 accessibility/visible-elements.html [ Skip ]
 
+webkit.org/b/97359 accessibility/svg-bounds.html [ Skip ]
+webkit.org/b/97359 accessibility/svg-remote-element.html [ Skip ]
 webkit.org/b/96529 accessibility/hidden-legend.html [ Skip ]
 webkit.org/b/73912 accessibility/aria-checkbox-text.html [ Skip ]
 webkit.org/b/99665 accessibility/loading-iframe-sends-notification.html [ Skip ]

Copied: trunk/LayoutTests/platform/chromium/accessibility/svg-bounds-expected.txt (from rev 138119, trunk/LayoutTests/accessibility/svg-bounds-expected.txt) (0 => 138121)


--- trunk/LayoutTests/platform/chromium/accessibility/svg-bounds-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/chromium/accessibility/svg-bounds-expected.txt	2012-12-19 07:36:39 UTC (rev 138121)
@@ -0,0 +1,44 @@
+Test
+This test ensures the accessibility bounds of embedded SVG objects are correct.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+container location: (1007, 1007)
+Face role: AXRole: AXButton
+Face label: AXDescription: face
+FaceX: 0
+FaceY: 0
+
+
+Eye role: AXRole: AXButton
+Eye label: AXDescription: left-eye
+EyeX: 103
+EyeY: 148
+
+
+Nose role: AXRole: AXButton
+Nose label: AXDescription: nose
+NoseX: 193
+NoseY: 206
+
+
+Mouth role: AXRole: AXButton
+Mouth label: AXDescription: smile
+MouthX: 115
+MouthY: 274.5
+
+
+Text role: AXRole: AXStaticText
+TextX: 0.5
+TextY: 2
+
+
+Image role: AXRole: AXImage
+Image label: AXDescription: Test Image
+ImageX: 21
+ImageY: 21
+PASS successfullyParsed is true
+
+TEST COMPLETE
+

Copied: trunk/LayoutTests/platform/mac/accessibility/svg-bounds-expected.txt (from rev 138119, trunk/LayoutTests/accessibility/svg-bounds-expected.txt) (0 => 138121)


--- trunk/LayoutTests/platform/mac/accessibility/svg-bounds-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/svg-bounds-expected.txt	2012-12-19 07:36:39 UTC (rev 138121)
@@ -0,0 +1,44 @@
+Test
+This test ensures the accessibility bounds of embedded SVG objects are correct.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+container location: (1007, 1007)
+Face role: AXRole: AXButton
+Face label: AXDescription: face
+FaceX: 0
+FaceY: 0
+
+
+Eye role: AXRole: AXButton
+Eye label: AXDescription: left-eye
+EyeX: 103
+EyeY: 148
+
+
+Nose role: AXRole: AXButton
+Nose label: AXDescription: nose
+NoseX: 193
+NoseY: 206
+
+
+Mouth role: AXRole: AXButton
+Mouth label: AXDescription: smile
+MouthX: 115
+MouthY: 275.5
+
+
+Text role: AXRole: AXStaticText
+TextX: 1.5
+TextY: 2
+
+
+Image role: AXRole: AXImage
+Image label: AXDescription: Test Image
+ImageX: 21
+ImageY: 21
+PASS successfullyParsed is true
+
+TEST COMPLETE
+

Property changes: trunk/LayoutTests/platform/mac/accessibility/svg-bounds-expected.txt


Added: svn:eol-style

Copied: trunk/LayoutTests/platform/mac/accessibility/svg-remote-element-expected.txt (from rev 138119, trunk/LayoutTests/accessibility/svg-remote-element-expected.txt) (0 => 138121)


--- trunk/LayoutTests/platform/mac/accessibility/svg-remote-element-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/svg-remote-element-expected.txt	2012-12-19 07:36:39 UTC (rev 138121)
@@ -0,0 +1,37 @@
+
+
+
+This test ensures that accessibility elements can be created out of what a remote SVG image defines.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+container location: (7, 43)
+Face role: AXRole: AXButton
+Face label: AXDescription: face
+FaceX: 0
+FaceY: 0
+
+
+Eye role: AXRole: AXButton
+Eye label: AXDescription: left-eye
+EyeX: 103
+EyeY: 148
+
+
+Nose role: AXRole: AXButton
+Nose label: AXDescription: nose
+NoseX: 193
+NoseY: 206
+
+
+Mouth role: AXRole: AXButton
+Mouth label: AXDescription: smile
+MouthX: 115
+MouthY: 275.5
+
+
+

Modified: trunk/Source/WebKit/chromium/ChangeLog (138120 => 138121)


--- trunk/Source/WebKit/chromium/ChangeLog	2012-12-19 07:33:00 UTC (rev 138120)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-12-19 07:36:39 UTC (rev 138121)
@@ -1,3 +1,18 @@
+2012-12-18  Ilya Tikhonovsky  <loi...@chromium.org>
+
+        Unreviewed, rolling out r138061.
+        https://bugs.webkit.org/show_bug.cgi?id=105396
+
+        Original patch:
+        http://trac.webkit.org/changeset/138061
+        https://bugs.webkit.org/show_bug.cgi?id=97359
+
+        It is crashing on Debug bots
+
+        * public/WebAccessibilityObject.h:
+        (WebAccessibilityObject):
+        * src/WebAccessibilityObject.cpp:
+
 2012-12-18  David Dorwin  <ddor...@chromium.org>
 
         [Chromium] Remove temporary backwards compatible interface code (from r137724).

Modified: trunk/Source/WebKit/chromium/public/WebAccessibilityObject.h (138120 => 138121)


--- trunk/Source/WebKit/chromium/public/WebAccessibilityObject.h	2012-12-19 07:33:00 UTC (rev 138120)
+++ trunk/Source/WebKit/chromium/public/WebAccessibilityObject.h	2012-12-19 07:36:39 UTC (rev 138121)
@@ -128,7 +128,6 @@
     WEBKIT_EXPORT WebString ariaLiveRegionStatus() const;
     WEBKIT_EXPORT WebRect boundingBoxRect() const;
     WEBKIT_EXPORT bool canvasHasFallbackContent() const;
-    WEBKIT_EXPORT WebPoint clickPoint() const;
     WEBKIT_EXPORT double estimatedLoadingProgress() const;
     WEBKIT_EXPORT WebString helpText() const;
     WEBKIT_EXPORT int headingLevel() const;

Modified: trunk/Source/WebKit/chromium/src/WebAccessibilityObject.cpp (138120 => 138121)


--- trunk/Source/WebKit/chromium/src/WebAccessibilityObject.cpp	2012-12-19 07:33:00 UTC (rev 138120)
+++ trunk/Source/WebKit/chromium/src/WebAccessibilityObject.cpp	2012-12-19 07:36:39 UTC (rev 138121)
@@ -490,14 +490,6 @@
     return m_private->canvasHasFallbackContent();
 }
 
-WebPoint WebAccessibilityObject::clickPoint() const
-{
-    if (isDetached())
-        return WebPoint();
-
-    return WebPoint(m_private->clickPoint());
-}
-
 double WebAccessibilityObject::estimatedLoadingProgress() const
 {
     if (isDetached())

Modified: trunk/Tools/ChangeLog (138120 => 138121)


--- trunk/Tools/ChangeLog	2012-12-19 07:33:00 UTC (rev 138120)
+++ trunk/Tools/ChangeLog	2012-12-19 07:36:39 UTC (rev 138121)
@@ -1,3 +1,20 @@
+2012-12-18  Ilya Tikhonovsky  <loi...@chromium.org>
+
+        Unreviewed, rolling out r138061.
+        https://bugs.webkit.org/show_bug.cgi?id=105396
+
+        Original patch:
+        http://trac.webkit.org/changeset/138061
+        https://bugs.webkit.org/show_bug.cgi?id=97359
+
+        It is crashing on Debug bots
+
+        * DumpRenderTree/chromium/TestRunner/src/AccessibilityUIElementChromium.cpp:
+        (WebTestRunner::AccessibilityUIElement::AccessibilityUIElement):
+        (WebTestRunner::AccessibilityUIElement::elementAtPointCallback):
+        * DumpRenderTree/chromium/TestRunner/src/AccessibilityUIElementChromium.h:
+        (AccessibilityUIElement):
+
 2012-12-18  Alice Liu  <alice....@apple.com>
 
         Test for https://bugs.webkit.org/show_bug.cgi?id=105106

Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/AccessibilityUIElementChromium.cpp (138120 => 138121)


--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/AccessibilityUIElementChromium.cpp	2012-12-19 07:33:00 UTC (rev 138120)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/AccessibilityUIElementChromium.cpp	2012-12-19 07:36:39 UTC (rev 138121)
@@ -397,8 +397,6 @@
     bindProperty("isValid", &AccessibilityUIElement::isValidGetterCallback);
     bindProperty("isReadOnly", &AccessibilityUIElement::isReadOnlyGetterCallback);
     bindProperty("orientation", &AccessibilityUIElement::orientationGetterCallback);
-    bindProperty("clickPointX", &AccessibilityUIElement::clickPointXGetterCallback);
-    bindProperty("clickPointY", &AccessibilityUIElement::clickPointYGetterCallback);
 
     //
     // Methods
@@ -650,16 +648,6 @@
     result->set(getOrientation(accessibilityObject()));
 }
 
-void AccessibilityUIElement::clickPointXGetterCallback(CppVariant* result)
-{
-    result->set(accessibilityObject().clickPoint().x);
-}
-
-void AccessibilityUIElement::clickPointYGetterCallback(CppVariant* result)
-{
-    result->set(accessibilityObject().clickPoint().y);
-}
-
 //
 // Methods
 //
@@ -737,21 +725,9 @@
     result->set(*(child->getAsCppVariant()));
 }
 
-void AccessibilityUIElement::elementAtPointCallback(const CppArgumentList& arguments, CppVariant* result)
+void AccessibilityUIElement::elementAtPointCallback(const CppArgumentList&, CppVariant* result)
 {
     result->setNull();
-
-    if (arguments.size() != 2 || !arguments[0].isNumber() || !arguments[1].isNumber())
-        return;
-
-    int x = arguments[0].toInt32();
-    int y = arguments[1].toInt32();
-    WebPoint point(x, y);
-    WebAccessibilityObject obj = accessibilityObject().hitTest(point);
-    if (obj.isNull())
-        return;
-
-    result->set(*(m_factory->getOrCreate(obj)->getAsCppVariant()));
 }
 
 void AccessibilityUIElement::attributesOfColumnHeadersCallback(const CppArgumentList&, CppVariant* result)

Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/AccessibilityUIElementChromium.h (138120 => 138121)


--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/AccessibilityUIElementChromium.h	2012-12-19 07:33:00 UTC (rev 138120)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/AccessibilityUIElementChromium.h	2012-12-19 07:36:39 UTC (rev 138121)
@@ -94,8 +94,6 @@
     void isValidGetterCallback(CppVariant*);
     void isReadOnlyGetterCallback(CppVariant*);
     void orientationGetterCallback(CppVariant*);
-    void clickPointXGetterCallback(CppVariant*);
-    void clickPointYGetterCallback(CppVariant*);
 
     // Bound methods.
     void allAttributesCallback(const CppArgumentList&, CppVariant*);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to