diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-08-10 14:18:22 (GMT) |
|---|---|---|
| committer | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-08-12 08:18:25 (GMT) |
| commit | 8da0be0dd2cffe739733f53500b1fc5d8ac4a49a (patch) | |
| tree | 35bd01765d8b60283c85c90a721bb76d2115fede | |
| parent | be79edc572527b33197b7258f5614a8ee9ac3679 (diff) | |
| download | Qt-8da0be0dd2cffe739733f53500b1fc5d8ac4a49a.zip Qt-8da0be0dd2cffe739733f53500b1fc5d8ac4a49a.tar.gz Qt-8da0be0dd2cffe739733f53500b1fc5d8ac4a49a.tar.bz2 | |
Updated WebKit to 72b1c38579ca1fdb3f242e29cd16e5bfb4925813
Integrated changes:
|| <https://webkit.org/b/43782> || [Qt] NPAPI plugins not drawn until page scrolled ||
(cherry picked from commit 87b7587f25928272900900a106f360a4fbb4d6cd)
| -rw-r--r-- | src/3rdparty/webkit/.tag | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/VERSION | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/ChangeLog | 10 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.mm | 5 |
4 files changed, 16 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag index fb2703e..d31a2b4 100644 --- a/src/3rdparty/webkit/.tag +++ b/src/3rdparty/webkit/.tag @@ -1 +1 @@ -413404da27312051bb3ff2cfd0f3fca42aa4b245 +72b1c38579ca1fdb3f242e29cd16e5bfb4925813 diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index c256434..62aa8ce 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from and has the sha1 checksum - 413404da27312051bb3ff2cfd0f3fca42aa4b245 + 72b1c38579ca1fdb3f242e29cd16e5bfb4925813 diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index 5b78226..98d4d51 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,13 @@ +2010-08-10 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> + + Reviewed by Simon Hausmann. + + Make sure NPAPI plugins get an initial setNPWindow on Mac + + https://bugs.webkit.org/show_bug.cgi?id=43782 + + * plugins/mac/PluginViewMac.mm: + 2010-06-14 Andreas Kling <andreas.kling@nokia.com> Reviewed by Tor Arne Vestbø. diff --git a/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.mm b/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.mm index 57d74ab..c8781a8 100644 --- a/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.mm +++ b/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.mm @@ -227,7 +227,10 @@ bool PluginView::platformStart() #endif } - show(); + updatePluginWidget(); + + if (!m_plugin->quirks().contains(PluginQuirkDeferFirstSetWindowCall)) + setNPWindowIfNeeded(); // TODO: Implement null timer throttling depending on plugin activation m_nullEventTimer.set(new Timer<PluginView>(this, &PluginView::nullEventTimerFired)); |