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

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

Issue 126443005: Use TreeScope::completeURL and baseURL instead of the Document versions (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased again, passes tests Created 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/css/resolver/FontBuilder.h ('k') | Source/core/css/resolver/StyleResolverState.h » ('j') | 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 642 matching lines...) Expand 10 before | Expand all | Expand 10 after
653 void StyleBuilderFunctions::applyValueCSSPropertyWebkitClipPath(StyleResolverSta te& state, CSSValue* value) 653 void StyleBuilderFunctions::applyValueCSSPropertyWebkitClipPath(StyleResolverSta te& state, CSSValue* value)
654 { 654 {
655 if (value->isPrimitiveValue()) { 655 if (value->isPrimitiveValue()) {
656 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); 656 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
657 if (primitiveValue->getValueID() == CSSValueNone) { 657 if (primitiveValue->getValueID() == CSSValueNone) {
658 state.style()->setClipPath(0); 658 state.style()->setClipPath(0);
659 } else if (primitiveValue->isShape()) { 659 } else if (primitiveValue->isShape()) {
660 state.style()->setClipPath(ShapeClipPathOperation::create(basicShape ForValue(state, primitiveValue->getShapeValue()))); 660 state.style()->setClipPath(ShapeClipPathOperation::create(basicShape ForValue(state, primitiveValue->getShapeValue())));
661 } else if (primitiveValue->primitiveType() == CSSPrimitiveValue::CSS_URI ) { 661 } else if (primitiveValue->primitiveType() == CSSPrimitiveValue::CSS_URI ) {
662 String cssURLValue = primitiveValue->getStringValue(); 662 String cssURLValue = primitiveValue->getStringValue();
663 KURL url = state.document().completeURL(cssURLValue); 663 KURL url = state.treeScope().completeURL(cssURLValue);
664 // FIXME: It doesn't work with forward or external SVG references (s ee https://bugs.webkit.org/show_bug.cgi?id=90405) 664 // FIXME: It doesn't work with forward or external SVG references (s ee https://bugs.webkit.org/show_bug.cgi?id=90405)
665 state.style()->setClipPath(ReferenceClipPathOperation::create(cssURL Value, AtomicString(url.fragmentIdentifier()))); 665 state.style()->setClipPath(ReferenceClipPathOperation::create(cssURL Value, AtomicString(url.fragmentIdentifier())));
666 } 666 }
667 } 667 }
668 } 668 }
669 669
670 void StyleBuilderFunctions::applyInitialCSSPropertyWebkitFontVariantLigatures(St yleResolverState& state) 670 void StyleBuilderFunctions::applyInitialCSSPropertyWebkitFontVariantLigatures(St yleResolverState& state)
671 { 671 {
672 state.fontBuilder().setFontVariantLigaturesInitial(); 672 state.fontBuilder().setFontVariantLigaturesInitial();
673 } 673 }
(...skipping 1480 matching lines...) Expand 10 before | Expand all | Expand 10 after
2154 break; 2154 break;
2155 } 2155 }
2156 case CSSPropertyEnableBackground: 2156 case CSSPropertyEnableBackground:
2157 // Silently ignoring this property for now 2157 // Silently ignoring this property for now
2158 // http://bugs.webkit.org/show_bug.cgi?id=6022 2158 // http://bugs.webkit.org/show_bug.cgi?id=6022
2159 break; 2159 break;
2160 } 2160 }
2161 } 2161 }
2162 2162
2163 } // namespace WebCore 2163 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/resolver/FontBuilder.h ('k') | Source/core/css/resolver/StyleResolverState.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698