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

Side by Side Diff: Source/modules/canvas2d/CanvasRenderingContext2D.cpp

Issue 1240223003: Oilpan: remove unnecessary ENABLE(OILPAN) protections of trace() calls. (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 | « no previous file | Source/modules/compositorworker/CompositorWorkerGlobalScope.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
3 * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2007 Alp Toker <alp@atoker.com> 4 * Copyright (C) 2007 Alp Toker <alp@atoker.com>
5 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 5 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
6 * Copyright (C) 2008 Dirk Schulze <krit@webkit.org> 6 * Copyright (C) 2008 Dirk Schulze <krit@webkit.org>
7 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved. 7 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
8 * Copyright (C) 2012, 2013 Intel Corporation. All rights reserved. 8 * Copyright (C) 2012, 2013 Intel Corporation. All rights reserved.
9 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 9 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
10 * 10 *
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 } else { 209 } else {
210 // legacy synchronous context restoration. 210 // legacy synchronous context restoration.
211 reset(); 211 reset();
212 m_contextLostMode = NotLostContext; 212 m_contextLostMode = NotLostContext;
213 } 213 }
214 } 214 }
215 } 215 }
216 216
217 DEFINE_TRACE(CanvasRenderingContext2D) 217 DEFINE_TRACE(CanvasRenderingContext2D)
218 { 218 {
219 #if ENABLE(OILPAN)
220 visitor->trace(m_stateStack); 219 visitor->trace(m_stateStack);
221 visitor->trace(m_hitRegionManager); 220 visitor->trace(m_hitRegionManager);
222 #endif
223 CanvasRenderingContext::trace(visitor); 221 CanvasRenderingContext::trace(visitor);
224 } 222 }
225 223
226 void CanvasRenderingContext2D::dispatchContextLostEvent(Timer<CanvasRenderingCon text2D>*) 224 void CanvasRenderingContext2D::dispatchContextLostEvent(Timer<CanvasRenderingCon text2D>*)
227 { 225 {
228 if (contextLostRestoredEventsEnabled()) { 226 if (contextLostRestoredEventsEnabled()) {
229 RefPtrWillBeRawPtr<Event> event = Event::createCancelable(EventTypeNames ::contextlost); 227 RefPtrWillBeRawPtr<Event> event = Event::createCancelable(EventTypeNames ::contextlost);
230 canvas()->dispatchEvent(event); 228 canvas()->dispatchEvent(event);
231 if (event->defaultPrevented()) { 229 if (event->defaultPrevented()) {
232 m_contextRestorable = false; 230 m_contextRestorable = false;
(...skipping 2023 matching lines...) Expand 10 before | Expand all | Expand 10 after
2256 if (imageType == CanvasRenderingContext2DState::NonOpaqueImage) 2254 if (imageType == CanvasRenderingContext2DState::NonOpaqueImage)
2257 return; 2255 return;
2258 if (alpha < 0xFF) 2256 if (alpha < 0xFF)
2259 return; 2257 return;
2260 } 2258 }
2261 2259
2262 canvas()->buffer()->willOverwriteCanvas(); 2260 canvas()->buffer()->willOverwriteCanvas();
2263 } 2261 }
2264 2262
2265 } // namespace blink 2263 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/modules/compositorworker/CompositorWorkerGlobalScope.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698