diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
| commit | 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (patch) | |
| tree | 988e8c5b116dd0466244ae2fe5af8ee9be926d76 /Source/WebKit/gtk/webkit/webkitwebframe.cpp | |
| parent | dd91e772430dc294e3bf478c119ef8d43c0a3358 (diff) | |
| download | qtwebkit-2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47.tar.gz | |
Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)
Diffstat (limited to 'Source/WebKit/gtk/webkit/webkitwebframe.cpp')
| -rw-r--r-- | Source/WebKit/gtk/webkit/webkitwebframe.cpp | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/Source/WebKit/gtk/webkit/webkitwebframe.cpp b/Source/WebKit/gtk/webkit/webkitwebframe.cpp index 39bdbb3aa..77292213e 100644 --- a/Source/WebKit/gtk/webkit/webkitwebframe.cpp +++ b/Source/WebKit/gtk/webkit/webkitwebframe.cpp @@ -51,7 +51,6 @@ #include "RenderListItem.h" #include "RenderTreeAsText.h" #include "RenderView.h" -#include "ReplaceSelectionCommand.h" #include "ScriptController.h" #include "SubstituteData.h" #include "TextIterator.h" @@ -113,6 +112,7 @@ enum { RESOURCE_LOAD_FINISHED, RESOURCE_CONTENT_LENGTH_RECEIVED, RESOURCE_LOAD_FAILED, + INSECURE_CONTENT_RUN, LAST_SIGNAL }; @@ -432,6 +432,28 @@ static void webkit_web_frame_class_init(WebKitWebFrameClass* frameClass) WEBKIT_TYPE_WEB_RESOURCE, G_TYPE_POINTER); + /** + * WebKitWebFrame::insecure-content-run: + * @web_frame: the #WebKitWebFrame the response was received for. + * @security_origin: the #WebKitSecurityOrigin. + * @url: the url of the insecure content. + * + * Invoked when insecure content is run from a secure page. This happens + * when a page loaded via HTTPS loads a stylesheet, script, image or + * iframe from an unencrypted HTTP URL. + * + * Since: 1.10.0 + */ + webkit_web_frame_signals[INSECURE_CONTENT_RUN] = g_signal_new("insecure-content-run", + G_TYPE_FROM_CLASS(frameClass), + G_SIGNAL_RUN_LAST, + 0, + 0, 0, + webkit_marshal_VOID__OBJECT_STRING, + G_TYPE_NONE, 2, + WEBKIT_TYPE_SECURITY_ORIGIN, + G_TYPE_STRING); + /* * implementations of virtual methods */ |