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

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

Issue 1490063002: Implement Paint Containment (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix merge 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 2690 matching lines...) Expand 10 before | Expand all | Expand 10 after
2701 if (!style.contain()) 2701 if (!style.contain())
2702 return cssValuePool().createIdentifierValue(CSSValueNone); 2702 return cssValuePool().createIdentifierValue(CSSValueNone);
2703 if (style.contain() == ContainsStrict) 2703 if (style.contain() == ContainsStrict)
2704 return cssValuePool().createIdentifierValue(CSSValueStrict); 2704 return cssValuePool().createIdentifierValue(CSSValueStrict);
2705 2705
2706 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparat ed(); 2706 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparat ed();
2707 if (style.contain() & ContainsStyle) 2707 if (style.contain() & ContainsStyle)
2708 list->append(cssValuePool().createIdentifierValue(CSSValueStyle)); 2708 list->append(cssValuePool().createIdentifierValue(CSSValueStyle));
2709 if (style.contain() & ContainsLayout) 2709 if (style.contain() & ContainsLayout)
2710 list->append(cssValuePool().createIdentifierValue(CSSValueLayout)); 2710 list->append(cssValuePool().createIdentifierValue(CSSValueLayout));
2711 if (style.contain() & ContainsPaint) 2711 if (style.containsPaint())
2712 list->append(cssValuePool().createIdentifierValue(CSSValuePaint)); 2712 list->append(cssValuePool().createIdentifierValue(CSSValuePaint));
2713 ASSERT(list->length()); 2713 ASSERT(list->length());
2714 return list.release(); 2714 return list.release();
2715 } 2715 }
2716 case CSSPropertyVariable: 2716 case CSSPropertyVariable:
2717 // Variables are retrieved via get(AtomicString). 2717 // Variables are retrieved via get(AtomicString).
2718 ASSERT_NOT_REACHED(); 2718 ASSERT_NOT_REACHED();
2719 return nullptr; 2719 return nullptr;
2720 case CSSPropertyAll: 2720 case CSSPropertyAll:
2721 return nullptr; 2721 return nullptr;
2722 default: 2722 default:
2723 break; 2723 break;
2724 } 2724 }
2725 ASSERT_NOT_REACHED(); 2725 ASSERT_NOT_REACHED();
2726 return nullptr; 2726 return nullptr;
2727 } 2727 }
2728 2728
2729 } 2729 }
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/core.gypi ('k') | third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698