Title: [250615] trunk/Source/WebCore
- Revision
- 250615
- Author
- timothy_hor...@apple.com
- Date
- 2019-10-02 11:19:01 -0700 (Wed, 02 Oct 2019)
Log Message
Try to fix the Windows build
* css/typedom/TypedOMCSSImageValue.cpp:
(WebCore::TypedOMCSSImageValue::document const):
* css/typedom/TypedOMCSSImageValue.h:
Out-of-line this instead of including Document.h in TypedOMCSSImageValue,
which was an earlier build fix from r250610.
* platform/graphics/cg/GradientCG.cpp:
* platform/graphics/win/GlyphPageTreeNodeCGWin.cpp:
* platform/graphics/win/GraphicsContextCGWin.cpp:
Try to fix the build.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (250614 => 250615)
--- trunk/Source/WebCore/ChangeLog 2019-10-02 17:43:01 UTC (rev 250614)
+++ trunk/Source/WebCore/ChangeLog 2019-10-02 18:19:01 UTC (rev 250615)
@@ -1,3 +1,18 @@
+2019-10-02 Tim Horton <timothy_hor...@apple.com>
+
+ Try to fix the Windows build
+
+ * css/typedom/TypedOMCSSImageValue.cpp:
+ (WebCore::TypedOMCSSImageValue::document const):
+ * css/typedom/TypedOMCSSImageValue.h:
+ Out-of-line this instead of including Document.h in TypedOMCSSImageValue,
+ which was an earlier build fix from r250610.
+
+ * platform/graphics/cg/GradientCG.cpp:
+ * platform/graphics/win/GlyphPageTreeNodeCGWin.cpp:
+ * platform/graphics/win/GraphicsContextCGWin.cpp:
+ Try to fix the build.
+
2019-10-02 Keith Rollin <krol...@apple.com>
Unreviewed build fix after r250595.
Modified: trunk/Source/WebCore/css/typedom/TypedOMCSSImageValue.cpp (250614 => 250615)
--- trunk/Source/WebCore/css/typedom/TypedOMCSSImageValue.cpp 2019-10-02 17:43:01 UTC (rev 250614)
+++ trunk/Source/WebCore/css/typedom/TypedOMCSSImageValue.cpp 2019-10-02 18:19:01 UTC (rev 250615)
@@ -30,6 +30,8 @@
#include "config.h"
#include "TypedOMCSSImageValue.h"
+#include "Document.h"
+
#if ENABLE(CSS_TYPED_OM)
#include <wtf/IsoMallocInlines.h>
@@ -38,6 +40,8 @@
WTF_MAKE_ISO_ALLOCATED_IMPL(TypedOMCSSImageValue);
+Document* TypedOMCSSImageValue::document() const { return m_document.get(); }
+
} // namespace WebCore
#endif
Modified: trunk/Source/WebCore/css/typedom/TypedOMCSSImageValue.h (250614 => 250615)
--- trunk/Source/WebCore/css/typedom/TypedOMCSSImageValue.h 2019-10-02 17:43:01 UTC (rev 250614)
+++ trunk/Source/WebCore/css/typedom/TypedOMCSSImageValue.h 2019-10-02 18:19:01 UTC (rev 250615)
@@ -28,7 +28,6 @@
#if ENABLE(CSS_TYPED_OM)
#include "CSSImageValue.h"
-#include "Document.h"
#include "TypedOMCSSStyleValue.h"
#include <wtf/RefCounted.h>
#include <wtf/text/StringConcatenateNumbers.h>
@@ -47,7 +46,7 @@
String toString() final { return m_cssValue->cssText(); }
CachedImage* image() { return m_cssValue->cachedImage(); }
- Document* document() const { return m_document.get(); }
+ Document* document() const;
private:
TypedOMCSSImageValue(CSSImageValue& cssValue, Document& document)
Modified: trunk/Source/WebCore/platform/graphics/cg/GradientCG.cpp (250614 => 250615)
--- trunk/Source/WebCore/platform/graphics/cg/GradientCG.cpp 2019-10-02 17:43:01 UTC (rev 250614)
+++ trunk/Source/WebCore/platform/graphics/cg/GradientCG.cpp 2019-10-02 18:19:01 UTC (rev 250615)
@@ -30,7 +30,7 @@
#if USE(CG)
#include "GraphicsContextCG.h"
-#include <CoreGraphics/CoreGraphics.h>
+#include <pal/spi/cg/CoreGraphicsSPI.h>
#include <wtf/RetainPtr.h>
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/win/GlyphPageTreeNodeCGWin.cpp (250614 => 250615)
--- trunk/Source/WebCore/platform/graphics/win/GlyphPageTreeNodeCGWin.cpp 2019-10-02 17:43:01 UTC (rev 250614)
+++ trunk/Source/WebCore/platform/graphics/win/GlyphPageTreeNodeCGWin.cpp 2019-10-02 18:19:01 UTC (rev 250615)
@@ -32,6 +32,7 @@
#if USE(CG)
#include "Font.h"
+#include <pal/spi/cg/CoreGraphicsSPI.h>
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/win/GraphicsContextCGWin.cpp (250614 => 250615)
--- trunk/Source/WebCore/platform/graphics/win/GraphicsContextCGWin.cpp 2019-10-02 17:43:01 UTC (rev 250614)
+++ trunk/Source/WebCore/platform/graphics/win/GraphicsContextCGWin.cpp 2019-10-02 18:19:01 UTC (rev 250615)
@@ -33,7 +33,7 @@
#include "GraphicsContextPlatformPrivateCG.h"
#include "Path.h"
-#include <CoreGraphics/CGBitmapContext.h>
+#include <pal/spi/cg/CoreGraphicsSPI.h>
#include <wtf/win/GDIObject.h>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
