cc/heads_up_display_layer_impl.cc - Issue 11111005: Remove GraphicsContext3D:: stubs from cc

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: cc/heads_up_display_layer_impl.cc

Issue 11111005: Remove GraphicsContext3D:: stubs from cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase again Created 8 years, 2 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: cc/heads_up_display_layer_impl.cc

diff --git a/cc/heads_up_display_layer_impl.cc b/cc/heads_up_display_layer_impl.cc

index c6a46b80ec7e99b89efa0789ff77da7b7522e82a..1904baf4fa3d4cfc909068ce5ce976289ef5e49f 100644

--- a/cc/heads_up_display_layer_impl.cc

+++ b/cc/heads_up_display_layer_impl.cc

@@ -6,20 +6,21 @@

#include "CCHeadsUpDisplayLayerImpl.h"

-#include "base/stringprintf.h"

-#include "ui/gfx/point.h"

#include "CCDebugRectHistory.h"

#include "CCFontAtlas.h"

#include "CCFrameRateCounter.h"

#include "CCLayerTreeHostImpl.h"

#include "CCQuadSink.h"

#include "CCTextureDrawQuad.h"

-#include "Extensions3DChromium.h"

-#include "GraphicsContext3D.h"

+#include "base/stringprintf.h"

#include "skia/ext/platform_canvas.h"

+#include "skia/ext/platform_canvas.h"

+#include "third_party/khronos/GLES2/gl2.h"

+#include "third_party/khronos/GLES2/gl2ext.h"

#include "third_party/skia/include/core/SkBitmap.h"

#include "third_party/skia/include/core/SkPaint.h"

#include "third_party/skia/include/effects/SkColorMatrixFilter.h"

+#include "ui/gfx/point.h"

namespace cc {

@@ -67,7 +68,7 @@ void CCHeadsUpDisplayLayerImpl::willDraw(CCResourceProvider* resourceProvider)

m_hudTexture->free();

if (!m_hudTexture->id())

- m_hudTexture->allocate(CCRenderer::ImplPool, bounds(), GraphicsContext3D::RGBA, CCResourceProvider::TextureUsageAny);

+ m_hudTexture->allocate(CCRenderer::ImplPool, bounds(), GL_RGBA, CCResourceProvider::TextureUsageAny);

}

void CCHeadsUpDisplayLayerImpl::appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& appendQuadsData)

« no previous file with comments | « cc/gl_renderer_unittest.cc ('k') | cc/image_layer.cc » ('j') | no next file with comments »