| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright (C) 2009 Apple Inc. All Rights Reserved. | 2  * Copyright (C) 2009 Apple Inc. All Rights Reserved. | 
| 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 | 
| 11  *    documentation and/or other materials provided with the distribution. | 11  *    documentation and/or other materials provided with the distribution. | 
| 12  * | 12  * | 
| 13  * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY | 13  * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY | 
| 14  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 
| 15  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 
| 16  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR | 16  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR | 
| 17  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 
| 18  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 
| 19  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 
| 20  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 
| 21  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 
| 22  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
| 23  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 
| 24  */ | 24  */ | 
| 25 | 25 | 
| 26 #include "config.h" | 26 #include "config.h" | 
| 27 #include "platform/win/SystemInfo.h" | 27 #include "platform/win/SystemInfo.h" | 
| 28 | 28 | 
| 29 #include "platform/PlatformExport.h" |  | 
| 30 |  | 
| 31 #if _WIN32_WINNT_WINBLUE | 29 #if _WIN32_WINNT_WINBLUE | 
| 32 #include <versionhelpers.h> | 30 #include <versionhelpers.h> | 
| 33 #endif | 31 #endif | 
| 34 | 32 | 
| 35 #include <windows.h> | 33 #include <windows.h> | 
| 36 | 34 | 
| 37 namespace WebCore { | 35 namespace WebCore { | 
| 38 | 36 | 
| 39 #ifndef _WIN32_WINNT_WINBLUE | 37 #ifndef _WIN32_WINNT_WINBLUE | 
| 40 static bool IsWindowsVistaOrGreater() | 38 static bool IsWindowsVistaOrGreater() | 
| (...skipping 15 matching lines...) Expand all  Loading... | 
| 56     static bool cachedIsWindowsVistaOrGreater; | 54     static bool cachedIsWindowsVistaOrGreater; | 
| 57 | 55 | 
| 58     if (!initialized) { | 56     if (!initialized) { | 
| 59         initialized = true; | 57         initialized = true; | 
| 60         cachedIsWindowsVistaOrGreater = IsWindowsVistaOrGreater(); | 58         cachedIsWindowsVistaOrGreater = IsWindowsVistaOrGreater(); | 
| 61     } | 59     } | 
| 62     return cachedIsWindowsVistaOrGreater; | 60     return cachedIsWindowsVistaOrGreater; | 
| 63 } | 61 } | 
| 64 | 62 | 
| 65 } // namespace WebCore | 63 } // namespace WebCore | 
| OLD | NEW | 
|---|