[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
atwilson at chromium.org
atwilson at chromium.org
Wed Dec 22 13:37:58 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 30f4175666be9f3a7bdd78fd6bfbc75876014023
Author: atwilson at chromium.org <atwilson at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 22 01:10:54 2010 +0000
Revert "2010-09-21 Chris Guillory <chris.guillory at google.com>"
This reverts commit 347aab9430be62b827cd1130adbfdf99d18bfaf0.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68005 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 80931f6..de3a9bb 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,34 @@
+2010-09-21 Andrew Wilson <atwilson at chromium.org>
+
+ Unreviewed, rolling out r67982.
+ http://trac.webkit.org/changeset/67982
+ https://bugs.webkit.org/show_bug.cgi?id=45156
+
+ Causes crashes on chromium testshell
+
+ * platform/chromium/accessibility/post-notification-ActiveDescendantChanged-expected.txt:
+ * platform/chromium/accessibility/post-notification-CheckedStateChanged-expected.txt:
+ * platform/chromium/accessibility/post-notification-ChildrenChanged-expected.txt:
+ * platform/chromium/accessibility/post-notification-FocusedUIElementChanged-expected.txt:
+ * platform/chromium/accessibility/post-notification-FocusedUIElementChanged.html:
+ * platform/chromium/accessibility/post-notification-LayoutComplete-expected.txt:
+ * platform/chromium/accessibility/post-notification-LayoutComplete.html:
+ * platform/chromium/accessibility/post-notification-LiveRegionChanged-expected.txt:
+ * platform/chromium/accessibility/post-notification-LoadComplete-expected.txt:
+ * platform/chromium/accessibility/post-notification-LoadComplete.html:
+ * platform/chromium/accessibility/post-notification-MenuListValueChanged-expected.txt:
+ * platform/chromium/accessibility/post-notification-RowCollapsed-expected.txt:
+ * platform/chromium/accessibility/post-notification-RowCountChanged-expected.txt:
+ * platform/chromium/accessibility/post-notification-RowExpanded-expected.txt:
+ * platform/chromium/accessibility/post-notification-ScrolledToAnchor-expected.txt:
+ * platform/chromium/accessibility/post-notification-ScrolledToAnchor.html:
+ * platform/chromium/accessibility/post-notification-SelectedChildrenChanged-expected.txt:
+ * platform/chromium/accessibility/post-notification-SelectedTextChanged-expected.txt:
+ * platform/chromium/accessibility/post-notification-SelectedTextChanged.html:
+ * platform/chromium/accessibility/post-notification-ValueChanged-expected.txt:
+ * platform/chromium/accessibility/post-notification.js:
+ (test):
+
2010-09-21 Cosmin Truta <ctruta at chromium.org>
Reviewed by James Robinson.
diff --git a/LayoutTests/platform/chromium/accessibility/post-notification-ActiveDescendantChanged-expected.txt b/LayoutTests/platform/chromium/accessibility/post-notification-ActiveDescendantChanged-expected.txt
index df356e2..2f9b708 100644
--- a/LayoutTests/platform/chromium/accessibility/post-notification-ActiveDescendantChanged-expected.txt
+++ b/LayoutTests/platform/chromium/accessibility/post-notification-ActiveDescendantChanged-expected.txt
@@ -1,6 +1,3 @@
-AccessibilityNotification - FocusedUIElementChanged - id:ul-for-ActiveDescendantChanged
-AccessibilityNotification - FocusedUIElementChanged - id:r1
AccessibilityNotification - ActiveDescendantChanged - id:ul-for-ActiveDescendantChanged
-AccessibilityNotification - LoadComplete
This tests that chromium correctly recieves the ActiveDescendantChanged notification.
li1
diff --git a/LayoutTests/platform/chromium/accessibility/post-notification-CheckedStateChanged-expected.txt b/LayoutTests/platform/chromium/accessibility/post-notification-CheckedStateChanged-expected.txt
index 34987a3..27666e4 100644
--- a/LayoutTests/platform/chromium/accessibility/post-notification-CheckedStateChanged-expected.txt
+++ b/LayoutTests/platform/chromium/accessibility/post-notification-CheckedStateChanged-expected.txt
@@ -1,3 +1,2 @@
AccessibilityNotification - CheckedStateChanged - id:checkbox-for-CheckedStateChanged
-AccessibilityNotification - LoadComplete
This tests that chromium correctly recieves the CheckedStateChanged notification.
diff --git a/LayoutTests/platform/chromium/accessibility/post-notification-ChildrenChanged-expected.txt b/LayoutTests/platform/chromium/accessibility/post-notification-ChildrenChanged-expected.txt
index 715b350..64a23e3 100644
--- a/LayoutTests/platform/chromium/accessibility/post-notification-ChildrenChanged-expected.txt
+++ b/LayoutTests/platform/chromium/accessibility/post-notification-ChildrenChanged-expected.txt
@@ -1,5 +1,3 @@
AccessibilityNotification - ChildrenChanged - id:div-for-ChildrenChanged
-AccessibilityNotification - LayoutComplete
-AccessibilityNotification - LoadComplete
This tests that chromium correctly recieves the ChildrenChanged notification.
text
diff --git a/LayoutTests/platform/chromium/accessibility/post-notification-FocusedUIElementChanged-expected.txt b/LayoutTests/platform/chromium/accessibility/post-notification-FocusedUIElementChanged-expected.txt
index c44b67a..9dfe2a4 100644
--- a/LayoutTests/platform/chromium/accessibility/post-notification-FocusedUIElementChanged-expected.txt
+++ b/LayoutTests/platform/chromium/accessibility/post-notification-FocusedUIElementChanged-expected.txt
@@ -1,4 +1 @@
-AccessibilityNotification - FocusedUIElementChanged - id:div-for-FocusedUIElementChanged
-AccessibilityNotification - LoadComplete
This tests that chromium correctly recieves the FocusedUIElementChanged notification.
-div
diff --git a/LayoutTests/platform/chromium/accessibility/post-notification-FocusedUIElementChanged.html b/LayoutTests/platform/chromium/accessibility/post-notification-FocusedUIElementChanged.html
index a568e53..4790849 100644
--- a/LayoutTests/platform/chromium/accessibility/post-notification-FocusedUIElementChanged.html
+++ b/LayoutTests/platform/chromium/accessibility/post-notification-FocusedUIElementChanged.html
@@ -2,15 +2,13 @@
<head>
<script>
function testNotification() {
- document.body.children[0].focus();
+ // Not sent to the chromium port - see handleFocusedUIElementChanged
}
</script>
</head>
<body onload="test()">
This tests that chromium correctly recieves the FocusedUIElementChanged notification.
-<div id="div-for-FocusedUIElementChanged" aria-help="div-for-FocusedUIElementChanged" tabindex="-1">div</div>
-
<script type="text/javascript" src="post-notification.js"></script>
</body>
</html>
diff --git a/LayoutTests/platform/chromium/accessibility/post-notification-LayoutComplete-expected.txt b/LayoutTests/platform/chromium/accessibility/post-notification-LayoutComplete-expected.txt
index ac6754c..da109f3 100644
--- a/LayoutTests/platform/chromium/accessibility/post-notification-LayoutComplete-expected.txt
+++ b/LayoutTests/platform/chromium/accessibility/post-notification-LayoutComplete-expected.txt
@@ -1,3 +1 @@
-AccessibilityNotification - LayoutComplete
-AccessibilityNotification - LoadComplete
This tests that chromium correctly recieves the LayoutComplete notification.
diff --git a/LayoutTests/platform/chromium/accessibility/post-notification-LayoutComplete.html b/LayoutTests/platform/chromium/accessibility/post-notification-LayoutComplete.html
index 04c6d02..10287f7 100644
--- a/LayoutTests/platform/chromium/accessibility/post-notification-LayoutComplete.html
+++ b/LayoutTests/platform/chromium/accessibility/post-notification-LayoutComplete.html
@@ -2,16 +2,13 @@
<head>
<script>
function testNotification() {
- // Triger layout operation.
- document.body.children[0].style.width = 500;
+ // Mac specific
}
</script>
</head>
<body onload="test()">
This tests that chromium correctly recieves the LayoutComplete notification.
-<div id="div-for-LayoutComplete" aria-help="div-for-LayoutComplete"><div></div></div>
-
<script type="text/javascript" src="post-notification.js"></script>
</body>
</html>
diff --git a/LayoutTests/platform/chromium/accessibility/post-notification-LiveRegionChanged-expected.txt b/LayoutTests/platform/chromium/accessibility/post-notification-LiveRegionChanged-expected.txt
index c8e61c1..e6a4c08 100644
--- a/LayoutTests/platform/chromium/accessibility/post-notification-LiveRegionChanged-expected.txt
+++ b/LayoutTests/platform/chromium/accessibility/post-notification-LiveRegionChanged-expected.txt
@@ -1,3 +1,2 @@
AccessibilityNotification - LiveRegionChanged - id:ul-for-LiveRegionChanged
-AccessibilityNotification - LoadComplete
This tests that chromium correctly recieves the LiveRegionChanged notification.
diff --git a/LayoutTests/platform/chromium/accessibility/post-notification-LoadComplete-expected.txt b/LayoutTests/platform/chromium/accessibility/post-notification-LoadComplete-expected.txt
index 750eb42..082172b 100644
--- a/LayoutTests/platform/chromium/accessibility/post-notification-LoadComplete-expected.txt
+++ b/LayoutTests/platform/chromium/accessibility/post-notification-LoadComplete-expected.txt
@@ -1,2 +1 @@
-AccessibilityNotification - LoadComplete
This tests that chromium correctly recieves the LoadComplete notification.
diff --git a/LayoutTests/platform/chromium/accessibility/post-notification-LoadComplete.html b/LayoutTests/platform/chromium/accessibility/post-notification-LoadComplete.html
index 9c8fecf..df68f19 100644
--- a/LayoutTests/platform/chromium/accessibility/post-notification-LoadComplete.html
+++ b/LayoutTests/platform/chromium/accessibility/post-notification-LoadComplete.html
@@ -1,7 +1,9 @@
<html>
<head>
<script>
- function testNotification() { }
+ function testNotification() {
+ // Mac specific
+ }
</script>
</head>
<body onload="test()">
diff --git a/LayoutTests/platform/chromium/accessibility/post-notification-MenuListValueChanged-expected.txt b/LayoutTests/platform/chromium/accessibility/post-notification-MenuListValueChanged-expected.txt
index 2f3e420..368b614 100644
--- a/LayoutTests/platform/chromium/accessibility/post-notification-MenuListValueChanged-expected.txt
+++ b/LayoutTests/platform/chromium/accessibility/post-notification-MenuListValueChanged-expected.txt
@@ -1,3 +1,2 @@
AccessibilityNotification - MenuListValueChanged - id:select-for-MenuListValueChanged
-AccessibilityNotification - LoadComplete
This tests that chromium correctly recieves the MenuListValueChanged notification.
diff --git a/LayoutTests/platform/chromium/accessibility/post-notification-RowCollapsed-expected.txt b/LayoutTests/platform/chromium/accessibility/post-notification-RowCollapsed-expected.txt
index 7cc70e1..e82794f 100644
--- a/LayoutTests/platform/chromium/accessibility/post-notification-RowCollapsed-expected.txt
+++ b/LayoutTests/platform/chromium/accessibility/post-notification-RowCollapsed-expected.txt
@@ -1,3 +1,2 @@
AccessibilityNotification - RowCollapsed - id:div-for-RowCollapsed
-AccessibilityNotification - LoadComplete
This tests that chromium correctly recieves the RowCollapsed notification.
diff --git a/LayoutTests/platform/chromium/accessibility/post-notification-RowCountChanged-expected.txt b/LayoutTests/platform/chromium/accessibility/post-notification-RowCountChanged-expected.txt
index 850f63b..3710548 100644
--- a/LayoutTests/platform/chromium/accessibility/post-notification-RowCountChanged-expected.txt
+++ b/LayoutTests/platform/chromium/accessibility/post-notification-RowCountChanged-expected.txt
@@ -1,3 +1,2 @@
AccessibilityNotification - RowCountChanged - id:div-for-RowCountChanged
-AccessibilityNotification - LoadComplete
This tests that chromium correctly recieves the RowCountChanged notification.
diff --git a/LayoutTests/platform/chromium/accessibility/post-notification-RowExpanded-expected.txt b/LayoutTests/platform/chromium/accessibility/post-notification-RowExpanded-expected.txt
index 5274cb0..907d66c 100644
--- a/LayoutTests/platform/chromium/accessibility/post-notification-RowExpanded-expected.txt
+++ b/LayoutTests/platform/chromium/accessibility/post-notification-RowExpanded-expected.txt
@@ -1,3 +1,2 @@
AccessibilityNotification - RowExpanded - id:div-for-RowExpanded
-AccessibilityNotification - LoadComplete
This tests that chromium correctly recieves the RowExpanded notification.
diff --git a/LayoutTests/platform/chromium/accessibility/post-notification-ScrolledToAnchor-expected.txt b/LayoutTests/platform/chromium/accessibility/post-notification-ScrolledToAnchor-expected.txt
index 4836d9f..0499099 100644
--- a/LayoutTests/platform/chromium/accessibility/post-notification-ScrolledToAnchor-expected.txt
+++ b/LayoutTests/platform/chromium/accessibility/post-notification-ScrolledToAnchor-expected.txt
@@ -1,6 +1 @@
-AccessibilityNotification - ScrolledToAnchor - id:a-for-ScrolledToAnchor
-AccessibilityNotification - ChildrenChanged
-AccessibilityNotification - ChildrenChanged
-AccessibilityNotification - LayoutComplete
-AccessibilityNotification - LoadComplete
This tests that chromium correctly recieves the ScrolledToAnchor notification.
diff --git a/LayoutTests/platform/chromium/accessibility/post-notification-ScrolledToAnchor.html b/LayoutTests/platform/chromium/accessibility/post-notification-ScrolledToAnchor.html
index ae16f1a..c1f1c6f 100644
--- a/LayoutTests/platform/chromium/accessibility/post-notification-ScrolledToAnchor.html
+++ b/LayoutTests/platform/chromium/accessibility/post-notification-ScrolledToAnchor.html
@@ -2,18 +2,13 @@
<head>
<script>
function testNotification() {
- window.location.href = '#a-for-ScrolledToAnchor';
-
- // Remove element to prevent another scroll notification. Appears to repro when test is run in isolation.
- document.body.removeChild(document.body.children[0]);
+ // Not sent to the chromium port - see handleScrolledToAnchor
}
</script>
</head>
<body onload="test()">
This tests that chromium correctly recieves the ScrolledToAnchor notification.
-<a id="a-for-ScrolledToAnchor" aria-help="a-for-ScrolledToAnchor"></a>
-
<script type="text/javascript" src="post-notification.js"></script>
</body>
</html>
diff --git a/LayoutTests/platform/chromium/accessibility/post-notification-SelectedChildrenChanged-expected.txt b/LayoutTests/platform/chromium/accessibility/post-notification-SelectedChildrenChanged-expected.txt
index e403387..5fecca3 100644
--- a/LayoutTests/platform/chromium/accessibility/post-notification-SelectedChildrenChanged-expected.txt
+++ b/LayoutTests/platform/chromium/accessibility/post-notification-SelectedChildrenChanged-expected.txt
@@ -1,3 +1,2 @@
AccessibilityNotification - SelectedChildrenChanged - id:select-for-SelectedChildrenChanged
-AccessibilityNotification - LoadComplete
This tests that chromium correctly recieves the SelectedChildrenChanged notification.
diff --git a/LayoutTests/platform/chromium/accessibility/post-notification-SelectedTextChanged-expected.txt b/LayoutTests/platform/chromium/accessibility/post-notification-SelectedTextChanged-expected.txt
index 2ac09ff..c2e94fc 100644
--- a/LayoutTests/platform/chromium/accessibility/post-notification-SelectedTextChanged-expected.txt
+++ b/LayoutTests/platform/chromium/accessibility/post-notification-SelectedTextChanged-expected.txt
@@ -1,4 +1 @@
-AccessibilityNotification - FocusedUIElementChanged - id:text-for-SelectedTextChanged
-AccessibilityNotification - SelectedTextChanged - id:text-for-SelectedTextChanged
-AccessibilityNotification - LoadComplete
-This tests that chromium correctly recieves the SelectedTextChanged notification.
+This tests that chromium correctly recieves the SelectedTextChanged notification.
diff --git a/LayoutTests/platform/chromium/accessibility/post-notification-SelectedTextChanged.html b/LayoutTests/platform/chromium/accessibility/post-notification-SelectedTextChanged.html
index bf4e414..60819bb 100644
--- a/LayoutTests/platform/chromium/accessibility/post-notification-SelectedTextChanged.html
+++ b/LayoutTests/platform/chromium/accessibility/post-notification-SelectedTextChanged.html
@@ -2,15 +2,13 @@
<head>
<script>
function testNotification() {
- document.getElementById("text-for-SelectedTextChanged").select();
+ // Mac specific - see notifyAccessibilityForSelectionChange
}
</script>
</head>
<body onload="test()">
This tests that chromium correctly recieves the SelectedTextChanged notification.
-<input id="text-for-SelectedTextChanged" aria-help="text-for-SelectedTextChanged" value="text" type=text />
-
<script type="text/javascript" src="post-notification.js"></script>
</body>
</html>
diff --git a/LayoutTests/platform/chromium/accessibility/post-notification-ValueChanged-expected.txt b/LayoutTests/platform/chromium/accessibility/post-notification-ValueChanged-expected.txt
index 8cebff2..e226cff 100644
--- a/LayoutTests/platform/chromium/accessibility/post-notification-ValueChanged-expected.txt
+++ b/LayoutTests/platform/chromium/accessibility/post-notification-ValueChanged-expected.txt
@@ -1,3 +1,2 @@
AccessibilityNotification - ValueChanged - id:text-for-ValueChanged
-AccessibilityNotification - LoadComplete
This tests that chromium correctly recieves the ValueChanged notification.
diff --git a/LayoutTests/platform/chromium/accessibility/post-notification.js b/LayoutTests/platform/chromium/accessibility/post-notification.js
index 3add977..af0336b 100644
--- a/LayoutTests/platform/chromium/accessibility/post-notification.js
+++ b/LayoutTests/platform/chromium/accessibility/post-notification.js
@@ -21,5 +21,5 @@ function test() {
testNotification();
// Use setTimeout so that asynchronous accessibility notifications can be processed.
- setTimeout("setTimeout(testDone, 0);", 0);
+ setTimeout(testDone, 0);
}
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 26c70e7..1f4f913 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,25 @@
+2010-09-21 Andrew Wilson <atwilson at chromium.org>
+
+ Unreviewed, rolling out r67982.
+ http://trac.webkit.org/changeset/67982
+ https://bugs.webkit.org/show_bug.cgi?id=45156
+
+ Causes crashes on chromium testshell
+
+ * WebCore.gypi:
+ * accessibility/chromium/AXObjectCacheChromium.cpp:
+ (WebCore::AXObjectCache::postPlatformNotification):
+ (WebCore::AXObjectCache::handleFocusedUIElementChanged):
+ (WebCore::AXObjectCache::handleScrolledToAnchor):
+ * dom/Document.cpp:
+ (WebCore::Document::implicitClose):
+ (WebCore::Document::setFocusedNode):
+ * editing/SelectionController.h:
+ * editing/chromium/SelectionControllerChromium.cpp: Removed.
+ * page/FrameView.cpp:
+ (WebCore::FrameView::layout):
+ * page/chromium/ChromeClientChromium.h:
+
2010-09-21 Cosmin Truta <ctruta at chromium.org>
Reviewed by James Robinson.
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index da57352..a7b093b 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -1333,7 +1333,6 @@
'dom/XMLDocumentParserQt.cpp',
'editing/android/EditorAndroid.cpp',
'editing/chromium/EditorChromium.cpp',
- 'editing/chromium/SelectionControllerChromium.cpp',
'editing/mac/EditorMac.mm',
'editing/mac/SelectionControllerMac.mm',
'editing/qt/EditorQt.cpp',
diff --git a/WebCore/accessibility/chromium/AXObjectCacheChromium.cpp b/WebCore/accessibility/chromium/AXObjectCacheChromium.cpp
index aae00e9..3ff0837 100644
--- a/WebCore/accessibility/chromium/AXObjectCacheChromium.cpp
+++ b/WebCore/accessibility/chromium/AXObjectCacheChromium.cpp
@@ -63,17 +63,15 @@ void AXObjectCache::postPlatformNotification(AccessibilityObject* obj, AXNotific
if (!client)
return;
+ // TODO: Remove after the new postAccessibilityNotification is used downstream.
switch (notification) {
- case AXActiveDescendantChanged:
- if (!obj->document()->focusedNode() || (obj->node() != obj->document()->focusedNode()))
- break;
-
- // Calling handleFocusedUIElementChanged will focus the new active
- // descendant and send the AXFocusedUIElementChanged notification.
- handleFocusedUIElementChanged(0, obj->document()->focusedNode()->renderer());
- break;
case AXCheckedStateChanged:
+ client->didChangeAccessibilityObjectState(obj);
+ break;
case AXChildrenChanged:
+ client->didChangeAccessibilityObjectChildren(obj);
+ break;
+ case AXActiveDescendantChanged:
case AXFocusedUIElementChanged:
case AXLayoutComplete:
case AXLiveRegionChanged:
@@ -92,27 +90,12 @@ void AXObjectCache::postPlatformNotification(AccessibilityObject* obj, AXNotific
client->postAccessibilityNotification(obj, notification);
}
-void AXObjectCache::handleFocusedUIElementChanged(RenderObject*, RenderObject* newFocusedRenderer)
+void AXObjectCache::handleFocusedUIElementChanged(RenderObject*, RenderObject*)
{
- if (!newFocusedRenderer)
- return;
-
- Page* page = newFocusedRenderer->document()->page();
- if (!page)
- return;
-
- AccessibilityObject* focusedObject = focusedUIElementForPage(page);
- if (!focusedObject)
- return;
-
- postPlatformNotification(focusedObject, AXFocusedUIElementChanged);
}
-void AXObjectCache::handleScrolledToAnchor(const Node* anchorNode)
+void AXObjectCache::handleScrolledToAnchor(const Node*)
{
- // The anchor node may not be accessible. Post the notification for the
- // first accessible object.
- postPlatformNotification(AccessibilityObject::firstAccessibleObjectFromNode(anchorNode), AXScrolledToAnchor);
}
} // namespace WebCore
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index 5b40528..194d4e1 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -2051,7 +2051,7 @@ void Document::implicitClose()
view()->layout();
}
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
+#if PLATFORM(MAC)
if (f && renderObject && this == topDocument() && AXObjectCache::accessibilityEnabled()) {
// The AX cache may have been cleared at this point, but we need to make sure it contains an
// AX object to send the notification to. getOrCreate will make sure that an valid AX object
@@ -3165,7 +3165,7 @@ bool Document::setFocusedNode(PassRefPtr<Node> newFocusedNode)
}
}
-#if PLATFORM(MAC) || PLATFORM(WIN) || PLATFORM(GTK) || PLATFORM(CHROMIUM)
+#if ((PLATFORM(MAC) || PLATFORM(WIN)) && !PLATFORM(CHROMIUM)) || PLATFORM(GTK)
if (!focusChangeBlocked && m_focusedNode && AXObjectCache::accessibilityEnabled()) {
RenderObject* oldFocusedRenderer = 0;
RenderObject* newFocusedRenderer = 0;
diff --git a/WebCore/editing/SelectionController.h b/WebCore/editing/SelectionController.h
index e5fe71b..34d6ed9 100644
--- a/WebCore/editing/SelectionController.h
+++ b/WebCore/editing/SelectionController.h
@@ -247,7 +247,7 @@ inline void SelectionController::setTypingStyle(PassRefPtr<CSSMutableStyleDeclar
m_typingStyle = style;
}
-#if !(PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(CHROMIUM))
+#if !(PLATFORM(MAC) || PLATFORM(GTK))
inline void SelectionController::notifyAccessibilityForSelectionChange()
{
}
diff --git a/WebCore/editing/chromium/SelectionControllerChromium.cpp b/WebCore/editing/chromium/SelectionControllerChromium.cpp
deleted file mode 100644
index d627d9b..0000000
--- a/WebCore/editing/chromium/SelectionControllerChromium.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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 "SelectionController.h"
-
-#include "AXObjectCache.h"
-#include "Frame.h"
-
-namespace WebCore {
-
-void SelectionController::notifyAccessibilityForSelectionChange()
-{
- // FIXME: Support editable text in chromium.
- if (AXObjectCache::accessibilityEnabled() && m_selection.start().isNotNull() && m_selection.end().isNotNull()) {
- Document* document = m_frame->document();
- document->axObjectCache()->postNotification(m_selection.start().node()->renderer(), AXObjectCache::AXSelectedTextChanged, false);
- }
-}
-
-} // namespace WebCore
diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp
index 53cf356..279e651 100644
--- a/WebCore/page/FrameView.cpp
+++ b/WebCore/page/FrameView.cpp
@@ -799,7 +799,7 @@ void FrameView::layout(bool allowSubtree)
m_layoutCount++;
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
+#if PLATFORM(MAC)
if (AXObjectCache::accessibilityEnabled())
root->document()->axObjectCache()->postNotification(root, AXObjectCache::AXLayoutComplete, true);
#endif
diff --git a/WebCore/page/chromium/ChromeClientChromium.h b/WebCore/page/chromium/ChromeClientChromium.h
index 4505948..44e005f 100644
--- a/WebCore/page/chromium/ChromeClientChromium.h
+++ b/WebCore/page/chromium/ChromeClientChromium.h
@@ -54,6 +54,12 @@ public:
// Notifies the client a popup was closed.
virtual void popupClosed(PopupContainer* popupContainer) = 0;
+ // Notifies embedder that the state of an accessibility object has changed.
+ virtual void didChangeAccessibilityObjectState(AccessibilityObject*) = 0;
+
+ // Notified embedder that the children of an accessibility object has changed.
+ virtual void didChangeAccessibilityObjectChildren(AccessibilityObject*) = 0;
+
// Notifies embedder about an accessibility notification.
virtual void postAccessibilityNotification(AccessibilityObject*, AXObjectCache::AXNotification) = 0;
};
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 28f84ec..1971f4e 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,22 @@
+2010-09-21 Andrew Wilson <atwilson at chromium.org>
+
+ Unreviewed, rolling out r67982.
+ http://trac.webkit.org/changeset/67982
+ https://bugs.webkit.org/show_bug.cgi?id=45156
+
+ Causes crashes on chromium testshell
+
+ * public/WebAccessibilityCache.h:
+ * public/WebViewClient.h:
+ (WebKit::WebViewClient::didChangeAccessibilityObjectState):
+ (WebKit::WebViewClient::didChangeAccessibilityObjectChildren):
+ * src/ChromeClientImpl.cpp:
+ (WebKit::ChromeClientImpl::focusedNodeChanged):
+ (WebKit::ChromeClientImpl::didChangeAccessibilityObjectState):
+ (WebKit::ChromeClientImpl::didChangeAccessibilityObjectChildren):
+ * src/ChromeClientImpl.h:
+ * src/WebAccessibilityCache.cpp:
+
2010-09-21 Kenneth Russell <kbr at google.com>
Reviewed by James Robinson.
diff --git a/WebKit/chromium/public/WebAccessibilityCache.h b/WebKit/chromium/public/WebAccessibilityCache.h
index c9aec1f..52e438c 100644
--- a/WebKit/chromium/public/WebAccessibilityCache.h
+++ b/WebKit/chromium/public/WebAccessibilityCache.h
@@ -45,7 +45,6 @@ public:
WEBKIT_API static WebAccessibilityCache* create();
WEBKIT_API static void enableAccessibility();
- WEBKIT_API static bool accessibilityEnabled();
virtual void initialize(WebView* view) = 0;
virtual bool isInitialized() const = 0;
diff --git a/WebKit/chromium/public/WebViewClient.h b/WebKit/chromium/public/WebViewClient.h
index 3b0e47a..f686419 100644
--- a/WebKit/chromium/public/WebViewClient.h
+++ b/WebKit/chromium/public/WebViewClient.h
@@ -276,6 +276,12 @@ public:
// accessibility object.
virtual void focusAccessibilityObject(const WebAccessibilityObject&) { }
+ // Notifies embedder that the state of an accessibility object has changed.
+ virtual void didChangeAccessibilityObjectState(const WebAccessibilityObject&) { }
+
+ // Notifies embedder that the children of an accessibility object has changed.
+ virtual void didChangeAccessibilityObjectChildren(const WebAccessibilityObject&) { }
+
// Notifies embedder about an accessibility notification.
virtual void postAccessibilityNotification(const WebAccessibilityObject&, WebAccessibilityNotification) { }
diff --git a/WebKit/chromium/src/ChromeClientImpl.cpp b/WebKit/chromium/src/ChromeClientImpl.cpp
index 5f702e0..744b3ac 100644
--- a/WebKit/chromium/src/ChromeClientImpl.cpp
+++ b/WebKit/chromium/src/ChromeClientImpl.cpp
@@ -256,9 +256,7 @@ void ChromeClientImpl::focusedNodeChanged(Node* node)
if (!document) {
ASSERT_NOT_REACHED();
return;
- }
-
- // TODO: Remove once the FocusedUIElementChanged notification is handled downstream.
+ }
if (document && document->axObjectCache()->accessibilityEnabled()) {
// Retrieve the focused AccessibilityObject.
AccessibilityObject* focusedAccObj =
@@ -761,6 +759,20 @@ void ChromeClientImpl::getPopupMenuInfo(PopupContainer* popupContainer,
info->rightAligned = popupContainer->menuStyle().textDirection() == RTL;
}
+void ChromeClientImpl::didChangeAccessibilityObjectState(AccessibilityObject* obj)
+{
+ // Alert assistive technology about the accessibility object state change
+ if (obj)
+ m_webView->client()->didChangeAccessibilityObjectState(WebAccessibilityObject(obj));
+}
+
+void ChromeClientImpl::didChangeAccessibilityObjectChildren(WebCore::AccessibilityObject* obj)
+{
+ // Alert assistive technology about the accessibility object children change
+ if (obj)
+ m_webView->client()->didChangeAccessibilityObjectChildren(WebAccessibilityObject(obj));
+}
+
void ChromeClientImpl::postAccessibilityNotification(AccessibilityObject* obj, AXObjectCache::AXNotification notification)
{
// Alert assistive technology about the accessibility object notification.
diff --git a/WebKit/chromium/src/ChromeClientImpl.h b/WebKit/chromium/src/ChromeClientImpl.h
index 02f1de6..fbaac87 100644
--- a/WebKit/chromium/src/ChromeClientImpl.h
+++ b/WebKit/chromium/src/ChromeClientImpl.h
@@ -166,6 +166,8 @@ public:
const WebCore::IntRect& bounds,
bool handleExternally);
virtual void popupClosed(WebCore::PopupContainer* popupContainer);
+ virtual void didChangeAccessibilityObjectState(WebCore::AccessibilityObject*);
+ virtual void didChangeAccessibilityObjectChildren(WebCore::AccessibilityObject*);
virtual void postAccessibilityNotification(WebCore::AccessibilityObject*, WebCore::AXObjectCache::AXNotification);
// ChromeClientImpl:
diff --git a/WebKit/chromium/src/WebAccessibilityCache.cpp b/WebKit/chromium/src/WebAccessibilityCache.cpp
index ab8f814..8a3f697 100644
--- a/WebKit/chromium/src/WebAccessibilityCache.cpp
+++ b/WebKit/chromium/src/WebAccessibilityCache.cpp
@@ -42,9 +42,4 @@ void WebAccessibilityCache::enableAccessibility()
AXObjectCache::enableAccessibility();
}
-bool WebAccessibilityCache::accessibilityEnabled()
-{
- return AXObjectCache::accessibilityEnabled();
-}
-
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list