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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.h

Issue 10543010: Smooth Tab Switching on aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Simplifying this patch since the CompositorLock already nicely resets itself after a timeout. Created 8 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 | « no previous file | content/browser/renderer_host/render_widget_host_view_aura.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/callback.h" 12 #include "base/callback.h"
13 #include "base/memory/linked_ptr.h" 13 #include "base/memory/linked_ptr.h"
14 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
15 #include "content/browser/renderer_host/image_transport_factory.h" 15 #include "content/browser/renderer_host/image_transport_factory.h"
16 #include "content/browser/renderer_host/render_widget_host_view_base.h" 16 #include "content/browser/renderer_host/render_widget_host_view_base.h"
17 #include "content/common/content_export.h" 17 #include "content/common/content_export.h"
18 #include "ui/aura/client/activation_delegate.h" 18 #include "ui/aura/client/activation_delegate.h"
19 #include "ui/aura/window_delegate.h" 19 #include "ui/aura/window_delegate.h"
20 #include "ui/base/ime/text_input_client.h" 20 #include "ui/base/ime/text_input_client.h"
21 #include "ui/compositor/compositor_observer.h" 21 #include "ui/compositor/compositor_observer.h"
22 #include "ui/gfx/rect.h" 22 #include "ui/gfx/rect.h"
23 #include "webkit/glue/webcursor.h" 23 #include "webkit/glue/webcursor.h"
24 24
25 namespace aura {
26 class CompositorLock;
27 }
28
25 namespace content { 29 namespace content {
26 class RenderWidgetHostImpl; 30 class RenderWidgetHostImpl;
27 class RenderWidgetHostView; 31 class RenderWidgetHostView;
28 } 32 }
29 33
30 namespace gfx { 34 namespace gfx {
31 class Canvas; 35 class Canvas;
32 } 36 }
33 37
34 namespace ui { 38 namespace ui {
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 bool needs_update_texture_; 304 bool needs_update_texture_;
301 305
302 // Used to prevent further resizes while a resize is pending. 306 // Used to prevent further resizes while a resize is pending.
303 class ResizeLock; 307 class ResizeLock;
304 // These locks are the ones waiting for a texture of the right size to come 308 // These locks are the ones waiting for a texture of the right size to come
305 // back from the renderer/GPU process. 309 // back from the renderer/GPU process.
306 std::vector<linked_ptr<ResizeLock> > resize_locks_; 310 std::vector<linked_ptr<ResizeLock> > resize_locks_;
307 // These locks are the ones waiting for a frame to be drawn. 311 // These locks are the ones waiting for a frame to be drawn.
308 std::vector<linked_ptr<ResizeLock> > locks_pending_draw_; 312 std::vector<linked_ptr<ResizeLock> > locks_pending_draw_;
309 313
314 // This lock is for waiting for a front surface to become available to draw.
315 scoped_refptr<aura::CompositorLock> released_front_lock_;
316
310 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); 317 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
311 }; 318 };
312 319
313 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 320 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698