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

Side by Side Diff: third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

Issue 2609803002: Use ShadowData in DropShadowFilterOperation (Closed)
Patch Set: Fix blend(...) order Created 3 years, 11 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 Zack Rusin <zack@kde.org> 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
4 * All rights reserved. 4 * All rights reserved.
5 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 5 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
7 * Copyright (C) 2011 Sencha, Inc. All rights reserved. 7 * Copyright (C) 2011 Sencha, Inc. All rights reserved.
8 * Copyright (C) 2015 Google Inc. All rights reserved. 8 * Copyright (C) 2015 Google Inc. All rights reserved.
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 1799 matching lines...) Expand 10 before | Expand all | Expand 10 after
1810 toBasicComponentTransferFilterOperation(filterOperation)->amount(), 1810 toBasicComponentTransferFilterOperation(filterOperation)->amount(),
1811 CSSPrimitiveValue::UnitType::Number)); 1811 CSSPrimitiveValue::UnitType::Number));
1812 break; 1812 break;
1813 case FilterOperation::BLUR: 1813 case FilterOperation::BLUR:
1814 filterValue = CSSFunctionValue::create(CSSValueBlur); 1814 filterValue = CSSFunctionValue::create(CSSValueBlur);
1815 filterValue->append(*zoomAdjustedPixelValue( 1815 filterValue->append(*zoomAdjustedPixelValue(
1816 toBlurFilterOperation(filterOperation)->stdDeviation().value(), 1816 toBlurFilterOperation(filterOperation)->stdDeviation().value(),
1817 style)); 1817 style));
1818 break; 1818 break;
1819 case FilterOperation::DROP_SHADOW: { 1819 case FilterOperation::DROP_SHADOW: {
1820 DropShadowFilterOperation* dropShadowOperation = 1820 const auto& dropShadowOperation =
1821 toDropShadowFilterOperation(filterOperation); 1821 toDropShadowFilterOperation(*filterOperation);
1822 filterValue = CSSFunctionValue::create(CSSValueDropShadow); 1822 filterValue = CSSFunctionValue::create(CSSValueDropShadow);
1823 // We want our computed style to look like that of a text shadow (has 1823 // We want our computed style to look like that of a text shadow (has
1824 // neither spread nor inset style). 1824 // neither spread nor inset style).
1825 ShadowData shadow(dropShadowOperation->location(), 1825 filterValue->append(
1826 dropShadowOperation->stdDeviation(), 0, Normal, 1826 *valueForShadowData(dropShadowOperation.shadow(), style, false));
1827 StyleColor(dropShadowOperation->getColor()));
1828 filterValue->append(*valueForShadowData(shadow, style, false));
1829 break; 1827 break;
1830 } 1828 }
1831 default: 1829 default:
1832 ASSERT_NOT_REACHED(); 1830 ASSERT_NOT_REACHED();
1833 break; 1831 break;
1834 } 1832 }
1835 list->append(*filterValue); 1833 list->append(*filterValue);
1836 } 1834 }
1837 1835
1838 return list; 1836 return list;
(...skipping 1806 matching lines...) Expand 10 before | Expand all | Expand 10 after
3645 case CSSPropertyAll: 3643 case CSSPropertyAll:
3646 return nullptr; 3644 return nullptr;
3647 default: 3645 default:
3648 break; 3646 break;
3649 } 3647 }
3650 ASSERT_NOT_REACHED(); 3648 ASSERT_NOT_REACHED();
3651 return nullptr; 3649 return nullptr;
3652 } 3650 }
3653 3651
3654 } // namespace blink 3652 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698