Diff
Modified: trunk/Source/WTF/ChangeLog (183745 => 183746)
--- trunk/Source/WTF/ChangeLog 2015-05-04 15:20:41 UTC (rev 183745)
+++ trunk/Source/WTF/ChangeLog 2015-05-04 15:35:25 UTC (rev 183746)
@@ -1,3 +1,21 @@
+2015-05-04 Zan Dobersek <[email protected]>
+
+ [WTF] Remove Functional.h inclusions
+ https://bugs.webkit.org/show_bug.cgi?id=144400
+
+ Reviewed by Darin Adler.
+
+ Remove most of the Functional.h header inclusions. The header is preserved
+ since it's still used by older versions of Safari, and for the callOnMainThread()
+ stub in DeprecatedSymbolsUsedBySafari.mm.
+
+ * wtf/MainThread.cpp:
+ * wtf/RunLoop.h:
+ * wtf/WorkQueue.cpp:
+ * wtf/WorkQueue.h:
+ * wtf/efl/DispatchQueueEfl.h:
+ * wtf/efl/DispatchQueueWorkItemEfl.h:
+
2015-05-02 Commit Queue <[email protected]>
Unreviewed, rolling out r183722.
Modified: trunk/Source/WTF/wtf/MainThread.cpp (183745 => 183746)
--- trunk/Source/WTF/wtf/MainThread.cpp 2015-05-04 15:20:41 UTC (rev 183745)
+++ trunk/Source/WTF/wtf/MainThread.cpp 2015-05-04 15:35:25 UTC (rev 183746)
@@ -31,8 +31,8 @@
#include "CurrentTime.h"
#include "Deque.h"
-#include "Functional.h"
#include "StdLibExtras.h"
+#include "Threading.h"
#include <mutex>
#include <wtf/NeverDestroyed.h>
#include <wtf/ThreadSpecific.h>
Modified: trunk/Source/WTF/wtf/RunLoop.h (183745 => 183746)
--- trunk/Source/WTF/wtf/RunLoop.h 2015-05-04 15:20:41 UTC (rev 183745)
+++ trunk/Source/WTF/wtf/RunLoop.h 2015-05-04 15:35:25 UTC (rev 183746)
@@ -31,7 +31,6 @@
#include <wtf/Deque.h>
#include <wtf/Forward.h>
#include <wtf/FunctionDispatcher.h>
-#include <wtf/Functional.h>
#include <wtf/HashMap.h>
#include <wtf/RetainPtr.h>
#include <wtf/Threading.h>
Modified: trunk/Source/WTF/wtf/WorkQueue.cpp (183745 => 183746)
--- trunk/Source/WTF/wtf/WorkQueue.cpp 2015-05-04 15:20:41 UTC (rev 183745)
+++ trunk/Source/WTF/wtf/WorkQueue.cpp 2015-05-04 15:35:25 UTC (rev 183746)
@@ -26,6 +26,8 @@
#include "config.h"
#include "WorkQueue.h"
+#include "Ref.h"
+
namespace WTF {
Ref<WorkQueue> WorkQueue::create(const char* name, Type type, QOS qos)
Modified: trunk/Source/WTF/wtf/WorkQueue.h (183745 => 183746)
--- trunk/Source/WTF/wtf/WorkQueue.h 2015-05-04 15:20:41 UTC (rev 183745)
+++ trunk/Source/WTF/wtf/WorkQueue.h 2015-05-04 15:35:25 UTC (rev 183746)
@@ -31,7 +31,6 @@
#include <functional>
#include <wtf/Forward.h>
#include <wtf/FunctionDispatcher.h>
-#include <wtf/Functional.h>
#include <wtf/RefCounted.h>
#include <wtf/Threading.h>
Modified: trunk/Source/WTF/wtf/efl/DispatchQueueEfl.h (183745 => 183746)
--- trunk/Source/WTF/wtf/efl/DispatchQueueEfl.h 2015-05-04 15:20:41 UTC (rev 183745)
+++ trunk/Source/WTF/wtf/efl/DispatchQueueEfl.h 2015-05-04 15:35:25 UTC (rev 183746)
@@ -26,9 +26,10 @@
#ifndef DispatchQueueEfl_h
#define DispatchQueueEfl_h
+#include <functional>
#include <time.h>
-#include <wtf/Functional.h>
-#include <wtf/RefCounted.h>
+#include <wtf/ThreadSafeRefCounted.h>
+#include <wtf/ThreadingPrimitives.h>
#include <wtf/Vector.h>
class TimerWorkItem;
Modified: trunk/Source/WTF/wtf/efl/DispatchQueueWorkItemEfl.h (183745 => 183746)
--- trunk/Source/WTF/wtf/efl/DispatchQueueWorkItemEfl.h 2015-05-04 15:20:41 UTC (rev 183745)
+++ trunk/Source/WTF/wtf/efl/DispatchQueueWorkItemEfl.h 2015-05-04 15:35:25 UTC (rev 183746)
@@ -28,7 +28,6 @@
#include <wtf/Assertions.h>
#include <wtf/CurrentTime.h>
-#include <wtf/Functional.h>
#include <wtf/RefCounted.h>
#include <wtf/WorkQueue.h>
Modified: trunk/Source/WebCore/ChangeLog (183745 => 183746)
--- trunk/Source/WebCore/ChangeLog 2015-05-04 15:20:41 UTC (rev 183745)
+++ trunk/Source/WebCore/ChangeLog 2015-05-04 15:35:25 UTC (rev 183746)
@@ -1,3 +1,26 @@
+2015-05-04 Zan Dobersek <[email protected]>
+
+ [WTF] Remove Functional.h inclusions
+ https://bugs.webkit.org/show_bug.cgi?id=144400
+
+ Reviewed by Darin Adler.
+
+ Remove unnecessary inclusions of the <wtf/Functional.h> header in WebCore.
+
+ * Modules/mediastream/MediaStreamTrack.cpp:
+ * Modules/mediastream/MediaStreamTrackSourcesRequest.cpp:
+ * Modules/mediastream/UserMediaRequest.cpp:
+ * page/scrolling/ScrollingTree.h:
+ * page/scrolling/ios/ScrollingCoordinatorIOS.mm:
+ * page/scrolling/mac/ScrollingCoordinatorMac.mm:
+ * platform/MemoryPressureHandler.cpp:
+ * platform/UserActivity.h: Include the <objc/objc.h> header that was previously
+ indirectly included through Functional.h.
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+ * platform/mac/SoftLinking.h: Unconditionally include the <objc/runtime.h> header
+ that was previously included for the Mac port through Functional.h.
+
2015-05-04 Xabier Rodriguez Calvar <[email protected]> and Youenn Fablet <[email protected]>
[Streams API] Refactor ReadableJSStream and ReadableStreamJSSource
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp (183745 => 183746)
--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp 2015-05-04 15:20:41 UTC (rev 183745)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp 2015-05-04 15:35:25 UTC (rev 183746)
@@ -45,7 +45,6 @@
#include "MediaTrackConstraints.h"
#include "NotImplemented.h"
#include "RealtimeMediaSourceCenter.h"
-#include <wtf/Functional.h>
#include <wtf/NeverDestroyed.h>
namespace WebCore {
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrackSourcesRequest.cpp (183745 => 183746)
--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrackSourcesRequest.cpp 2015-05-04 15:20:41 UTC (rev 183745)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrackSourcesRequest.cpp 2015-05-04 15:35:25 UTC (rev 183746)
@@ -33,7 +33,6 @@
#include "ScriptExecutionContext.h"
#include "SecurityOrigin.h"
#include "SourceInfo.h"
-#include <wtf/Functional.h>
#include <wtf/MainThread.h>
namespace WebCore {
Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp (183745 => 183746)
--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2015-05-04 15:20:41 UTC (rev 183745)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2015-05-04 15:35:25 UTC (rev 183746)
@@ -49,7 +49,6 @@
#include "RealtimeMediaSourceCenter.h"
#include "SecurityOrigin.h"
#include "UserMediaController.h"
-#include <wtf/Functional.h>
#include <wtf/MainThread.h>
namespace WebCore {
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.h (183745 => 183746)
--- trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2015-05-04 15:20:41 UTC (rev 183745)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2015-05-04 15:35:25 UTC (rev 183746)
@@ -32,7 +32,6 @@
#include "Region.h"
#include "ScrollingCoordinator.h"
#include "WheelEventTestTrigger.h"
-#include <wtf/Functional.h>
#include <wtf/HashMap.h>
#include <wtf/ThreadSafeRefCounted.h>
#include <wtf/TypeCasts.h>
Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.mm (183745 => 183746)
--- trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.mm 2015-05-04 15:20:41 UTC (rev 183745)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.mm 2015-05-04 15:35:25 UTC (rev 183746)
@@ -39,7 +39,6 @@
#include "ScrollingTreeFrameScrollingNodeIOS.h"
#include "ScrollingTreeStickyNode.h"
#include "ScrollingTreeIOS.h"
-#include <wtf/Functional.h>
#include <wtf/MainThread.h>
#include <wtf/PassRefPtr.h>
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm (183745 => 183746)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2015-05-04 15:20:41 UTC (rev 183745)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2015-05-04 15:35:25 UTC (rev 183746)
@@ -41,7 +41,6 @@
#include "ScrollingTreeMac.h"
#include "ScrollingTreeStickyNode.h"
#include "TiledBacking.h"
-#include <wtf/Functional.h>
#include <wtf/MainThread.h>
#include <wtf/PassRefPtr.h>
Modified: trunk/Source/WebCore/platform/MemoryPressureHandler.cpp (183745 => 183746)
--- trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2015-05-04 15:20:41 UTC (rev 183745)
+++ trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2015-05-04 15:35:25 UTC (rev 183746)
@@ -39,7 +39,6 @@
#include "WorkerThread.h"
#include <wtf/CurrentTime.h>
#include <wtf/FastMalloc.h>
-#include <wtf/Functional.h>
#include <wtf/StdLibExtras.h>
namespace WebCore {
Modified: trunk/Source/WebCore/platform/UserActivity.h (183745 => 183746)
--- trunk/Source/WebCore/platform/UserActivity.h 2015-05-04 15:20:41 UTC (rev 183745)
+++ trunk/Source/WebCore/platform/UserActivity.h 2015-05-04 15:35:25 UTC (rev 183746)
@@ -29,6 +29,7 @@
#include "HysteresisActivity.h"
#if HAVE(NS_ACTIVITY)
+#include <objc/objc.h>
#include <wtf/RetainPtr.h>
#include <wtf/RunLoop.h>
OBJC_CLASS NSString;
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h (183745 => 183746)
--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2015-05-04 15:20:41 UTC (rev 183745)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2015-05-04 15:35:25 UTC (rev 183746)
@@ -33,7 +33,6 @@
#include "MediaPlayerPrivate.h"
#include "Timer.h"
#include <functional>
-#include <wtf/Functional.h>
#include <wtf/RetainPtr.h>
#include <wtf/WeakPtr.h>
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (183745 => 183746)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2015-05-04 15:20:41 UTC (rev 183745)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2015-05-04 15:35:25 UTC (rev 183746)
@@ -40,7 +40,6 @@
#import <AVFoundation/AVTime.h>
#import <QuartzCore/CALayer.h>
#import <objc_runtime.h>
-#import <wtf/Functional.h>
#import <wtf/MainThread.h>
#import <wtf/NeverDestroyed.h>
Modified: trunk/Source/WebCore/platform/mac/SoftLinking.h (183745 => 183746)
--- trunk/Source/WebCore/platform/mac/SoftLinking.h 2015-05-04 15:20:41 UTC (rev 183745)
+++ trunk/Source/WebCore/platform/mac/SoftLinking.h 2015-05-04 15:35:25 UTC (rev 183746)
@@ -27,10 +27,7 @@
#import <wtf/Assertions.h>
#import <dlfcn.h>
-
-#if PLATFORM(IOS)
#import <objc/runtime.h>
-#endif
#pragma mark - Soft-link macros for use within a single source file
Modified: trunk/Source/WebKit2/ChangeLog (183745 => 183746)
--- trunk/Source/WebKit2/ChangeLog 2015-05-04 15:20:41 UTC (rev 183745)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-04 15:35:25 UTC (rev 183746)
@@ -1,3 +1,17 @@
+2015-05-04 Zan Dobersek <[email protected]>
+
+ [WTF] Remove Functional.h inclusions
+ https://bugs.webkit.org/show_bug.cgi?id=144400
+
+ Reviewed by Darin Adler.
+
+ Remove unnecessary inclusions of the <wtf/Functional.h> header in WebKit2.
+
+ * Platform/IPC/unix/ConnectionUnix.cpp:
+ * WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm: Import the <objc/runtime.h>
+ header that was previously indirectly included through the Functional.h header.
+ * WebProcess/WebPage/DrawingArea.cpp:
+
2015-05-04 Csaba Osztrogonác <[email protected]>
[ARM] Don't compare unsigned chars to EOF (-1)
Modified: trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp (183745 => 183746)
--- trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp 2015-05-04 15:20:41 UTC (rev 183745)
+++ trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp 2015-05-04 15:35:25 UTC (rev 183746)
@@ -36,7 +36,6 @@
#include <fcntl.h>
#include <poll.h>
#include <wtf/Assertions.h>
-#include <wtf/Functional.h>
#include <wtf/StdLibExtras.h>
#include <wtf/UniStdExtras.h>
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm (183745 => 183746)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm 2015-05-04 15:20:41 UTC (rev 183745)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm 2015-05-04 15:35:25 UTC (rev 183746)
@@ -37,6 +37,7 @@
#import <WebCore/MachSendRight.h>
#import <WebCore/NotImplemented.h>
#import <WebKitSystemInterface.h>
+#import <objc/runtime.h>
#import <wtf/NeverDestroyed.h>
#import <wtf/text/StringView.h>
Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp (183745 => 183746)
--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp 2015-05-04 15:20:41 UTC (rev 183745)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp 2015-05-04 15:35:25 UTC (rev 183746)
@@ -32,7 +32,6 @@
#include "WebProcess.h"
#include <WebCore/DisplayRefreshMonitor.h>
#include <WebCore/TransformationMatrix.h>
-#include <wtf/Functional.h>
// Subclasses
#if PLATFORM(COCOA)
