diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-07-24 08:22:11 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-07-24 08:22:11 (GMT) |
| commit | 9dadc219814cd9baaa4be4cee6ee2b3cf7df4a19 (patch) | |
| tree | 13b6cb569e0a141fe015dd702e70bc444b2f76aa /src | |
| parent | c8dbff8b5ae8e4b5ef8a46a5e3b513a5f6f4a205 (diff) | |
| download | Qt-9dadc219814cd9baaa4be4cee6ee2b3cf7df4a19.zip Qt-9dadc219814cd9baaa4be4cee6ee2b3cf7df4a19.tar.gz Qt-9dadc219814cd9baaa4be4cee6ee2b3cf7df4a19.tar.bz2 | |
Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( eb3afcbfb4006de4015047555cb256fcde93b954 )
Changes in WebKit since the last update:
++ b/WebCore/ChangeLog
2009-05-27 John Sullivan <sullivan@apple.com>
fixed <rdar://problem/6925482> repro crash in WebCore::DragController::dragExited dropping
bookmarks (at least) over Top Sites (at least)
Reviewed by Kevin Decker
* page/DragController.cpp:
(WebCore::DragController::dragExited):
nil check m_documentUnderMouse and take the "local file" case if it's nil
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/webkit/VERSION | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/ChangeLog | 11 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/html/HTMLElement.cpp | 1 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/page/DragController.cpp | 2 |
4 files changed, 14 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index eaa0479..12018e1 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 - 1535d41a668e5f74f44ff3aa1313a84d5718d2d7 + eb3afcbfb4006de4015047555cb256fcde93b954 diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index 83f5e6f..7dc4f71 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,14 @@ +2009-05-27 John Sullivan <sullivan@apple.com> + + fixed <rdar://problem/6925482> repro crash in WebCore::DragController::dragExited dropping + bookmarks (at least) over Top Sites (at least) + + Reviewed by Kevin Decker + + * page/DragController.cpp: + (WebCore::DragController::dragExited): + nil check m_documentUnderMouse and take the "local file" case if it's nil + 2009-07-23 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Holger Freyther. diff --git a/src/3rdparty/webkit/WebCore/html/HTMLElement.cpp b/src/3rdparty/webkit/WebCore/html/HTMLElement.cpp index 4caf336..b21a3fe 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLElement.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLElement.cpp @@ -44,6 +44,7 @@ #include "XMLTokenizer.h" #include "markup.h" #include <wtf/StdLibExtras.h> +#include <stdio.h> namespace WebCore { diff --git a/src/3rdparty/webkit/WebCore/page/DragController.cpp b/src/3rdparty/webkit/WebCore/page/DragController.cpp index 10a11f2..c756da8 100644 --- a/src/3rdparty/webkit/WebCore/page/DragController.cpp +++ b/src/3rdparty/webkit/WebCore/page/DragController.cpp @@ -157,7 +157,7 @@ void DragController::dragExited(DragData* dragData) Frame* mainFrame = m_page->mainFrame(); if (RefPtr<FrameView> v = mainFrame->view()) { - ClipboardAccessPolicy policy = m_document->securityOrigin()->isLocal() ? ClipboardReadable : ClipboardTypesReadable; + ClipboardAccessPolicy policy = (!m_document || m_document->securityOrigin()->isLocal()) ? ClipboardReadable : ClipboardTypesReadable; RefPtr<Clipboard> clipboard = dragData->createClipboard(policy); clipboard->setSourceOperation(dragData->draggingSourceOperationMask()); mainFrame->eventHandler()->cancelDragAndDrop(createMouseEvent(dragData), clipboard.get()); |