Changeset 206056 in webkit

Timestamp:

Sep 16, 2016 5:14:16 PM (8 years ago)

Author:

Brent Fulgham

Message:

[Win][Direct2D] Provide Color support for Direct2D
​https://bugs.webkit.org/show_bug.cgi?id=162090

Reviewed by Dean Jackson.

Add casting operations to the Color class to allow easy interoption with
native Direct2D operations.

No new tests. No change in behavior.

• PlatformWin.cmake: Add new Windows implementation file.
• platform/graphics/Color.h:
• platform/graphics/win/ColorDirect2D.cpp: Added.

(WebCore::Color::Color):
(WebCore::Color::operator D2D1_COLOR_F):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• PlatformWin.cmake (modified) (1 diff)
• platform/graphics/Color.h (modified) (3 diffs)
• platform/graphics/win/ColorDirect2D.cpp (added)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-16  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win][Direct2D] Provide Color support for Direct2D
+        https://bugs.webkit.org/show_bug.cgi?id=162090
+
+        Reviewed by Dean Jackson.
+
+        Add casting operations to the Color class to allow easy interoption with
+        native Direct2D operations.
+
+        No new tests. No change in behavior.
+
+        * PlatformWin.cmake: Add new Windows implementation file.
+        * platform/graphics/Color.h:
+        * platform/graphics/win/ColorDirect2D.cpp: Added.
+        (WebCore::Color::Color):
+        (WebCore::Color::operator D2D1_COLOR_F):
+
 2016-09-16  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/PlatformWin.cmake

@@ -87 +87 @@
     platform/graphics/opentype/OpenTypeUtilities.cpp
 
+    platform/graphics/win/ColorDirect2D.cpp
     platform/graphics/win/DIBPixelData.cpp
     platform/graphics/win/FloatPointDirect2D.cpp

trunk/Source/WebCore/platform/graphics/Color.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2003-2006, 2010, 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2016 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -40 +40 @@
 #endif
 
+#if PLATFORM(WIN)
+struct _D3DCOLORVALUE;
+typedef _D3DCOLORVALUE D3DCOLORVALUE;
+typedef D3DCOLORVALUE D2D_COLOR_F;
+typedef D2D_COLOR_F D2D1_COLOR_F;
+#endif
+
 #if PLATFORM(GTK)
 typedef struct _GdkColor GdkColor;
@@ -175 +182 @@
 #endif
 
+#if PLATFORM(WIN)
+    WEBCORE_EXPORT Color(D2D1_COLOR_F);
+    WEBCORE_EXPORT operator D2D1_COLOR_F() const;
+#endif
+
     static bool parseHexColor(const String&, RGBA32&);
     static bool parseHexColor(const StringView&, RGBA32&);