Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (110363 => 110364)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-03-10 03:10:08 UTC (rev 110363)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-03-10 03:11:24 UTC (rev 110364)
@@ -1,3 +1,18 @@
+2012-03-07 James Robinson <[email protected]>
+
+ [chromium] Deprecate renderDirectlyToWebView parameter of WebViewClient::createGraphicsContext3D()
+ https://bugs.webkit.org/show_bug.cgi?id=80523
+
+ Reviewed by Darin Fisher.
+
+ * public/WebViewClient.h:
+ (WebViewClient):
+ (WebKit::WebViewClient::createGraphicsContext3D):
+ * public/platform/WebKitPlatformSupport.h:
+ (WebKit):
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::createCompositorGraphicsContext3D):
+
2012-03-09 Joshua Bell <[email protected]>
IndexedDB: Handle LevelDB database corruption
Modified: trunk/Source/WebKit/chromium/public/WebViewClient.h (110363 => 110364)
--- trunk/Source/WebKit/chromium/public/WebViewClient.h 2012-03-10 03:10:08 UTC (rev 110363)
+++ trunk/Source/WebKit/chromium/public/WebViewClient.h 2012-03-10 03:11:24 UTC (rev 110364)
@@ -113,10 +113,10 @@
// Create a session storage namespace object associated with this WebView.
virtual WebStorageNamespace* createSessionStorageNamespace(unsigned quota) { return 0; }
- // Creates a graphics context associated with the client's WebView.
- // renderDirectlyToWebView means whether the context should be setup to
- // render directly to the WebView (e.g. compositor context), or to an
- // offscreen surface (e.g. WebGL context).
+ // Creates a graphics context that renders to the client's WebView.
+ virtual WebGraphicsContext3D* createGraphicsContext3D(const WebGraphicsContext3D::Attributes&) { return 0; }
+
+ // Deprecated, use the first version of this function. If you want an offscreen context, use WebKitPlatformSupport::createOffscreenGraphicsContext3D().
virtual WebGraphicsContext3D* createGraphicsContext3D(const WebGraphicsContext3D::Attributes&, bool renderDirectlyToWebView) { return 0; }
// Misc ----------------------------------------------------------------
Modified: trunk/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h (110363 => 110364)
--- trunk/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h 2012-03-10 03:10:08 UTC (rev 110363)
+++ trunk/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h 2012-03-10 03:11:24 UTC (rev 110364)
@@ -58,7 +58,6 @@
class WebCookieJar;
class WebFileSystem;
class WebFileUtilities;
-class WebGraphicsContext3D;
class WebIDBFactory; // FIXME: Does this belong in platform?
class WebIDBKey; // FIXME: Does this belong in platform?
class WebMediaStreamCenter;
@@ -386,8 +385,6 @@
// May return null if GPU is not supported.
// Returns newly allocated and initialized offscreen WebGraphicsContext3D instance.
virtual WebGraphicsContext3D* createOffscreenGraphicsContext3D(const WebGraphicsContext3D::Attributes&) { return 0; }
- // Deprecated.
- virtual WebGraphicsContext3D* createGraphicsContext3D() { return 0; }
// Audio --------------------------------------------------------------
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (110363 => 110364)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-03-10 03:10:08 UTC (rev 110363)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-03-10 03:11:24 UTC (rev 110364)
@@ -3235,7 +3235,7 @@
attributes.antialias = false;
attributes.shareResources = true;
- OwnPtr<WebGraphicsContext3D> webContext = adoptPtr(client()->createGraphicsContext3D(attributes, true /* renderDirectlyToHostWindow */));
+ OwnPtr<WebGraphicsContext3D> webContext = adoptPtr(client()->createGraphicsContext3D(attributes));
if (!webContext)
return nullptr;
Modified: trunk/Tools/ChangeLog (110363 => 110364)
--- trunk/Tools/ChangeLog 2012-03-10 03:10:08 UTC (rev 110363)
+++ trunk/Tools/ChangeLog 2012-03-10 03:11:24 UTC (rev 110364)
@@ -1,3 +1,15 @@
+2012-03-07 James Robinson <[email protected]>
+
+ [chromium] Deprecate renderDirectlyToWebView parameter of WebViewClient::createGraphicsContext3D()
+ https://bugs.webkit.org/show_bug.cgi?id=80523
+
+ Reviewed by Darin Fisher.
+
+ * DumpRenderTree/chromium/WebViewHost.cpp:
+ (WebViewHost::createGraphicsContext3D):
+ * DumpRenderTree/chromium/WebViewHost.h:
+ (WebViewHost):
+
2012-03-09 Eric Seidel <[email protected]>
build-webkit should build Source/WTF on Mac
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp (110363 => 110364)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2012-03-10 03:10:08 UTC (rev 110363)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2012-03-10 03:11:24 UTC (rev 110364)
@@ -277,11 +277,11 @@
return webkit_support::CreateSessionStorageNamespace(quota);
}
-WebKit::WebGraphicsContext3D* WebViewHost::createGraphicsContext3D(const WebKit::WebGraphicsContext3D::Attributes& attributes, bool direct)
+WebKit::WebGraphicsContext3D* WebViewHost::createGraphicsContext3D(const WebKit::WebGraphicsContext3D::Attributes& attributes)
{
if (!webView())
return 0;
- return webkit_support::CreateGraphicsContext3D(attributes, webView(), direct);
+ return webkit_support::CreateGraphicsContext3D(attributes, webView(), true);
}
void WebViewHost::didAddMessageToConsole(const WebConsoleMessage& message, const WebString& sourceName, unsigned sourceLine)
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.h (110363 => 110364)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2012-03-10 03:10:08 UTC (rev 110363)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2012-03-10 03:11:24 UTC (rev 110364)
@@ -130,7 +130,7 @@
virtual WebKit::WebWidget* createPopupMenu(WebKit::WebPopupType);
virtual WebKit::WebWidget* createPopupMenu(const WebKit::WebPopupMenuInfo&);
virtual WebKit::WebStorageNamespace* createSessionStorageNamespace(unsigned quota);
- virtual WebKit::WebGraphicsContext3D* createGraphicsContext3D(const WebKit::WebGraphicsContext3D::Attributes&, bool direct);
+ virtual WebKit::WebGraphicsContext3D* createGraphicsContext3D(const WebKit::WebGraphicsContext3D::Attributes&);
virtual void didAddMessageToConsole(const WebKit::WebConsoleMessage&, const WebKit::WebString& sourceName, unsigned sourceLine);
virtual void didStartLoading();
virtual void didStopLoading();
