diff options
| author | John Reck <jreck@google.com> | 2010-11-04 12:00:17 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2010-11-09 11:35:04 -0800 |
| commit | e14391e94c850b8bd03680c23b38978db68687a8 (patch) | |
| tree | 3fed87e6620fecaf3edc7259ae58a11662bedcb2 /WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp | |
| parent | 1bd705833a68f07850cf7e204b26f8d328d16951 (diff) | |
| download | external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.zip external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.tar.gz external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.tar.bz2 | |
Merge Webkit at r70949: Initial merge by git.
Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
Diffstat (limited to 'WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp')
| -rw-r--r-- | WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp index 7e4090b..e864ea7 100644 --- a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp +++ b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp @@ -25,6 +25,7 @@ #include "ChromeClientGtk.h" #include "Console.h" +#include "DumpRenderTreeSupportGtk.h" #include "FileSystem.h" #include "FileChooser.h" #include "FloatRect.h" @@ -35,6 +36,7 @@ #include "HitTestResult.h" #include "Icon.h" #include "KURL.h" +#include "NavigationAction.h" #include "PlatformString.h" #include "PopupMenuClient.h" #include "PopupMenuGtk.h" @@ -137,7 +139,7 @@ void ChromeClient::unfocus() gtk_window_set_focus(GTK_WINDOW(window), NULL); } -Page* ChromeClient::createWindow(Frame* frame, const FrameLoadRequest& frameLoadRequest, const WindowFeatures& coreFeatures) +Page* ChromeClient::createWindow(Frame* frame, const FrameLoadRequest& frameLoadRequest, const WindowFeatures& coreFeatures, const NavigationAction&) { WebKitWebView* webView = 0; @@ -330,6 +332,9 @@ bool ChromeClient::shouldInterruptJavaScript() bool ChromeClient::tabsToLinks() const { + if (DumpRenderTreeSupportGtk::dumpRenderTreeModeEnabled()) + return DumpRenderTreeSupportGtk::linksIncludedInFocusChain(); + return true; } |