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

Side by Side Diff: cc/output/software_output_device.h

Issue 638353002: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr in src/… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formating. 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_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_ 5 #ifndef CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_
6 #define CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_ 6 #define CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "cc/base/cc_export.h" 10 #include "cc/base/cc_export.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 // Ensures that there is a backing buffer available on this instance. 61 // Ensures that there is a backing buffer available on this instance.
62 virtual void EnsureBackbuffer() {} 62 virtual void EnsureBackbuffer() {}
63 63
64 // TODO(skaslev) Remove this after UberCompositor lands. 64 // TODO(skaslev) Remove this after UberCompositor lands.
65 // Called in response to receiving a SwapBuffersAck. At this point, software 65 // Called in response to receiving a SwapBuffersAck. At this point, software
66 // frame identified by id can be reused or discarded as it is no longer being 66 // frame identified by id can be reused or discarded as it is no longer being
67 // displayed. 67 // displayed.
68 virtual void ReclaimSoftwareFrame(unsigned id); 68 virtual void ReclaimSoftwareFrame(unsigned id);
69 69
70 // VSyncProvider used to update the timer used to schedule draws with the 70 // VSyncProvider used to update the timer used to schedule draws with the
71 // hardware vsync. Return NULL if a provider doesn't exist. 71 // hardware vsync. Return nullptr if a provider doesn't exist.
danakj 2014/10/10 17:28:45 just use null
72 virtual gfx::VSyncProvider* GetVSyncProvider(); 72 virtual gfx::VSyncProvider* GetVSyncProvider();
73 73
74 protected: 74 protected:
75 gfx::Size viewport_pixel_size_; 75 gfx::Size viewport_pixel_size_;
76 float scale_factor_; 76 float scale_factor_;
77 gfx::Rect damage_rect_; 77 gfx::Rect damage_rect_;
78 skia::RefPtr<SkCanvas> canvas_; 78 skia::RefPtr<SkCanvas> canvas_;
79 scoped_ptr<gfx::VSyncProvider> vsync_provider_; 79 scoped_ptr<gfx::VSyncProvider> vsync_provider_;
80 80
81 private: 81 private:
82 DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDevice); 82 DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDevice);
83 }; 83 };
84 84
85 } // namespace cc 85 } // namespace cc
86 86
87 #endif // CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_ 87 #endif // CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698