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

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

Issue 2797213002: Fix BaseRenderingContext2D create/put/get-ImageData() for color managed canvas (Closed)
Patch Set: Addressing comments Created 3 years, 8 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 /* 1 /*
2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
3 * All rights reserved. 3 * All rights reserved.
4 * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies) 4 * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
5 * Copyright (C) 2007 Alp Toker <alp@atoker.com> 5 * Copyright (C) 2007 Alp Toker <alp@atoker.com>
6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
7 * Copyright (C) 2008 Dirk Schulze <krit@webkit.org> 7 * Copyright (C) 2008 Dirk Schulze <krit@webkit.org>
8 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved. 8 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
9 * Copyright (C) 2012, 2013 Intel Corporation. All rights reserved. 9 * Copyright (C) 2012, 2013 Intel Corporation. All rights reserved.
10 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 10 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 if (contextLostRestoredEventsEnabled()) { 272 if (contextLostRestoredEventsEnabled()) {
273 Event* event(Event::create(EventTypeNames::contextrestored)); 273 Event* event(Event::create(EventTypeNames::contextrestored));
274 canvas()->dispatchEvent(event); 274 canvas()->dispatchEvent(event);
275 } 275 }
276 } 276 }
277 277
278 void CanvasRenderingContext2D::willDrawImage(CanvasImageSource* source) const { 278 void CanvasRenderingContext2D::willDrawImage(CanvasImageSource* source) const {
279 canvas()->willDrawImageTo2DContext(source); 279 canvas()->willDrawImageTo2DContext(source);
280 } 280 }
281 281
282 const CanvasRenderingContext* CanvasRenderingContext2D::renderingContext()
283 const {
284 return static_cast<CanvasRenderingContext*>(
285 const_cast<CanvasRenderingContext2D*>(this));
286 }
287
282 ColorBehavior CanvasRenderingContext2D::drawImageColorBehavior() const { 288 ColorBehavior CanvasRenderingContext2D::drawImageColorBehavior() const {
283 return CanvasRenderingContext::colorBehaviorForMediaDrawnToCanvas(); 289 return CanvasRenderingContext::colorBehaviorForMediaDrawnToCanvas();
284 } 290 }
285 291
286 void CanvasRenderingContext2D::reset() { 292 void CanvasRenderingContext2D::reset() {
287 // This is a multiple inherritance bootstrap 293 // This is a multiple inherritance bootstrap
288 BaseRenderingContext2D::reset(); 294 BaseRenderingContext2D::reset();
289 } 295 }
290 296
291 void CanvasRenderingContext2D::restoreCanvasMatrixClipStack( 297 void CanvasRenderingContext2D::restoreCanvasMatrixClipStack(
(...skipping 871 matching lines...) Expand 10 before | Expand all | Expand 10 after
1163 } 1169 }
1164 return true; 1170 return true;
1165 } 1171 }
1166 1172
1167 void CanvasRenderingContext2D::resetUsageTracking() { 1173 void CanvasRenderingContext2D::resetUsageTracking() {
1168 UsageCounters newCounters; 1174 UsageCounters newCounters;
1169 m_usageCounters = newCounters; 1175 m_usageCounters = newCounters;
1170 } 1176 }
1171 1177
1172 } // namespace blink 1178 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698