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

Side by Side Diff: Source/core/html/canvas/CanvasRenderingContext2DState.cpp

Issue 1215843002: Oilpan: fix build after r197938. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 5 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 | « Source/core/html/canvas/CanvasRenderingContext2DState.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "config.h" 5 #include "config.h"
6 6
7 #include "core/html/canvas/CanvasRenderingContext2DState.h" 7 #include "core/html/canvas/CanvasRenderingContext2DState.h"
8 8
9 #include "core/css/CSSFontSelector.h" 9 #include "core/css/CSSFontSelector.h"
10 #include "core/css/resolver/FilterOperationResolver.h" 10 #include "core/css/resolver/FilterOperationResolver.h"
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 m_font.update(fontSelector); 169 m_font.update(fontSelector);
170 // FIXME: We only really need to invalidate the resolved filter if the font 170 // FIXME: We only really need to invalidate the resolved filter if the font
171 // update above changed anything and the filter uses font-dependent units. 171 // update above changed anything and the filter uses font-dependent units.
172 m_resolvedFilter.clear(); 172 m_resolvedFilter.clear();
173 } 173 }
174 174
175 DEFINE_TRACE(CanvasRenderingContext2DState) 175 DEFINE_TRACE(CanvasRenderingContext2DState)
176 { 176 {
177 visitor->trace(m_strokeStyle); 177 visitor->trace(m_strokeStyle);
178 visitor->trace(m_fillStyle); 178 visitor->trace(m_fillStyle);
179 visitor->trace(m_filterValue);
179 CSSFontSelectorClient::trace(visitor); 180 CSSFontSelectorClient::trace(visitor);
180 } 181 }
181 182
182 void CanvasRenderingContext2DState::setLineDashOffset(float offset) 183 void CanvasRenderingContext2DState::setLineDashOffset(float offset)
183 { 184 {
184 m_lineDashOffset = offset; 185 m_lineDashOffset = offset;
185 m_lineDashDirty = true; 186 m_lineDashDirty = true;
186 } 187 }
187 188
188 void CanvasRenderingContext2DState::setLineDash(const Vector<float>& dash) 189 void CanvasRenderingContext2DState::setLineDash(const Vector<float>& dash)
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
520 paint->setLooper(0); 521 paint->setLooper(0);
521 paint->setImageFilter(shadowAndForegroundImageFilter()); 522 paint->setImageFilter(shadowAndForegroundImageFilter());
522 return paint; 523 return paint;
523 } 524 }
524 paint->setLooper(shadowAndForegroundDrawLooper()); 525 paint->setLooper(shadowAndForegroundDrawLooper());
525 paint->setImageFilter(0); 526 paint->setImageFilter(0);
526 return paint; 527 return paint;
527 } 528 }
528 529
529 } // blink 530 } // blink
OLDNEW
« no previous file with comments | « Source/core/html/canvas/CanvasRenderingContext2DState.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698