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

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

Issue 1164573002: CSSValue Immediates: Change CSSValue to an object instead of a pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 4 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. 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 633 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 String CanvasRenderingContext2D::filter() const 644 String CanvasRenderingContext2D::filter() const
645 { 645 {
646 return state().unparsedFilter(); 646 return state().unparsedFilter();
647 } 647 }
648 648
649 void CanvasRenderingContext2D::setFilter(const String& filterString) 649 void CanvasRenderingContext2D::setFilter(const String& filterString)
650 { 650 {
651 if (filterString == state().unparsedFilter()) 651 if (filterString == state().unparsedFilter())
652 return; 652 return;
653 653
654 RefPtrWillBeRawPtr<CSSValue> filterValue = CSSParser::parseSingleValue(CSSPr opertyWebkitFilter, filterString, CSSParserContext(HTMLStandardMode, 0)); 654 NullableCSSValue filterValue = CSSParser::parseSingleValue(CSSPropertyWebkit Filter, filterString, CSSParserContext(HTMLStandardMode, 0));
655 655
656 if (!filterValue || filterValue->isInitialValue() || filterValue->isInherite dValue()) 656 if (!filterValue || filterValue->isInitialValue() || filterValue->isInherite dValue())
657 return; 657 return;
658 658
659 modifiableState().setUnparsedFilter(filterString); 659 modifiableState().setUnparsedFilter(filterString);
660 modifiableState().setFilter(filterValue.release()); 660 modifiableState().setFilter(*filterValue);
661 } 661 }
662 662
663 PassRefPtrWillBeRawPtr<SVGMatrixTearOff> CanvasRenderingContext2D::currentTransf orm() const 663 PassRefPtrWillBeRawPtr<SVGMatrixTearOff> CanvasRenderingContext2D::currentTransf orm() const
664 { 664 {
665 return SVGMatrixTearOff::create(state().transform()); 665 return SVGMatrixTearOff::create(state().transform());
666 } 666 }
667 667
668 void CanvasRenderingContext2D::setCurrentTransform(PassRefPtrWillBeRawPtr<SVGMat rixTearOff> passMatrixTearOff) 668 void CanvasRenderingContext2D::setCurrentTransform(PassRefPtrWillBeRawPtr<SVGMat rixTearOff> passMatrixTearOff)
669 { 669 {
670 RefPtrWillBeRawPtr<SVGMatrixTearOff> matrixTearOff = passMatrixTearOff; 670 RefPtrWillBeRawPtr<SVGMatrixTearOff> matrixTearOff = passMatrixTearOff;
(...skipping 1584 matching lines...) Expand 10 before | Expand all | Expand 10 after
2255 if (imageType == CanvasRenderingContext2DState::NonOpaqueImage) 2255 if (imageType == CanvasRenderingContext2DState::NonOpaqueImage)
2256 return; 2256 return;
2257 if (alpha < 0xFF) 2257 if (alpha < 0xFF)
2258 return; 2258 return;
2259 } 2259 }
2260 2260
2261 canvas()->buffer()->willOverwriteCanvas(); 2261 canvas()->buffer()->willOverwriteCanvas();
2262 } 2262 }
2263 2263
2264 } // namespace blink 2264 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/style/StylePendingImage.h ('k') | Source/modules/canvas2d/CanvasRenderingContext2DState.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698