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/prioritized_resource.h" | 13 #include "cc/prioritized_resource.h" |
14 #include "cc/resource.h" | 14 #include "cc/resource.h" |
15 #include "cc/util.h" | 15 #include "cc/util.h" |
| 16 #include "gpu/GLES2/gl2extchromium.h" |
16 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3
D.h" | 17 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3
D.h" |
17 #include "third_party/khronos/GLES2/gl2.h" | 18 #include "third_party/khronos/GLES2/gl2.h" |
18 #include "third_party/khronos/GLES2/gl2ext.h" | 19 #include "third_party/khronos/GLES2/gl2ext.h" |
19 #include "ui/gfx/rect.h" | 20 #include "ui/gfx/rect.h" |
20 #include "ui/gfx/vector2d.h" | 21 #include "ui/gfx/vector2d.h" |
21 | 22 |
22 namespace { | 23 namespace { |
23 | 24 |
24 // How many previous uploads to use when predicting future throughput. | 25 // How many previous uploads to use when predicting future throughput. |
25 static const size_t uploadHistorySizeMax = 1000; | 26 static const size_t uploadHistorySizeMax = 1000; |
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
362 m_texturesPerSecondHistory.erase(m_texturesPerSecondHistory.begin())
; | 363 m_texturesPerSecondHistory.erase(m_texturesPerSecondHistory.begin())
; |
363 m_texturesPerSecondHistory.erase(--m_texturesPerSecondHistory.end())
; | 364 m_texturesPerSecondHistory.erase(--m_texturesPerSecondHistory.end())
; |
364 } | 365 } |
365 m_texturesPerSecondHistory.insert(texturesPerSecond); | 366 m_texturesPerSecondHistory.insert(texturesPerSecond); |
366 | 367 |
367 m_availableQueries.push_back(m_pendingQueries.take_front()); | 368 m_availableQueries.push_back(m_pendingQueries.take_front()); |
368 } | 369 } |
369 } | 370 } |
370 | 371 |
371 } // namespace cc | 372 } // namespace cc |
OLD | NEW |