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

Side by Side Diff: sky/engine/core/dom/RenderTreeBuilder.cpp

Issue 1206763002: Really remove config.h (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 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 | « sky/engine/core/dom/Range.cpp ('k') | sky/engine/core/dom/ScriptedAnimationController.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) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 6 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
7 * Copyright (C) 2011 Google Inc. All rights reserved. 7 * Copyright (C) 2011 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
11 * License as published by the Free Software Foundation; either 11 * License as published by the Free Software Foundation; either
12 * version 2 of the License, or (at your option) any later version. 12 * version 2 of the License, or (at your option) any later version.
13 * 13 *
14 * This library is distributed in the hope that it will be useful, 14 * This library is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17 * Library General Public License for more details. 17 * Library General Public License for more details.
18 * 18 *
19 * You should have received a copy of the GNU Library General Public License 19 * You should have received a copy of the GNU Library General Public License
20 * along with this library; see the file COPYING.LIB. If not, write to 20 * along with this library; see the file COPYING.LIB. If not, write to
21 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 21 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
22 * Boston, MA 02110-1301, USA. 22 * Boston, MA 02110-1301, USA.
23 * 23 *
24 */ 24 */
25 25
26 #include "sky/engine/config.h"
27 #include "sky/engine/core/dom/RenderTreeBuilder.h" 26 #include "sky/engine/core/dom/RenderTreeBuilder.h"
28 27
29 #include "sky/engine/core/css/resolver/StyleResolver.h" 28 #include "sky/engine/core/css/resolver/StyleResolver.h"
30 #include "sky/engine/core/dom/Node.h" 29 #include "sky/engine/core/dom/Node.h"
31 #include "sky/engine/core/dom/Text.h" 30 #include "sky/engine/core/dom/Text.h"
32 #include "sky/engine/core/dom/shadow/InsertionPoint.h" 31 #include "sky/engine/core/dom/shadow/InsertionPoint.h"
33 #include "sky/engine/core/rendering/RenderObject.h" 32 #include "sky/engine/core/rendering/RenderObject.h"
34 #include "sky/engine/core/rendering/RenderText.h" 33 #include "sky/engine/core/rendering/RenderText.h"
35 #include "sky/engine/core/rendering/RenderView.h" 34 #include "sky/engine/core/rendering/RenderView.h"
36 35
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 } 127 }
129 128
130 RenderObject* nextRenderer = this->nextRenderer(); 129 RenderObject* nextRenderer = this->nextRenderer();
131 textNode->setRenderer(newRenderer); 130 textNode->setRenderer(newRenderer);
132 // Parent takes care of the animations, no need to call setAnimatableStyle. 131 // Parent takes care of the animations, no need to call setAnimatableStyle.
133 newRenderer->setStyle(m_style.release()); 132 newRenderer->setStyle(m_style.release());
134 parentRenderer->addChild(newRenderer, nextRenderer); 133 parentRenderer->addChild(newRenderer, nextRenderer);
135 } 134 }
136 135
137 } 136 }
OLDNEW
« no previous file with comments | « sky/engine/core/dom/Range.cpp ('k') | sky/engine/core/dom/ScriptedAnimationController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698