summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-25 19:52:04 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-25 19:52:04 +0000
commite59f00ea94e2642034881cd3d94d9ac1afa02df8 (patch)
tree1a0165090e14e7b4e41a37df6128ad6e5157b46a /webkit
parent2bcdd3ecefb43bea7af1e9f2d12f4b3213659575 (diff)
downloadchromium_src-e59f00ea94e2642034881cd3d94d9ac1afa02df8.zip
chromium_src-e59f00ea94e2642034881cd3d94d9ac1afa02df8.tar.gz
chromium_src-e59f00ea94e2642034881cd3d94d9ac1afa02df8.tar.bz2
Enable CSS grid layout in test_shell to ease development.
It's off by default because it's nowhere close to ready for developer use, but this will make it easier to develop. We could do something similar for content_shell if needed. BUG=None Review URL: https://chromiumcodereview.appspot.com/10666002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143984 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/test_shell/webview_host_gtk.cc2
-rw-r--r--webkit/tools/test_shell/webview_host_mac.mm2
-rw-r--r--webkit/tools/test_shell/webview_host_win.cc2
3 files changed, 6 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/webview_host_gtk.cc b/webkit/tools/test_shell/webview_host_gtk.cc
index 40b61fa..117da89 100644
--- a/webkit/tools/test_shell/webview_host_gtk.cc
+++ b/webkit/tools/test_shell/webview_host_gtk.cc
@@ -8,6 +8,7 @@
#include "base/logging.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSettings.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/size.h"
#include "webkit/glue/webpreferences.h"
@@ -30,6 +31,7 @@ WebViewHost* WebViewHost::Create(GtkWidget* parent_view,
host->webwidget_ = WebView::create(delegate);
host->webview()->setDevToolsAgentClient(dev_tools_client);
prefs.Apply(host->webview());
+ host->webview()->settings()->setExperimentalCSSGridLayoutEnabled(true);
host->webview()->initializeMainFrame(delegate);
host->webwidget_->layout();
diff --git a/webkit/tools/test_shell/webview_host_mac.mm b/webkit/tools/test_shell/webview_host_mac.mm
index 98ce43f..cabe00e 100644
--- a/webkit/tools/test_shell/webview_host_mac.mm
+++ b/webkit/tools/test_shell/webview_host_mac.mm
@@ -9,6 +9,7 @@
#include "skia/ext/platform_canvas.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSettings.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/size.h"
@@ -42,6 +43,7 @@ WebViewHost* WebViewHost::Create(NSView* parent_view,
host->webwidget_ = WebView::create(delegate);
host->webview()->setDevToolsAgentClient(dev_tools_client);
prefs.Apply(host->webview());
+ host->webview()->settings()->setExperimentalCSSGridLayoutEnabled(true);
host->webview()->initializeMainFrame(delegate);
host->webwidget_->resize(WebSize(NSWidth(content_rect),
NSHeight(content_rect)));
diff --git a/webkit/tools/test_shell/webview_host_win.cc b/webkit/tools/test_shell/webview_host_win.cc
index f1f7842..c911b2d 100644
--- a/webkit/tools/test_shell/webview_host_win.cc
+++ b/webkit/tools/test_shell/webview_host_win.cc
@@ -4,6 +4,7 @@
#include "webkit/tools/test_shell/webview_host.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSettings.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
#include "ui/base/win/hwnd_util.h"
#include "ui/gfx/rect.h"
@@ -44,6 +45,7 @@ WebViewHost* WebViewHost::Create(HWND parent_view,
host->webwidget_ = WebView::create(delegate);
host->webview()->setDevToolsAgentClient(dev_tools_client);
prefs.Apply(host->webview());
+ host->webview()->settings()->setExperimentalCSSGridLayoutEnabled(true);
host->webview()->initializeMainFrame(delegate);
return host;