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

Side by Side Diff: sky/engine/core/rendering/RenderObject.cpp

Issue 1060223002: Remove parsing for display:block/inline-block. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 118
119 RenderObject* RenderObject::createObject(Element* element, RenderStyle* style) 119 RenderObject* RenderObject::createObject(Element* element, RenderStyle* style)
120 { 120 {
121 ASSERT(isAllowedToModifyRenderTreeStructure(element->document())); 121 ASSERT(isAllowedToModifyRenderTreeStructure(element->document()));
122 122
123 switch (style->display()) { 123 switch (style->display()) {
124 case NONE: 124 case NONE:
125 return 0; 125 return 0;
126 case INLINE: 126 case INLINE:
127 return new RenderInline(element); 127 return new RenderInline(element);
128 case BLOCK:
129 case INLINE_BLOCK:
130 return new RenderBlockFlow(element);
131 case PARAGRAPH: 128 case PARAGRAPH:
132 return new RenderParagraph(element); 129 return new RenderParagraph(element);
133 case FLEX: 130 case FLEX:
134 case INLINE_FLEX: 131 case INLINE_FLEX:
135 return new RenderFlexibleBox(element); 132 return new RenderFlexibleBox(element);
136 } 133 }
137 134
138 return 0; 135 return 0;
139 } 136 }
140 137
(...skipping 1831 matching lines...) Expand 10 before | Expand all | Expand 10 after
1972 { 1969 {
1973 if (object1) { 1970 if (object1) {
1974 const blink::RenderObject* root = object1; 1971 const blink::RenderObject* root = object1;
1975 while (root->parent()) 1972 while (root->parent())
1976 root = root->parent(); 1973 root = root->parent();
1977 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 1974 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
1978 } 1975 }
1979 } 1976 }
1980 1977
1981 #endif 1978 #endif
OLDNEW
« no previous file with comments | « sky/engine/core/css/resolver/StyleResolver.cpp ('k') | sky/engine/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698