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

Side by Side Diff: Source/core/css/resolver/StyleBuilderCustom.cpp

Issue 1266713003: Clean up some StyleBuilder property application code (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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
« no previous file with comments | « Source/core/css/resolver/StyleBuilderConverter.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
(...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 String cssURLValue = primitiveValue->getStringValue(); 575 String cssURLValue = primitiveValue->getStringValue();
576 KURL url = state.document().completeURL(cssURLValue); 576 KURL url = state.document().completeURL(cssURLValue);
577 // FIXME: It doesn't work with forward or external SVG references (s ee https://bugs.webkit.org/show_bug.cgi?id=90405) 577 // FIXME: It doesn't work with forward or external SVG references (s ee https://bugs.webkit.org/show_bug.cgi?id=90405)
578 state.style()->setClipPath(ReferenceClipPathOperation::create(cssURL Value, AtomicString(url.fragmentIdentifier()))); 578 state.style()->setClipPath(ReferenceClipPathOperation::create(cssURL Value, AtomicString(url.fragmentIdentifier())));
579 } 579 }
580 } 580 }
581 } 581 }
582 582
583 void StyleBuilderFunctions::applyValueCSSPropertyWebkitFilter(StyleResolverState & state, CSSValue* value) 583 void StyleBuilderFunctions::applyValueCSSPropertyWebkitFilter(StyleResolverState & state, CSSValue* value)
584 { 584 {
585 // FIXME: We should just make this a converter
585 FilterOperations operations; 586 FilterOperations operations;
586 if (FilterOperationResolver::createFilterOperations(value, state.cssToLength ConversionData(), operations, state)) 587 FilterOperationResolver::createFilterOperations(*value, state.cssToLengthCon versionData(), operations, state);
587 state.style()->setFilter(operations); 588 state.style()->setFilter(operations);
588 } 589 }
589 590
590 void StyleBuilderFunctions::applyInitialCSSPropertyWebkitTextEmphasisStyle(Style ResolverState& state) 591 void StyleBuilderFunctions::applyInitialCSSPropertyWebkitTextEmphasisStyle(Style ResolverState& state)
591 { 592 {
592 state.style()->setTextEmphasisFill(ComputedStyle::initialTextEmphasisFill()) ; 593 state.style()->setTextEmphasisFill(ComputedStyle::initialTextEmphasisFill()) ;
593 state.style()->setTextEmphasisMark(ComputedStyle::initialTextEmphasisMark()) ; 594 state.style()->setTextEmphasisMark(ComputedStyle::initialTextEmphasisMark()) ;
594 state.style()->setTextEmphasisCustomMark(ComputedStyle::initialTextEmphasisC ustomMark()); 595 state.style()->setTextEmphasisCustomMark(ComputedStyle::initialTextEmphasisC ustomMark());
595 } 596 }
596 597
597 void StyleBuilderFunctions::applyInheritCSSPropertyWebkitTextEmphasisStyle(Style ResolverState& state) 598 void StyleBuilderFunctions::applyInheritCSSPropertyWebkitTextEmphasisStyle(Style ResolverState& state)
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
827 return; 828 return;
828 case CSSValueSuper: 829 case CSSValueSuper:
829 svgStyle.setBaselineShift(BS_SUPER); 830 svgStyle.setBaselineShift(BS_SUPER);
830 return; 831 return;
831 default: 832 default:
832 ASSERT_NOT_REACHED(); 833 ASSERT_NOT_REACHED();
833 } 834 }
834 } 835 }
835 836
836 } // namespace blink 837 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/resolver/StyleBuilderConverter.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698