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

Side by Side Diff: sky/engine/core/css/resolver/StyleResolver.cpp

Issue 1077473002: Stop rendering text inside flex boxes. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: make p default to display: paragraph Created 5 years, 8 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 | sky/engine/core/dom/Text.cpp » ('j') | 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 if (ruleSet) 95 if (ruleSet)
96 return *ruleSet; 96 return *ruleSet;
97 97
98 String cssText = 98 String cssText =
99 "link, import, meta, script, style, template, title {\n" 99 "link, import, meta, script, style, template, title {\n"
100 " display: none;\n" 100 " display: none;\n"
101 "}\n" 101 "}\n"
102 "t {\n" 102 "t {\n"
103 " display: inline;" 103 " display: inline;"
104 "}\n" 104 "}\n"
105 "p {\n"
106 " display: paragraph;"
107 "}\n"
105 "a {\n" 108 "a {\n"
106 " color: blue;\n" 109 " color: blue;\n"
107 " display: inline;\n" 110 " display: inline;\n"
108 " text-decoration: underline;\n" 111 " text-decoration: underline;\n"
109 "}\n"; 112 "}\n";
110 113
111 styleSheet = StyleSheetContents::create(0, CSSParserContext()); 114 styleSheet = StyleSheetContents::create(0, CSSParserContext());
112 styleSheet->parseString(cssText); 115 styleSheet->parseString(cssText);
113 116
114 ruleSet = RuleSet::create(); 117 ruleSet = RuleSet::create();
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 break; 595 break;
593 default: 596 default:
594 break; 597 break;
595 } 598 }
596 StyleBuilder::applyProperty(properties[i].property, state, propertie s[i].value); 599 StyleBuilder::applyProperty(properties[i].property, state, propertie s[i].value);
597 } 600 }
598 } 601 }
599 } 602 }
600 603
601 } // namespace blink 604 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | sky/engine/core/dom/Text.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698