cc/tiled_layer.cc - Issue 11150025: Patch from https://codereview.chromium.org/11111005/ without actual file deletes

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/tiled_layer.cc

Issue 11150025: Patch from https://codereview.chromium.org/11111005/ without actual file deletes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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:

View side-by-side diff with in-line comments

Download patch

Index: cc/tiled_layer.cc

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

index cfec53682698f2f7dc163ac3c144e2806e1d959d..3c1b51d4af8adafa3aa723faa8ffd516d0482f4e 100644

--- a/cc/tiled_layer.cc

+++ b/cc/tiled_layer.cc

@@ -7,12 +7,12 @@

#include "TiledLayerChromium.h"

#include "base/basictypes.h"

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

#include "CCLayerImpl.h"

#include "CCLayerTreeHost.h"

#include "CCOverdrawMetrics.h"

#include "CCTextureUpdateQueue.h"

#include "CCTiledLayerImpl.h"

-#include "GraphicsContext3D.h"

#include "Region.h"

#include <wtf/CurrentTime.h>

#include <wtf/MathExtras.h>

@@ -79,7 +79,7 @@ private:

TiledLayerChromium::TiledLayerChromium()

: LayerChromium()

- , m_textureFormat(GraphicsContext3D::INVALID_ENUM)

+ , m_textureFormat(GL_INVALID_ENUM)

, m_skipsDraw(false)

, m_failedUpdate(false)

, m_sampledTexelFormat(LayerTextureUpdater::SampledTexelFormatInvalid)

« no previous file with comments | « cc/tiled_layer.h ('k') | cc/tiled_layer_impl.cc » ('j') | no next file with comments »