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

Side by Side Diff: cc/test/fake_proxy.h

Issue 634243003: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr [part-4] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formating fix. Created 6 years, 2 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
OLDNEW
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 #ifndef CC_TEST_FAKE_PROXY_H_ 5 #ifndef CC_TEST_FAKE_PROXY_H_
6 #define CC_TEST_FAKE_PROXY_H_ 6 #define CC_TEST_FAKE_PROXY_H_
7 7
8 #include "base/single_thread_task_runner.h" 8 #include "base/single_thread_task_runner.h"
9 #include "cc/trees/layer_tree_host.h" 9 #include "cc/trees/layer_tree_host.h"
10 #include "cc/trees/proxy.h" 10 #include "cc/trees/proxy.h"
11 11
12 namespace cc { 12 namespace cc {
13 13
14 class FakeProxy : public Proxy { 14 class FakeProxy : public Proxy {
15 public: 15 public:
16 FakeProxy() : Proxy(NULL, NULL), layer_tree_host_(NULL) {} 16 FakeProxy() : Proxy(nullptr, nullptr), layer_tree_host_(nullptr) {}
17 explicit FakeProxy( 17 explicit FakeProxy(
18 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, 18 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
19 scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner) 19 scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner)
20 : Proxy(main_task_runner, impl_task_runner), layer_tree_host_(NULL) {} 20 : Proxy(main_task_runner, impl_task_runner), layer_tree_host_(nullptr) {}
21 21
22 void SetLayerTreeHost(LayerTreeHost* host); 22 void SetLayerTreeHost(LayerTreeHost* host);
23 23
24 virtual void FinishAllRendering() override {} 24 virtual void FinishAllRendering() override {}
25 virtual bool IsStarted() const override; 25 virtual bool IsStarted() const override;
26 virtual void SetOutputSurface(scoped_ptr<OutputSurface>) override {} 26 virtual void SetOutputSurface(scoped_ptr<OutputSurface>) override {}
27 virtual void SetLayerTreeHostClientReady() override {} 27 virtual void SetLayerTreeHostClientReady() override {}
28 virtual void SetVisible(bool visible) override {} 28 virtual void SetVisible(bool visible) override {}
29 virtual const RendererCapabilities& GetRendererCapabilities() const override; 29 virtual const RendererCapabilities& GetRendererCapabilities() const override;
30 virtual void SetNeedsAnimate() override {} 30 virtual void SetNeedsAnimate() override {}
(...skipping 20 matching lines...) Expand all
51 51
52 private: 52 private:
53 RendererCapabilities capabilities_; 53 RendererCapabilities capabilities_;
54 size_t max_partial_texture_updates_; 54 size_t max_partial_texture_updates_;
55 LayerTreeHost* layer_tree_host_; 55 LayerTreeHost* layer_tree_host_;
56 }; 56 };
57 57
58 } // namespace cc 58 } // namespace cc
59 59
60 #endif // CC_TEST_FAKE_PROXY_H_ 60 #endif // CC_TEST_FAKE_PROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698