Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( eb4957a561d3f85d4cd5602832375c66f378b521 )

Changes in WebKit since the last update:

++ b/LayoutTests/ChangeLog
2009-06-04  Ariya Hidayat  <ariya.hidayat@nokia.com>

        Rubber-stamped by Tor Arne Vestbø.

        Added Qt-specific expected result for Canvas pointInPath's test.

        Qt's QPainterPath::contains(point) returns false if the point is
        exactly along one of the edges (except the origin). Until we
        find a workaround for this, compensate it in the expected result.

        * platform/qt/fast/canvas/pointInPath-expected.txt: Added.

2009-01-11  Simon Fraser  <simon.fraser@apple.com>

        Reviewed by Oliver Hunt

        https://bugs.webkit.org/show_bug.cgi?id=23242

        Add testcase for incremental repaint after use of ctx.transform(), and
        enhanced isPointInPath testcase to do testing after use of ctx.transform().

        * fast/canvas/canvas-incremental-repaint-2.html: Added.
        * fast/canvas/pointInPath-expected.txt:
        * fast/canvas/pointInPath.js:
        * platform/mac/fast/canvas/canvas-incremental-repaint-2-expected.checksum: Added.
        * platform/mac/fast/canvas/canvas-incremental-repaint-2-expected.png: Added.
        * platform/mac/fast/canvas/canvas-incremental-repaint-2-expected.txt: Added.

++ b/WebCore/ChangeLog
2008-12-18  Bernhard Rosenkraenzer <bero@arklinux.ch>

        Reviewed by Darin Adler.

        https://bugs.webkit.org/show_bug.cgi?id=22205
        Fix compatibility with bison 2.4, partially based on older patch by
        Priit Laes <amd@store20.com>

        * WebCore/css/CSSGrammar.y: Made compatible with bison 2.4

2009-07-13  Cédric Luthi  <cedric.luthi@gmail.com>

        Reviewed by Tor Arne Vestbø.

        Fix NPWindow clip rect in PluginViewMac

        The rect should be in window-coordinates. This bug can be observed
        with Flash 10 here: http://www.permadi.com/tutorial/cursorTracker/

        * plugins/mac/PluginViewMac.cpp:

2009-07-13  Simon Hausmann  <hausmann@webkit.org>

        Reviewed by Ariya Hidayat.

        Fix Qt implementation of WebCore::directoryName to return the absolute
        directory name instead of the base file name.

        * platform/qt/FileSystemQt.cpp:
        (WebCore::directoryName):

2009-07-13  Simon Hausmann  <hausmann@webkit.org>

        Reviewed by Ariya Hidayat.

        Fix WebCore::Path::isEmpty() for the Qt port to return true
        if there is no element in the path.

        QPainterPath::isEmpty() returns also true if there is one single
        MoveTo element inside, which makes sense but doesn't patch Webcore's
        is-empty definition.

        * platform/graphics/qt/PathQt.cpp:
        (WebCore::Path::isEmpty): Use elementCount() == 0.

2009-01-11  Simon Fraser  <simon.fraser@apple.com>

        Reviewed by Oliver Hunt

        https://bugs.webkit.org/show_bug.cgi?id=23242

        Fix CanvasRenderingContext2D::transform to do a pre-multiply,
        rather than a post-multiply into m_transform. This bug did not affect
        drawing, but did cause m_transform to be incorrect, which impacted
        willDraw(), and isPointInPath.

        Test: fast/canvas/canvas-incremental-repaint-2.html

        * html/CanvasRenderingContext2D.cpp:
        (WebCore::CanvasRenderingContext2D::transform):

2009-07-04  Sriram Yadavalli  <sriram.yadavalli@nokia.com>

        Reviewed by Simon Hausmann.

        https://bugs.webkit.org/show_bug.cgi?id=26439

        QtWebKit fails in loading www.nytimes.com in Windows/Linux

        QNetworkReplyHandler is ignoring content associated with 401 error.
        This causes the XHR response handling to fail.

        Simon: Added also ProxyAuthenticationRequiredError, to handle the same
        case when going through proxies, as suggested by Prasanth.

        * platform/network/qt/QNetworkReplyHandler.cpp:
        (WebCore::QNetworkReplyHandler::finish):

++ b/WebKit/qt/ChangeLog
        Fix crash with plugins when the plugin stream is cancelled.

        Similar to r26667 handle the case where didReceiveResponse on the
        plugin view results in failure to set up the stream and
        setMainDocumentError being called instead. This will set the
        m_pluginView back to 0 and we need check for it before calling
        didReceiveData.

        This was triggered by consecutive execution of
        LayoutTests/plugins/return-error-from-new-stream-callback-in-full-frame-plugin.html
        followed by LayoutTests/scrollbars/scrollbar-crash-on-refresh.html

        * WebCoreSupport/FrameLoaderClientQt.cpp:
        (WebCore::FrameLoaderClientQt::committedLoad):

2009-07-13  Simon Hausmann  <hausmann@webkit.org>

        Reviewed by Ariya Hidayat.

2 files changed, 24 insertions, 0 deletions

diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog
index afbc770..a7e176d 100644
--- a/src/3rdparty/webkit/WebKit/qt/ChangeLog
+++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog
@@ -12,6 +12,25 @@
 
         Reviewed by Simon Hausmann.
 
+        Fix crash with plugins when the plugin stream is cancelled.
+
+        Similar to r26667 handle the case where didReceiveResponse on the
+        plugin view results in failure to set up the stream and
+        setMainDocumentError being called instead. This will set the
+        m_pluginView back to 0 and we need check for it before calling
+        didReceiveData.
+
+        This was triggered by consecutive execution of
+        LayoutTests/plugins/return-error-from-new-stream-callback-in-full-frame-plugin.html
+        followed by LayoutTests/scrollbars/scrollbar-crash-on-refresh.html
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::committedLoad):
+
+2009-07-13  Simon Hausmann  <hausmann@webkit.org>
+
+        Reviewed by Ariya Hidayat.
+
         Fix a plugin bug in the WebKit code, similar to the one in WebCore.
 
         The problem is when a non visible QtPluginWidget would show it self
diff --git a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index a2b33c0..680a67a 100644
--- a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -680,6 +680,11 @@ void FrameLoaderClientQt::committedLoad(WebCore::DocumentLoader* loader, const c
     if (m_pluginView) {
         if (!m_hasSentResponseToPlugin) {
             m_pluginView->didReceiveResponse(loader->response());
+            // didReceiveResponse sets up a new stream to the plug-in. on a full-page plug-in, a failure in
+            // setting up this stream can cause the main document load to be cancelled, setting m_pluginView
+            // to null
+            if (!m_pluginView)
+                return;
             m_hasSentResponseToPlugin = true;
         }
         m_pluginView->didReceiveData(data, length);