Diff
Modified: tags/Safari-602.1.26.0.2/Source/WebCore/ChangeLog (199049 => 199050)
--- tags/Safari-602.1.26.0.2/Source/WebCore/ChangeLog 2016-04-05 06:16:38 UTC (rev 199049)
+++ tags/Safari-602.1.26.0.2/Source/WebCore/ChangeLog 2016-04-05 06:17:52 UTC (rev 199050)
@@ -1,3 +1,30 @@
+2016-04-04 Babak Shafiei <[email protected]>
+
+ Merge r198850.
+
+ 2016-03-30 Brent Fulgham <[email protected]>
+
+ Avoid WebCore-prefixed paths when building WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=156027
+
+ Reviewed by David Kilzer.
+
+ Replace instances of '#include <WebCore/XXXYYY.h>"' with the normal
+ '#include "XXXYYY.h"' for files inside WebCore.
+
+ * config.h:
+ * inspector/InspectorTimelineAgent.cpp:
+ * page/ViewportConfiguration.cpp:
+ * platform/audio/ios/AudioDestinationIOS.cpp:
+ * platform/cocoa/WebVideoFullscreenModel.h:
+ * platform/cocoa/WebVideoFullscreenModelVideoElement.h:
+ * platform/graphics/Font.h:
+ * platform/graphics/ca/cocoa/LayerFlushSchedulerMac.cpp:
+ * platform/graphics/cg/ColorCG.cpp:
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.h:
+ * platform/mac/WebVideoFullscreenInterfaceMac.h:
+ * platform/mock/MediaPlaybackTargetPickerMock.cpp:
+
2016-03-30 Babak Shafiei <[email protected]>
Merge r198875.
Modified: tags/Safari-602.1.26.0.2/Source/WebCore/config.h (199049 => 199050)
--- tags/Safari-602.1.26.0.2/Source/WebCore/config.h 2016-04-05 06:16:38 UTC (rev 199049)
+++ tags/Safari-602.1.26.0.2/Source/WebCore/config.h 2016-04-05 06:17:52 UTC (rev 199050)
@@ -30,7 +30,7 @@
#endif
#if PLATFORM(WIN) && !USE(WINGDI)
-#include <WebCore/WebCoreHeaderDetection.h>
+#include "WebCoreHeaderDetection.h"
#endif
#include <wtf/ExportMacros.h>
Modified: tags/Safari-602.1.26.0.2/Source/WebCore/inspector/InspectorTimelineAgent.cpp (199049 => 199050)
--- tags/Safari-602.1.26.0.2/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2016-04-05 06:16:38 UTC (rev 199049)
+++ tags/Safari-602.1.26.0.2/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2016-04-05 06:17:52 UTC (rev 199050)
@@ -48,11 +48,11 @@
#if PLATFORM(IOS)
#include "RuntimeApplicationChecks.h"
-#include <WebCore/WebCoreThread.h>
+#include "WebCoreThread.h"
#endif
#if PLATFORM(COCOA)
-#include <WebCore/RunLoopObserver.h>
+#include "RunLoopObserver.h"
#endif
using namespace Inspector;
Modified: tags/Safari-602.1.26.0.2/Source/WebCore/page/ViewportConfiguration.cpp (199049 => 199050)
--- tags/Safari-602.1.26.0.2/Source/WebCore/page/ViewportConfiguration.cpp 2016-04-05 06:16:38 UTC (rev 199049)
+++ tags/Safari-602.1.26.0.2/Source/WebCore/page/ViewportConfiguration.cpp 2016-04-05 06:17:52 UTC (rev 199050)
@@ -26,7 +26,7 @@
#include "config.h"
#include "ViewportConfiguration.h"
-#include <WebCore/TextStream.h>
+#include "TextStream.h"
#include <wtf/Assertions.h>
#include <wtf/MathExtras.h>
#include <wtf/text/CString.h>
Modified: tags/Safari-602.1.26.0.2/Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp (199049 => 199050)
--- tags/Safari-602.1.26.0.2/Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp 2016-04-05 06:16:38 UTC (rev 199049)
+++ tags/Safari-602.1.26.0.2/Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp 2016-04-05 06:17:52 UTC (rev 199050)
@@ -38,9 +38,9 @@
#include "FloatConversion.h"
#include "Logging.h"
#include "Page.h"
+#include "RuntimeApplicationChecks.h"
#include "SoftLinking.h"
#include <AudioToolbox/AudioServices.h>
-#include <WebCore/RuntimeApplicationChecks.h>
#include <wtf/HashSet.h>
#include <wtf/NeverDestroyed.h>
Modified: tags/Safari-602.1.26.0.2/Source/WebCore/platform/cocoa/WebVideoFullscreenModel.h (199049 => 199050)
--- tags/Safari-602.1.26.0.2/Source/WebCore/platform/cocoa/WebVideoFullscreenModel.h 2016-04-05 06:16:38 UTC (rev 199049)
+++ tags/Safari-602.1.26.0.2/Source/WebCore/platform/cocoa/WebVideoFullscreenModel.h 2016-04-05 06:17:52 UTC (rev 199050)
@@ -29,8 +29,8 @@
#if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
-#include <WebCore/FloatRect.h>
-#include <WebCore/HTMLMediaElementEnums.h>
+#include "FloatRect.h"
+#include "HTMLMediaElementEnums.h"
namespace WebCore {
Modified: tags/Safari-602.1.26.0.2/Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.h (199049 => 199050)
--- tags/Safari-602.1.26.0.2/Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.h 2016-04-05 06:16:38 UTC (rev 199049)
+++ tags/Safari-602.1.26.0.2/Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.h 2016-04-05 06:17:52 UTC (rev 199050)
@@ -29,11 +29,11 @@
#if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
-#include <WebCore/EventListener.h>
-#include <WebCore/FloatRect.h>
-#include <WebCore/HTMLMediaElementEnums.h>
-#include <WebCore/PlatformLayer.h>
-#include <WebCore/WebVideoFullscreenModel.h>
+#include "EventListener.h"
+#include "FloatRect.h"
+#include "HTMLMediaElementEnums.h"
+#include "PlatformLayer.h"
+#include "WebVideoFullscreenModel.h"
#include <wtf/RefPtr.h>
#include <wtf/RetainPtr.h>
#include <wtf/Vector.h>
Modified: tags/Safari-602.1.26.0.2/Source/WebCore/platform/graphics/Font.h (199049 => 199050)
--- tags/Safari-602.1.26.0.2/Source/WebCore/platform/graphics/Font.h 2016-04-05 06:16:38 UTC (rev 199049)
+++ tags/Safari-602.1.26.0.2/Source/WebCore/platform/graphics/Font.h 2016-04-05 06:17:52 UTC (rev 199050)
@@ -54,7 +54,7 @@
#endif
#if USE(CG)
-#include <WebCore/CoreGraphicsSPI.h>
+#include "CoreGraphicsSPI.h"
#endif
namespace WebCore {
Modified: tags/Safari-602.1.26.0.2/Source/WebCore/platform/graphics/ca/cocoa/LayerFlushSchedulerMac.cpp (199049 => 199050)
--- tags/Safari-602.1.26.0.2/Source/WebCore/platform/graphics/ca/cocoa/LayerFlushSchedulerMac.cpp 2016-04-05 06:16:38 UTC (rev 199049)
+++ tags/Safari-602.1.26.0.2/Source/WebCore/platform/graphics/ca/cocoa/LayerFlushSchedulerMac.cpp 2016-04-05 06:17:52 UTC (rev 199050)
@@ -30,8 +30,8 @@
#if PLATFORM(IOS)
#include "RuntimeApplicationChecks.h"
+#include "WebCoreThread.h"
#include <CoreFoundation/CFBundle.h>
-#include <WebCore/WebCoreThread.h>
#endif
namespace WebCore {
Modified: tags/Safari-602.1.26.0.2/Source/WebCore/platform/graphics/cg/ColorCG.cpp (199049 => 199050)
--- tags/Safari-602.1.26.0.2/Source/WebCore/platform/graphics/cg/ColorCG.cpp 2016-04-05 06:16:38 UTC (rev 199049)
+++ tags/Safari-602.1.26.0.2/Source/WebCore/platform/graphics/cg/ColorCG.cpp 2016-04-05 06:17:52 UTC (rev 199050)
@@ -35,7 +35,7 @@
#if !PLATFORM(IOS)
#include <ApplicationServices/ApplicationServices.h>
#else
-#include <WebCore/CoreGraphicsSPI.h>
+#include "CoreGraphicsSPI.h"
#include <wtf/StdLibExtras.h>
#endif // !PLATFORM(IOS)
Modified: tags/Safari-602.1.26.0.2/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h (199049 => 199050)
--- tags/Safari-602.1.26.0.2/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h 2016-04-05 06:16:38 UTC (rev 199049)
+++ tags/Safari-602.1.26.0.2/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h 2016-04-05 06:17:52 UTC (rev 199050)
@@ -29,11 +29,11 @@
#if PLATFORM(IOS)
-#include <WebCore/EventListener.h>
-#include <WebCore/HTMLMediaElementEnums.h>
-#include <WebCore/PlatformLayer.h>
-#include <WebCore/Timer.h>
-#include <WebCore/WebVideoFullscreenInterface.h>
+#include "EventListener.h"
+#include "HTMLMediaElementEnums.h"
+#include "PlatformLayer.h"
+#include "Timer.h"
+#include "WebVideoFullscreenInterface.h"
#include <functional>
#include <objc/objc.h>
#include <wtf/RefCounted.h>
Modified: tags/Safari-602.1.26.0.2/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.h (199049 => 199050)
--- tags/Safari-602.1.26.0.2/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.h 2016-04-05 06:16:38 UTC (rev 199049)
+++ tags/Safari-602.1.26.0.2/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.h 2016-04-05 06:17:52 UTC (rev 199050)
@@ -28,8 +28,8 @@
#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
-#include <WebCore/HTMLMediaElementEnums.h>
-#include <WebCore/WebVideoFullscreenInterface.h>
+#include "HTMLMediaElementEnums.h"
+#include "WebVideoFullscreenInterface.h"
#include <wtf/RefCounted.h>
#include <wtf/RetainPtr.h>
#include <wtf/text/WTFString.h>
Modified: tags/Safari-602.1.26.0.2/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp (199049 => 199050)
--- tags/Safari-602.1.26.0.2/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp 2016-04-05 06:16:38 UTC (rev 199049)
+++ tags/Safari-602.1.26.0.2/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp 2016-04-05 06:17:52 UTC (rev 199050)
@@ -28,10 +28,10 @@
#if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
+#include "FloatRect.h"
#include "Logging.h"
-#include <WebCore/FloatRect.h>
-#include <WebCore/MediaPlaybackTargetMock.h>
-#include <WebCore/WebMediaSessionManager.h>
+#include "MediaPlaybackTargetMock.h"
+#include "WebMediaSessionManager.h"
using namespace WebCore;
