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

Side by Side Diff: Source/core/style/ContentData.cpp

Issue 1045723009: Move core/layout/style to core/style (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase. 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/style/ContentData.h ('k') | Source/core/style/CounterContent.h » ('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 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 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Library General Public License for more details. 13 * Library General Public License for more details.
14 * 14 *
15 * You should have received a copy of the GNU Library General Public License 15 * You should have received a copy of the GNU Library General Public License
16 * along with this library; see the file COPYING.LIB. If not, write to 16 * along with this library; see the file COPYING.LIB. If not, write to
17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 * Boston, MA 02110-1301, USA. 18 * Boston, MA 02110-1301, USA.
19 * 19 *
20 */ 20 */
21 21
22 #include "config.h" 22 #include "config.h"
23 #include "core/layout/style/ContentData.h" 23 #include "core/style/ContentData.h"
24 24
25 #include "core/layout/LayoutCounter.h" 25 #include "core/layout/LayoutCounter.h"
26 #include "core/layout/LayoutImage.h" 26 #include "core/layout/LayoutImage.h"
27 #include "core/layout/LayoutImageResource.h" 27 #include "core/layout/LayoutImageResource.h"
28 #include "core/layout/LayoutImageResourceStyleImage.h" 28 #include "core/layout/LayoutImageResourceStyleImage.h"
29 #include "core/layout/LayoutQuote.h" 29 #include "core/layout/LayoutQuote.h"
30 #include "core/layout/LayoutTextFragment.h" 30 #include "core/layout/LayoutTextFragment.h"
31 #include "core/layout/style/ComputedStyle.h" 31 #include "core/style/ComputedStyle.h"
32 32
33 namespace blink { 33 namespace blink {
34 34
35 PassOwnPtr<ContentData> ContentData::create(PassRefPtr<StyleImage> image) 35 PassOwnPtr<ContentData> ContentData::create(PassRefPtr<StyleImage> image)
36 { 36 {
37 return adoptPtr(new ImageContentData(image)); 37 return adoptPtr(new ImageContentData(image));
38 } 38 }
39 39
40 PassOwnPtr<ContentData> ContentData::create(const String& text) 40 PassOwnPtr<ContentData> ContentData::create(const String& text)
41 { 41 {
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 } 92 }
93 93
94 LayoutObject* QuoteContentData::createLayoutObject(Document& doc, ComputedStyle& pseudoStyle) const 94 LayoutObject* QuoteContentData::createLayoutObject(Document& doc, ComputedStyle& pseudoStyle) const
95 { 95 {
96 LayoutObject* layoutObject = new LayoutQuote(&doc, m_quote); 96 LayoutObject* layoutObject = new LayoutQuote(&doc, m_quote);
97 layoutObject->setPseudoStyle(&pseudoStyle); 97 layoutObject->setPseudoStyle(&pseudoStyle);
98 return layoutObject; 98 return layoutObject;
99 } 99 }
100 100
101 } // namespace blink 101 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/style/ContentData.h ('k') | Source/core/style/CounterContent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698