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

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

Issue 705003002: Change the return type of WTF::bind() to |OwnPtr<Function>| (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Reflect comments from yhirano Created 6 years, 1 month 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. 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 1621 matching lines...) Expand 10 before | Expand all | Expand 10 after
1632 c->restore(); 1632 c->restore();
1633 } 1633 }
1634 1634
1635 bool CanvasRenderingContext2D::rectContainsTransformedRect(const FloatRect& rect , const FloatRect& transformedRect) const 1635 bool CanvasRenderingContext2D::rectContainsTransformedRect(const FloatRect& rect , const FloatRect& transformedRect) const
1636 { 1636 {
1637 FloatQuad quad(rect); 1637 FloatQuad quad(rect);
1638 FloatQuad transformedQuad(transformedRect); 1638 FloatQuad transformedQuad(transformedRect);
1639 return state().m_transform.mapQuad(quad).containsQuad(transformedQuad); 1639 return state().m_transform.mapQuad(quad).containsQuad(transformedQuad);
1640 } 1640 }
1641 1641
1642 void CanvasRenderingContext2D::fullCanvasCompositedDraw(const Closure& draw) 1642 void CanvasRenderingContext2D::fullCanvasCompositedDraw(PassOwnPtr<Closure> draw )
1643 { 1643 {
1644 ASSERT(isFullCanvasCompositeMode(state().m_globalComposite)); 1644 ASSERT(isFullCanvasCompositeMode(state().m_globalComposite));
1645 1645
1646 GraphicsContext* c = drawingContext(); 1646 GraphicsContext* c = drawingContext();
1647 ASSERT(c); 1647 ASSERT(c);
1648 1648
1649 CompositeOperator previousOperator = c->compositeOperation(); 1649 CompositeOperator previousOperator = c->compositeOperation();
1650 if (shouldDrawShadows()) { 1650 if (shouldDrawShadows()) {
1651 // unroll into two independently composited passes if drawing shadows 1651 // unroll into two independently composited passes if drawing shadows
1652 c->beginLayer(1, state().m_globalComposite); 1652 c->beginLayer(1, state().m_globalComposite);
1653 c->setCompositeOperation(CompositeSourceOver); 1653 c->setCompositeOperation(CompositeSourceOver);
1654 applyShadow(DrawShadowOnly); 1654 applyShadow(DrawShadowOnly);
1655 draw(); 1655 (*draw)();
1656 c->setCompositeOperation(previousOperator); 1656 c->setCompositeOperation(previousOperator);
1657 c->endLayer(); 1657 c->endLayer();
1658 } 1658 }
1659 1659
1660 c->beginLayer(1, state().m_globalComposite); 1660 c->beginLayer(1, state().m_globalComposite);
1661 c->clearShadow(); 1661 c->clearShadow();
1662 c->setCompositeOperation(CompositeSourceOver); 1662 c->setCompositeOperation(CompositeSourceOver);
1663 draw(); 1663 (*draw)();
1664 c->setCompositeOperation(previousOperator); 1664 c->setCompositeOperation(previousOperator);
1665 c->endLayer(); 1665 c->endLayer();
1666 applyShadow(DrawShadowAndForeground); // go back to normal shadows mode 1666 applyShadow(DrawShadowAndForeground); // go back to normal shadows mode
1667 } 1667 }
1668 1668
1669 PassRefPtrWillBeRawPtr<CanvasGradient> CanvasRenderingContext2D::createLinearGra dient(float x0, float y0, float x1, float y1) 1669 PassRefPtrWillBeRawPtr<CanvasGradient> CanvasRenderingContext2D::createLinearGra dient(float x0, float y0, float x1, float y1)
1670 { 1670 {
1671 RefPtrWillBeRawPtr<CanvasGradient> gradient = CanvasGradient::create(FloatPo int(x0, y0), FloatPoint(x1, y1)); 1671 RefPtrWillBeRawPtr<CanvasGradient> gradient = CanvasGradient::create(FloatPo int(x0, y0), FloatPoint(x1, y1));
1672 return gradient.release(); 1672 return gradient.release();
1673 } 1673 }
(...skipping 774 matching lines...) Expand 10 before | Expand all | Expand 10 after
2448 2448
2449 unsigned CanvasRenderingContext2D::hitRegionsCount() const 2449 unsigned CanvasRenderingContext2D::hitRegionsCount() const
2450 { 2450 {
2451 if (m_hitRegionManager) 2451 if (m_hitRegionManager)
2452 return m_hitRegionManager->getHitRegionsCount(); 2452 return m_hitRegionManager->getHitRegionsCount();
2453 2453
2454 return 0; 2454 return 0;
2455 } 2455 }
2456 2456
2457 } // namespace blink 2457 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/html/canvas/CanvasRenderingContext2D.h ('k') | Source/core/html/parser/HTMLParserThread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698