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

Side by Side Diff: Source/core/css/CSSComputedStyleDeclaration.cpp

Issue 138443013: Remove iframe@seamless (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Include remove 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
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. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2011 Sencha, Inc. All rights reserved. 6 * Copyright (C) 2011 Sencha, Inc. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 1536 matching lines...) Expand 10 before | Expand all | Expand 10 after
1547 1547
1548 // The style recalc could have caused the styled node to be discarded or replaced 1548 // The style recalc could have caused the styled node to be discarded or replaced
1549 // if it was a PseudoElement so we need to update it. 1549 // if it was a PseudoElement so we need to update it.
1550 styledNode = this->styledNode(); 1550 styledNode = this->styledNode();
1551 renderer = styledNode->renderer(); 1551 renderer = styledNode->renderer();
1552 1552
1553 style = computeRenderStyle(propertyID); 1553 style = computeRenderStyle(propertyID);
1554 1554
1555 bool forceFullLayout = isLayoutDependent(propertyID, style, renderer) 1555 bool forceFullLayout = isLayoutDependent(propertyID, style, renderer)
1556 || styledNode->isInShadowTree() 1556 || styledNode->isInShadowTree()
1557 || (document.ownerElement() && document.ensureStyleResolver().hasVie wportDependentMediaQueries()) 1557 || (document.ownerElement() && document.ensureStyleResolver().hasVie wportDependentMediaQueries());
1558 || document.seamlessParentIFrame();
1559 1558
1560 if (forceFullLayout) { 1559 if (forceFullLayout) {
1561 document.updateLayoutIgnorePendingStylesheets(); 1560 document.updateLayoutIgnorePendingStylesheets();
1562 styledNode = this->styledNode(); 1561 styledNode = this->styledNode();
1563 style = computeRenderStyle(propertyID); 1562 style = computeRenderStyle(propertyID);
1564 renderer = styledNode->renderer(); 1563 renderer = styledNode->renderer();
1565 } 1564 }
1566 } else { 1565 } else {
1567 style = computeRenderStyle(propertyID); 1566 style = computeRenderStyle(propertyID);
1568 } 1567 }
(...skipping 1578 matching lines...) Expand 10 before | Expand all | Expand 10 after
3147 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3146 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3148 CSSPropertyB ackgroundClip }; 3147 CSSPropertyB ackgroundClip };
3149 3148
3150 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 3149 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
3151 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3150 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3152 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3151 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3153 return list.release(); 3152 return list.release();
3154 } 3153 }
3155 3154
3156 } // namespace WebCore 3155 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698