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

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

Issue 22747002: setViewportEnabled on InternalSettings (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Mac compile issue: removed unused member variable Created 7 years, 4 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
« no previous file with comments | « Source/core/page/Settings.h ('k') | Source/core/testing/InternalSettings.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 SETTINGS_INITIALIZER_LIST 130 SETTINGS_INITIALIZER_LIST
131 , m_isJavaEnabled(false) 131 , m_isJavaEnabled(false)
132 , m_loadsImagesAutomatically(false) 132 , m_loadsImagesAutomatically(false)
133 , m_areImagesEnabled(true) 133 , m_areImagesEnabled(true)
134 , m_arePluginsEnabled(false) 134 , m_arePluginsEnabled(false)
135 , m_isScriptEnabled(false) 135 , m_isScriptEnabled(false)
136 , m_isCSSCustomFilterEnabled(false) 136 , m_isCSSCustomFilterEnabled(false)
137 , m_cssStickyPositionEnabled(true) 137 , m_cssStickyPositionEnabled(true)
138 , m_dnsPrefetchingEnabled(false) 138 , m_dnsPrefetchingEnabled(false)
139 , m_touchEventEmulationEnabled(false) 139 , m_touchEventEmulationEnabled(false)
140 , m_viewportEnabled(false)
140 , m_setImageLoadingSettingsTimer(this, &Settings::imageLoadingSettingsTimerF ired) 141 , m_setImageLoadingSettingsTimer(this, &Settings::imageLoadingSettingsTimerF ired)
141 { 142 {
142 m_page = page; // Page is not yet fully initialized wen constructing Setting s, so keeping m_page null over initializeDefaultFontFamilies() call. 143 m_page = page; // Page is not yet fully initialized wen constructing Setting s, so keeping m_page null over initializeDefaultFontFamilies() call.
143 } 144 }
144 145
145 PassOwnPtr<Settings> Settings::create(Page* page) 146 PassOwnPtr<Settings> Settings::create(Page* page)
146 { 147 {
147 return adoptPtr(new Settings(page)); 148 return adoptPtr(new Settings(page));
148 } 149 }
149 150
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 374
374 m_openGLMultisamplingEnabled = flag; 375 m_openGLMultisamplingEnabled = flag;
375 m_page->multisamplingChanged(); 376 m_page->multisamplingChanged();
376 } 377 }
377 378
378 bool Settings::openGLMultisamplingEnabled() 379 bool Settings::openGLMultisamplingEnabled()
379 { 380 {
380 return m_openGLMultisamplingEnabled; 381 return m_openGLMultisamplingEnabled;
381 } 382 }
382 383
384 void Settings::setViewportEnabled(bool enabled)
385 {
386 if (m_viewportEnabled == enabled)
387 return;
388
389 m_viewportEnabled = enabled;
390 if (m_page->mainFrame())
391 m_page->mainFrame()->document()->updateViewportArguments();
392 }
393
383 } // namespace WebCore 394 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/page/Settings.h ('k') | Source/core/testing/InternalSettings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698