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

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

Issue 1812763002: Pseudo and non pseudo elements should return correct computed content value (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 PassOwnPtrWillBeRawPtr<ContentData> ContentData::create(PassOwnPtr<CounterConten t> counter) 44 PassOwnPtrWillBeRawPtr<ContentData> ContentData::create(PassOwnPtr<CounterConten t> counter)
45 { 45 {
46 return adoptPtrWillBeNoop(new CounterContentData(counter)); 46 return adoptPtrWillBeNoop(new CounterContentData(counter));
47 } 47 }
48 48
49 PassOwnPtrWillBeRawPtr<ContentData> ContentData::create(QuoteType quote) 49 PassOwnPtrWillBeRawPtr<ContentData> ContentData::create(QuoteType quote)
50 { 50 {
51 return adoptPtrWillBeNoop(new QuoteContentData(quote)); 51 return adoptPtrWillBeNoop(new QuoteContentData(quote));
52 } 52 }
53 53
54 PassOwnPtrWillBeRawPtr<ContentData> ContentData::create(ElementContent elementCo ntent)
55 {
56 return adoptPtrWillBeNoop(new ElementContentContentData(elementContent));
57 }
58
54 PassOwnPtrWillBeRawPtr<ContentData> ContentData::clone() const 59 PassOwnPtrWillBeRawPtr<ContentData> ContentData::clone() const
55 { 60 {
56 OwnPtrWillBeRawPtr<ContentData> result = cloneInternal(); 61 OwnPtrWillBeRawPtr<ContentData> result = cloneInternal();
57 62
58 ContentData* lastNewData = result.get(); 63 ContentData* lastNewData = result.get();
59 for (const ContentData* contentData = next(); contentData; contentData = con tentData->next()) { 64 for (const ContentData* contentData = next(); contentData; contentData = con tentData->next()) {
60 OwnPtrWillBeRawPtr<ContentData> newData = contentData->cloneInternal(); 65 OwnPtrWillBeRawPtr<ContentData> newData = contentData->cloneInternal();
61 lastNewData->setNext(newData.release()); 66 lastNewData->setNext(newData.release());
62 lastNewData = lastNewData->next(); 67 lastNewData = lastNewData->next();
63 } 68 }
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 return layoutObject; 106 return layoutObject;
102 } 107 }
103 108
104 LayoutObject* QuoteContentData::createLayoutObject(Document& doc, ComputedStyle& pseudoStyle) const 109 LayoutObject* QuoteContentData::createLayoutObject(Document& doc, ComputedStyle& pseudoStyle) const
105 { 110 {
106 LayoutObject* layoutObject = new LayoutQuote(&doc, m_quote); 111 LayoutObject* layoutObject = new LayoutQuote(&doc, m_quote);
107 layoutObject->setPseudoStyle(&pseudoStyle); 112 layoutObject->setPseudoStyle(&pseudoStyle);
108 return layoutObject; 113 return layoutObject;
109 } 114 }
110 115
116 LayoutObject* ElementContentContentData::createLayoutObject(Document& doc, Compu tedStyle& pseudoStyle) const
117 {
118 LayoutObject* layoutObject = LayoutInline::createAnonymous(&doc);
119 layoutObject->setPseudoStyle(&pseudoStyle);
120 return layoutObject;
121 }
122
111 } // namespace blink 123 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698