Changeset 53036 in webkit
- Timestamp:
- Jan 8, 2010 11:09:59 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
-
JavaScriptCore/ChangeLog (modified) (1 diff)
-
JavaScriptCore/wtf/Platform.h (modified) (13 diffs)
-
WebCore/ChangeLog (modified) (1 diff)
-
WebCore/platform/graphics/SimpleFontData.h (modified) (2 diffs)
-
WebCore/plugins/PluginPackage.cpp (modified) (1 diff)
-
WebKit/chromium/ChangeLog (modified) (1 diff)
-
WebKit/chromium/src/GraphicsContext3D.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/JavaScriptCore/ChangeLog
r53032 r53036 1 2010-01-08 Daniel Bates <dbates@webkit.org> 2 3 Reviewed by Adam Barth. 4 5 https://bugs.webkit.org/show_bug.cgi?id=33417 6 7 Cleans up style errors exposed by the patch for bug #33198. 8 Moreover, fixes all "Weird number of spaces at line-start. Are you using a 4-space indent?" 9 errors reported by check-webkit-style. 10 11 No functionality was changed. So, no new tests. 12 13 * wtf/Platform.h: 14 1 15 2010-01-08 Kent Hansen <kent.hansen@nokia.com> 2 16 -
trunk/JavaScriptCore/wtf/Platform.h
r52794 r53036 107 107 /* CPU(PPC) - PowerPC 32-bit */ 108 108 #if defined(__ppc__) \ 109 || defined(__PPC__) \110 || defined(__powerpc__) \111 || defined(__powerpc) \112 || defined(__POWERPC__) \113 || defined(_M_PPC) \114 || defined(__PPC)109 || defined(__PPC__) \ 110 || defined(__powerpc__) \ 111 || defined(__powerpc) \ 112 || defined(__POWERPC__) \ 113 || defined(_M_PPC) \ 114 || defined(__PPC) 115 115 #define WTF_CPU_PPC 1 116 116 #define WTF_CPU_BIG_ENDIAN 1 … … 119 119 /* CPU(PPC64) - PowerPC 64-bit */ 120 120 #if defined(__ppc64__) \ 121 || defined(__PPC64__)121 || defined(__PPC64__) 122 122 #define WTF_CPU_PPC64 1 123 123 #define WTF_CPU_BIG_ENDIAN 1 … … 148 148 /* CPU(X86) - i386 / x86 32-bit */ 149 149 #if defined(__i386__) \ 150 || defined(i386) \151 || defined(_M_IX86) \152 || defined(_X86_) \153 || defined(__THW_INTEL)150 || defined(i386) \ 151 || defined(_M_IX86) \ 152 || defined(_X86_) \ 153 || defined(__THW_INTEL) 154 154 #define WTF_CPU_X86 1 155 155 #endif … … 157 157 /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */ 158 158 #if defined(__x86_64__) \ 159 || defined(_M_X64)159 || defined(_M_X64) 160 160 #define WTF_CPU_X86_64 1 161 161 #endif … … 163 163 /* CPU(ARM) - ARM, any version*/ 164 164 #if defined(arm) \ 165 || defined(__arm__)165 || defined(__arm__) 166 166 #define WTF_CPU_ARM 1 167 167 … … 170 170 171 171 #elif !defined(__ARM_EABI__) \ 172 && !defined(__EABI__) \173 && !defined(__VFP_FP__) \174 && !defined(ANDROID)172 && !defined(__EABI__) \ 173 && !defined(__VFP_FP__) \ 174 && !defined(ANDROID) 175 175 #define WTF_CPU_MIDDLE_ENDIAN 1 176 176 … … 181 181 /* Set WTF_ARM_ARCH_VERSION */ 182 182 #if defined(__ARM_ARCH_4__) \ 183 || defined(__ARM_ARCH_4T__) \184 || defined(__MARM_ARMV4__) \185 || defined(_ARMV4I_)183 || defined(__ARM_ARCH_4T__) \ 184 || defined(__MARM_ARMV4__) \ 185 || defined(_ARMV4I_) 186 186 #define WTF_ARM_ARCH_VERSION 4 187 187 188 188 #elif defined(__ARM_ARCH_5__) \ 189 || defined(__ARM_ARCH_5T__) \190 || defined(__ARM_ARCH_5E__) \191 || defined(__ARM_ARCH_5TE__) \192 || defined(__ARM_ARCH_5TEJ__) \193 || defined(__MARM_ARMV5__)189 || defined(__ARM_ARCH_5T__) \ 190 || defined(__ARM_ARCH_5E__) \ 191 || defined(__ARM_ARCH_5TE__) \ 192 || defined(__ARM_ARCH_5TEJ__) \ 193 || defined(__MARM_ARMV5__) 194 194 #define WTF_ARM_ARCH_VERSION 5 195 195 196 196 #elif defined(__ARM_ARCH_6__) \ 197 || defined(__ARM_ARCH_6J__) \198 || defined(__ARM_ARCH_6K__) \199 || defined(__ARM_ARCH_6Z__) \200 || defined(__ARM_ARCH_6ZK__) \201 || defined(__ARM_ARCH_6T2__) \202 || defined(__ARMV6__)197 || defined(__ARM_ARCH_6J__) \ 198 || defined(__ARM_ARCH_6K__) \ 199 || defined(__ARM_ARCH_6Z__) \ 200 || defined(__ARM_ARCH_6ZK__) \ 201 || defined(__ARM_ARCH_6T2__) \ 202 || defined(__ARMV6__) 203 203 #define WTF_ARM_ARCH_VERSION 6 204 204 205 205 #elif defined(__ARM_ARCH_7A__) \ 206 || defined(__ARM_ARCH_7R__)206 || defined(__ARM_ARCH_7R__) 207 207 #define WTF_ARM_ARCH_VERSION 7 208 208 … … 221 221 222 222 #elif defined(__ARM_ARCH_5T__) \ 223 || defined(__ARM_ARCH_5TE__) \224 || defined(__ARM_ARCH_5TEJ__)223 || defined(__ARM_ARCH_5TE__) \ 224 || defined(__ARM_ARCH_5TEJ__) 225 225 #define WTF_THUMB_ARCH_VERSION 2 226 226 227 227 #elif defined(__ARM_ARCH_6J__) \ 228 || defined(__ARM_ARCH_6K__) \229 || defined(__ARM_ARCH_6Z__) \230 || defined(__ARM_ARCH_6ZK__) \231 || defined(__ARM_ARCH_6M__)228 || defined(__ARM_ARCH_6K__) \ 229 || defined(__ARM_ARCH_6Z__) \ 230 || defined(__ARM_ARCH_6ZK__) \ 231 || defined(__ARM_ARCH_6M__) 232 232 #define WTF_THUMB_ARCH_VERSION 3 233 233 234 234 #elif defined(__ARM_ARCH_6T2__) \ 235 || defined(__ARM_ARCH_7__) \236 || defined(__ARM_ARCH_7A__) \237 || defined(__ARM_ARCH_7R__) \238 || defined(__ARM_ARCH_7M__)235 || defined(__ARM_ARCH_7__) \ 236 || defined(__ARM_ARCH_7A__) \ 237 || defined(__ARM_ARCH_7R__) \ 238 || defined(__ARM_ARCH_7M__) 239 239 #define WTF_THUMB_ARCH_VERSION 4 240 240 … … 261 261 #if !defined(WTF_CPU_ARM_TRADITIONAL) && !defined(WTF_CPU_ARM_THUMB2) 262 262 # if defined(thumb2) || defined(__thumb2__) \ 263 || ((defined(__thumb) || defined(__thumb__)) && WTF_THUMB_ARCH_VERSION == 4)263 || ((defined(__thumb) || defined(__thumb__)) && WTF_THUMB_ARCH_VERSION == 4) 264 264 # define WTF_CPU_ARM_TRADITIONAL 0 265 265 # define WTF_CPU_ARM_THUMB2 1 … … 318 318 /* OS(MAC_OS_X) - Mac OS X (not including iPhone OS) */ 319 319 #if OS(DARWIN) && ((defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED) \ 320 || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) \321 || (defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR))320 || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) \ 321 || (defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR)) 322 322 #define WTF_OS_IPHONE_OS 1 323 323 #elif OS(DARWIN) && defined(TARGET_OS_MAC) && TARGET_OS_MAC … … 380 380 /* OS(UNIX) - Any Unix-like system */ 381 381 #if OS(AIX) \ 382 || OS(ANDROID) \383 || OS(DARWIN) \384 || OS(FREEBSD) \385 || OS(HAIKU) \386 || OS(LINUX) \387 || OS(NETBSD) \388 || OS(OPENBSD) \389 || OS(QNX) \390 || OS(SOLARIS) \391 || OS(SYMBIAN) \392 || defined(unix) \393 || defined(__unix) \394 || defined(__unix__)382 || OS(ANDROID) \ 383 || OS(DARWIN) \ 384 || OS(FREEBSD) \ 385 || OS(HAIKU) \ 386 || OS(LINUX) \ 387 || OS(NETBSD) \ 388 || OS(OPENBSD) \ 389 || OS(QNX) \ 390 || OS(SOLARIS) \ 391 || OS(SYMBIAN) \ 392 || defined(unix) \ 393 || defined(__unix) \ 394 || defined(__unix__) 395 395 #define WTF_OS_UNIX 1 396 396 #endif … … 898 898 /* YARR supports x86 & x86-64, and has been tested on Mac and Windows. */ 899 899 #if (CPU(X86) && PLATFORM(MAC)) \ 900 || (CPU(X86_64) && PLATFORM(MAC)) \901 || (CPU(ARM_THUMB2) && PLATFORM(IPHONE)) \902 || (CPU(X86) && PLATFORM(WIN))900 || (CPU(X86_64) && PLATFORM(MAC)) \ 901 || (CPU(ARM_THUMB2) && PLATFORM(IPHONE)) \ 902 || (CPU(X86) && PLATFORM(WIN)) 903 903 #define ENABLE_YARR 1 904 904 #define ENABLE_YARR_JIT 1 … … 907 907 #if PLATFORM(QT) 908 908 #if (CPU(X86) && OS(WINDOWS) && COMPILER(MINGW) && GCC_VERSION >= 40100) \ 909 || (CPU(X86) && OS(WINDOWS) && COMPILER(MSVC)) \910 || (CPU(X86) && OS(LINUX) && GCC_VERSION >= 40100) \911 || (CPU(ARM_TRADITIONAL) && OS(LINUX))909 || (CPU(X86) && OS(WINDOWS) && COMPILER(MSVC)) \ 910 || (CPU(X86) && OS(LINUX) && GCC_VERSION >= 40100) \ 911 || (CPU(ARM_TRADITIONAL) && OS(LINUX)) 912 912 #define ENABLE_YARR 1 913 913 #define ENABLE_YARR_JIT 1 -
trunk/WebCore/ChangeLog
r53034 r53036 1 2010-01-08 Daniel Bates <dbates@webkit.org> 2 3 Reviewed by Adam Barth. 4 5 https://bugs.webkit.org/show_bug.cgi?id=33417 6 7 Cleans up style errors exposed by the patch for bug #33198. 8 9 No functionality was changed. So, no new tests. 10 11 * platform/graphics/SimpleFontData.h: 12 * plugins/PluginPackage.cpp: 13 1 14 2010-01-08 Simon Fraser <simon.fraser@apple.com> 2 15 -
trunk/WebCore/platform/graphics/SimpleFontData.h
r52931 r53036 141 141 #if PLATFORM(WIN) 142 142 bool isSystemFont() const { return m_isSystemFont; } 143 #if !OS(WINCE) 143 #if !OS(WINCE) // disable unused members to save space 144 144 SCRIPT_FONTPROPERTIES* scriptFontProperties() const; 145 145 SCRIPT_CACHE* scriptCache() const { return &m_scriptCache; } … … 228 228 #if PLATFORM(WIN) 229 229 bool m_isSystemFont; 230 #if !OS(WINCE) 230 #if !OS(WINCE) // disable unused members to save space 231 231 mutable SCRIPT_CACHE m_scriptCache; 232 232 mutable SCRIPT_FONTPROPERTIES* m_scriptFontProperties; -
trunk/WebCore/plugins/PluginPackage.cpp
r52791 r53036 127 127 unloadWithoutShutdown(); 128 128 } 129 #endif // !OS(SYMBIAN)129 #endif // !OS(SYMBIAN) 130 130 131 131 void PluginPackage::unloadWithoutShutdown() -
trunk/WebKit/chromium/ChangeLog
r53001 r53036 1 2010-01-08 Daniel Bates <dbates@webkit.org> 2 3 Reviewed by Adam Barth. 4 5 https://bugs.webkit.org/show_bug.cgi?id=33417 6 7 Cleans up style errors exposed by the patch for bug #33198. 8 9 No functionality was changed. So, no new tests. 10 11 * src/GraphicsContext3D.cpp: 12 1 13 2010-01-08 Darin Fisher <darin@chromium.org> 2 14 -
trunk/WebKit/chromium/src/GraphicsContext3D.cpp
r52845 r53036 353 353 } 354 354 355 #endif 355 #endif // OS(LINUX) 356 356 357 357 GraphicsContext3DInternal::VertexAttribPointerState::VertexAttribPointerState()
Note: See TracChangeset
for help on using the changeset viewer.
