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

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

Issue 27694002: Ability to block <audio> and <video> media. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rename "video" to "media". Created 7 years, 2 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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 , m_textAutosizingEnabled(true) 119 , m_textAutosizingEnabled(true)
120 #else 120 #else
121 , m_textAutosizingEnabled(false) 121 , m_textAutosizingEnabled(false)
122 #endif 122 #endif
123 , m_useWideViewport(true) 123 , m_useWideViewport(true)
124 , m_loadWithOverviewMode(true) 124 , m_loadWithOverviewMode(true)
125 SETTINGS_INITIALIZER_LIST 125 SETTINGS_INITIALIZER_LIST
126 , m_isJavaEnabled(false) 126 , m_isJavaEnabled(false)
127 , m_loadsImagesAutomatically(false) 127 , m_loadsImagesAutomatically(false)
128 , m_areImagesEnabled(true) 128 , m_areImagesEnabled(true)
129 , m_isMediaLoadingEnabled(true)
129 , m_arePluginsEnabled(false) 130 , m_arePluginsEnabled(false)
130 , m_isScriptEnabled(false) 131 , m_isScriptEnabled(false)
131 , m_dnsPrefetchingEnabled(false) 132 , m_dnsPrefetchingEnabled(false)
132 , m_touchEventEmulationEnabled(false) 133 , m_touchEventEmulationEnabled(false)
133 , m_openGLMultisamplingEnabled(false) 134 , m_openGLMultisamplingEnabled(false)
134 , m_viewportEnabled(false) 135 , m_viewportEnabled(false)
135 , m_setImageLoadingSettingsTimer(this, &Settings::imageLoadingSettingsTimerF ired) 136 , m_setImageLoadingSettingsTimer(this, &Settings::imageLoadingSettingsTimerF ired)
136 , m_compositorDrivenAcceleratedScrollingEnabled(false) 137 , m_compositorDrivenAcceleratedScrollingEnabled(false)
137 { 138 {
138 m_page = page; // Page is not yet fully initialized wen constructing Setting s, so keeping m_page null over initializeDefaultFontFamilies() call. 139 m_page = page; // Page is not yet fully initialized wen constructing Setting s, so keeping m_page null over initializeDefaultFontFamilies() call.
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 } 323 }
323 324
324 void Settings::setImagesEnabled(bool areImagesEnabled) 325 void Settings::setImagesEnabled(bool areImagesEnabled)
325 { 326 {
326 m_areImagesEnabled = areImagesEnabled; 327 m_areImagesEnabled = areImagesEnabled;
327 328
328 // See comment in setLoadsImagesAutomatically. 329 // See comment in setLoadsImagesAutomatically.
329 m_setImageLoadingSettingsTimer.startOneShot(0); 330 m_setImageLoadingSettingsTimer.startOneShot(0);
330 } 331 }
331 332
333 void Settings::setMediaLoadingEnabled(bool isMediaLoadingEnabled)
334 {
335 m_isMediaLoadingEnabled = isMediaLoadingEnabled;
336 }
337
332 void Settings::setPluginsEnabled(bool arePluginsEnabled) 338 void Settings::setPluginsEnabled(bool arePluginsEnabled)
333 { 339 {
334 m_arePluginsEnabled = arePluginsEnabled; 340 m_arePluginsEnabled = arePluginsEnabled;
335 } 341 }
336 342
337 void Settings::setUserStyleSheetLocation(const KURL& userStyleSheetLocation) 343 void Settings::setUserStyleSheetLocation(const KURL& userStyleSheetLocation)
338 { 344 {
339 if (m_userStyleSheetLocation == userStyleSheetLocation) 345 if (m_userStyleSheetLocation == userStyleSheetLocation)
340 return; 346 return;
341 347
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 { 387 {
382 if (m_viewportEnabled == enabled) 388 if (m_viewportEnabled == enabled)
383 return; 389 return;
384 390
385 m_viewportEnabled = enabled; 391 m_viewportEnabled = enabled;
386 if (m_page->mainFrame()) 392 if (m_page->mainFrame())
387 m_page->mainFrame()->document()->updateViewportDescription(); 393 m_page->mainFrame()->document()->updateViewportDescription();
388 } 394 }
389 395
390 } // namespace WebCore 396 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698