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

Side by Side Diff: third_party/WebKit/Source/core/style/ComputedStyle.h

Issue 1452343002: Ignore break-word when white-space pre/nowrap is specified (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 | « third_party/WebKit/LayoutTests/platform/win/fast/text/whitespace/pre-break-word-expected.txt ('k') | 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 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
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 Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 646 matching lines...) Expand 10 before | Expand all | Expand 10 after
657 return false; 657 return false;
658 } 658 }
659 659
660 bool breakOnlyAfterWhiteSpace() const 660 bool breakOnlyAfterWhiteSpace() const
661 { 661 {
662 return whiteSpace() == PRE_WRAP || lineBreak() == LineBreakAfterWhiteSpa ce; 662 return whiteSpace() == PRE_WRAP || lineBreak() == LineBreakAfterWhiteSpa ce;
663 } 663 }
664 664
665 bool breakWords() const 665 bool breakWords() const
666 { 666 {
667 return wordBreak() == BreakWordBreak || overflowWrap() == BreakOverflowW rap; 667 return (wordBreak() == BreakWordBreak || overflowWrap() == BreakOverflow Wrap)
668 && whiteSpace() != PRE && whiteSpace() != NOWRAP;
668 } 669 }
669 670
670 EFillBox backgroundClip() const { return static_cast<EFillBox>(m_background- >background().clip()); } 671 EFillBox backgroundClip() const { return static_cast<EFillBox>(m_background- >background().clip()); }
671 FillLayer& accessBackgroundLayers() { return m_background.access()->m_backgr ound; } 672 FillLayer& accessBackgroundLayers() { return m_background.access()->m_backgr ound; }
672 const FillLayer& backgroundLayers() const { return m_background->background( ); } 673 const FillLayer& backgroundLayers() const { return m_background->background( ); }
673 674
674 StyleImage* maskImage() const { return rareNonInheritedData->m_mask.image(); } 675 StyleImage* maskImage() const { return rareNonInheritedData->m_mask.image(); }
675 FillLayer& accessMaskLayers() { return rareNonInheritedData.access()->m_mask ; } 676 FillLayer& accessMaskLayers() { return rareNonInheritedData.access()->m_mask ; }
676 const FillLayer& maskLayers() const { return rareNonInheritedData->m_mask; } 677 const FillLayer& maskLayers() const { return rareNonInheritedData->m_mask; }
677 678
(...skipping 1319 matching lines...) Expand 10 before | Expand all | Expand 10 after
1997 } 1998 }
1998 1999
1999 inline bool ComputedStyle::hasPseudoElementStyle() const 2000 inline bool ComputedStyle::hasPseudoElementStyle() const
2000 { 2001 {
2001 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; 2002 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;
2002 } 2003 }
2003 2004
2004 } // namespace blink 2005 } // namespace blink
2005 2006
2006 #endif // ComputedStyle_h 2007 #endif // ComputedStyle_h
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/platform/win/fast/text/whitespace/pre-break-word-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698