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

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: Layout test added 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 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 if (contextLostRestoredEventsEnabled()) { 268 if (contextLostRestoredEventsEnabled()) {
269 Event* event(Event::create(EventTypeNames::contextrestored)); 269 Event* event(Event::create(EventTypeNames::contextrestored));
270 canvas()->dispatchEvent(event); 270 canvas()->dispatchEvent(event);
271 } 271 }
272 } 272 }
273 273
274 void CanvasRenderingContext2D::willDrawImage(CanvasImageSource* source) const { 274 void CanvasRenderingContext2D::willDrawImage(CanvasImageSource* source) const {
275 canvas()->willDrawImageTo2DContext(source); 275 canvas()->willDrawImageTo2DContext(source);
276 } 276 }
277 277
278 CanvasRenderingContext* CanvasRenderingContext2D::renderingContext() const {
279 return static_cast<CanvasRenderingContext*>(
280 const_cast<CanvasRenderingContext2D*>(this));
281 }
282
278 ColorBehavior CanvasRenderingContext2D::drawImageColorBehavior() const { 283 ColorBehavior CanvasRenderingContext2D::drawImageColorBehavior() const {
279 return CanvasRenderingContext::colorBehaviorForMediaDrawnToCanvas(); 284 return CanvasRenderingContext::colorBehaviorForMediaDrawnToCanvas();
280 } 285 }
281 286
282 void CanvasRenderingContext2D::reset() { 287 void CanvasRenderingContext2D::reset() {
283 // This is a multiple inherritance bootstrap 288 // This is a multiple inherritance bootstrap
284 BaseRenderingContext2D::reset(); 289 BaseRenderingContext2D::reset();
285 } 290 }
286 291
287 void CanvasRenderingContext2D::restoreCanvasMatrixClipStack( 292 void CanvasRenderingContext2D::restoreCanvasMatrixClipStack(
(...skipping 871 matching lines...) Expand 10 before | Expand all | Expand 10 after
1159 } 1164 }
1160 return true; 1165 return true;
1161 } 1166 }
1162 1167
1163 void CanvasRenderingContext2D::resetUsageTracking() { 1168 void CanvasRenderingContext2D::resetUsageTracking() {
1164 UsageCounters newCounters; 1169 UsageCounters newCounters;
1165 m_usageCounters = newCounters; 1170 m_usageCounters = newCounters;
1166 } 1171 }
1167 1172
1168 } // namespace blink 1173 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698