Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(921)

Unified Diff: Source/core/html/canvas/WebGLRenderingContext.cpp

Issue 894143002: Adding Blink bindings for WebGL 2 (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Removed accidentally added scratch file Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/html/canvas/WebGLRenderingContext.cpp
diff --git a/Source/core/html/canvas/WebGLRenderingContext.cpp b/Source/core/html/canvas/WebGLRenderingContext.cpp
index 0202118a12d3534e503c8c729bae07b8c7e480f7..388c84e4a3d9a520c8d5dcc2148f401ac1a19ce0 100644
--- a/Source/core/html/canvas/WebGLRenderingContext.cpp
+++ b/Source/core/html/canvas/WebGLRenderingContext.cpp
@@ -62,61 +62,12 @@
namespace blink {
-static bool shouldFailContextCreationForTesting = false;
-
PassOwnPtrWillBeRawPtr<WebGLRenderingContext> WebGLRenderingContext::create(HTMLCanvasElement* canvas, const CanvasContextCreationAttributes& attrs)
{
- Document& document = canvas->document();
- LocalFrame* frame = document.frame();
- if (!frame) {
- canvas->dispatchEvent(WebGLContextEvent::create(EventTypeNames::webglcontextcreationerror, false, true, "Web page was not allowed to create a WebGL context."));
- return nullptr;
- }
- Settings* settings = frame->settings();
-
- // The FrameLoaderClient might block creation of a new WebGL context despite the page settings; in
- // particular, if WebGL contexts were lost one or more times via the GL_ARB_robustness extension.
- if (!frame->loader().client()->allowWebGL(settings && settings->webGLEnabled())) {
- canvas->dispatchEvent(WebGLContextEvent::create(EventTypeNames::webglcontextcreationerror, false, true, "Web page was not allowed to create a WebGL context."));
- return nullptr;
- }
-
WebGLContextAttributes attributes = toWebGLContextAttributes(attrs);
- blink::WebGraphicsContext3D::Attributes wgc3dAttributes = toWebGraphicsContext3DAttributes(attributes, document.topDocument().url().string(), settings, 1);
- blink::WebGLInfo glInfo;
- OwnPtr<blink::WebGraphicsContext3D> context = adoptPtr(blink::Platform::current()->createOffscreenGraphicsContext3D(wgc3dAttributes, 0, &glInfo));
- if (!context || shouldFailContextCreationForTesting) {
- shouldFailContextCreationForTesting = false;
- String statusMessage;
- if (!glInfo.contextInfoCollectionFailure.isEmpty()) {
- statusMessage.append("Could not create a WebGL context. ");
- statusMessage.append(glInfo.contextInfoCollectionFailure);
- } else {
- statusMessage.append("Could not create a WebGL context");
- if (!glInfo.vendorInfo.isEmpty()) {
- statusMessage.append(" VendorInfo = ");
- statusMessage.append(glInfo.vendorInfo);
- } else {
- statusMessage.append(" VendorInfo = Not Available");
- }
- if (!glInfo.rendererInfo.isEmpty()) {
- statusMessage.append(", RendererInfo = ");
- statusMessage.append(glInfo.rendererInfo);
- } else {
- statusMessage.append(", RendererInfo = Not Available");
- }
- if (!glInfo.driverVersion.isEmpty()) {
- statusMessage.append(", DriverInfo = ");
- statusMessage.append(glInfo.driverVersion);
- } else {
- statusMessage.append(", DriverInfo = Not Available");
- }
- statusMessage.append(".");
- }
- canvas->dispatchEvent(WebGLContextEvent::create(EventTypeNames::webglcontextcreationerror, false, true, statusMessage));
+ OwnPtr<blink::WebGraphicsContext3D> context(createWebGraphicsContext3D(canvas, attributes, 1));
+ if (!context)
return nullptr;
- }
-
OwnPtr<Extensions3DUtil> extensionsUtil = Extensions3DUtil::create(context.get());
if (!extensionsUtil)
return nullptr;
@@ -204,9 +155,4 @@ void WebGLRenderingContext::trace(Visitor* visitor)
WebGLRenderingContextBase::trace(visitor);
}
-void WebGLRenderingContext::forceNextWebGLContextCreationToFail()
-{
- shouldFailContextCreationForTesting = true;
-}
-
} // namespace blink
« no previous file with comments | « Source/core/html/canvas/WebGLRenderingContext.h ('k') | Source/core/html/canvas/WebGLRenderingContextBase.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698