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

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

Issue 660333004: cc cleanup: Update paths to geometry headers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 6 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 unified diff | Download patch
« no previous file with comments | « cc/resources/texture_mailbox.cc ('k') | cc/resources/tile.h » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/texture_uploader.h" 5 #include "cc/resources/texture_uploader.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
11 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.h"
12 #include "cc/base/util.h" 12 #include "cc/base/util.h"
13 #include "cc/resources/prioritized_resource.h"
14 #include "cc/resources/resource.h" 13 #include "cc/resources/resource.h"
15 #include "gpu/GLES2/gl2extchromium.h" 14 #include "gpu/GLES2/gl2extchromium.h"
16 #include "gpu/command_buffer/client/gles2_interface.h" 15 #include "gpu/command_buffer/client/gles2_interface.h"
17 #include "third_party/khronos/GLES2/gl2.h" 16 #include "third_party/khronos/GLES2/gl2.h"
18 #include "third_party/khronos/GLES2/gl2ext.h" 17 #include "third_party/khronos/GLES2/gl2ext.h"
19 #include "ui/gfx/rect.h" 18 #include "ui/gfx/geometry/rect.h"
20 #include "ui/gfx/vector2d.h" 19 #include "ui/gfx/geometry/vector2d.h"
21 20
22 using gpu::gles2::GLES2Interface; 21 using gpu::gles2::GLES2Interface;
23 22
24 namespace { 23 namespace {
25 24
26 // How many previous uploads to use when predicting future throughput. 25 // How many previous uploads to use when predicting future throughput.
27 static const size_t kUploadHistorySizeMax = 1000; 26 static const size_t kUploadHistorySizeMax = 1000;
28 static const size_t kUploadHistorySizeInitial = 100; 27 static const size_t kUploadHistorySizeInitial = 100;
29 28
30 // Global estimated number of textures per second to maintain estimates across 29 // Global estimated number of textures per second to maintain estimates across
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 textures_per_second_history_.erase(textures_per_second_history_.begin()); 329 textures_per_second_history_.erase(textures_per_second_history_.begin());
331 textures_per_second_history_.erase(--textures_per_second_history_.end()); 330 textures_per_second_history_.erase(--textures_per_second_history_.end());
332 } 331 }
333 textures_per_second_history_.insert(textures_per_second); 332 textures_per_second_history_.insert(textures_per_second);
334 333
335 available_queries_.push_back(pending_queries_.take_front()); 334 available_queries_.push_back(pending_queries_.take_front());
336 } 335 }
337 } 336 }
338 337
339 } // namespace cc 338 } // namespace cc
OLDNEW
« no previous file with comments | « cc/resources/texture_mailbox.cc ('k') | cc/resources/tile.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698