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

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

Issue 40423003: Experimental viewport meta tag support for desktop, Blink-side. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase again Created 7 years, 1 month 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/web/WebSettingsImpl.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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 SETTINGS_INITIALIZER_LIST 126 SETTINGS_INITIALIZER_LIST
127 , m_isJavaEnabled(false) 127 , m_isJavaEnabled(false)
128 , m_loadsImagesAutomatically(false) 128 , m_loadsImagesAutomatically(false)
129 , m_areImagesEnabled(true) 129 , m_areImagesEnabled(true)
130 , m_arePluginsEnabled(false) 130 , m_arePluginsEnabled(false)
131 , m_isScriptEnabled(false) 131 , m_isScriptEnabled(false)
132 , m_dnsPrefetchingEnabled(false) 132 , m_dnsPrefetchingEnabled(false)
133 , m_touchEventEmulationEnabled(false) 133 , m_touchEventEmulationEnabled(false)
134 , m_openGLMultisamplingEnabled(false) 134 , m_openGLMultisamplingEnabled(false)
135 , m_viewportEnabled(false) 135 , m_viewportEnabled(false)
136 , m_viewportMetaEnabled(false)
136 , m_compositorDrivenAcceleratedScrollingEnabled(false) 137 , m_compositorDrivenAcceleratedScrollingEnabled(false)
137 , m_setImageLoadingSettingsTimer(this, &Settings::imageLoadingSettingsTimerF ired) 138 , m_setImageLoadingSettingsTimer(this, &Settings::imageLoadingSettingsTimerF ired)
138 { 139 {
139 m_page = page; // Page is not yet fully initialized wen constructing Setting s, so keeping m_page null over initializeDefaultFontFamilies() call. 140 m_page = page; // Page is not yet fully initialized wen constructing Setting s, so keeping m_page null over initializeDefaultFontFamilies() call.
140 } 141 }
141 142
142 PassOwnPtr<Settings> Settings::create(Page* page) 143 PassOwnPtr<Settings> Settings::create(Page* page)
143 { 144 {
144 return adoptPtr(new Settings(page)); 145 return adoptPtr(new Settings(page));
145 } 146 }
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 bool Settings::openGLMultisamplingEnabled() 397 bool Settings::openGLMultisamplingEnabled()
397 { 398 {
398 return m_openGLMultisamplingEnabled; 399 return m_openGLMultisamplingEnabled;
399 } 400 }
400 401
401 void Settings::setViewportEnabled(bool enabled) 402 void Settings::setViewportEnabled(bool enabled)
402 { 403 {
403 if (m_viewportEnabled == enabled) 404 if (m_viewportEnabled == enabled)
404 return; 405 return;
405 406
407 // FIXME: Remove once Chromium-side lands.
408 setViewportMetaEnabled(enabled);
409
406 m_viewportEnabled = enabled; 410 m_viewportEnabled = enabled;
407 if (m_page->mainFrame()) 411 if (m_page->mainFrame())
408 m_page->mainFrame()->document()->updateViewportDescription(); 412 m_page->mainFrame()->document()->updateViewportDescription();
409 } 413 }
410 414
415 void Settings::setViewportMetaEnabled(bool enabled)
416 {
417 m_viewportMetaEnabled = enabled;
418 }
419
411 } // namespace WebCore 420 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/page/Settings.h ('k') | Source/web/WebSettingsImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698