Title: [127931] trunk
- Revision
- 127931
- Author
- [email protected]
- Date
- 2012-09-07 15:55:23 -0700 (Fri, 07 Sep 2012)
Log Message
AX: Chromium needs access to canvasHasFallbackContent
https://bugs.webkit.org/show_bug.cgi?id=96124
Reviewed by Chris Fleizach.
Source/WebKit/chromium:
Expose canvasHasFallbackContent on Chromium.
* public/WebAccessibilityObject.h:
(WebAccessibilityObject):
* src/WebAccessibilityObject.cpp:
(WebKit::WebAccessibilityObject::canvasHasFallbackContent):
(WebKit):
Tools:
Distinguish between canvas roles with and without fallback
content on Chromium.
* DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.cpp:
(getRole):
LayoutTests:
Update canvas test to distinguish between canvas elements with
fallback content on Chromium.
* platform/chromium/accessibility/canvas-description-and-role-expected.txt:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (127930 => 127931)
--- trunk/LayoutTests/ChangeLog 2012-09-07 22:50:45 UTC (rev 127930)
+++ trunk/LayoutTests/ChangeLog 2012-09-07 22:55:23 UTC (rev 127931)
@@ -1,3 +1,15 @@
+2012-09-07 Dominic Mazzoni <[email protected]>
+
+ AX: Chromium needs access to canvasHasFallbackContent
+ https://bugs.webkit.org/show_bug.cgi?id=96124
+
+ Reviewed by Chris Fleizach.
+
+ Update canvas test to distinguish between canvas elements with
+ fallback content on Chromium.
+
+ * platform/chromium/accessibility/canvas-description-and-role-expected.txt:
+
2012-09-07 Gavin Barraclough <[email protected]>
Object.prototype.__define{G,S}etter__ with non-callable second parameter should throw TypeError instead of SyntaxError
Modified: trunk/LayoutTests/platform/chromium/accessibility/canvas-description-and-role-expected.txt (127930 => 127931)
--- trunk/LayoutTests/platform/chromium/accessibility/canvas-description-and-role-expected.txt 2012-09-07 22:50:45 UTC (rev 127930)
+++ trunk/LayoutTests/platform/chromium/accessibility/canvas-description-and-role-expected.txt 2012-09-07 22:55:23 UTC (rev 127931)
@@ -7,7 +7,7 @@
Canvas 1 description: AXDescription: Canvas label
Canvas 1 role: AXRole: AXCanvas
Canvas 2 description: AXDescription:
-Canvas 2 role: AXRole: AXCanvas
+Canvas 2 role: AXRole: AXCanvasWithFallbackContent
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/Source/WebKit/chromium/ChangeLog (127930 => 127931)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-09-07 22:50:45 UTC (rev 127930)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-09-07 22:55:23 UTC (rev 127931)
@@ -1,3 +1,18 @@
+2012-09-07 Dominic Mazzoni <[email protected]>
+
+ AX: Chromium needs access to canvasHasFallbackContent
+ https://bugs.webkit.org/show_bug.cgi?id=96124
+
+ Reviewed by Chris Fleizach.
+
+ Expose canvasHasFallbackContent on Chromium.
+
+ * public/WebAccessibilityObject.h:
+ (WebAccessibilityObject):
+ * src/WebAccessibilityObject.cpp:
+ (WebKit::WebAccessibilityObject::canvasHasFallbackContent):
+ (WebKit):
+
2012-09-07 Robert Kroeger <[email protected]>
[chromium] Add touchscreen specific fling curve parametrization
Modified: trunk/Source/WebKit/chromium/public/WebAccessibilityObject.h (127930 => 127931)
--- trunk/Source/WebKit/chromium/public/WebAccessibilityObject.h 2012-09-07 22:50:45 UTC (rev 127930)
+++ trunk/Source/WebKit/chromium/public/WebAccessibilityObject.h 2012-09-07 22:55:23 UTC (rev 127931)
@@ -133,6 +133,7 @@
WEBKIT_EXPORT WebString ariaLiveRegionRelevant() const;
WEBKIT_EXPORT WebString ariaLiveRegionStatus() const;
WEBKIT_EXPORT WebRect boundingBoxRect() const;
+ WEBKIT_EXPORT bool canvasHasFallbackContent() const;
WEBKIT_EXPORT double estimatedLoadingProgress() const;
WEBKIT_EXPORT WebString helpText() const;
WEBKIT_EXPORT int headingLevel() const;
Modified: trunk/Source/WebKit/chromium/src/WebAccessibilityObject.cpp (127930 => 127931)
--- trunk/Source/WebKit/chromium/src/WebAccessibilityObject.cpp 2012-09-07 22:50:45 UTC (rev 127930)
+++ trunk/Source/WebKit/chromium/src/WebAccessibilityObject.cpp 2012-09-07 22:55:23 UTC (rev 127931)
@@ -459,6 +459,14 @@
return m_private->pixelSnappedBoundingBoxRect();
}
+bool WebAccessibilityObject::canvasHasFallbackContent() const
+{
+ if (isDetached())
+ return false;
+
+ return m_private->canvasHasFallbackContent();
+}
+
double WebAccessibilityObject::estimatedLoadingProgress() const
{
if (isDetached())
Modified: trunk/Tools/ChangeLog (127930 => 127931)
--- trunk/Tools/ChangeLog 2012-09-07 22:50:45 UTC (rev 127930)
+++ trunk/Tools/ChangeLog 2012-09-07 22:55:23 UTC (rev 127931)
@@ -1,3 +1,16 @@
+2012-09-07 Dominic Mazzoni <[email protected]>
+
+ AX: Chromium needs access to canvasHasFallbackContent
+ https://bugs.webkit.org/show_bug.cgi?id=96124
+
+ Reviewed by Chris Fleizach.
+
+ Distinguish between canvas roles with and without fallback
+ content on Chromium.
+
+ * DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.cpp:
+ (getRole):
+
2012-09-07 Ojan Vafai <[email protected]>
Handle non-existant TestExpectations files gracefully
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.cpp (127930 => 127931)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.cpp 2012-09-07 22:50:45 UTC (rev 127930)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.cpp 2012-09-07 22:55:23 UTC (rev 127931)
@@ -234,7 +234,15 @@
string getRole(const WebAccessibilityObject& object)
{
- return roleToString(object.roleValue());
+ string roleString = roleToString(object.roleValue());
+
+ // Special-case canvas with fallback content because Chromium wants to
+ // treat this as essentially a separate role that it can map differently depending
+ // on the platform.
+ if (object.roleValue() == WebAccessibilityRoleCanvas && object.canvasHasFallbackContent())
+ roleString += "WithFallbackContent";
+
+ return roleString;
}
string getTitle(const WebAccessibilityObject& object)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
