summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-08 12:34:40 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-08 12:34:40 +0000
commit40ec0c15c1394e6ebf596d6d8a2ddf110b00027d (patch)
tree747cf8b863a15667d64b02ec47aab680d9661f98 /webkit/tools
parentc676a5abecc66777379b9ae324281d1e38d9f9ad (diff)
downloadchromium_src-40ec0c15c1394e6ebf596d6d8a2ddf110b00027d.zip
chromium_src-40ec0c15c1394e6ebf596d6d8a2ddf110b00027d.tar.gz
chromium_src-40ec0c15c1394e6ebf596d6d8a2ddf110b00027d.tar.bz2
Add one-arg implementations of WebViewClient::createGraphicsContext3D()
The 2-arg version of WebViewClient::createGraphicsContext3D() is being deprecated, this adds implementations of the 1-arg version so that we can switch WebKit over. Must land after https://bugs.webkit.org/show_bug.cgi?id=80521 or a few layout tests in platform/chromium/compositing/plugins/ will break. BUG=none TEST=compiles Review URL: http://codereview.chromium.org/9623009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125600 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/test_webview_delegate.cc4
-rw-r--r--webkit/tools/test_shell/test_webview_delegate.h3
2 files changed, 7 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 8975516..1b4af4d 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -345,6 +345,10 @@ WebStorageNamespace* TestWebViewDelegate::createSessionStorageNamespace(
}
WebGraphicsContext3D* TestWebViewDelegate::createGraphicsContext3D(
+ const WebGraphicsContext3D::Attributes& attributes) {
+ return createGraphicsContext3D(attributes, true);
+}
+WebGraphicsContext3D* TestWebViewDelegate::createGraphicsContext3D(
const WebGraphicsContext3D::Attributes& attributes,
bool direct) {
return webkit::gpu::WebGraphicsContext3DInProcessImpl::CreateForWebView(
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index 324ee91..c541b78 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -90,6 +90,9 @@ class TestWebViewDelegate : public WebKit::WebViewClient,
virtual WebKit::WebStorageNamespace* createSessionStorageNamespace(
unsigned quota);
virtual WebKit::WebGraphicsContext3D* createGraphicsContext3D(
+ const WebKit::WebGraphicsContext3D::Attributes& attributes);
+ // TODO(jamesr): remove this form after deleted upstream.
+ virtual WebKit::WebGraphicsContext3D* createGraphicsContext3D(
const WebKit::WebGraphicsContext3D::Attributes& attributes,
bool direct);
virtual void didAddMessageToConsole(