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

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

Issue 567923002: Refactoring the weak_ptr_factory order in content/browser/renderer_host (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 | content/browser/renderer_host/compositor_resize_lock_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 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 #ifndef CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_RESIZE_LOCK_AURA_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_RESIZE_LOCK_AURA_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_RESIZE_LOCK_AURA_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_RESIZE_LOCK_AURA_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "base/time/time.h" 10 #include "base/time/time.h"
(...skipping 20 matching lines...) Expand all
31 virtual bool GrabDeferredLock() OVERRIDE; 31 virtual bool GrabDeferredLock() OVERRIDE;
32 virtual void UnlockCompositor() OVERRIDE; 32 virtual void UnlockCompositor() OVERRIDE;
33 33
34 protected: 34 protected:
35 virtual void LockCompositor() OVERRIDE; 35 virtual void LockCompositor() OVERRIDE;
36 void CancelLock(); 36 void CancelLock();
37 37
38 private: 38 private:
39 aura::WindowTreeHost* host_; 39 aura::WindowTreeHost* host_;
40 scoped_refptr<ui::CompositorLock> compositor_lock_; 40 scoped_refptr<ui::CompositorLock> compositor_lock_;
41 bool cancelled_;
42
41 base::WeakPtrFactory<CompositorResizeLock> weak_ptr_factory_; 43 base::WeakPtrFactory<CompositorResizeLock> weak_ptr_factory_;
42 bool cancelled_;
43 44
44 DISALLOW_COPY_AND_ASSIGN(CompositorResizeLock); 45 DISALLOW_COPY_AND_ASSIGN(CompositorResizeLock);
45 }; 46 };
46 47
47 } // namespace content 48 } // namespace content
48 49
49 #endif // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_RESIZE_LOCK_AURA_H_ 50 #endif // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_RESIZE_LOCK_AURA_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/compositor_resize_lock_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698