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

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: Android stylesheet and fixes 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
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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_arePluginsEnabled(false) 129 , m_arePluginsEnabled(false)
130 , m_isScriptEnabled(false) 130 , m_isScriptEnabled(false)
131 , m_dnsPrefetchingEnabled(false) 131 , m_dnsPrefetchingEnabled(false)
132 , m_touchEventEmulationEnabled(false) 132 , m_touchEventEmulationEnabled(false)
133 , m_openGLMultisamplingEnabled(false) 133 , m_openGLMultisamplingEnabled(false)
134 , m_viewportEnabled(false) 134 , m_viewportEnabled(false)
135 , m_viewportMetaEnabled(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.
139 } 140 }
140 141
141 PassOwnPtr<Settings> Settings::create(Page* page) 142 PassOwnPtr<Settings> Settings::create(Page* page)
142 { 143 {
143 return adoptPtr(new Settings(page)); 144 return adoptPtr(new Settings(page));
144 } 145 }
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 void Settings::setViewportEnabled(bool enabled) 386 void Settings::setViewportEnabled(bool enabled)
386 { 387 {
387 if (m_viewportEnabled == enabled) 388 if (m_viewportEnabled == enabled)
388 return; 389 return;
389 390
390 m_viewportEnabled = enabled; 391 m_viewportEnabled = enabled;
391 if (m_page->mainFrame()) 392 if (m_page->mainFrame())
392 m_page->mainFrame()->document()->updateViewportDescription(); 393 m_page->mainFrame()->document()->updateViewportDescription();
393 } 394 }
394 395
396 void Settings::setViewportMetaEnabled(bool enabled)
397 {
398 m_viewportMetaEnabled = enabled;
399 }
400
395 } // namespace WebCore 401 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698