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

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

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle 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/layout/style/ContentData.h ('k') | Source/core/layout/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,
(...skipping 10 matching lines...) Expand all
21 21
22 #include "config.h" 22 #include "config.h"
23 #include "core/layout/style/ContentData.h" 23 #include "core/layout/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/LayoutStyle.h" 31 #include "core/layout/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 17 matching lines...) Expand all
59 ContentData* lastNewData = result.get(); 59 ContentData* lastNewData = result.get();
60 for (const ContentData* contentData = next(); contentData; contentData = con tentData->next()) { 60 for (const ContentData* contentData = next(); contentData; contentData = con tentData->next()) {
61 OwnPtr<ContentData> newData = contentData->cloneInternal(); 61 OwnPtr<ContentData> newData = contentData->cloneInternal();
62 lastNewData->setNext(newData.release()); 62 lastNewData->setNext(newData.release());
63 lastNewData = lastNewData->next(); 63 lastNewData = lastNewData->next();
64 } 64 }
65 65
66 return result.release(); 66 return result.release();
67 } 67 }
68 68
69 LayoutObject* ImageContentData::createLayoutObject(Document& doc, LayoutStyle& p seudoStyle) const 69 LayoutObject* ImageContentData::createLayoutObject(Document& doc, ComputedStyle& pseudoStyle) const
70 { 70 {
71 LayoutImage* image = LayoutImage::createAnonymous(&doc); 71 LayoutImage* image = LayoutImage::createAnonymous(&doc);
72 image->setPseudoStyle(&pseudoStyle); 72 image->setPseudoStyle(&pseudoStyle);
73 if (m_image) 73 if (m_image)
74 image->setImageResource(LayoutImageResourceStyleImage::create(m_image.ge t())); 74 image->setImageResource(LayoutImageResourceStyleImage::create(m_image.ge t()));
75 else 75 else
76 image->setImageResource(LayoutImageResource::create()); 76 image->setImageResource(LayoutImageResource::create());
77 return image; 77 return image;
78 } 78 }
79 79
80 LayoutObject* TextContentData::createLayoutObject(Document& doc, LayoutStyle& ps eudoStyle) const 80 LayoutObject* TextContentData::createLayoutObject(Document& doc, ComputedStyle& pseudoStyle) const
81 { 81 {
82 LayoutObject* layoutObject = new LayoutTextFragment(&doc, m_text.impl()); 82 LayoutObject* layoutObject = new LayoutTextFragment(&doc, m_text.impl());
83 layoutObject->setPseudoStyle(&pseudoStyle); 83 layoutObject->setPseudoStyle(&pseudoStyle);
84 return layoutObject; 84 return layoutObject;
85 } 85 }
86 86
87 LayoutObject* CounterContentData::createLayoutObject(Document& doc, LayoutStyle& pseudoStyle) const 87 LayoutObject* CounterContentData::createLayoutObject(Document& doc, ComputedStyl e& pseudoStyle) const
88 { 88 {
89 LayoutObject* layoutObject = new LayoutCounter(&doc, *m_counter); 89 LayoutObject* layoutObject = new LayoutCounter(&doc, *m_counter);
90 layoutObject->setPseudoStyle(&pseudoStyle); 90 layoutObject->setPseudoStyle(&pseudoStyle);
91 return layoutObject; 91 return layoutObject;
92 } 92 }
93 93
94 LayoutObject* QuoteContentData::createLayoutObject(Document& doc, LayoutStyle& p seudoStyle) 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/layout/style/ContentData.h ('k') | Source/core/layout/style/CounterContent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698