Changeset 206780 in webkit

Timestamp:

Oct 4, 2016 12:37:42 PM (8 years ago)

Author:

Brent Fulgham

Message:

Unreviewed build fix after r206773.

Exclude Direct2D definitions when building for normal CG Windows.

• platform/graphics/GraphicsContext.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GraphicsContext.h (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-04  Brent Fulgham  <bfulgham@apple.com>
+
+        Unreviewed build fix after r206773.
+
+        Exclude Direct2D definitions when building for normal CG Windows.
+
+        * platform/graphics/GraphicsContext.h:
+
 2016-10-04  Yusuke Suzuki  <utatane.tea@gmail.com>
 

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

@@ -510 +510 @@
 #else
     GraphicsContext(HDC, bool hasAlpha = false); // FIXME: To be removed.
-    GraphicsContext(HDC, ID2D1DCRenderTarget**, RECT, bool hasAlpha = false); // FIXME: To be removed.
 
     // When set to true, child windows should be rendered into this context
@@ -547 +546 @@
     void drawWindowsBitmap(WindowsBitmap*, const IntPoint&);
 #endif
+#if USE(DIRECT2D)
+    GraphicsContext(HDC, ID2D1DCRenderTarget**, RECT, bool hasAlpha = false); // FIXME: To be removed.
+
     WEBCORE_EXPORT static ID2D1Factory* systemFactory();
     WEBCORE_EXPORT static ID2D1RenderTarget* defaultRenderTarget();
@@ -556 +558 @@
     ID2D1SolidColorBrush* solidStrokeBrush();
     ID2D1SolidColorBrush* solidFillBrush();
+#endif
 #else // PLATFORM(WIN)
     bool shouldIncludeChildWindows() const { return false; }
@@ -573 +576 @@
 #if PLATFORM(WIN) && !USE(WINGDI)
     void platformInit(HDC, bool hasAlpha = false);
+#endif
+
+#if USE(DIRECT2D)
     void platformInit(HDC, ID2D1RenderTarget**, RECT, bool hasAlpha = false);
     void platformInit(ID2D1RenderTarget*);
-#endif
-
-#if USE(DIRECT2D)
     void drawWithoutShadow(const FloatRect& boundingRect, const std::function<void(ID2D1RenderTarget*)>&);
     void drawWithShadow(const FloatRect& boundingRect, const std::function<void(ID2D1RenderTarget*)>&);