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

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: rebaseline TestExpectations 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 | 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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_isCSSCustomFilterEnabled(false) 131 , m_isCSSCustomFilterEnabled(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_setImageLoadingSettingsTimer(this, &Settings::imageLoadingSettingsTimerF ired) 136 , m_setImageLoadingSettingsTimer(this, &Settings::imageLoadingSettingsTimerF ired)
137 , m_compositorDrivenAcceleratedScrollingEnabled(false) 137 , m_compositorDrivenAcceleratedScrollingEnabled(true)
138 { 138 {
139 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.
140 } 140 }
141 141
142 PassOwnPtr<Settings> Settings::create(Page* page) 142 PassOwnPtr<Settings> Settings::create(Page* page)
143 { 143 {
144 return adoptPtr(new Settings(page)); 144 return adoptPtr(new Settings(page));
145 } 145 }
146 146
147 SETTINGS_SETTER_BODIES 147 SETTINGS_SETTER_BODIES
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 { 371 {
372 if (m_viewportEnabled == enabled) 372 if (m_viewportEnabled == enabled)
373 return; 373 return;
374 374
375 m_viewportEnabled = enabled; 375 m_viewportEnabled = enabled;
376 if (m_page->mainFrame()) 376 if (m_page->mainFrame())
377 m_page->mainFrame()->document()->updateViewportDescription(); 377 m_page->mainFrame()->document()->updateViewportDescription();
378 } 378 }
379 379
380 } // namespace WebCore 380 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698