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

Side by Side Diff: android_webview/browser/render_thread_manager.cc

Issue 2354903003: Don't include the tracing in gpu_memory_buffer.h (Closed)
Patch Set: Fix linux build again Created 4 years, 3 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 | « no previous file | cc/output/software_renderer_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 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 "android_webview/browser/render_thread_manager.h" 5 #include "android_webview/browser/render_thread_manager.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "android_webview/browser/child_frame.h" 9 #include "android_webview/browser/child_frame.h"
10 #include "android_webview/browser/compositor_frame_producer.h" 10 #include "android_webview/browser/compositor_frame_producer.h"
11 #include "android_webview/browser/compositor_id.h" 11 #include "android_webview/browser/compositor_id.h"
12 #include "android_webview/browser/deferred_gpu_command_service.h" 12 #include "android_webview/browser/deferred_gpu_command_service.h"
13 #include "android_webview/browser/hardware_renderer.h" 13 #include "android_webview/browser/hardware_renderer.h"
14 #include "android_webview/browser/render_thread_manager_client.h" 14 #include "android_webview/browser/render_thread_manager_client.h"
15 #include "android_webview/browser/scoped_app_gl_state_restore.h" 15 #include "android_webview/browser/scoped_app_gl_state_restore.h"
16 #include "android_webview/public/browser/draw_gl.h" 16 #include "android_webview/public/browser/draw_gl.h"
17 #include "base/bind.h" 17 #include "base/bind.h"
18 #include "base/lazy_instance.h" 18 #include "base/lazy_instance.h"
19 #include "base/location.h" 19 #include "base/location.h"
20 #include "base/time/time.h" 20 #include "base/time/time.h"
21 #include "base/trace_event/trace_event.h"
21 #include "base/trace_event/trace_event_argument.h" 22 #include "base/trace_event/trace_event_argument.h"
22 23
23 namespace android_webview { 24 namespace android_webview {
24 25
25 namespace internal { 26 namespace internal {
26 27
27 class RequestInvokeGLTracker { 28 class RequestInvokeGLTracker {
28 public: 29 public:
29 RequestInvokeGLTracker(); 30 RequestInvokeGLTracker();
30 bool ShouldRequestOnNonUiThread(RenderThreadManager* state); 31 bool ShouldRequestOnNonUiThread(RenderThreadManager* state);
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 : render_thread_manager_(render_thread_manager) { 399 : render_thread_manager_(render_thread_manager) {
399 DCHECK(!render_thread_manager_->IsInsideHardwareRelease()); 400 DCHECK(!render_thread_manager_->IsInsideHardwareRelease());
400 render_thread_manager_->SetInsideHardwareRelease(true); 401 render_thread_manager_->SetInsideHardwareRelease(true);
401 } 402 }
402 403
403 RenderThreadManager::InsideHardwareReleaseReset::~InsideHardwareReleaseReset() { 404 RenderThreadManager::InsideHardwareReleaseReset::~InsideHardwareReleaseReset() {
404 render_thread_manager_->SetInsideHardwareRelease(false); 405 render_thread_manager_->SetInsideHardwareRelease(false);
405 } 406 }
406 407
407 } // namespace android_webview 408 } // namespace android_webview
OLDNEW
« no previous file with comments | « no previous file | cc/output/software_renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698