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

Side by Side Diff: Source/core/rendering/style/RenderStyle.cpp

Issue 22336008: Use the runtime flag and remove '-webkit-' prefix for CSS3 text-indent. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. 4 * Copyright (C) 2011 Adobe Systems Incorporated. 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 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 || rareNonInheritedData->m_gridItem.get() != other->rareNonInherited Data->m_gridItem.get()) 424 || rareNonInheritedData->m_gridItem.get() != other->rareNonInherited Data->m_gridItem.get())
425 return StyleDifferenceLayout; 425 return StyleDifferenceLayout;
426 426
427 if (rareNonInheritedData->m_shapeInside != other->rareNonInheritedData-> m_shapeInside) 427 if (rareNonInheritedData->m_shapeInside != other->rareNonInheritedData-> m_shapeInside)
428 return StyleDifferenceLayout; 428 return StyleDifferenceLayout;
429 } 429 }
430 430
431 if (rareInheritedData.get() != other->rareInheritedData.get()) { 431 if (rareInheritedData.get() != other->rareInheritedData.get()) {
432 if (rareInheritedData->highlight != other->rareInheritedData->highlight 432 if (rareInheritedData->highlight != other->rareInheritedData->highlight
433 || rareInheritedData->indent != other->rareInheritedData->indent 433 || rareInheritedData->indent != other->rareInheritedData->indent
434 #if ENABLE(CSS3_TEXT)
435 || rareInheritedData->m_textIndentLine != other->rareInheritedData-> m_textIndentLine 434 || rareInheritedData->m_textIndentLine != other->rareInheritedData-> m_textIndentLine
436 #endif
437 || rareInheritedData->m_effectiveZoom != other->rareInheritedData->m _effectiveZoom 435 || rareInheritedData->m_effectiveZoom != other->rareInheritedData->m _effectiveZoom
438 || rareInheritedData->wordBreak != other->rareInheritedData->wordBre ak 436 || rareInheritedData->wordBreak != other->rareInheritedData->wordBre ak
439 || rareInheritedData->overflowWrap != other->rareInheritedData->over flowWrap 437 || rareInheritedData->overflowWrap != other->rareInheritedData->over flowWrap
440 || rareInheritedData->lineBreak != other->rareInheritedData->lineBre ak 438 || rareInheritedData->lineBreak != other->rareInheritedData->lineBre ak
441 || rareInheritedData->textSecurity != other->rareInheritedData->text Security 439 || rareInheritedData->textSecurity != other->rareInheritedData->text Security
442 || rareInheritedData->hyphens != other->rareInheritedData->hyphens 440 || rareInheritedData->hyphens != other->rareInheritedData->hyphens
443 || rareInheritedData->hyphenationLimitBefore != other->rareInherited Data->hyphenationLimitBefore 441 || rareInheritedData->hyphenationLimitBefore != other->rareInherited Data->hyphenationLimitBefore
444 || rareInheritedData->hyphenationLimitAfter != other->rareInheritedD ata->hyphenationLimitAfter 442 || rareInheritedData->hyphenationLimitAfter != other->rareInheritedD ata->hyphenationLimitAfter
445 || rareInheritedData->hyphenationString != other->rareInheritedData- >hyphenationString 443 || rareInheritedData->hyphenationString != other->rareInheritedData- >hyphenationString
446 || rareInheritedData->locale != other->rareInheritedData->locale 444 || rareInheritedData->locale != other->rareInheritedData->locale
(...skipping 1118 matching lines...) Expand 10 before | Expand all | Expand 10 after
1565 surround.access()->border.m_image.setOutset(outset); 1563 surround.access()->border.m_image.setOutset(outset);
1566 } 1564 }
1567 1565
1568 ShapeValue* RenderStyle::initialShapeInside() 1566 ShapeValue* RenderStyle::initialShapeInside()
1569 { 1567 {
1570 DEFINE_STATIC_LOCAL(RefPtr<ShapeValue>, sOutsideValue, (ShapeValue::createOu tsideValue())); 1568 DEFINE_STATIC_LOCAL(RefPtr<ShapeValue>, sOutsideValue, (ShapeValue::createOu tsideValue()));
1571 return sOutsideValue.get(); 1569 return sOutsideValue.get();
1572 } 1570 }
1573 1571
1574 } // namespace WebCore 1572 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698