Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Unified Diff: cc/texture_copier.cc

Issue 11410021: Remove WTF and WebCore from cc/ and webkit/compositor_bindings/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix content_browsertests Created 8 years, 1 month 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 | « cc/test/tiled_layer_test_common.cc ('k') | cc/texture_copier_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/texture_copier.cc
diff --git a/cc/texture_copier.cc b/cc/texture_copier.cc
index ddb0f7a549df7dbcb857e0d4de246de22d897492..5bb4e1be277e8e09585e2f347f24553978d4f910 100644
--- a/cc/texture_copier.cc
+++ b/cc/texture_copier.cc
@@ -2,11 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "config.h"
-
#include "cc/texture_copier.h"
#include "base/debug/trace_event.h"
+#include "build/build_config.h"
#include "cc/gl_renderer.h" // For the GLC() macro.
#include "third_party/khronos/GLES2/gl2.h"
#include <public/WebGraphicsContext3D.h>
@@ -55,7 +54,7 @@ void AcceleratedTextureCopier::copyTexture(Parameters parameters)
GLC(m_context, m_context->bindFramebuffer(GL_FRAMEBUFFER, m_fbo));
GLC(m_context, m_context->framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, parameters.destTexture, 0));
-#if OS(ANDROID)
+#if defined(OS_ANDROID)
// Clear destination to improve performance on tiling GPUs.
// TODO: Use EXT_discard_framebuffer or skip clearing if it isn't available.
GLC(m_context, m_context->clear(GL_COLOR_BUFFER_BIT));
« no previous file with comments | « cc/test/tiled_layer_test_common.cc ('k') | cc/texture_copier_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698