diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-11 13:45:28 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-11 13:45:28 +0200 |
| commit | d6a599dbc9d824a462b2b206316e102bf8136446 (patch) | |
| tree | ecb257a5e55b2239d74b90fdad62fccd661cf286 /Source/WebKit/gtk/webkit/webkitwebview.cpp | |
| parent | 3ccc3a85f09a83557b391aae380d3bf5f81a2911 (diff) | |
| download | qtwebkit-d6a599dbc9d824a462b2b206316e102bf8136446.tar.gz | |
Imported WebKit commit 8ff1f22783a32de82fee915abd55bd1b298f2644 (http://svn.webkit.org/repository/webkit/trunk@122325)
New snapshot that should work with the latest Qt build system changes
Diffstat (limited to 'Source/WebKit/gtk/webkit/webkitwebview.cpp')
| -rw-r--r-- | Source/WebKit/gtk/webkit/webkitwebview.cpp | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/Source/WebKit/gtk/webkit/webkitwebview.cpp b/Source/WebKit/gtk/webkit/webkitwebview.cpp index aac487f23..3344bf84b 100644 --- a/Source/WebKit/gtk/webkit/webkitwebview.cpp +++ b/Source/WebKit/gtk/webkit/webkitwebview.cpp @@ -3438,10 +3438,6 @@ static void webkit_web_view_update_settings(WebKitWebView* webView) coreSettings->setWebAudioEnabled(settingsPrivate->enableWebAudio); #endif -#if ENABLE(WEB_SOCKETS) - coreSettings->setUseHixie76WebSocketProtocol(false); -#endif - #if ENABLE(SMOOTH_SCROLLING) coreSettings->setEnableScrollAnimator(settingsPrivate->enableSmoothScrolling); #endif @@ -5228,7 +5224,8 @@ GdkPixbuf* webkit_web_view_try_get_favicon_pixbuf(WebKitWebView* webView, guint * webkit_web_view_get_dom_document: * @web_view: a #WebKitWebView * - * Returns: (transfer none): the #WebKitDOMDocument currently loaded in the @web_view + * Returns: (transfer none): the #WebKitDOMDocument currently loaded in + * the main frame of the @web_view or %NULL if no document is loaded * * Since: 1.3.1 **/ @@ -5237,15 +5234,7 @@ webkit_web_view_get_dom_document(WebKitWebView* webView) { g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), 0); - Frame* coreFrame = core(webView)->mainFrame(); - if (!coreFrame) - return 0; - - Document* doc = coreFrame->document(); - if (!doc) - return 0; - - return kit(doc); + return webkit_web_frame_get_dom_document(webView->priv->mainFrame); } GtkMenu* webkit_web_view_get_context_menu(WebKitWebView* webView) |