diff options
Diffstat (limited to 'Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp')
| -rw-r--r-- | Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp b/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp index d8ea90e..ca8bf9a 100644 --- a/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp +++ b/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp @@ -6,6 +6,7 @@ * Copyright (C) 2009, 2010 Gustavo Noronha Silva <gns@gnome.org> * Copyright (C) Research In Motion Limited 2009. All rights reserved. * Copyright (C) 2010 Igalia S.L. + * Copyright (C) 2011 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -65,6 +66,7 @@ #include "webkiterror.h" #include "webkitglobals.h" #include "webkitglobalsprivate.h" +#include "webkiticondatabase.h" #include "webkitnetworkrequest.h" #include "webkitnetworkrequestprivate.h" #include "webkitnetworkresponse.h" @@ -710,9 +712,9 @@ PassRefPtr<Widget> FrameLoaderClient::createJavaAppletWidget(const IntSize& plug return FrameLoaderClient::createPlugin(pluginSize, element, baseURL, paramNames, paramValues, "application/x-java-applet", false); } -ObjectContentType FrameLoaderClient::objectContentType(const KURL& url, const String& mimeType) +ObjectContentType FrameLoaderClient::objectContentType(const KURL& url, const String& mimeType, bool shouldPreferPlugInsForImages) { - return FrameLoader::defaultObjectContentType(url, mimeType); + return FrameLoader::defaultObjectContentType(url, mimeType, shouldPreferPlugInsForImages); } String FrameLoaderClient::overrideMediaType() const @@ -925,6 +927,10 @@ void FrameLoaderClient::dispatchDidReceiveIcon() if (m_loadingErrorPage) return; + const gchar* frameURI = webkit_web_frame_get_uri(m_frame); + WebKitIconDatabase* database = webkit_get_icon_database(); + g_signal_emit_by_name(database, "icon-loaded", m_frame, frameURI); + WebKitWebView* webView = getViewFromFrame(m_frame); // Avoid reporting favicons for non-main frames. |