diff options
Diffstat (limited to 'WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp')
| -rw-r--r-- | WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp index 1b57138..5c6364e 100644 --- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp +++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp @@ -280,6 +280,10 @@ void FrameLoaderClientQt::transitionToCommittedForNewPage() preferredLayoutSize.isValid(), hScrollbar, hLock, vScrollbar, vLock); + + bool isMainFrame = m_frame == m_frame->page()->mainFrame(); + if (isMainFrame && page->d->client) + m_frame->view()->setPaintsEntireContents(page->d->client->viewResizesToContentsEnabled()); } void FrameLoaderClientQt::dispatchDidBecomeFrameset(bool) @@ -892,6 +896,7 @@ enum { WebKitErrorCannotFindPlugIn = 200, WebKitErrorCannotLoadPlugIn = 201, WebKitErrorJavaUnavailable = 202, + WebKitErrorPluginWillHandleLoad = 203 }; WebCore::ResourceError FrameLoaderClientQt::blockedError(const WebCore::ResourceRequest& request) @@ -925,10 +930,10 @@ WebCore::ResourceError FrameLoaderClientQt::fileDoesNotExistError(const WebCore: QCoreApplication::translate("QWebFrame", "File does not exist", 0, QCoreApplication::UnicodeUTF8)); } -WebCore::ResourceError FrameLoaderClientQt::pluginWillHandleLoadError(const WebCore::ResourceResponse&) +WebCore::ResourceError FrameLoaderClientQt::pluginWillHandleLoadError(const WebCore::ResourceResponse& response) { - notImplemented(); - return ResourceError(); + return ResourceError("WebKit", WebKitErrorPluginWillHandleLoad, response.url().string(), + QCoreApplication::translate("QWebFrame", "Loading is handled by the media engine", 0, QCoreApplication::UnicodeUTF8)); } bool FrameLoaderClientQt::shouldFallBack(const WebCore::ResourceError&) |