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

Side by Side Diff: sky/engine/core/painting/Canvas.cpp

Issue 1158843002: Sky: Add a Point class. (Closed) Base URL: git@github.com:/domokit/mojo.git@master
Patch Set: Created 5 years, 7 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "sky/engine/config.h" 5 #include "sky/engine/config.h"
6 #include "sky/engine/core/painting/Canvas.h" 6 #include "sky/engine/core/painting/Canvas.h"
7 7
8 #include "sky/engine/core/dom/Document.h" 8 #include "sky/engine/core/dom/Document.h"
9 #include "sky/engine/core/dom/Element.h" 9 #include "sky/engine/core/dom/Element.h"
10 #include "sky/engine/core/painting/PaintingTasks.h" 10 #include "sky/engine/core/painting/PaintingTasks.h"
(...skipping 19 matching lines...) Expand all
30 return; 30 return;
31 ASSERT(m_displayList->isRecording()); 31 ASSERT(m_displayList->isRecording());
32 m_canvas->save(); 32 m_canvas->save();
33 } 33 }
34 34
35 void Canvas::saveLayer(const Rect& bounds, const Paint* paint) 35 void Canvas::saveLayer(const Rect& bounds, const Paint* paint)
36 { 36 {
37 if (!m_canvas) 37 if (!m_canvas)
38 return; 38 return;
39 ASSERT(m_displayList->isRecording()); 39 ASSERT(m_displayList->isRecording());
40 m_canvas->saveLayer(!bounds.is_null ? &bounds.sk_rect : nullptr, 40 m_canvas->saveLayer(!bounds.isNull ? &bounds.skRect : nullptr,
41 paint ? &paint->paint() : nullptr); 41 paint ? &paint->paint() : nullptr);
42 } 42 }
43 43
44 void Canvas::restore() 44 void Canvas::restore()
45 { 45 {
46 if (!m_canvas) 46 if (!m_canvas)
47 return; 47 return;
48 ASSERT(m_displayList->isRecording()); 48 ASSERT(m_displayList->isRecording());
49 m_canvas->restore(); 49 m_canvas->restore();
50 } 50 }
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 SkMatrix sk_matrix; 90 SkMatrix sk_matrix;
91 sk_matrix.set9(matrix.data()); 91 sk_matrix.set9(matrix.data());
92 m_canvas->concat(sk_matrix); 92 m_canvas->concat(sk_matrix);
93 } 93 }
94 94
95 void Canvas::clipRect(const Rect& rect) 95 void Canvas::clipRect(const Rect& rect)
96 { 96 {
97 if (!m_canvas) 97 if (!m_canvas)
98 return; 98 return;
99 ASSERT(m_displayList->isRecording()); 99 ASSERT(m_displayList->isRecording());
100 m_canvas->clipRect(rect.sk_rect); 100 m_canvas->clipRect(rect.skRect);
101 } 101 }
102 102
103 void Canvas::drawPicture(Picture* picture) 103 void Canvas::drawPicture(Picture* picture)
104 { 104 {
105 if (!m_canvas) 105 if (!m_canvas)
106 return; 106 return;
107 ASSERT(picture); 107 ASSERT(picture);
108 ASSERT(m_displayList->isRecording()); 108 ASSERT(m_displayList->isRecording());
109 m_canvas->drawPicture(picture->toSkia()); 109 m_canvas->drawPicture(picture->toSkia());
110 } 110 }
111 111
112 void Canvas::drawPaint(const Paint* paint) 112 void Canvas::drawPaint(const Paint* paint)
113 { 113 {
114 if (!m_canvas) 114 if (!m_canvas)
115 return; 115 return;
116 ASSERT(paint); 116 ASSERT(paint);
117 ASSERT(m_displayList->isRecording()); 117 ASSERT(m_displayList->isRecording());
118 m_canvas->drawPaint(paint->paint()); 118 m_canvas->drawPaint(paint->paint());
119 } 119 }
120 120
121 void Canvas::drawRect(const Rect& rect, const Paint* paint) 121 void Canvas::drawRect(const Rect& rect, const Paint* paint)
122 { 122 {
123 if (!m_canvas) 123 if (!m_canvas)
124 return; 124 return;
125 ASSERT(paint); 125 ASSERT(paint);
126 ASSERT(m_displayList->isRecording()); 126 ASSERT(m_displayList->isRecording());
127 m_canvas->drawRect(rect.sk_rect, paint->paint()); 127 m_canvas->drawRect(rect.skRect, paint->paint());
128 } 128 }
129 129
130 void Canvas::drawOval(const Rect& rect, const Paint* paint) 130 void Canvas::drawOval(const Rect& rect, const Paint* paint)
131 { 131 {
132 if (!m_canvas) 132 if (!m_canvas)
133 return; 133 return;
134 ASSERT(paint); 134 ASSERT(paint);
135 ASSERT(m_displayList->isRecording()); 135 ASSERT(m_displayList->isRecording());
136 m_canvas->drawOval(rect.sk_rect, paint->paint()); 136 m_canvas->drawOval(rect.skRect, paint->paint());
137 } 137 }
138 138
139 void Canvas::drawCircle(float x, float y, float radius, const Paint* paint) 139 void Canvas::drawCircle(float x, float y, float radius, const Paint* paint)
140 { 140 {
141 if (!m_canvas) 141 if (!m_canvas)
142 return; 142 return;
143 ASSERT(paint); 143 ASSERT(paint);
144 ASSERT(m_displayList->isRecording()); 144 ASSERT(m_displayList->isRecording());
145 m_canvas->drawCircle(x, y, radius, paint->paint()); 145 m_canvas->drawCircle(x, y, radius, paint->paint());
146 } 146 }
(...skipping 11 matching lines...) Expand all
158 PassRefPtr<DisplayList> Canvas::finishRecording() 158 PassRefPtr<DisplayList> Canvas::finishRecording()
159 { 159 {
160 if (!isRecording()) 160 if (!isRecording())
161 return nullptr; 161 return nullptr;
162 m_canvas = nullptr; 162 m_canvas = nullptr;
163 m_displayList->endRecording(); 163 m_displayList->endRecording();
164 return m_displayList.release(); 164 return m_displayList.release();
165 } 165 }
166 166
167 } // namespace blink 167 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698