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

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

Issue 2870113002: m_foo -> foo_ in SettingsMacros, fix DEBUG_TEXT_AUTOSIZING_ON_DESKTOP build. (Closed)
Patch Set: Created 3 years, 7 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) 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights 2 * Copyright (C) 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights
3 * reserved. 3 * reserved.
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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 } 55 }
56 56
57 #if OS(WIN) 57 #if OS(WIN)
58 static const bool kDefaultSelectTrailingWhitespaceEnabled = true; 58 static const bool kDefaultSelectTrailingWhitespaceEnabled = true;
59 #else 59 #else
60 static const bool kDefaultSelectTrailingWhitespaceEnabled = false; 60 static const bool kDefaultSelectTrailingWhitespaceEnabled = false;
61 #endif 61 #endif
62 62
63 Settings::Settings() 63 Settings::Settings()
64 #if DEBUG_TEXT_AUTOSIZING_ON_DESKTOP 64 #if DEBUG_TEXT_AUTOSIZING_ON_DESKTOP
65 : m_textAutosizingWindowSizeOverride(320, 480), 65 : text_autosizing_window_size_override_(320, 480),
66 m_textAutosizingEnabled(true) 66 text_autosizing_enabled_(true)
Nico 2017/05/09 15:15:30 Given that this hasn't been building for a few wee
pdr. 2017/05/09 22:29:03 sure, this isn't all that useful anymore because w
67 #else 67 #else
68 : text_autosizing_enabled_(false) 68 : text_autosizing_enabled_(false)
69 #endif 69 #endif
70 SETTINGS_INITIALIZER_LIST { 70 SETTINGS_INITIALIZER_LIST {
71 } 71 }
72 72
73 std::unique_ptr<Settings> Settings::Create() { 73 std::unique_ptr<Settings> Settings::Create() {
74 return WTF::WrapUnique(new Settings); 74 return WTF::WrapUnique(new Settings);
75 } 75 }
76 76
(...skipping 29 matching lines...) Expand all
106 106
107 void Settings::SetMockScrollbarsEnabled(bool flag) { 107 void Settings::SetMockScrollbarsEnabled(bool flag) {
108 ScrollbarTheme::SetMockScrollbarsEnabled(flag); 108 ScrollbarTheme::SetMockScrollbarsEnabled(flag);
109 } 109 }
110 110
111 bool Settings::MockScrollbarsEnabled() { 111 bool Settings::MockScrollbarsEnabled() {
112 return ScrollbarTheme::MockScrollbarsEnabled(); 112 return ScrollbarTheme::MockScrollbarsEnabled();
113 } 113 }
114 114
115 } // namespace blink 115 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698