diff options
| author | Steve Block <steveblock@google.com> | 2010-04-29 02:02:09 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-04-29 02:02:09 -0700 |
| commit | fbcad591f3f2962b92aa61c017c360ddaef5ebba (patch) | |
| tree | a1e6f4d2b649801f5455f51739d75f4f34a7d190 /WebCore/platform/qt | |
| parent | 5a0626b52e267a829822dd9fc9f2863ebc3259c0 (diff) | |
| parent | ec79cd2f7baa7ba941c8343f6d79f0dbfdd5be2a (diff) | |
| download | external_webkit-fbcad591f3f2962b92aa61c017c360ddaef5ebba.zip external_webkit-fbcad591f3f2962b92aa61c017c360ddaef5ebba.tar.gz external_webkit-fbcad591f3f2962b92aa61c017c360ddaef5ebba.tar.bz2 | |
Merge changes Ie9ba4c69,I35363367,I18aaae5f,I2c315360,I4f163c97,Ib640e64c,I98a4af82
* changes:
Merge webkit.org at r55033 : Update WebKit revision
Merge webkit.org at r55033 : Update Android-specific LayoutTest expected result
Merge webkit.org at r55033 : Implement FrameLoaderClient::didTransferChildFrameToNewDocument for Android
Merge webkit.org at r55033 : Implement PluginPackage::NPVersion for Android
Merge webkit.org at r55033 : Implement new ChromeClient::iconForFiles method for Android
Merge webkit.org at r55033 : Fix merge conflicts
Merge webkit.org at r55033 : Initial merge by git
Diffstat (limited to 'WebCore/platform/qt')
| -rw-r--r-- | WebCore/platform/qt/PasteboardQt.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebCore/platform/qt/PasteboardQt.cpp b/WebCore/platform/qt/PasteboardQt.cpp index 44c9eec..70ec546 100644 --- a/WebCore/platform/qt/PasteboardQt.cpp +++ b/WebCore/platform/qt/PasteboardQt.cpp @@ -151,7 +151,8 @@ void Pasteboard::writeImage(Node* node, const KURL&, const String&) #ifndef QT_NO_CLIPBOARD CachedImage* cachedImage = toRenderImage(node->renderer())->cachedImage(); - ASSERT(cachedImage); + if (!cachedImage || cachedImage->errorOccurred()) + return; Image* image = cachedImage->image(); ASSERT(image); |