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

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

Issue 1288073003: Inline default false setting for unifiedTextCheckerEnabled setting. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: merge conflict Created 5 years, 4 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 | « no previous file | Source/core/frame/Settings.in » ('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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 #elif OS(WIN) 45 #elif OS(WIN)
46 EditingWindowsBehavior 46 EditingWindowsBehavior
47 #elif OS(ANDROID) 47 #elif OS(ANDROID)
48 EditingAndroidBehavior 48 EditingAndroidBehavior
49 #else // Rest of the UNIX-like systems 49 #else // Rest of the UNIX-like systems
50 EditingUnixBehavior 50 EditingUnixBehavior
51 #endif 51 #endif
52 ; 52 ;
53 } 53 }
54 54
55 static const bool defaultUnifiedTextCheckerEnabled = false;
56 #if OS(WIN) 55 #if OS(WIN)
57 static const bool defaultSelectTrailingWhitespaceEnabled = true; 56 static const bool defaultSelectTrailingWhitespaceEnabled = true;
58 #else 57 #else
59 static const bool defaultSelectTrailingWhitespaceEnabled = false; 58 static const bool defaultSelectTrailingWhitespaceEnabled = false;
60 #endif 59 #endif
61 60
62 Settings::Settings() 61 Settings::Settings()
63 : m_openGLMultisamplingEnabled(false) 62 : m_openGLMultisamplingEnabled(false)
64 #if DEBUG_TEXT_AUTOSIZING_ON_DESKTOP 63 #if DEBUG_TEXT_AUTOSIZING_ON_DESKTOP
65 , m_textAutosizingWindowSizeOverride(320, 480) 64 , m_textAutosizingWindowSizeOverride(320, 480)
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 void Settings::setOpenGLMultisamplingEnabled(bool flag) 120 void Settings::setOpenGLMultisamplingEnabled(bool flag)
122 { 121 {
123 if (m_openGLMultisamplingEnabled == flag) 122 if (m_openGLMultisamplingEnabled == flag)
124 return; 123 return;
125 124
126 m_openGLMultisamplingEnabled = flag; 125 m_openGLMultisamplingEnabled = flag;
127 invalidate(SettingsDelegate::MultisamplingChange); 126 invalidate(SettingsDelegate::MultisamplingChange);
128 } 127 }
129 128
130 } // namespace blink 129 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/frame/Settings.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698