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

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

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 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 10 matching lines...) Expand all
21 21
22 #include "core/style/ContentData.h" 22 #include "core/style/ContentData.h"
23 23
24 #include "core/layout/LayoutCounter.h" 24 #include "core/layout/LayoutCounter.h"
25 #include "core/layout/LayoutImage.h" 25 #include "core/layout/LayoutImage.h"
26 #include "core/layout/LayoutImageResource.h" 26 #include "core/layout/LayoutImageResource.h"
27 #include "core/layout/LayoutImageResourceStyleImage.h" 27 #include "core/layout/LayoutImageResourceStyleImage.h"
28 #include "core/layout/LayoutQuote.h" 28 #include "core/layout/LayoutQuote.h"
29 #include "core/layout/LayoutTextFragment.h" 29 #include "core/layout/LayoutTextFragment.h"
30 #include "core/style/ComputedStyle.h" 30 #include "core/style/ComputedStyle.h"
31 #include <memory>
31 32
32 namespace blink { 33 namespace blink {
33 34
34 ContentData* ContentData::create(StyleImage* image) 35 ContentData* ContentData::create(StyleImage* image)
35 { 36 {
36 return new ImageContentData(image); 37 return new ImageContentData(image);
37 } 38 }
38 39
39 ContentData* ContentData::create(const String& text) 40 ContentData* ContentData::create(const String& text)
40 { 41 {
41 return new TextContentData(text); 42 return new TextContentData(text);
42 } 43 }
43 44
44 ContentData* ContentData::create(PassOwnPtr<CounterContent> counter) 45 ContentData* ContentData::create(std::unique_ptr<CounterContent> counter)
45 { 46 {
46 return new CounterContentData(std::move(counter)); 47 return new CounterContentData(std::move(counter));
47 } 48 }
48 49
49 ContentData* ContentData::create(QuoteType quote) 50 ContentData* ContentData::create(QuoteType quote)
50 { 51 {
51 return new QuoteContentData(quote); 52 return new QuoteContentData(quote);
52 } 53 }
53 54
54 ContentData* ContentData::clone() const 55 ContentData* ContentData::clone() const
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 } 103 }
103 104
104 LayoutObject* QuoteContentData::createLayoutObject(Document& doc, ComputedStyle& pseudoStyle) const 105 LayoutObject* QuoteContentData::createLayoutObject(Document& doc, ComputedStyle& pseudoStyle) const
105 { 106 {
106 LayoutObject* layoutObject = new LayoutQuote(&doc, m_quote); 107 LayoutObject* layoutObject = new LayoutQuote(&doc, m_quote);
107 layoutObject->setPseudoStyle(&pseudoStyle); 108 layoutObject->setPseudoStyle(&pseudoStyle);
108 return layoutObject; 109 return layoutObject;
109 } 110 }
110 111
111 } // namespace blink 112 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/ContentData.h ('k') | third_party/WebKit/Source/core/style/CounterDirectives.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698