| OLD | NEW |
|---|
| 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 20 matching lines...) Expand all Loading... |
| 31 namespace blink { | 31 namespace blink { |
| 32 | 32 |
| 33 static const bool defaultUnifiedTextCheckerEnabled = false; | 33 static const bool defaultUnifiedTextCheckerEnabled = false; |
| 34 #if OS(MACOSX) | 34 #if OS(MACOSX) |
| 35 static const bool defaultSmartInsertDeleteEnabled = true; | 35 static const bool defaultSmartInsertDeleteEnabled = true; |
| 36 #else | 36 #else |
| 37 static const bool defaultSmartInsertDeleteEnabled = false; | 37 static const bool defaultSmartInsertDeleteEnabled = false; |
| 38 #endif | 38 #endif |
| 39 | 39 |
| 40 Settings::Settings() | 40 Settings::Settings() |
| 41 : m_openGLMultisamplingEnabled(false) | 41 : m_delegate(nullptr) |
| 42 , m_openGLMultisamplingEnabled(false) |
| 42 SETTINGS_INITIALIZER_LIST | 43 SETTINGS_INITIALIZER_LIST |
| 43 { | 44 { |
| 44 } | 45 } |
| 45 | 46 |
| 46 PassOwnPtr<Settings> Settings::create() | 47 PassOwnPtr<Settings> Settings::create() |
| 47 { | 48 { |
| 48 return adoptPtr(new Settings); | 49 return adoptPtr(new Settings); |
| 49 } | 50 } |
| 50 | 51 |
| 51 SETTINGS_SETTER_BODIES | 52 SETTINGS_SETTER_BODIES |
| (...skipping 12 matching lines...) Expand all Loading... |
| 64 void Settings::setOpenGLMultisamplingEnabled(bool flag) | 65 void Settings::setOpenGLMultisamplingEnabled(bool flag) |
| 65 { | 66 { |
| 66 if (m_openGLMultisamplingEnabled == flag) | 67 if (m_openGLMultisamplingEnabled == flag) |
| 67 return; | 68 return; |
| 68 | 69 |
| 69 m_openGLMultisamplingEnabled = flag; | 70 m_openGLMultisamplingEnabled = flag; |
| 70 invalidate(SettingsDelegate::MultisamplingChange); | 71 invalidate(SettingsDelegate::MultisamplingChange); |
| 71 } | 72 } |
| 72 | 73 |
| 73 } // namespace blink | 74 } // namespace blink |
| OLD | NEW |
|---|
Chromium Code Reviews
