Source/core/platform/graphics/chromium/Canvas2DLayerBridge.cpp - Issue 15301006: Merged GraphicsContext3DPrivate into GraphicsContext3D

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/platform/graphics/chromium/Canvas2DLayerBridge.cpp

Issue 15301006: Merged GraphicsContext3DPrivate into GraphicsContext3D (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Removed ExtractWebGraphicsContext3D Created 7 years, 7 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:

Index: Source/core/platform/graphics/chromium/Canvas2DLayerBridge.cpp

diff --git a/Source/core/platform/graphics/chromium/Canvas2DLayerBridge.cpp b/Source/core/platform/graphics/chromium/Canvas2DLayerBridge.cpp

index 6ba5d17bfc7c55cda98116383f50306c999bff4d..8715c44be61a490d0efe6489bddff8c640e9290d 100644

--- a/Source/core/platform/graphics/chromium/Canvas2DLayerBridge.cpp

+++ b/Source/core/platform/graphics/chromium/Canvas2DLayerBridge.cpp

@@ -31,7 +31,6 @@

#include "SkDevice.h"

#include "SkSurface.h"

#include "core/platform/chromium/TraceEvent.h"

-#include "core/platform/chromium/support/GraphicsContext3DPrivate.h"

#include "core/platform/graphics/GraphicsContext3D.h"

#include "core/platform/graphics/chromium/Canvas2DLayerManager.h"

#include "core/platform/graphics/chromium/GraphicsLayerChromium.h"

@@ -167,7 +166,7 @@ unsigned Canvas2DLayerBridge::prepareTexture(WebTextureUpdater& updater)

WebGraphicsContext3D* Canvas2DLayerBridge::context()

{

- return GraphicsContext3DPrivate::extractWebGraphicsContext3D(m_context.get());

+ return m_context->webContext();

}

bool Canvas2DLayerBridge::prepareMailbox(WebKit::WebExternalTextureMailbox* outMailbox)