Title: [205855] trunk/Source/WebCore
- Revision
- 205855
- Author
- [email protected]
- Date
- 2016-09-12 23:52:32 -0700 (Mon, 12 Sep 2016)
Log Message
[Win] Warning fix.
https://bugs.webkit.org/show_bug.cgi?id=161858
Reviewed by Brent Fulgham.
Use exported constants from CoreText.dll, instead of creating copies.
* PlatformAppleWin.cmake:
* platform/spi/win/CoreTextSPIWin.cpp: Removed.
* platform/spi/win/CoreTextSPIWin.h:
Modified Paths
Removed Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (205854 => 205855)
--- trunk/Source/WebCore/ChangeLog 2016-09-13 06:46:15 UTC (rev 205854)
+++ trunk/Source/WebCore/ChangeLog 2016-09-13 06:52:32 UTC (rev 205855)
@@ -1,3 +1,16 @@
+2016-09-12 Per Arne Vollan <[email protected]>
+
+ [Win] Warning fix.
+ https://bugs.webkit.org/show_bug.cgi?id=161858
+
+ Reviewed by Brent Fulgham.
+
+ Use exported constants from CoreText.dll, instead of creating copies.
+
+ * PlatformAppleWin.cmake:
+ * platform/spi/win/CoreTextSPIWin.cpp: Removed.
+ * platform/spi/win/CoreTextSPIWin.h:
+
2016-09-12 Youenn Fablet <[email protected]>
ScriptElement should use FetchOptions::mode according its crossOrigin attribute
Modified: trunk/Source/WebCore/PlatformAppleWin.cmake (205854 => 205855)
--- trunk/Source/WebCore/PlatformAppleWin.cmake 2016-09-13 06:46:15 UTC (rev 205854)
+++ trunk/Source/WebCore/PlatformAppleWin.cmake 2016-09-13 06:52:32 UTC (rev 205855)
@@ -107,8 +107,6 @@
platform/network/cf/SynchronousLoaderClientCFNet.cpp
platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp
- platform/spi/win/CoreTextSPIWin.cpp
-
platform/win/DragImageCGWin.cpp
)
Deleted: trunk/Source/WebCore/platform/spi/win/CoreTextSPIWin.cpp (205854 => 205855)
--- trunk/Source/WebCore/platform/spi/win/CoreTextSPIWin.cpp 2016-09-13 06:46:15 UTC (rev 205854)
+++ trunk/Source/WebCore/platform/spi/win/CoreTextSPIWin.cpp 2016-09-13 06:52:32 UTC (rev 205855)
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "CoreTextSPIWin.h"
-
-WTF_EXTERN_C_BEGIN
-
-const CFStringRef kCTFontAttributeName = CFSTR("NSFont");
-const CFStringRef kCTForegroundColorFromContextAttributeName = CFSTR("CTForegroundColorFromContext");
-
-WTF_EXTERN_C_END
-
Modified: trunk/Source/WebCore/platform/spi/win/CoreTextSPIWin.h (205854 => 205855)
--- trunk/Source/WebCore/platform/spi/win/CoreTextSPIWin.h 2016-09-13 06:46:15 UTC (rev 205854)
+++ trunk/Source/WebCore/platform/spi/win/CoreTextSPIWin.h 2016-09-13 06:52:32 UTC (rev 205855)
@@ -36,8 +36,8 @@
typedef UInt32 FourCharCode;
typedef FourCharCode CTFontTableTag;
-extern const CFStringRef kCTFontAttributeName;
-extern const CFStringRef kCTForegroundColorFromContextAttributeName;
+CT_EXPORT const CFStringRef kCTFontAttributeName;
+CT_EXPORT const CFStringRef kCTForegroundColorFromContextAttributeName;
typedef CF_OPTIONS(uint32_t, CTFontTableOptions)
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
