| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2003, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights
reserved. | 2 * Copyright (C) 2003, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights
reserved. |
| 3 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 3 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| 11 * notice, this list of conditions and the following disclaimer in the | 11 * notice, this list of conditions and the following disclaimer in the |
| 12 * documentation and/or other materials provided with the distribution. | 12 * documentation and/or other materials provided with the distribution. |
| 13 * | 13 * |
| 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
| 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 25 */ | 25 */ |
| 26 | 26 |
| 27 #ifndef Settings_h | 27 #ifndef Settings_h |
| 28 #define Settings_h | 28 #define Settings_h |
| 29 | 29 |
| 30 #include "bindings/core/v8/ScriptStreamingMode.h" | |
| 31 #include "bindings/core/v8/V8CacheOptions.h" | 30 #include "bindings/core/v8/V8CacheOptions.h" |
| 32 #include "core/SettingsMacros.h" | 31 #include "core/SettingsMacros.h" |
| 33 #include "core/css/PointerProperties.h" | 32 #include "core/css/PointerProperties.h" |
| 34 #include "core/editing/EditingBehaviorTypes.h" | 33 #include "core/editing/EditingBehaviorTypes.h" |
| 35 #include "core/frame/SettingsDelegate.h" | 34 #include "core/frame/SettingsDelegate.h" |
| 36 #include "platform/Timer.h" | 35 #include "platform/Timer.h" |
| 37 #include "platform/fonts/GenericFontFamilySettings.h" | 36 #include "platform/fonts/GenericFontFamilySettings.h" |
| 38 #include "platform/geometry/IntSize.h" | 37 #include "platform/geometry/IntSize.h" |
| 39 #include "platform/weborigin/KURL.h" | 38 #include "platform/weborigin/KURL.h" |
| 40 #include "wtf/HashSet.h" | 39 #include "wtf/HashSet.h" |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 bool m_openGLMultisamplingEnabled : 1; | 80 bool m_openGLMultisamplingEnabled : 1; |
| 82 IntSize m_textAutosizingWindowSizeOverride; | 81 IntSize m_textAutosizingWindowSizeOverride; |
| 83 bool m_textAutosizingEnabled : 1; | 82 bool m_textAutosizingEnabled : 1; |
| 84 | 83 |
| 85 SETTINGS_MEMBER_VARIABLES | 84 SETTINGS_MEMBER_VARIABLES |
| 86 }; | 85 }; |
| 87 | 86 |
| 88 } // namespace blink | 87 } // namespace blink |
| 89 | 88 |
| 90 #endif // Settings_h | 89 #endif // Settings_h |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 680493002:
Revert "Script streaming: Add an option to make the main thread block (wait for parsing)" (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink.git@master