Title: [227314] branches/safari-605-branch/Source/WebKitLegacy/win
- Revision
- 227314
- Author
- jmarc...@apple.com
- Date
- 2018-01-22 09:57:39 -0800 (Mon, 22 Jan 2018)
Log Message
Cherry-pick r227209. rdar://problem/36722622
Modified Paths
Diff
Modified: branches/safari-605-branch/Source/WebKitLegacy/win/ChangeLog (227313 => 227314)
--- branches/safari-605-branch/Source/WebKitLegacy/win/ChangeLog 2018-01-22 17:57:37 UTC (rev 227313)
+++ branches/safari-605-branch/Source/WebKitLegacy/win/ChangeLog 2018-01-22 17:57:39 UTC (rev 227314)
@@ -1,5 +1,23 @@
2018-01-22 Jason Marcell <jmarc...@apple.com>
+ Cherry-pick r227209. rdar://problem/36722622
+
+ 2018-01-19 Per Arne Vollan <pvol...@apple.com>
+
+ [Win] Compile error: 'WebKitQuartzCoreAdditionsBase.h' not found.
+ https://bugs.webkit.org/show_bug.cgi?id=181859
+ <rdar://problem/36659886>
+
+ Reviewed by Alex Christensen.
+
+ Use local include patch.
+
+ * WebKitQuartzCoreAdditions/API/WKCACFImage.h:
+ * WebKitQuartzCoreAdditions/API/WKCACFView.h:
+ * WebKitQuartzCoreAdditions/API/WKCACFViewPrivate.h:
+
+2018-01-22 Jason Marcell <jmarc...@apple.com>
+
Cherry-pick r227079. rdar://problem/36722442
2018-01-17 Youenn Fablet <you...@apple.com>
Modified: branches/safari-605-branch/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/API/WKCACFImage.h (227313 => 227314)
--- branches/safari-605-branch/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/API/WKCACFImage.h 2018-01-22 17:57:37 UTC (rev 227313)
+++ branches/safari-605-branch/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/API/WKCACFImage.h 2018-01-22 17:57:39 UTC (rev 227314)
@@ -25,7 +25,7 @@
#pragma once
-#include <WebKitQuartzCoreAdditions/WebKitQuartzCoreAdditionsBase.h>
+#include "WebKitQuartzCoreAdditionsBase.h"
#ifdef __cplusplus
extern "C" {
Modified: branches/safari-605-branch/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/API/WKCACFView.h (227313 => 227314)
--- branches/safari-605-branch/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/API/WKCACFView.h 2018-01-22 17:57:37 UTC (rev 227313)
+++ branches/safari-605-branch/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/API/WKCACFView.h 2018-01-22 17:57:39 UTC (rev 227314)
@@ -25,8 +25,8 @@
#pragma once
+#include "WebKitQuartzCoreAdditionsBase.h"
#include <QuartzCore/CoreAnimationCF.h>
-#include <WebKitQuartzCoreAdditions/WebKitQuartzCoreAdditionsBase.h>
#ifndef WIN32_LEAN_AND_MEAN
#define WKQCA_DEFINED_WIN32_LEAN_AND_MEAN
Modified: branches/safari-605-branch/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/API/WKCACFViewPrivate.h (227313 => 227314)
--- branches/safari-605-branch/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/API/WKCACFViewPrivate.h 2018-01-22 17:57:37 UTC (rev 227313)
+++ branches/safari-605-branch/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/API/WKCACFViewPrivate.h 2018-01-22 17:57:39 UTC (rev 227314)
@@ -25,7 +25,7 @@
#pragma once
-#include <WebKitQuartzCoreAdditions/WKCACFView.h>
+#include "WKCACFView.h"
#ifdef __cplusplus
extern "C" {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
