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

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

Issue 1485973005: Add CSS support for Containment (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add test expectation Created 5 years 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. 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 * Copyright (C) 2015 Google Inc. All rights reserved. 7 * Copyright (C) 2015 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Lesser General Public 10 * modify it under the terms of the GNU Lesser General Public
(...skipping 2661 matching lines...) Expand 10 before | Expand all | Expand 10 after
2672 return cssValuePool().createValue(1, CSSPrimitiveValue::UnitType::Nu mber); 2672 return cssValuePool().createValue(1, CSSPrimitiveValue::UnitType::Nu mber);
2673 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparat ed(); 2673 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparat ed();
2674 list->append(cssValuePool().createValue(style.scale()->x(), CSSPrimitive Value::UnitType::Number)); 2674 list->append(cssValuePool().createValue(style.scale()->x(), CSSPrimitive Value::UnitType::Number));
2675 if (style.scale()->y() == 1 && style.scale()->z() == 1) 2675 if (style.scale()->y() == 1 && style.scale()->z() == 1)
2676 return list.release(); 2676 return list.release();
2677 list->append(cssValuePool().createValue(style.scale()->y(), CSSPrimitive Value::UnitType::Number)); 2677 list->append(cssValuePool().createValue(style.scale()->y(), CSSPrimitive Value::UnitType::Number));
2678 if (style.scale()->z() != 1) 2678 if (style.scale()->z() != 1)
2679 list->append(cssValuePool().createValue(style.scale()->z(), CSSPrimi tiveValue::UnitType::Number)); 2679 list->append(cssValuePool().createValue(style.scale()->z(), CSSPrimi tiveValue::UnitType::Number));
2680 return list.release(); 2680 return list.release();
2681 } 2681 }
2682 case CSSPropertyContain: {
2683 if (!style.contain())
2684 return cssValuePool().createIdentifierValue(CSSValueNone);
2685 if (style.contain() == ContainsStrict)
2686 return cssValuePool().createIdentifierValue(CSSValueStrict);
2687
2688 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparat ed();
2689 if (style.contain() & ContainsStyle)
2690 list->append(cssValuePool().createIdentifierValue(CSSValueStyle));
2691 if (style.contain() & ContainsLayout)
2692 list->append(cssValuePool().createIdentifierValue(CSSValueLayout));
2693 if (style.contain() & ContainsPaint)
2694 list->append(cssValuePool().createIdentifierValue(CSSValuePaint));
2695 ASSERT(list->length());
2696 return list.release();
2697 }
2682 case CSSPropertyVariable: 2698 case CSSPropertyVariable:
2683 // TODO(leviw): We should have a way to retrive variables here. 2699 // TODO(leviw): We should have a way to retrive variables here.
2684 ASSERT_NOT_REACHED(); 2700 ASSERT_NOT_REACHED();
2685 return nullptr; 2701 return nullptr;
2686 case CSSPropertyAll: 2702 case CSSPropertyAll:
2687 return nullptr; 2703 return nullptr;
2688 default: 2704 default:
2689 break; 2705 break;
2690 } 2706 }
2691 ASSERT_NOT_REACHED(); 2707 ASSERT_NOT_REACHED();
2692 return nullptr; 2708 return nullptr;
2693 } 2709 }
2694 2710
2695 } 2711 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698