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

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

Issue 23819053: Rename usesOverlayScrollbars of settings to mockScrollbarsUseOverlay (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: mockScrollbarsUses... -> mockScrollbarsUse... 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
« no previous file with comments | « Source/core/page/Settings.h ('k') | Source/core/platform/ScrollbarTheme.cpp » ('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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 { 70 {
71 ScriptFontFamilyMap::const_iterator it = fontMap.find(static_cast<int>(scrip t)); 71 ScriptFontFamilyMap::const_iterator it = fontMap.find(static_cast<int>(scrip t));
72 if (it != fontMap.end()) 72 if (it != fontMap.end())
73 return it->value; 73 return it->value;
74 if (script != USCRIPT_COMMON) 74 if (script != USCRIPT_COMMON)
75 return getGenericFontFamilyForScript(fontMap, USCRIPT_COMMON); 75 return getGenericFontFamilyForScript(fontMap, USCRIPT_COMMON);
76 return emptyAtom; 76 return emptyAtom;
77 } 77 }
78 78
79 bool Settings::gMockScrollbarsEnabled = false; 79 bool Settings::gMockScrollbarsEnabled = false;
80 bool Settings::gUsesOverlayScrollbars = false; 80 bool Settings::gMockScrollbarsUseOverlay = false;
81 81
82 // NOTEs 82 // NOTEs
83 // 1) EditingMacBehavior comprises builds on Mac; 83 // 1) EditingMacBehavior comprises builds on Mac;
84 // 2) EditingWindowsBehavior comprises builds on Windows; 84 // 2) EditingWindowsBehavior comprises builds on Windows;
85 // 3) EditingUnixBehavior comprises all unix-based systems, but Darwin/MacOS/An droid (and then abusing the terminology); 85 // 3) EditingUnixBehavior comprises all unix-based systems, but Darwin/MacOS/An droid (and then abusing the terminology);
86 // 4) EditingAndroidBehavior comprises Android builds. 86 // 4) EditingAndroidBehavior comprises Android builds.
87 // 99) MacEditingBehavior is used a fallback. 87 // 99) MacEditingBehavior is used a fallback.
88 static EditingBehaviorType editingBehaviorTypeForPlatform() 88 static EditingBehaviorType editingBehaviorTypeForPlatform()
89 { 89 {
90 return 90 return
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 void Settings::setMockScrollbarsEnabled(bool flag) 352 void Settings::setMockScrollbarsEnabled(bool flag)
353 { 353 {
354 gMockScrollbarsEnabled = flag; 354 gMockScrollbarsEnabled = flag;
355 } 355 }
356 356
357 bool Settings::mockScrollbarsEnabled() 357 bool Settings::mockScrollbarsEnabled()
358 { 358 {
359 return gMockScrollbarsEnabled; 359 return gMockScrollbarsEnabled;
360 } 360 }
361 361
362 void Settings::setUsesOverlayScrollbars(bool flag) 362 void Settings::setMockScrollbarsUseOverlay(bool flag)
363 { 363 {
364 gUsesOverlayScrollbars = flag; 364 gMockScrollbarsUseOverlay = flag;
365 } 365 }
366 366
367 bool Settings::usesOverlayScrollbars() 367 bool Settings::mockScrollbarsUseOverlay()
368 { 368 {
369 return gUsesOverlayScrollbars; 369 return gMockScrollbarsUseOverlay;
370 } 370 }
371 371
372 void Settings::setOpenGLMultisamplingEnabled(bool flag) 372 void Settings::setOpenGLMultisamplingEnabled(bool flag)
373 { 373 {
374 if (m_openGLMultisamplingEnabled == flag) 374 if (m_openGLMultisamplingEnabled == flag)
375 return; 375 return;
376 376
377 m_openGLMultisamplingEnabled = flag; 377 m_openGLMultisamplingEnabled = flag;
378 m_page->multisamplingChanged(); 378 m_page->multisamplingChanged();
379 } 379 }
380 380
381 bool Settings::openGLMultisamplingEnabled() 381 bool Settings::openGLMultisamplingEnabled()
382 { 382 {
383 return m_openGLMultisamplingEnabled; 383 return m_openGLMultisamplingEnabled;
384 } 384 }
385 385
386 void Settings::setViewportEnabled(bool enabled) 386 void Settings::setViewportEnabled(bool enabled)
387 { 387 {
388 if (m_viewportEnabled == enabled) 388 if (m_viewportEnabled == enabled)
389 return; 389 return;
390 390
391 m_viewportEnabled = enabled; 391 m_viewportEnabled = enabled;
392 if (m_page->mainFrame()) 392 if (m_page->mainFrame())
393 m_page->mainFrame()->document()->updateViewportArguments(); 393 m_page->mainFrame()->document()->updateViewportArguments();
394 } 394 }
395 395
396 } // namespace WebCore 396 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/page/Settings.h ('k') | Source/core/platform/ScrollbarTheme.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698