third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp - Issue 1832263002: Remove WGC3D typedefs and move WebGraphicsInfo to Platform.

Unified Diff: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp

Issue 1832263002: Remove WGC3D typedefs and move WebGraphicsInfo to Platform. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: webgraphicsinfo: rebase Created 4 years, 9 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

« no previous file with comments | « gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.cc ('k') | third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp

diff --git a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp

index b2d2ac957d8e916e758c8df9cbe96112aa6d9828..143731a384476a021e480090d788dc5dc155f652 100644

--- a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp

+++ b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp

@@ -503,7 +503,7 @@ public:

~WebGLRenderingContextErrorMessageCallback() override { }

- virtual void onErrorMessage(const WebString& message, WGC3Dint)

+ virtual void onErrorMessage(const WebString& message, GLint)

{

if (m_context->m_synthesizedErrorsToConsole)

m_context->printGLErrorToConsole(message);

@@ -528,7 +528,7 @@ static void formatWebGLStatusString(const String& glInfo, const String& infostri

statusMessage.append(", " + glInfo + " = " + infostring);

}

-static String extractWebGLContextCreationError(const WebGraphicsContext3D::WebGraphicsInfo& info)

+static String extractWebGLContextCreationError(const Platform::GraphicsInfo& info)

{

String statusMessage("Could not create a WebGL context");

formatWebGLStatusString("VENDOR", info.vendorId ? String::format("0x%04x", info.vendorId).utf8().data() : "0xffff", statusMessage);

@@ -564,7 +564,7 @@ PassOwnPtr<WebGraphicsContext3DProvider> WebGLRenderingContextBase::createWebGra

}

WebGraphicsContext3D::Attributes wgc3dAttributes = toWebGraphicsContext3DAttributes(attributes, document.topDocument().url().getString(), settings, webGLVersion);

- WebGraphicsContext3D::WebGraphicsInfo glInfo;

+ Platform::GraphicsInfo glInfo;

glInfo.testFailContext = shouldFailContextCreationForTesting;

OwnPtr<WebGraphicsContext3DProvider> contextProvider = adoptPtr(Platform::current()->createOffscreenGraphicsContext3DProvider(wgc3dAttributes, 0, &glInfo));

if (!contextProvider || shouldFailContextCreationForTesting) {

@@ -5996,7 +5996,7 @@ void WebGLRenderingContextBase::maybeRestoreContext(Timer<WebGLRenderingContextB

}

WebGraphicsContext3D::Attributes attributes = toWebGraphicsContext3DAttributes(m_requestedAttributes, canvas()->document().topDocument().url().getString(), settings, version());

- blink::WebGraphicsContext3D::WebGraphicsInfo glInfo;

+ Platform::GraphicsInfo glInfo;

OwnPtr<WebGraphicsContext3DProvider> contextProvider = adoptPtr(Platform::current()->createOffscreenGraphicsContext3DProvider(attributes, 0, &glInfo));

RefPtr<DrawingBuffer> buffer;

if (contextProvider) {