[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8
dglazkov at chromium.org
dglazkov at chromium.org
Wed Feb 10 22:18:08 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 58fd1a373399e250c1c16f9a89716f0ef7446708
Author: dglazkov at chromium.org <dglazkov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Feb 6 20:18:51 2010 +0000
2010-02-06 Dimitri Glazkov <dglazkov at chromium.org>
No review, rolling out r54364.
http://trac.webkit.org/changeset/54364
https://bugs.webkit.org/show_bug.cgi?id=34464
Introduced asserts in layout tests, needs more testing
locally.
* accessibility/chromium/AXObjectCacheChromium.cpp:
(WebCore::AXObjectCache::postPlatformNotification):
* page/chromium/ChromeClientChromium.h:
2010-02-06 Dimitri Glazkov <dglazkov at chromium.org>
No review, rolling out r54364.
http://trac.webkit.org/changeset/54364
https://bugs.webkit.org/show_bug.cgi?id=34464
Introduced asserts in layout tests, needs more testing
locally.
* public/WebViewClient.h:
* src/ChromeClientImpl.cpp:
* src/ChromeClientImpl.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54466 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8a0e851..b8c9b32 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,18 @@
2010-02-06 Dimitri Glazkov <dglazkov at chromium.org>
+ No review, rolling out r54364.
+ http://trac.webkit.org/changeset/54364
+ https://bugs.webkit.org/show_bug.cgi?id=34464
+
+ Introduced asserts in layout tests, needs more testing
+ locally.
+
+ * accessibility/chromium/AXObjectCacheChromium.cpp:
+ (WebCore::AXObjectCache::postPlatformNotification):
+ * page/chromium/ChromeClientChromium.h:
+
+2010-02-06 Dimitri Glazkov <dglazkov at chromium.org>
+
Reviewed by Adam Barth.
Using inlines and function-level statics don't mix, according to gcc.
diff --git a/WebCore/accessibility/chromium/AXObjectCacheChromium.cpp b/WebCore/accessibility/chromium/AXObjectCacheChromium.cpp
index 37769b1..a97dfe2 100644
--- a/WebCore/accessibility/chromium/AXObjectCacheChromium.cpp
+++ b/WebCore/accessibility/chromium/AXObjectCacheChromium.cpp
@@ -26,22 +26,11 @@
#include "config.h"
#include "AXObjectCache.h"
+
#include "AccessibilityObject.h"
-#include "Chrome.h"
-#include "ChromeClientChromium.h"
-#include "FrameView.h"
namespace WebCore {
-static ChromeClientChromium* toChromeClientChromium(FrameView* view)
-{
- Page* page = view->frame() ? view->frame()->page() : 0;
- if (!page)
- return 0;
-
- return static_cast<ChromeClientChromium*>(page->chrome()->client());
-}
-
void AXObjectCache::detachWrapper(AccessibilityObject* obj)
{
// In Chromium, AccessibilityObjects are wrapped lazily.
@@ -54,14 +43,8 @@ void AXObjectCache::attachWrapper(AccessibilityObject*)
// In Chromium, AccessibilityObjects are wrapped lazily.
}
-void AXObjectCache::postPlatformNotification(AccessibilityObject* obj, AXNotification notification)
+void AXObjectCache::postPlatformNotification(AccessibilityObject*, AXNotification)
{
- if (!obj || !obj->documentFrameView() || notification != AXCheckedStateChanged)
- return;
-
- ChromeClientChromium* client = toChromeClientChromium(obj->documentFrameView());
- if (client)
- client->didChangeAccessibilityObjectState(obj);
}
void AXObjectCache::handleFocusedUIElementChanged(RenderObject*, RenderObject*)
diff --git a/WebCore/page/chromium/ChromeClientChromium.h b/WebCore/page/chromium/ChromeClientChromium.h
index c83ff26..f6689d3 100644
--- a/WebCore/page/chromium/ChromeClientChromium.h
+++ b/WebCore/page/chromium/ChromeClientChromium.h
@@ -35,25 +35,20 @@
#include <wtf/Forward.h>
namespace WebCore {
-
-class AccessibilityObject;
-class IntRect;
-class PopupContainer;
-
-// Contains Chromium-specific extensions to the ChromeClient. Only put
-// things here that don't make sense for other ports.
-class ChromeClientChromium : public ChromeClient {
-public:
- // Notifies the client of a new popup widget. The client should place
- // and size the widget with the given bounds, relative to the screen.
- // If handleExternal is true, then drawing and input handling for the
- // popup will be handled by the external embedder.
- virtual void popupOpened(PopupContainer* popupContainer, const IntRect& bounds,
- bool focusOnShow, bool handleExternal) = 0;
-
- // Notifies embedder that the state of an accessibility object has changed.
- virtual void didChangeAccessibilityObjectState(AccessibilityObject*) = 0;
-};
+ class IntRect;
+ class PopupContainer;
+
+ // Contains Chromium-specific extensions to the ChromeClient. Only put
+ // things here that don't make sense for other ports.
+ class ChromeClientChromium : public ChromeClient {
+ public:
+ // Notifies the client of a new popup widget. The client should place
+ // and size the widget with the given bounds, relative to the screen.
+ // If handleExternal is true, then drawing and input handling for the
+ // popup will be handled by the external embedder.
+ virtual void popupOpened(PopupContainer* popupContainer, const IntRect& bounds,
+ bool focusOnShow, bool handleExternal) = 0;
+ };
} // namespace WebCore
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index c2245d1..b022b17 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-06 Dimitri Glazkov <dglazkov at chromium.org>
+
+ No review, rolling out r54364.
+ http://trac.webkit.org/changeset/54364
+ https://bugs.webkit.org/show_bug.cgi?id=34464
+
+ Introduced asserts in layout tests, needs more testing
+ locally.
+
+ * public/WebViewClient.h:
+ * src/ChromeClientImpl.cpp:
+ * src/ChromeClientImpl.h:
+
2010-02-05 James Hawkins <jhawkins at chromium.org>
Reviewed by David Levin.
diff --git a/WebKit/chromium/public/WebViewClient.h b/WebKit/chromium/public/WebViewClient.h
index 4d272bb..964d382 100644
--- a/WebKit/chromium/public/WebViewClient.h
+++ b/WebKit/chromium/public/WebViewClient.h
@@ -252,9 +252,6 @@ public:
// accessibility object.
virtual void focusAccessibilityObject(const WebAccessibilityObject&) { }
- // Notifies embedder that the state of an accessibility object has changed.
- virtual void didChangeAccessibilityObjectState(const WebAccessibilityObject&) { }
-
// Developer tools -----------------------------------------------------
diff --git a/WebKit/chromium/src/ChromeClientImpl.cpp b/WebKit/chromium/src/ChromeClientImpl.cpp
index a69e470..9079094 100644
--- a/WebKit/chromium/src/ChromeClientImpl.cpp
+++ b/WebKit/chromium/src/ChromeClientImpl.cpp
@@ -659,13 +659,6 @@ void ChromeClientImpl::getPopupMenuInfo(PopupContainer* popupContainer,
info->items.swap(outputItems);
}
-void ChromeClientImpl::didChangeAccessibilityObjectState(AccessibilityObject* obj)
-{
- // Alert assistive technology about the accessibility object state change
- if (obj)
- m_webView->client()->didChangeAccessibilityObjectState(WebAccessibilityObject(obj));
-}
-
#if ENABLE(NOTIFICATIONS)
NotificationPresenter* ChromeClientImpl::notificationPresenter() const
{
diff --git a/WebKit/chromium/src/ChromeClientImpl.h b/WebKit/chromium/src/ChromeClientImpl.h
index 9e8c2e3..5a1e9cc 100644
--- a/WebKit/chromium/src/ChromeClientImpl.h
+++ b/WebKit/chromium/src/ChromeClientImpl.h
@@ -34,7 +34,6 @@
#include "ChromeClientChromium.h"
namespace WebCore {
-class AccessibilityObject;
class HTMLParserQuirks;
class PopupContainer;
class SecurityOrigin;
@@ -133,7 +132,6 @@ public:
const WebCore::IntRect& bounds,
bool activatable,
bool handleExternally);
- virtual void didChangeAccessibilityObjectState(WebCore::AccessibilityObject*);
// ChromeClientImpl:
void setCursor(const WebCursorInfo& cursor);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list