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

Side by Side Diff: third_party/WebKit/Source/core/frame/Settings.h

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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) 2003, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserved.
3 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 3 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 26 matching lines...) Expand all
37 #include "core/frame/SettingsDelegate.h" 37 #include "core/frame/SettingsDelegate.h"
38 #include "core/html/track/TextTrackKindUserPreference.h" 38 #include "core/html/track/TextTrackKindUserPreference.h"
39 #include "platform/Timer.h" 39 #include "platform/Timer.h"
40 #include "platform/fonts/GenericFontFamilySettings.h" 40 #include "platform/fonts/GenericFontFamilySettings.h"
41 #include "platform/geometry/IntSize.h" 41 #include "platform/geometry/IntSize.h"
42 #include "platform/graphics/ImageAnimationPolicy.h" 42 #include "platform/graphics/ImageAnimationPolicy.h"
43 #include "platform/weborigin/KURL.h" 43 #include "platform/weborigin/KURL.h"
44 #include "public/platform/PointerProperties.h" 44 #include "public/platform/PointerProperties.h"
45 #include "public/platform/WebDisplayMode.h" 45 #include "public/platform/WebDisplayMode.h"
46 #include "public/platform/WebViewportStyle.h" 46 #include "public/platform/WebViewportStyle.h"
47 #include <memory>
48 47
49 namespace blink { 48 namespace blink {
50 49
51 class CORE_EXPORT Settings { 50 class CORE_EXPORT Settings {
52 WTF_MAKE_NONCOPYABLE(Settings); 51 WTF_MAKE_NONCOPYABLE(Settings);
53 USING_FAST_MALLOC(Settings); 52 USING_FAST_MALLOC(Settings);
54 public: 53 public:
55 static std::unique_ptr<Settings> create(); 54 static PassOwnPtr<Settings> create();
56 55
57 GenericFontFamilySettings& genericFontFamilySettings() { return m_genericFon tFamilySettings; } 56 GenericFontFamilySettings& genericFontFamilySettings() { return m_genericFon tFamilySettings; }
58 void notifyGenericFontFamilyChange() { invalidate(SettingsDelegate::FontFami lyChange); } 57 void notifyGenericFontFamilyChange() { invalidate(SettingsDelegate::FontFami lyChange); }
59 58
60 void setTextAutosizingEnabled(bool); 59 void setTextAutosizingEnabled(bool);
61 bool textAutosizingEnabled() const { return m_textAutosizingEnabled; } 60 bool textAutosizingEnabled() const { return m_textAutosizingEnabled; }
62 61
63 // Only set by Layout Tests, and only used if textAutosizingEnabled() return s true. 62 // Only set by Layout Tests, and only used if textAutosizingEnabled() return s true.
64 void setTextAutosizingWindowSizeOverride(const IntSize&); 63 void setTextAutosizingWindowSizeOverride(const IntSize&);
65 const IntSize& textAutosizingWindowSizeOverride() const { return m_textAutos izingWindowSizeOverride; } 64 const IntSize& textAutosizingWindowSizeOverride() const { return m_textAutos izingWindowSizeOverride; }
(...skipping 16 matching lines...) Expand all
82 GenericFontFamilySettings m_genericFontFamilySettings; 81 GenericFontFamilySettings m_genericFontFamilySettings;
83 IntSize m_textAutosizingWindowSizeOverride; 82 IntSize m_textAutosizingWindowSizeOverride;
84 bool m_textAutosizingEnabled : 1; 83 bool m_textAutosizingEnabled : 1;
85 84
86 SETTINGS_MEMBER_VARIABLES 85 SETTINGS_MEMBER_VARIABLES
87 }; 86 };
88 87
89 } // namespace blink 88 } // namespace blink
90 89
91 #endif // Settings_h 90 #endif // Settings_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/PageScaleConstraintsSet.h ('k') | third_party/WebKit/Source/core/frame/Settings.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698