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

Side by Side Diff: sky/engine/core/frame/Settings.h

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « sky/engine/core/frame/Screen.h ('k') | sky/engine/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) 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
(...skipping 10 matching lines...) Expand all
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 SKY_ENGINE_CORE_FRAME_SETTINGS_H_ 27 #ifndef SKY_ENGINE_CORE_FRAME_SETTINGS_H_
28 #define SKY_ENGINE_CORE_FRAME_SETTINGS_H_ 28 #define SKY_ENGINE_CORE_FRAME_SETTINGS_H_
29 29
30 #include "gen/sky/core/SettingsMacros.h" 30 #include "gen/sky/core/SettingsMacros.h"
31 #include "sky/engine/bindings/core/v8/V8CacheOptions.h"
32 #include "sky/engine/core/css/PointerProperties.h" 31 #include "sky/engine/core/css/PointerProperties.h"
33 #include "sky/engine/core/frame/SettingsDelegate.h" 32 #include "sky/engine/core/frame/SettingsDelegate.h"
34 #include "sky/engine/platform/Timer.h" 33 #include "sky/engine/platform/Timer.h"
35 #include "sky/engine/platform/fonts/GenericFontFamilySettings.h" 34 #include "sky/engine/platform/fonts/GenericFontFamilySettings.h"
36 #include "sky/engine/platform/geometry/IntSize.h" 35 #include "sky/engine/platform/geometry/IntSize.h"
37 #include "sky/engine/platform/weborigin/KURL.h" 36 #include "sky/engine/platform/weborigin/KURL.h"
38 #include "sky/engine/wtf/HashSet.h" 37 #include "sky/engine/wtf/HashSet.h"
39 #include "sky/engine/wtf/RefCounted.h" 38 #include "sky/engine/wtf/RefCounted.h"
40 39
41 namespace blink { 40 namespace blink {
(...skipping 24 matching lines...) Expand all
66 65
67 GenericFontFamilySettings m_genericFontFamilySettings; 66 GenericFontFamilySettings m_genericFontFamilySettings;
68 bool m_openGLMultisamplingEnabled : 1; 67 bool m_openGLMultisamplingEnabled : 1;
69 68
70 SETTINGS_MEMBER_VARIABLES 69 SETTINGS_MEMBER_VARIABLES
71 }; 70 };
72 71
73 } // namespace blink 72 } // namespace blink
74 73
75 #endif // SKY_ENGINE_CORE_FRAME_SETTINGS_H_ 74 #endif // SKY_ENGINE_CORE_FRAME_SETTINGS_H_
OLDNEW
« no previous file with comments | « sky/engine/core/frame/Screen.h ('k') | sky/engine/core/frame/Settings.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698