[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Wed Apr 7 23:12:45 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 9ee2bd90cc07bd1aa0af4fb9c06e4f8f7d8aabb7
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 28 17:02:16 2009 +0000
2009-10-28 Joanmarie Diggs <joanmarie.diggs at gmail.com>
Reviewed by Jan Alonzo.
https://bugs.webkit.org/show_bug.cgi?id=25897
[Gtk] Extraneous object of ROLE_PANEL in hierarchy for entries
Expands upon the new funtionality which allows platforms to indicate
that a particular object should not be ignored, so that they can
specify that an object should be ignored or that it should be left up
to the default handling to decide.
* accessibility/AccessibilityObject.h:
* accessibility/chromium/AccessibilityObjectChromium.cpp:
* accessibility/gtk/AccessibilityObjectAtk.cpp:
* accessibility/mac/AccessibilityObjectMac.mm:
* accessibility/qt/AccessibilityObjectQt.cpp:
* accessibility/win/AccessibilityObjectWin.cpp:
* accessibility/wx/AccessibilityObjectWx.cpp:
(AccessibilityObject::accessibilityPlatformIncludesObject):
* accessibility/AccessibilityRenderObject.cpp:
(AccessibilityRenderObject::accessibilityIsIgnored):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50220 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1e57101..d10907c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,30 @@
Reviewed by Jan Alonzo.
+ https://bugs.webkit.org/show_bug.cgi?id=25897
+ [Gtk] Extraneous object of ROLE_PANEL in hierarchy for entries
+
+ Expands upon the new funtionality which allows platforms to indicate
+ that a particular object should not be ignored, so that they can
+ specify that an object should be ignored or that it should be left up
+ to the default handling to decide.
+
+ * accessibility/AccessibilityObject.h:
+ * accessibility/chromium/AccessibilityObjectChromium.cpp:
+ * accessibility/gtk/AccessibilityObjectAtk.cpp:
+ * accessibility/mac/AccessibilityObjectMac.mm:
+ * accessibility/qt/AccessibilityObjectQt.cpp:
+ * accessibility/win/AccessibilityObjectWin.cpp:
+ * accessibility/wx/AccessibilityObjectWx.cpp:
+ (AccessibilityObject::accessibilityPlatformIncludesObject):
+ * accessibility/AccessibilityRenderObject.cpp:
+ (AccessibilityRenderObject::accessibilityIsIgnored):
+
+
+2009-10-28 Joanmarie Diggs <joanmarie.diggs at gmail.com>
+
+ Reviewed by Jan Alonzo.
+
https://bugs.webkit.org/show_bug.cgi?id=25534
[GTK] Objects of ROLE_TABLE should implement the accessible table interface
diff --git a/WebCore/accessibility/AccessibilityObject.h b/WebCore/accessibility/AccessibilityObject.h
index f822df9..8fc40e8 100644
--- a/WebCore/accessibility/AccessibilityObject.h
+++ b/WebCore/accessibility/AccessibilityObject.h
@@ -189,6 +189,12 @@ enum AccessibilityOrientation {
AccessibilityOrientationHorizontal,
};
+enum AccessibilityObjectPlatformInclusion {
+ IncludeObject,
+ IgnoreObject,
+ DefaultBehavior,
+};
+
struct VisiblePositionRange {
VisiblePosition start;
@@ -460,11 +466,11 @@ public:
bool accessibilityIgnoreAttachment() const { return true; }
#endif
- // gives platforms the opportunity to indicate that an object shouldn't be ignored
+ // gives platforms the opportunity to indicate if and how an object should be included
#if HAVE(ACCESSIBILITY)
- bool accessibilityPlatformIncludesObject() const;
+ AccessibilityObjectPlatformInclusion accessibilityPlatformIncludesObject() const;
#else
- bool accessibilityPlatformIncludesObject() const { return false; }
+ AccessibilityObjectPlatformInclusion accessibilityPlatformIncludesObject() const { return DefaultBehavior; }
#endif
// allows for an AccessibilityObject to update its render tree or perform
diff --git a/WebCore/accessibility/AccessibilityRenderObject.cpp b/WebCore/accessibility/AccessibilityRenderObject.cpp
index 65742fe..2da798a 100644
--- a/WebCore/accessibility/AccessibilityRenderObject.cpp
+++ b/WebCore/accessibility/AccessibilityRenderObject.cpp
@@ -1259,8 +1259,12 @@ bool AccessibilityRenderObject::ariaIsHidden() const
bool AccessibilityRenderObject::accessibilityIsIgnored() const
{
// is the platform is interested in this object?
- if (accessibilityPlatformIncludesObject())
+ AccessibilityObjectPlatformInclusion decision = accessibilityPlatformIncludesObject();
+ if (decision == IncludeObject)
return false;
+ if (decision == IgnoreObject)
+ return true;
+ // the decision must, therefore, be DefaultBehavior.
// ignore invisible element
if (!m_renderer || m_renderer->style()->visibility() != VISIBLE)
diff --git a/WebCore/accessibility/chromium/AccessibilityObjectChromium.cpp b/WebCore/accessibility/chromium/AccessibilityObjectChromium.cpp
index c9a51ba..7ab7d79 100644
--- a/WebCore/accessibility/chromium/AccessibilityObjectChromium.cpp
+++ b/WebCore/accessibility/chromium/AccessibilityObjectChromium.cpp
@@ -34,9 +34,9 @@ bool AccessibilityObject::accessibilityIgnoreAttachment() const
return false;
}
-bool AccessibilityObject::accessibilityPlatformIncludesObject() const
+AccessibilityObjectPlatformInclusion AccessibilityObject::accessibilityPlatformIncludesObject() const
{
- return false;
+ return DefaultBehavior;
}
} // namespace WebCore
diff --git a/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp b/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp
index 3664f1b..0cd224d 100644
--- a/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp
+++ b/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp
@@ -32,17 +32,17 @@ bool AccessibilityObject::accessibilityIgnoreAttachment() const
return false;
}
-bool AccessibilityObject::accessibilityPlatformIncludesObject() const
+AccessibilityObjectPlatformInclusion AccessibilityObject::accessibilityPlatformIncludesObject() const
{
// When a list item is made up entirely of children (e.g. paragraphs)
// the list item gets ignored. We need it.
if (isGroup()) {
AccessibilityObject* parent = parentObject();
if (parent && parent->isList())
- return true;
+ return IncludeObject;
}
- return false;
+ return DefaultBehavior;
}
AccessibilityObjectWrapper* AccessibilityObject::wrapper() const
diff --git a/WebCore/accessibility/mac/AccessibilityObjectMac.mm b/WebCore/accessibility/mac/AccessibilityObjectMac.mm
index d79e2ec..217af54 100644
--- a/WebCore/accessibility/mac/AccessibilityObjectMac.mm
+++ b/WebCore/accessibility/mac/AccessibilityObjectMac.mm
@@ -41,9 +41,9 @@ bool AccessibilityObject::accessibilityIgnoreAttachment() const
return [attachment accessibilityIsIgnored];
}
-bool AccessibilityObject::accessibilityPlatformIncludesObject() const
+AccessibilityObjectPlatformInclusion AccessibilityObject::accessibilityPlatformIncludesObject() const
{
- return false;
+ return DefaultBehavior;
}
} // WebCore
diff --git a/WebCore/accessibility/qt/AccessibilityObjectQt.cpp b/WebCore/accessibility/qt/AccessibilityObjectQt.cpp
index 8705bc0..07f13d4 100644
--- a/WebCore/accessibility/qt/AccessibilityObjectQt.cpp
+++ b/WebCore/accessibility/qt/AccessibilityObjectQt.cpp
@@ -29,9 +29,9 @@ bool AccessibilityObject::accessibilityIgnoreAttachment() const
return false;
}
-bool AccessibilityObject::accessibilityPlatformIncludesObject() const
+AccessibilityObjectPlatformInclusion AccessibilityObject::accessibilityPlatformIncludesObject() const
{
- return false;
+ return DefaultBehavior;
}
} // namespace WebCore
diff --git a/WebCore/accessibility/win/AccessibilityObjectWin.cpp b/WebCore/accessibility/win/AccessibilityObjectWin.cpp
index 2f8756a..895fc43 100644
--- a/WebCore/accessibility/win/AccessibilityObjectWin.cpp
+++ b/WebCore/accessibility/win/AccessibilityObjectWin.cpp
@@ -35,9 +35,9 @@ bool AccessibilityObject::accessibilityIgnoreAttachment() const
return false;
}
-bool AccessibilityObject::accessibilityPlatformIncludesObject() const
+AccessibilityObjectPlatformInclusion AccessibilityObject::accessibilityPlatformIncludesObject() const
{
- return false;
+ return DefaultBehavior;
}
} // namespace WebCore
diff --git a/WebCore/accessibility/wx/AccessibilityObjectWx.cpp b/WebCore/accessibility/wx/AccessibilityObjectWx.cpp
index 8705bc0..07f13d4 100644
--- a/WebCore/accessibility/wx/AccessibilityObjectWx.cpp
+++ b/WebCore/accessibility/wx/AccessibilityObjectWx.cpp
@@ -29,9 +29,9 @@ bool AccessibilityObject::accessibilityIgnoreAttachment() const
return false;
}
-bool AccessibilityObject::accessibilityPlatformIncludesObject() const
+AccessibilityObjectPlatformInclusion AccessibilityObject::accessibilityPlatformIncludesObject() const
{
- return false;
+ return DefaultBehavior;
}
} // namespace WebCore
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list