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

Side by Side Diff: cc/resources/resource_provider.cc

Issue 16085003: Update refernces to Blink's Platform API (cc) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/resources/platform_color.h ('k') | cc/resources/resource_provider_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/resources/resource_provider.h" 5 #include "cc/resources/resource_provider.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 9
10 #include "base/debug/alias.h" 10 #include "base/debug/alias.h"
11 #include "base/hash_tables.h" 11 #include "base/hash_tables.h"
12 #include "base/stl_util.h" 12 #include "base/stl_util.h"
13 #include "base/string_util.h" 13 #include "base/string_util.h"
14 #include "base/strings/string_split.h" 14 #include "base/strings/string_split.h"
15 #include "cc/output/gl_renderer.h" // For the GLC() macro. 15 #include "cc/output/gl_renderer.h" // For the GLC() macro.
16 #include "cc/resources/platform_color.h" 16 #include "cc/resources/platform_color.h"
17 #include "cc/resources/transferable_resource.h" 17 #include "cc/resources/transferable_resource.h"
18 #include "cc/scheduler/texture_uploader.h" 18 #include "cc/scheduler/texture_uploader.h"
19 #include "gpu/GLES2/gl2extchromium.h" 19 #include "gpu/GLES2/gl2extchromium.h"
20 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3 D.h" 20 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
21 #include "third_party/khronos/GLES2/gl2.h" 21 #include "third_party/khronos/GLES2/gl2.h"
22 #include "third_party/khronos/GLES2/gl2ext.h" 22 #include "third_party/khronos/GLES2/gl2ext.h"
23 #include "ui/gfx/rect.h" 23 #include "ui/gfx/rect.h"
24 #include "ui/gfx/vector2d.h" 24 #include "ui/gfx/vector2d.h"
25 25
26 using WebKit::WebGraphicsContext3D; 26 using WebKit::WebGraphicsContext3D;
27 27
28 namespace cc { 28 namespace cc {
29 29
30 namespace { 30 namespace {
(...skipping 1334 matching lines...) Expand 10 before | Expand all | Expand 10 after
1365 WebGraphicsContext3D* context3d = output_surface_->context3d(); 1365 WebGraphicsContext3D* context3d = output_surface_->context3d();
1366 DCHECK(context3d); 1366 DCHECK(context3d);
1367 int stride = 0; 1367 int stride = 0;
1368 context3d->getImageParameterivCHROMIUM( 1368 context3d->getImageParameterivCHROMIUM(
1369 resource->image_id, GL_IMAGE_ROWBYTES_CHROMIUM, &stride); 1369 resource->image_id, GL_IMAGE_ROWBYTES_CHROMIUM, &stride);
1370 return stride; 1370 return stride;
1371 } 1371 }
1372 1372
1373 1373
1374 } // namespace cc 1374 } // namespace cc
OLDNEW
« no previous file with comments | « cc/resources/platform_color.h ('k') | cc/resources/resource_provider_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698