From 5138c39116a03e36005a03f47f718fced6cc6d4e Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 23 Jun 2009 15:10:39 +0200 Subject: Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( 4552f381497b5adc18714d7f6e33eba678e3a9b2 ) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes in WebKit since the last update: ++ b/WebCore/ChangeLog 2009-06-23 Thiago Macieira Reviewed by Simon Hausmann. Fix Qt build with Phonon. The #include header no longer exists. And the or headers have never existed (neither for us nor for the Phonon sources). You have to select each and every header that you do want now. * platform/graphics/qt/MediaPlayerPrivatePhonon.cpp: 2009-06-23 Tor Arne Vestbø Reviewed by Simon Hausmann. Fix NPAPI mouse translation issues on Mac The WindowRef we pass to the plugin refers to the the top level window, so the x and y positions have to be relative to this position, but we have to manually compensate for title bar decorations and other parents of the QWebView since contentsToWindow() only traverses to the QWebView. Previously we did this compensation when passing on mouse coordinates to the plugin, which caused various issues with translations such as not being able to close the Flash settings dialog, or the hand cursor not appearing over links. We now do the compensation as part of the call to NPP_SetWindow, and then pass mouse coordinates in global context without any compensation, similar to how both Safari and Mozilla does it. * plugins/mac/PluginViewMac.cpp: (WebCore::PluginView::updatePluginWidget): (WebCore::PluginView::globalMousePosForPlugin): ++ b/WebKit/qt/ChangeLog 2009-06-16 Morten Engvoldsen Reviewed by Ariya Hidayat. Clearifying QWebFrame docs Adding docs to toHtml() and toPlainText() * Api/qwebframe.cpp: --- src/3rdparty/webkit/VERSION | 2 +- src/3rdparty/webkit/WebCore/ChangeLog | 37 ++++++++++++++++++++++ .../webkit/WebCore/plugins/mac/PluginViewMac.cpp | 9 +++--- src/3rdparty/webkit/WebKit/qt/ChangeLog | 10 ++++++ 4 files changed, 52 insertions(+), 6 deletions(-) diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index f7bd730..71add8f 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -8,4 +8,4 @@ The commit imported was from the and has the sha1 checksum - bd7262be70c02564d655e4f2aaf79cd8302a937f + 4552f381497b5adc18714d7f6e33eba678e3a9b2 diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index 304b55d..4b74dcb 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,40 @@ +2009-06-23 Thiago Macieira + + Reviewed by Simon Hausmann. + + Fix Qt build with Phonon. + + The #include header no longer exists. And the or + headers have never existed (neither for us nor for the + Phonon sources). You have to select each and every header that you do + want now. + + * platform/graphics/qt/MediaPlayerPrivatePhonon.cpp: + +2009-06-23 Tor Arne Vestbø + + Reviewed by Simon Hausmann. + + Fix NPAPI mouse translation issues on Mac + + The WindowRef we pass to the plugin refers to the the top level window, + so the x and y positions have to be relative to this position, but we + have to manually compensate for title bar decorations and other parents + of the QWebView since contentsToWindow() only traverses to the QWebView. + + Previously we did this compensation when passing on mouse coordinates to + the plugin, which caused various issues with translations such as not + being able to close the Flash settings dialog, or the hand cursor not + appearing over links. + + We now do the compensation as part of the call to NPP_SetWindow, and + then pass mouse coordinates in global context without any compensation, + similar to how both Safari and Mozilla does it. + + * plugins/mac/PluginViewMac.cpp: + (WebCore::PluginView::updatePluginWidget): + (WebCore::PluginView::globalMousePosForPlugin): + 2009-05-21 Geoffrey Garen Reviewed by Sam Weinig. diff --git a/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp b/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp index 3229922..569ed37 100644 --- a/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp +++ b/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp @@ -393,7 +393,10 @@ void PluginView::updatePluginWidget() IntRect oldWindowRect = m_windowRect; IntRect oldClipRect = m_clipRect; - m_windowRect = IntRect(frameView->contentsToWindow(frameRect().location()), frameRect().size()); + m_windowRect = frameView->contentsToWindow(frameRect()); + IntPoint offset = topLevelOffsetFor(platformPluginWidget()); + m_windowRect.move(offset.x(), offset.y()); + m_clipRect = windowClipRect(); m_clipRect.move(-m_windowRect.x(), -m_windowRect.y()); @@ -620,10 +623,6 @@ Point PluginView::globalMousePosForPlugin() const Point pos; GetGlobalMouse(&pos); - IntPoint offset = topLevelOffsetFor(platformPluginWidget()); - pos.h -= offset.x(); - pos.v -= offset.y(); - float scaleFactor = tigerOrBetter() ? HIGetScaleFactor() : 1; pos.h = short(pos.h * scaleFactor); diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog index d9f925a..afbc770 100644 --- a/src/3rdparty/webkit/WebKit/qt/ChangeLog +++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog @@ -1,3 +1,13 @@ +2009-06-16 Morten Engvoldsen + + Reviewed by Ariya Hidayat. + + Clearifying QWebFrame docs + + Adding docs to toHtml() and toPlainText() + + * Api/qwebframe.cpp: + 2009-05-19 Kenneth Rohde Christiansen Reviewed by Simon Hausmann. -- cgit v0.12