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

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

Issue 1118613002: Hook up Android closed captions 'enabled' setting to Blink (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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 reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserv ed.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 #endif 65 #endif
66 66
67 Settings::Settings() 67 Settings::Settings()
68 : m_openGLMultisamplingEnabled(false) 68 : m_openGLMultisamplingEnabled(false)
69 #if DEBUG_TEXT_AUTOSIZING_ON_DESKTOP 69 #if DEBUG_TEXT_AUTOSIZING_ON_DESKTOP
70 , m_textAutosizingWindowSizeOverride(320, 480) 70 , m_textAutosizingWindowSizeOverride(320, 480)
71 , m_textAutosizingEnabled(true) 71 , m_textAutosizingEnabled(true)
72 #else 72 #else
73 , m_textAutosizingEnabled(false) 73 , m_textAutosizingEnabled(false)
74 #endif 74 #endif
75 , m_textTracksEnabled(false)
75 SETTINGS_INITIALIZER_LIST 76 SETTINGS_INITIALIZER_LIST
76 { 77 {
77 } 78 }
78 79
79 PassOwnPtr<Settings> Settings::create() 80 PassOwnPtr<Settings> Settings::create()
80 { 81 {
81 return adoptPtr(new Settings); 82 return adoptPtr(new Settings);
82 } 83 }
83 84
84 SETTINGS_SETTER_BODIES 85 SETTINGS_SETTER_BODIES
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 126
126 void Settings::setOpenGLMultisamplingEnabled(bool flag) 127 void Settings::setOpenGLMultisamplingEnabled(bool flag)
127 { 128 {
128 if (m_openGLMultisamplingEnabled == flag) 129 if (m_openGLMultisamplingEnabled == flag)
129 return; 130 return;
130 131
131 m_openGLMultisamplingEnabled = flag; 132 m_openGLMultisamplingEnabled = flag;
132 invalidate(SettingsDelegate::MultisamplingChange); 133 invalidate(SettingsDelegate::MultisamplingChange);
133 } 134 }
134 135
136 void Settings::setTextTracksEnabled(bool enabled)
137 {
138 if (m_textTracksEnabled == enabled)
139 return;
140 m_textTracksEnabled = enabled;
141 invalidate(SettingsDelegate::TextTracksVisibilityChange);
142 }
143
135 } // namespace blink 144 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698