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

Side by Side Diff: third_party/WebKit/Source/core/style/CachedUAStyle.h

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) 2013 Google, Inc. 2 * Copyright (C) 2013 Google, Inc.
3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
11 * This library is distributed in the hope that it will be useful, 11 * This library is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14 * Library General Public License for more details. 14 * Library General Public License for more details.
15 * 15 *
16 * You should have received a copy of the GNU Library General Public License 16 * You should have received a copy of the GNU Library General Public License
17 * along with this library; see the file COPYING.LIB. If not, write to 17 * along with this library; see the file COPYING.LIB. If not, write to
18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
19 * Boston, MA 02110-1301, USA. 19 * Boston, MA 02110-1301, USA.
20 */ 20 */
21 21
22 #ifndef CachedUAStyle_h 22 #ifndef CachedUAStyle_h
23 #define CachedUAStyle_h 23 #define CachedUAStyle_h
24 24
25 #include "core/style/ComputedStyle.h" 25 #include "core/style/ComputedStyle.h"
26 #include "wtf/Allocator.h" 26 #include "wtf/Allocator.h"
27 #include "wtf/Noncopyable.h" 27 #include "wtf/Noncopyable.h"
28 #include "wtf/PtrUtil.h"
29 #include <memory>
28 30
29 namespace blink { 31 namespace blink {
30 32
31 // LayoutTheme::adjustStyle wants the background and borders 33 // LayoutTheme::adjustStyle wants the background and borders
32 // as specified by the UA sheets, excluding any author rules. 34 // as specified by the UA sheets, excluding any author rules.
33 // We use this class to cache those values during 35 // We use this class to cache those values during
34 // applyMatchedProperties for later use during adjustComputedStyle. 36 // applyMatchedProperties for later use during adjustComputedStyle.
35 class CachedUAStyle { 37 class CachedUAStyle {
36 USING_FAST_MALLOC(CachedUAStyle); 38 USING_FAST_MALLOC(CachedUAStyle);
37 WTF_MAKE_NONCOPYABLE(CachedUAStyle); 39 WTF_MAKE_NONCOPYABLE(CachedUAStyle);
38 public: 40 public:
39 static PassOwnPtr<CachedUAStyle> create(const ComputedStyle* style) 41 static std::unique_ptr<CachedUAStyle> create(const ComputedStyle* style)
40 { 42 {
41 return adoptPtr(new CachedUAStyle(style)); 43 return wrapUnique(new CachedUAStyle(style));
42 } 44 }
43 45
44 BorderData border; 46 BorderData border;
45 FillLayer backgroundLayers; 47 FillLayer backgroundLayers;
46 StyleColor backgroundColor; 48 StyleColor backgroundColor;
47 49
48 private: 50 private:
49 explicit CachedUAStyle(const ComputedStyle* style) 51 explicit CachedUAStyle(const ComputedStyle* style)
50 : border(style->border()) 52 : border(style->border())
51 , backgroundLayers(style->backgroundLayers()) 53 , backgroundLayers(style->backgroundLayers())
52 , backgroundColor(style->backgroundColor()) 54 , backgroundColor(style->backgroundColor())
53 { 55 {
54 } 56 }
55 }; 57 };
56 58
57 59
58 60
59 } // namespace blink 61 } // namespace blink
60 62
61 #endif // CachedUAStyle_h 63 #endif // CachedUAStyle_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/streams/ReadableStreamTest.cpp ('k') | third_party/WebKit/Source/core/style/ComputedStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698