third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp - Issue 1844363003: Move WebGraphicsContext3D::Attributes to Platform::ContextAttributes.

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

Issue 1844363003: Move WebGraphicsContext3D::Attributes to Platform::ContextAttributes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@rm-alphadepthetc

Patch Set: move-attributes: webstring 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

« third_party/WebKit/Source/modules/webgl/WebGLContextAttributeHelpers.h ('K') | « third_party/WebKit/Source/modules/webgl/WebGLContextAttributeHelpers.cpp ('k') | third_party/WebKit/public/platform/Platform.h » ('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 aec68759c7b30dd545be0f6e743cce7338cce578..7840725d3eb09c10cfaccb60671f82697babb9e1 100644

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

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

@@ -562,10 +562,11 @@ PassOwnPtr<WebGraphicsContext3DProvider> WebGLRenderingContextBase::createWebGra

return nullptr;

}

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

+ WebGraphicsContext3D::Attributes wgc3dAttributes = toWebGraphicsContext3DAttributes(attributes, webGLVersion);

Platform::GraphicsInfo glInfo;

glInfo.testFailContext = shouldFailContextCreationForTesting;

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

+ OwnPtr<WebGraphicsContext3DProvider> contextProvider = adoptPtr(Platform::current()->createOffscreenGraphicsContext3DProvider(

+ wgc3dAttributes, document.topDocument().url(), 0, &glInfo));

if (!contextProvider || shouldFailContextCreationForTesting) {

shouldFailContextCreationForTesting = false;

canvas->dispatchEvent(WebGLContextEvent::create(EventTypeNames::webglcontextcreationerror, false, true, extractWebGLContextCreationError(glInfo)));

@@ -6007,9 +6008,10 @@ void WebGLRenderingContextBase::maybeRestoreContext(Timer<WebGLRenderingContextB

m_drawingBuffer.clear();

}

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

+ WebGraphicsContext3D::Attributes attributes = toWebGraphicsContext3DAttributes(m_requestedAttributes, version());

Platform::GraphicsInfo glInfo;

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

+ OwnPtr<WebGraphicsContext3DProvider> contextProvider = adoptPtr(Platform::current()->createOffscreenGraphicsContext3DProvider(

+ attributes, canvas()->document().topDocument().url(), 0, &glInfo));

RefPtr<DrawingBuffer> buffer;

if (contextProvider) {

// Construct a new drawing buffer with the new WebGraphicsContext3D.