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

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

Issue 19096006: Introduce css3TextEnabled instead of CSS3_TEXT (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 5 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
« no previous file with comments | « no previous file | no next file » | 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 * (C) 1999-2003 Lars Knoll (knoll@kde.org) 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
4 * Copyright (C) 2011 Research In Motion Limited. All rights reserved. 4 * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 CSSPropertyWebkitColumnBreakAfter, 370 CSSPropertyWebkitColumnBreakAfter,
371 CSSPropertyWebkitColumnBreakInside, 371 CSSPropertyWebkitColumnBreakInside,
372 CSSPropertyWebkitColumnWidth, 372 CSSPropertyWebkitColumnWidth,
373 CSSPropertyPageBreakAfter, 373 CSSPropertyPageBreakAfter,
374 CSSPropertyPageBreakBefore, 374 CSSPropertyPageBreakBefore,
375 CSSPropertyPageBreakInside, 375 CSSPropertyPageBreakInside,
376 CSSPropertyWebkitRegionBreakAfter, 376 CSSPropertyWebkitRegionBreakAfter,
377 CSSPropertyWebkitRegionBreakBefore, 377 CSSPropertyWebkitRegionBreakBefore,
378 CSSPropertyWebkitRegionBreakInside, 378 CSSPropertyWebkitRegionBreakInside,
379 CSSPropertyTextAlign, 379 CSSPropertyTextAlign,
380 #if ENABLE(CSS3_TEXT) 380 CSSPropertyTextAlignLast,
381 CSSPropertyWebkitTextAlignLast,
382 #endif // CSS3_TEXT
383 CSSPropertyTextIndent, 381 CSSPropertyTextIndent,
384 CSSPropertyWidows 382 CSSPropertyWidows
385 }; 383 };
386 384
387 static const Vector<CSSPropertyID>& blockProperties() 385 static const Vector<CSSPropertyID>& blockProperties()
388 { 386 {
389 DEFINE_STATIC_LOCAL(Vector<CSSPropertyID>, properties, ()); 387 DEFINE_STATIC_LOCAL(Vector<CSSPropertyID>, properties, ());
390 if (properties.isEmpty()) 388 if (properties.isEmpty())
391 RuntimeCSSEnabled::filterEnabledCSSPropertiesIntoVector(staticBlockPrope rties, WTF_ARRAY_LENGTH(staticBlockProperties), properties); 389 RuntimeCSSEnabled::filterEnabledCSSPropertiesIntoVector(staticBlockPrope rties, WTF_ARRAY_LENGTH(staticBlockProperties), properties);
392 return properties; 390 return properties;
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 result.appendLiteral(": "); 592 result.appendLiteral(": ");
595 result.append(propertyValue()->cssText()); 593 result.append(propertyValue()->cssText());
596 if (isImportant()) 594 if (isImportant())
597 result.appendLiteral(" !important"); 595 result.appendLiteral(" !important");
598 result.append(';'); 596 result.append(';');
599 return result.toString(); 597 return result.toString();
600 } 598 }
601 599
602 600
603 } // namespace WebCore 601 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698