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

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

Issue 20103002: Make composited scrolling codepaths co-operate. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: UMA + bug Created 7 years, 3 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 | Annotate | Revision Log
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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_viewportEnabled(false)
141 , m_setImageLoadingSettingsTimer(this, &Settings::imageLoadingSettingsTimerF ired) 141 , m_setImageLoadingSettingsTimer(this, &Settings::imageLoadingSettingsTimerF ired)
142 , m_compositorDrivenAcceleratedScrollingEnabled(false) 142 , m_compositorDrivenAcceleratedScrollingEnabled(true)
143 { 143 {
144 m_page = page; // Page is not yet fully initialized wen constructing Setting s, so keeping m_page null over initializeDefaultFontFamilies() call. 144 m_page = page; // Page is not yet fully initialized wen constructing Setting s, so keeping m_page null over initializeDefaultFontFamilies() call.
145 } 145 }
146 146
147 PassOwnPtr<Settings> Settings::create(Page* page) 147 PassOwnPtr<Settings> Settings::create(Page* page)
148 { 148 {
149 return adoptPtr(new Settings(page)); 149 return adoptPtr(new Settings(page));
150 } 150 }
151 151
152 SETTINGS_SETTER_BODIES 152 SETTINGS_SETTER_BODIES
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 { 386 {
387 if (m_viewportEnabled == enabled) 387 if (m_viewportEnabled == enabled)
388 return; 388 return;
389 389
390 m_viewportEnabled = enabled; 390 m_viewportEnabled = enabled;
391 if (m_page->mainFrame()) 391 if (m_page->mainFrame())
392 m_page->mainFrame()->document()->updateViewportArguments(); 392 m_page->mainFrame()->document()->updateViewportArguments();
393 } 393 }
394 394
395 } // namespace WebCore 395 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698