| OLD | NEW |
| 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/texture_uploader.h" | 5 #include "cc/texture_uploader.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/debug/alias.h" | 10 #include "base/debug/alias.h" |
| 11 #include "base/debug/trace_event.h" | 11 #include "base/debug/trace_event.h" |
| 12 #include "base/metrics/histogram.h" | 12 #include "base/metrics/histogram.h" |
| 13 #include "cc/base/util.h" | 13 #include "cc/base/util.h" |
| 14 #include "cc/prioritized_resource.h" | 14 #include "cc/resources/prioritized_resource.h" |
| 15 #include "cc/resource.h" | 15 #include "cc/resources/resource.h" |
| 16 #include "gpu/GLES2/gl2extchromium.h" | 16 #include "gpu/GLES2/gl2extchromium.h" |
| 17 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3
D.h" | 17 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3
D.h" |
| 18 #include "third_party/khronos/GLES2/gl2.h" | 18 #include "third_party/khronos/GLES2/gl2.h" |
| 19 #include "third_party/khronos/GLES2/gl2ext.h" | 19 #include "third_party/khronos/GLES2/gl2ext.h" |
| 20 #include "ui/gfx/rect.h" | 20 #include "ui/gfx/rect.h" |
| 21 #include "ui/gfx/vector2d.h" | 21 #include "ui/gfx/vector2d.h" |
| 22 | 22 |
| 23 namespace { | 23 namespace { |
| 24 | 24 |
| 25 // How many previous uploads to use when predicting future throughput. | 25 // How many previous uploads to use when predicting future throughput. |
| (...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 342 textures_per_second_history_.erase(textures_per_second_history_.begin()); | 342 textures_per_second_history_.erase(textures_per_second_history_.begin()); |
| 343 textures_per_second_history_.erase(--textures_per_second_history_.end()); | 343 textures_per_second_history_.erase(--textures_per_second_history_.end()); |
| 344 } | 344 } |
| 345 textures_per_second_history_.insert(textures_per_second); | 345 textures_per_second_history_.insert(textures_per_second); |
| 346 | 346 |
| 347 available_queries_.push_back(pending_queries_.take_front()); | 347 available_queries_.push_back(pending_queries_.take_front()); |
| 348 } | 348 } |
| 349 } | 349 } |
| 350 | 350 |
| 351 } // namespace cc | 351 } // namespace cc |
| OLD | NEW |