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

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

Issue 16358010: [CSS Exclusions] Add CSS parsing support for image URI shape-inside and shape-outside values (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 3639 matching lines...) Expand 10 before | Expand all | Expand 10 after
3650 m_state.style()->setMaskBoxImageSource(loadPendingImage(static_c ast<StylePendingImage*>(m_state.style()->maskBoxImageSource()))); 3650 m_state.style()->setMaskBoxImageSource(loadPendingImage(static_c ast<StylePendingImage*>(m_state.style()->maskBoxImageSource())));
3651 break; 3651 break;
3652 } 3652 }
3653 case CSSPropertyWebkitMaskImage: { 3653 case CSSPropertyWebkitMaskImage: {
3654 for (FillLayer* maskLayer = m_state.style()->accessMaskLayers(); mas kLayer; maskLayer = maskLayer->next()) { 3654 for (FillLayer* maskLayer = m_state.style()->accessMaskLayers(); mas kLayer; maskLayer = maskLayer->next()) {
3655 if (maskLayer->image() && maskLayer->image()->isPendingImage()) 3655 if (maskLayer->image() && maskLayer->image()->isPendingImage())
3656 maskLayer->setImage(loadPendingImage(static_cast<StylePendin gImage*>(maskLayer->image()))); 3656 maskLayer->setImage(loadPendingImage(static_cast<StylePendin gImage*>(maskLayer->image())));
3657 } 3657 }
3658 break; 3658 break;
3659 } 3659 }
3660 case CSSPropertyWebkitShapeInside:
3661 if (m_state.style()->shapeInside() && m_state.style()->shapeInside() ->image() && m_state.style()->shapeInside()->image()->isPendingImage())
eseidel 2013/06/04 18:10:36 It fees like these two lines are repeated for insi
3662 m_state.style()->shapeInside()->setImage(loadPendingImage(static _cast<StylePendingImage*>(m_state.style()->shapeInside()->image())));
3663 break;
3664 case CSSPropertyWebkitShapeOutside:
3665 if (m_state.style()->shapeOutside() && m_state.style()->shapeOutside ()->image() && m_state.style()->shapeOutside()->image()->isPendingImage())
3666 m_state.style()->shapeOutside()->setImage(loadPendingImage(stati c_cast<StylePendingImage*>(m_state.style()->shapeOutside()->image())));
3667 break;
3660 default: 3668 default:
3661 ASSERT_NOT_REACHED(); 3669 ASSERT_NOT_REACHED();
3662 } 3670 }
3663 } 3671 }
3664 3672
3665 m_state.pendingImageProperties().clear(); 3673 m_state.pendingImageProperties().clear();
3666 } 3674 }
3667 3675
3668 void StyleResolver::loadPendingResources() 3676 void StyleResolver::loadPendingResources()
3669 { 3677 {
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
3727 info.addMember(m_state, "state"); 3735 info.addMember(m_state, "state");
3728 3736
3729 // FIXME: move this to a place where it would be called only once? 3737 // FIXME: move this to a place where it would be called only once?
3730 info.addMember(CSSDefaultStyleSheets::defaultStyle, "defaultStyle"); 3738 info.addMember(CSSDefaultStyleSheets::defaultStyle, "defaultStyle");
3731 info.addMember(CSSDefaultStyleSheets::defaultQuirksStyle, "defaultQuirksStyl e"); 3739 info.addMember(CSSDefaultStyleSheets::defaultQuirksStyle, "defaultQuirksStyl e");
3732 info.addMember(CSSDefaultStyleSheets::defaultPrintStyle, "defaultPrintStyle" ); 3740 info.addMember(CSSDefaultStyleSheets::defaultPrintStyle, "defaultPrintStyle" );
3733 info.addMember(CSSDefaultStyleSheets::defaultViewSourceStyle, "defaultViewSo urceStyle"); 3741 info.addMember(CSSDefaultStyleSheets::defaultViewSourceStyle, "defaultViewSo urceStyle");
3734 } 3742 }
3735 3743
3736 } // namespace WebCore 3744 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698