[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
commit-queue at webkit.org
commit-queue at webkit.org
Sun Feb 20 23:11:24 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 33ddd998a9c3fc82654fba4933210d72899d0edb
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 18 21:02:31 2011 +0000
2011-01-18 Adam Klein <adamk at chromium.org>
Reviewed by Darin Fisher.
[Chromium] Replace ChromiumBridge::widgetSetCursor with ChromeClient::setCursor
https://bugs.webkit.org/show_bug.cgi?id=42236
* platform/chromium/ChromiumBridge.h:
* platform/chromium/WidgetChromium.cpp:
(WebCore::Widget::setCursor):
2011-01-18 Adam Klein <adamk at chromium.org>
Reviewed by Darin Fisher.
[Chromium] Replace ChromiumBridge::widgetSetCursor with ChromeClient::setCursor
https://bugs.webkit.org/show_bug.cgi?id=42236
* src/ChromeClientImpl.cpp:
(WebKit::ChromeClientImpl::setCursor):
* src/ChromeClientImpl.h:
* src/ChromiumBridge.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76048 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 10cafb9..192fc29 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-18 Adam Klein <adamk at chromium.org>
+
+ Reviewed by Darin Fisher.
+
+ [Chromium] Replace ChromiumBridge::widgetSetCursor with ChromeClient::setCursor
+ https://bugs.webkit.org/show_bug.cgi?id=42236
+
+ * platform/chromium/ChromiumBridge.h:
+ * platform/chromium/WidgetChromium.cpp:
+ (WebCore::Widget::setCursor):
+
2011-01-18 Chris Fleizach <cfleizach at apple.com>
Reviewed by Darin Adler.
diff --git a/Source/WebCore/platform/chromium/ChromiumBridge.h b/Source/WebCore/platform/chromium/ChromiumBridge.h
index d3b8528..f104b2c 100644
--- a/Source/WebCore/platform/chromium/ChromiumBridge.h
+++ b/Source/WebCore/platform/chromium/ChromiumBridge.h
@@ -346,9 +346,6 @@ namespace WebCore {
static LinkHash visitedLinkHash(const UChar* url, unsigned length);
static LinkHash visitedLinkHash(const KURL& base, const AtomicString& attributeURL);
static bool isLinkVisited(LinkHash);
-
- // Widget -------------------------------------------------------------
- static void widgetSetCursor(Widget*, const Cursor&);
};
} // namespace WebCore
diff --git a/Source/WebCore/platform/chromium/WidgetChromium.cpp b/Source/WebCore/platform/chromium/WidgetChromium.cpp
index 1b7fef4..ac52244 100644
--- a/Source/WebCore/platform/chromium/WidgetChromium.cpp
+++ b/Source/WebCore/platform/chromium/WidgetChromium.cpp
@@ -32,7 +32,8 @@
#include "Widget.h"
#include "Assertions.h"
-#include "ChromiumBridge.h"
+#include "HostWindow.h"
+#include "ScrollView.h"
namespace WebCore {
@@ -56,7 +57,9 @@ void Widget::hide()
void Widget::setCursor(const Cursor& cursor)
{
- ChromiumBridge::widgetSetCursor(this, cursor);
+ ScrollView* view = root();
+ if (view)
+ view->hostWindow()->setCursor(cursor);
}
void Widget::paint(GraphicsContext*, const IntRect&)
diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index a0e0410..0fef902 100644
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-18 Adam Klein <adamk at chromium.org>
+
+ Reviewed by Darin Fisher.
+
+ [Chromium] Replace ChromiumBridge::widgetSetCursor with ChromeClient::setCursor
+ https://bugs.webkit.org/show_bug.cgi?id=42236
+
+ * src/ChromeClientImpl.cpp:
+ (WebKit::ChromeClientImpl::setCursor):
+ * src/ChromeClientImpl.h:
+ * src/ChromiumBridge.cpp:
+
2011-01-17 Nico Weber <thakis at chromium.org>
Unreviewed.
diff --git a/Source/WebKit/chromium/src/ChromeClientImpl.cpp b/Source/WebKit/chromium/src/ChromeClientImpl.cpp
index 1a984c1..826c3b8 100644
--- a/Source/WebKit/chromium/src/ChromeClientImpl.cpp
+++ b/Source/WebKit/chromium/src/ChromeClientImpl.cpp
@@ -700,6 +700,11 @@ void ChromeClientImpl::popupClosed(WebCore::PopupContainer* popupContainer)
m_webView->popupClosed(popupContainer);
}
+void ChromeClientImpl::setCursor(const WebCore::Cursor& cursor)
+{
+ setCursor(WebCursorInfo(cursor));
+}
+
void ChromeClientImpl::setCursor(const WebCursorInfo& cursor)
{
if (m_webView->client())
diff --git a/Source/WebKit/chromium/src/ChromeClientImpl.h b/Source/WebKit/chromium/src/ChromeClientImpl.h
index b024bc0..a093f09 100644
--- a/Source/WebKit/chromium/src/ChromeClientImpl.h
+++ b/Source/WebKit/chromium/src/ChromeClientImpl.h
@@ -132,7 +132,7 @@ public:
virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*, WebCore::Geolocation*);
virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>);
virtual void chooseIconForFiles(const Vector<WTF::String>&, WebCore::FileChooser*);
- virtual void setCursor(const WebCore::Cursor&) { }
+ virtual void setCursor(const WebCore::Cursor&);
virtual void formStateDidChange(const WebCore::Node*);
virtual PassOwnPtr<WebCore::HTMLParserQuirks> createHTMLParserQuirks() { return 0; }
#if ENABLE(TOUCH_EVENTS)
@@ -167,8 +167,7 @@ public:
virtual void postAccessibilityNotification(WebCore::AccessibilityObject*, WebCore::AXObjectCache::AXNotification);
// ChromeClientImpl:
- void setCursor(const WebCursorInfo& cursor);
- void setCursorForPlugin(const WebCursorInfo& cursor);
+ void setCursorForPlugin(const WebCursorInfo&);
virtual bool selectItemWritingDirectionIsNatural();
virtual PassRefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const;
@@ -180,6 +179,7 @@ public:
private:
void getPopupMenuInfo(WebCore::PopupContainer*, WebPopupMenuInfo*);
+ void setCursor(const WebCursorInfo&);
WebViewImpl* m_webView; // weak pointer
bool m_toolbarsVisible;
diff --git a/Source/WebKit/chromium/src/ChromiumBridge.cpp b/Source/WebKit/chromium/src/ChromiumBridge.cpp
index e16025c..fbe9aa6 100644
--- a/Source/WebKit/chromium/src/ChromiumBridge.cpp
+++ b/Source/WebKit/chromium/src/ChromiumBridge.cpp
@@ -39,7 +39,6 @@
#include "WebClipboard.h"
#include "WebCookie.h"
#include "WebCookieJar.h"
-#include "WebCursorInfo.h"
#include "WebData.h"
#include "WebDragData.h"
#include "WebFileUtilities.h"
@@ -990,13 +989,6 @@ bool ChromiumBridge::popupsAllowed(NPP npp)
return false;
}
-void ChromiumBridge::widgetSetCursor(Widget* widget, const Cursor& cursor)
-{
- ChromeClientImpl* client = toChromeClientImpl(widget);
- if (client)
- client->setCursor(WebCursorInfo(cursor));
-}
-
WorkerContextProxy* WorkerContextProxy::create(Worker* worker)
{
return WebWorkerClientImpl::createWorkerContextProxy(worker);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list