Diff
Modified: trunk/Source/WTF/ChangeLog (202004 => 202005)
--- trunk/Source/WTF/ChangeLog 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WTF/ChangeLog 2016-06-13 21:58:53 UTC (rev 202005)
@@ -1,3 +1,16 @@
+2016-06-13 Alex Christensen <[email protected]>
+
+ Add WebSocketProvider stub
+ https://bugs.webkit.org/show_bug.cgi?id=158702
+
+ Reviewed by Brady Eidson.
+
+ * wtf/UniqueRef.h:
+ (WTF::UniqueRef::operator->):
+ (WTF::UniqueRef::operator T&):
+ (WTF::UniqueRef::operator const T&):
+ Added operator T& to avoid unneeded .get() calls.
+
2016-06-13 Sam Weinig <[email protected]>
Make HashMap and HashSet work with Refs
Modified: trunk/Source/WTF/wtf/UniqueRef.h (202004 => 202005)
--- trunk/Source/WTF/wtf/UniqueRef.h 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WTF/wtf/UniqueRef.h 2016-06-13 21:58:53 UTC (rev 202005)
@@ -56,6 +56,9 @@
T* operator->() { ASSERT(m_ref); return m_ref.get(); }
const T* operator->() const { ASSERT(m_ref); return m_ref.get(); }
+
+ operator T&() { ASSERT(m_ref); return *m_ref; }
+ operator const T&() const { ASSERT(m_ref); return *m_ref; }
private:
template<class U, class... Args> friend UniqueRef<U> makeUniqueRef(Args&&...);
Modified: trunk/Source/WebCore/ChangeLog (202004 => 202005)
--- trunk/Source/WebCore/ChangeLog 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/ChangeLog 2016-06-13 21:58:53 UTC (rev 202005)
@@ -1,3 +1,53 @@
+2016-06-13 Alex Christensen <[email protected]>
+
+ Add WebSocketProvider stub
+ https://bugs.webkit.org/show_bug.cgi?id=158702
+
+ Reviewed by Brady Eidson.
+
+ No new tests. No change in behavior.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * dom/DocumentMarkerController.cpp:
+ * dom/ScriptedAnimationController.cpp:
+ * html/HTMLMediaElement.cpp:
+ * html/MediaDocument.cpp:
+ * html/shadow/MediaControlElements.cpp:
+ * html/shadow/MediaControls.cpp:
+ * html/shadow/MediaControls.h:
+ * html/shadow/MediaControlsApple.cpp:
+ * inspector/InspectorInstrumentation.cpp:
+ * inspector/InspectorInstrumentation.h:
+ * inspector/InspectorOverlay.cpp:
+ (WebCore::InspectorOverlay::overlayPage):
+ * loader/EmptyClients.h:
+ * loader/FrameLoader.cpp:
+ * loader/FrameLoader.h:
+ * loader/appcache/ApplicationCacheHost.cpp:
+ * loader/cache/CachedResource.cpp:
+ * page/FrameView.cpp:
+ * page/Page.cpp:
+ (WebCore::Page::Page):
+ * page/Page.h:
+ (WebCore::Page::applicationCacheStorage):
+ (WebCore::Page::databaseProvider):
+ (WebCore::Page::socketProvider):
+ (WebCore::Page::storageNamespaceProvider):
+ * page/PageConfiguration.cpp:
+ (WebCore::PageConfiguration::PageConfiguration):
+ * page/PageConfiguration.h:
+ * page/ResourceUsageOverlay.cpp:
+ * page/SocketProvider.h: Added.
+ (WebCore::SocketProvider::~SocketProvider):
+ * page/cocoa/ResourceUsageOverlayCocoa.mm:
+ * rendering/RenderElement.cpp:
+ * rendering/RenderLayerBacking.cpp:
+ * style/StyleResolveForDocument.cpp:
+ * style/StyleTreeResolver.cpp:
+ * svg/graphics/SVGImage.cpp:
+ (WebCore::SVGImage::dataChanged):
+ * testing/MockPageOverlayClient.cpp:
+
2016-06-13 Brady Eidson <[email protected]>
Crashes in WebCore::IDBServer::UniqueIDBDatabase::executeNextDatabaseTask.
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (202004 => 202005)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-06-13 21:58:53 UTC (rev 202005)
@@ -2344,6 +2344,7 @@
5C4304B1191AC908000E2BC0 /* EXTShaderTextureLOD.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4304AE191AC908000E2BC0 /* EXTShaderTextureLOD.h */; };
5C4304B5191AEF46000E2BC0 /* JSEXTShaderTextureLOD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C4304B3191AEF46000E2BC0 /* JSEXTShaderTextureLOD.cpp */; };
5C4304B6191AEF46000E2BC0 /* JSEXTShaderTextureLOD.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4304B4191AEF46000E2BC0 /* JSEXTShaderTextureLOD.h */; };
+ 5C7C88D81D0F1F4A009D2F6D /* SocketProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C7C88D71D0F1F2B009D2F6D /* SocketProvider.h */; settings = {ATTRIBUTES = (Private, ); }; };
5C9A7A751AA0F6EA00958ACF /* DFABytecodeCompiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C39305E1AA0F6A90029C816 /* DFABytecodeCompiler.cpp */; };
5C9A7A761AA0F6ED00958ACF /* DFABytecodeInterpreter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C3930601AA0F6A90029C816 /* DFABytecodeInterpreter.cpp */; };
5C9B860C1C21E3C900110F36 /* ResourceLoadTiming.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C9B860B1C21E3C600110F36 /* ResourceLoadTiming.mm */; };
@@ -9965,6 +9966,7 @@
5C4304AF191AC908000E2BC0 /* EXTShaderTextureLOD.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = EXTShaderTextureLOD.idl; sourceTree = "<group>"; };
5C4304B3191AEF46000E2BC0 /* JSEXTShaderTextureLOD.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSEXTShaderTextureLOD.cpp; sourceTree = "<group>"; };
5C4304B4191AEF46000E2BC0 /* JSEXTShaderTextureLOD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSEXTShaderTextureLOD.h; sourceTree = "<group>"; };
+ 5C7C88D71D0F1F2B009D2F6D /* SocketProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketProvider.h; sourceTree = "<group>"; };
5C9B860B1C21E3C600110F36 /* ResourceLoadTiming.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceLoadTiming.mm; sourceTree = "<group>"; };
5CB37FFC1C62D27800F20188 /* ScrollAnimatorMock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollAnimatorMock.cpp; sourceTree = "<group>"; };
5CB37FFD1C62D27800F20188 /* ScrollAnimatorMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollAnimatorMock.h; sourceTree = "<group>"; };
@@ -17977,6 +17979,7 @@
65BF02180974806300C43196 /* page */ = {
isa = PBXGroup;
children = (
+ 5C7C88D71D0F1F2B009D2F6D /* SocketProvider.h */,
316FE1060E6E1D8400BF6088 /* animation */,
5D5975B5196362BE00D00878 /* cocoa */,
CE17AD141C58522F005F4799 /* csp */,
@@ -28129,6 +28132,7 @@
08FE0BC5127E2AC1000C4FB5 /* SVGAnimatedPreserveAspectRatio.h in Headers */,
088A0E05126EF1DB00978F7A /* SVGAnimatedProperty.h in Headers */,
088A0E06126EF1DB00978F7A /* SVGAnimatedPropertyDescription.h in Headers */,
+ 5C7C88D81D0F1F4A009D2F6D /* SocketProvider.h in Headers */,
088A0E07126EF1DB00978F7A /* SVGAnimatedPropertyMacros.h in Headers */,
088A0E08126EF1DB00978F7A /* SVGAnimatedPropertyTearOff.h in Headers */,
08C859C01274575400A5728D /* SVGAnimatedRect.h in Headers */,
Modified: trunk/Source/WebCore/bindings/gobject/DOMObjectCache.cpp (202004 => 202005)
--- trunk/Source/WebCore/bindings/gobject/DOMObjectCache.cpp 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/bindings/gobject/DOMObjectCache.cpp 2016-06-13 21:58:53 UTC (rev 202005)
@@ -27,6 +27,7 @@
#include <glib-object.h>
#include <wtf/HashMap.h>
#include <wtf/NeverDestroyed.h>
+#include <wtf/RunLoop.h>
#include <wtf/Vector.h>
#include <wtf/glib/GRefPtr.h>
Modified: trunk/Source/WebCore/dom/DocumentMarkerController.cpp (202004 => 202005)
--- trunk/Source/WebCore/dom/DocumentMarkerController.cpp 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/dom/DocumentMarkerController.cpp 2016-06-13 21:58:53 UTC (rev 202005)
@@ -31,6 +31,7 @@
#include "ChromeClient.h"
#include "MainFrame.h"
#include "NodeTraversal.h"
+#include "Page.h"
#include "Range.h"
#include "RenderBlockFlow.h"
#include "RenderLayer.h"
Modified: trunk/Source/WebCore/dom/ScriptedAnimationController.cpp (202004 => 202005)
--- trunk/Source/WebCore/dom/ScriptedAnimationController.cpp 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/dom/ScriptedAnimationController.cpp 2016-06-13 21:58:53 UTC (rev 202005)
@@ -36,6 +36,7 @@
#include "InspectorInstrumentation.h"
#include "Logging.h"
#include "MainFrame.h"
+#include "Page.h"
#include "RequestAnimationFrameCallback.h"
#include "Settings.h"
#include <wtf/Ref.h>
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (202004 => 202005)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-06-13 21:58:53 UTC (rev 202005)
@@ -72,6 +72,7 @@
#include "MemoryPressureHandler.h"
#include "NetworkingContext.h"
#include "NoEventDispatchAssertion.h"
+#include "Page.h"
#include "PageGroup.h"
#include "PageThrottler.h"
#include "PlatformMediaSessionManager.h"
Modified: trunk/Source/WebCore/html/MediaDocument.cpp (202004 => 202005)
--- trunk/Source/WebCore/html/MediaDocument.cpp 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/html/MediaDocument.cpp 2016-06-13 21:58:53 UTC (rev 202005)
@@ -43,6 +43,7 @@
#include "HTMLVideoElement.h"
#include "KeyboardEvent.h"
#include "NodeList.h"
+#include "Page.h"
#include "RawDataDocumentParser.h"
#include "ScriptController.h"
#include "ShadowRoot.h"
Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.cpp (202004 => 202005)
--- trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2016-06-13 21:58:53 UTC (rev 202005)
@@ -45,6 +45,7 @@
#include "LocalizedStrings.h"
#include "Logging.h"
#include "MediaControls.h"
+#include "Page.h"
#include "PageGroup.h"
#include "RenderLayer.h"
#include "RenderMediaControlElements.h"
Modified: trunk/Source/WebCore/html/shadow/MediaControls.cpp (202004 => 202005)
--- trunk/Source/WebCore/html/shadow/MediaControls.cpp 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/html/shadow/MediaControls.cpp 2016-06-13 21:58:53 UTC (rev 202005)
@@ -30,6 +30,7 @@
#include "MediaControls.h"
#include "ExceptionCodePlaceholder.h"
+#include "Page.h"
#include "Settings.h"
namespace WebCore {
Modified: trunk/Source/WebCore/html/shadow/MediaControls.h (202004 => 202005)
--- trunk/Source/WebCore/html/shadow/MediaControls.h 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/html/shadow/MediaControls.h 2016-06-13 21:58:53 UTC (rev 202005)
@@ -33,7 +33,6 @@
#include "HTMLDivElement.h"
#include "MediaControlElements.h"
#include "MouseEvent.h"
-#include "Page.h"
#include "RenderTheme.h"
#include "Text.h"
#include <wtf/RefPtr.h>
@@ -46,7 +45,6 @@
class Document;
class Event;
-class Page;
class MediaPlayer;
class RenderBox;
Modified: trunk/Source/WebCore/html/shadow/MediaControlsApple.cpp (202004 => 202005)
--- trunk/Source/WebCore/html/shadow/MediaControlsApple.cpp 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/html/shadow/MediaControlsApple.cpp 2016-06-13 21:58:53 UTC (rev 202005)
@@ -32,6 +32,7 @@
#include "CSSValueKeywords.h"
#include "ExceptionCodePlaceholder.h"
#include "HTMLNames.h"
+#include "Page.h"
#include "WheelEvent.h"
namespace WebCore {
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (202004 => 202005)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2016-06-13 21:58:53 UTC (rev 202005)
@@ -54,6 +54,7 @@
#include "InspectorTimelineAgent.h"
#include "InstrumentingAgents.h"
#include "MainFrame.h"
+#include "Page.h"
#include "PageDebuggerAgent.h"
#include "PageRuntimeAgent.h"
#include "RenderObject.h"
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (202004 => 202005)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2016-06-13 21:58:53 UTC (rev 202005)
@@ -38,7 +38,6 @@
#include "HitTestResult.h"
#include "InspectorInstrumentationCookie.h"
#include "MemoryPressureHandler.h"
-#include "Page.h"
#include "ScriptExecutionContext.h"
#include "StorageArea.h"
#include "WebSocketFrame.h"
@@ -80,6 +79,7 @@
class InspectorTimelineAgent;
class InstrumentingAgents;
class Node;
+class Page;
class PseudoElement;
class RenderLayer;
class RenderLayerBacking;
Modified: trunk/Source/WebCore/inspector/InspectorOverlay.cpp (202004 => 202005)
--- trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2016-06-13 21:58:53 UTC (rev 202005)
@@ -864,7 +864,7 @@
if (m_overlayPage)
return m_overlayPage.get();
- PageConfiguration pageConfiguration(makeUniqueRef<EmptyEditorClient>());
+ PageConfiguration pageConfiguration(makeUniqueRef<EmptyEditorClient>(), makeUniqueRef<EmptySocketProvider>());
fillWithEmptyClients(pageConfiguration);
m_overlayPage = std::make_unique<Page>(WTFMove(pageConfiguration));
Modified: trunk/Source/WebCore/loader/EmptyClients.cpp (202004 => 202005)
--- trunk/Source/WebCore/loader/EmptyClients.cpp 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/loader/EmptyClients.cpp 2016-06-13 21:58:53 UTC (rev 202005)
@@ -39,6 +39,7 @@
#include "FrameNetworkingContext.h"
#include "HTMLFormElement.h"
#include "InProcessIDBServer.h"
+#include "Page.h"
#include "PageConfiguration.h"
#include "StorageArea.h"
#include "StorageNamespace.h"
Modified: trunk/Source/WebCore/loader/EmptyClients.h (202004 => 202005)
--- trunk/Source/WebCore/loader/EmptyClients.h 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2016-06-13 21:58:53 UTC (rev 202005)
@@ -26,8 +26,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef EmptyClients_h
-#define EmptyClients_h
+#pragma once
#include "ChromeClient.h"
#include "ContextMenuClient.h"
@@ -42,6 +41,8 @@
#include "InspectorClient.h"
#include "ProgressTrackerClient.h"
#include "ResourceError.h"
+#include "SessionID.h"
+#include "SocketProvider.h"
#include "TextCheckerClient.h"
#include "VisitedLinkStore.h"
#include <wtf/text/StringView.h>
@@ -71,6 +72,7 @@
class GraphicsContext3D;
class Page;
+class PageConfiguration;
class EmptyChromeClient : public ChromeClient {
WTF_MAKE_FAST_ALLOCATED;
@@ -642,8 +644,9 @@
void logDiagnosticMessageWithValue(const String&, const String&, const String&, ShouldSample) override { }
};
+class EmptySocketProvider final : public SocketProvider {
+};
+
void fillWithEmptyClients(PageConfiguration&);
}
-
-#endif // EmptyClients_h
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (202004 => 202005)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2016-06-13 21:58:53 UTC (rev 202005)
@@ -86,6 +86,7 @@
#include "MIMETypeRegistry.h"
#include "MainFrame.h"
#include "MemoryCache.h"
+#include "Page.h"
#include "PageCache.h"
#include "PageThrottler.h"
#include "PageTransitionEvent.h"
Modified: trunk/Source/WebCore/loader/FrameLoader.h (202004 => 202005)
--- trunk/Source/WebCore/loader/FrameLoader.h 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/loader/FrameLoader.h 2016-06-13 21:58:53 UTC (rev 202005)
@@ -29,15 +29,13 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef FrameLoader_h
-#define FrameLoader_h
+#pragma once
#include "CachePolicy.h"
#include "FrameLoaderStateMachine.h"
#include "FrameLoaderTypes.h"
#include "LayoutMilestones.h"
#include "MixedContentChecker.h"
-#include "Page.h"
#include "PageThrottler.h"
#include "ResourceHandleTypes.h"
#include "ResourceLoadNotifier.h"
@@ -469,5 +467,3 @@
RefPtr<Frame> createWindow(Frame& openerFrame, Frame& lookupFrame, const FrameLoadRequest&, const WindowFeatures&, bool& created);
} // namespace WebCore
-
-#endif // FrameLoader_h
Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp (202004 => 202005)
--- trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp 2016-06-13 21:58:53 UTC (rev 202005)
@@ -38,6 +38,7 @@
#include "FrameLoaderClient.h"
#include "InspectorInstrumentation.h"
#include "MainFrame.h"
+#include "Page.h"
#include "ProgressEvent.h"
#include "ResourceHandle.h"
#include "ResourceRequest.h"
Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (202004 => 202005)
--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2016-06-13 21:58:53 UTC (rev 202005)
@@ -42,6 +42,7 @@
#include "Logging.h"
#include "MainFrame.h"
#include "MemoryCache.h"
+#include "Page.h"
#include "PlatformStrategies.h"
#include "ResourceHandle.h"
#include "SchemeRegistry.h"
Modified: trunk/Source/WebCore/page/FrameView.cpp (202004 => 202005)
--- trunk/Source/WebCore/page/FrameView.cpp 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/page/FrameView.cpp 2016-06-13 21:58:53 UTC (rev 202005)
@@ -64,6 +64,7 @@
#include "MemoryCache.h"
#include "MemoryPressureHandler.h"
#include "OverflowEvent.h"
+#include "Page.h"
#include "PageCache.h"
#include "PageOverlayController.h"
#include "ProgressTracker.h"
Modified: trunk/Source/WebCore/page/Page.cpp (202004 => 202005)
--- trunk/Source/WebCore/page/Page.cpp 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/page/Page.cpp 2016-06-13 21:58:53 UTC (rev 202005)
@@ -230,6 +230,7 @@
#endif
, m_lastSpatialNavigationCandidatesCount(0) // NOTE: Only called from Internals for Spatial Navigation testing.
, m_forbidPromptsDepth(0)
+ , m_socketProvider(WTFMove(pageConfiguration.socketProvider))
, m_applicationCacheStorage(*WTFMove(pageConfiguration.applicationCacheStorage))
, m_databaseProvider(*WTFMove(pageConfiguration.databaseProvider))
, m_storageNamespaceProvider(*WTFMove(pageConfiguration.storageNamespaceProvider))
Modified: trunk/Source/WebCore/page/Page.h (202004 => 202005)
--- trunk/Source/WebCore/page/Page.h 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/page/Page.h 2016-06-13 21:58:53 UTC (rev 202005)
@@ -120,6 +120,7 @@
class ScrollableArea;
class ScrollingCoordinator;
class Settings;
+class SocketProvider;
class StorageNamespace;
class StorageNamespaceProvider;
class UserContentProvider;
@@ -456,6 +457,7 @@
ApplicationCacheStorage& applicationCacheStorage() { return m_applicationCacheStorage; }
DatabaseProvider& databaseProvider() { return m_databaseProvider; }
+ SocketProvider& socketProvider() { return m_socketProvider; }
StorageNamespaceProvider& storageNamespaceProvider() { return m_storageNamespaceProvider.get(); }
void setStorageNamespaceProvider(Ref<StorageNamespaceProvider>&&);
@@ -690,6 +692,7 @@
unsigned m_lastSpatialNavigationCandidatesCount;
unsigned m_forbidPromptsDepth;
+ UniqueRef<SocketProvider> m_socketProvider;
Ref<ApplicationCacheStorage> m_applicationCacheStorage;
Ref<DatabaseProvider> m_databaseProvider;
Ref<StorageNamespaceProvider> m_storageNamespaceProvider;
Modified: trunk/Source/WebCore/page/PageConfiguration.cpp (202004 => 202005)
--- trunk/Source/WebCore/page/PageConfiguration.cpp 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/page/PageConfiguration.cpp 2016-06-13 21:58:53 UTC (rev 202005)
@@ -31,14 +31,16 @@
#include "DatabaseProvider.h"
#include "DiagnosticLoggingClient.h"
#include "EditorClient.h"
+#include "SocketProvider.h"
#include "StorageNamespaceProvider.h"
#include "UserContentController.h"
#include "VisitedLinkStore.h"
namespace WebCore {
-PageConfiguration::PageConfiguration(UniqueRef<EditorClient>&& editorClient)
+PageConfiguration::PageConfiguration(UniqueRef<EditorClient>&& editorClient, UniqueRef<SocketProvider>&& socketProvider)
: editorClient(WTFMove(editorClient))
+ , socketProvider(WTFMove(socketProvider))
{
}
Modified: trunk/Source/WebCore/page/PageConfiguration.h (202004 => 202005)
--- trunk/Source/WebCore/page/PageConfiguration.h 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/page/PageConfiguration.h 2016-06-13 21:58:53 UTC (rev 202005)
@@ -47,6 +47,7 @@
class InspectorClient;
class PlugInClient;
class ProgressTrackerClient;
+class SocketProvider;
class StorageNamespaceProvider;
class UserContentProvider;
class ValidationMessageClient;
@@ -59,7 +60,7 @@
class PageConfiguration {
WTF_MAKE_NONCOPYABLE(PageConfiguration); WTF_MAKE_FAST_ALLOCATED;
public:
- WEBCORE_EXPORT PageConfiguration(UniqueRef<EditorClient>&&);
+ WEBCORE_EXPORT PageConfiguration(UniqueRef<EditorClient>&&, UniqueRef<SocketProvider>&&);
WEBCORE_EXPORT ~PageConfiguration();
AlternativeTextClient* alternativeTextClient { nullptr };
@@ -68,6 +69,7 @@
ContextMenuClient* contextMenuClient { nullptr };
#endif
UniqueRef<EditorClient> editorClient;
+ UniqueRef<SocketProvider> socketProvider;
DragClient* dragClient { nullptr };
InspectorClient* inspectorClient { nullptr };
PlugInClient* plugInClient { nullptr };
Modified: trunk/Source/WebCore/page/ResourceUsageOverlay.cpp (202004 => 202005)
--- trunk/Source/WebCore/page/ResourceUsageOverlay.cpp 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/page/ResourceUsageOverlay.cpp 2016-06-13 21:58:53 UTC (rev 202005)
@@ -30,6 +30,7 @@
#include "ResourceUsageOverlay.h"
#include "FrameView.h"
+#include "Page.h"
#include "PageOverlayController.h"
#include "PlatformMouseEvent.h"
Added: trunk/Source/WebCore/page/SocketProvider.h (0 => 202005)
--- trunk/Source/WebCore/page/SocketProvider.h (rev 0)
+++ trunk/Source/WebCore/page/SocketProvider.h 2016-06-13 21:58:53 UTC (rev 202005)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+namespace WebCore {
+
+class SocketProvider {
+public:
+ virtual ~SocketProvider() { };
+};
+
+}
Modified: trunk/Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm (202004 => 202005)
--- trunk/Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm 2016-06-13 21:58:53 UTC (rev 202005)
@@ -34,6 +34,7 @@
#include <CoreGraphics/CGContext.h>
#include <QuartzCore/CALayer.h>
#include <QuartzCore/CATransaction.h>
+#include <wtf/MainThread.h>
#include <wtf/MathExtras.h>
#include <wtf/NeverDestroyed.h>
Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (202004 => 202005)
--- trunk/Source/WebCore/rendering/RenderElement.cpp 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2016-06-13 21:58:53 UTC (rev 202005)
@@ -40,6 +40,7 @@
#include "HTMLHtmlElement.h"
#include "HTMLNames.h"
#include "Logging.h"
+#include "Page.h"
#include "PathUtilities.h"
#include "RenderBlock.h"
#include "RenderChildIterator.h"
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (202004 => 202005)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2016-06-13 21:58:53 UTC (rev 202005)
@@ -45,6 +45,7 @@
#include "InspectorInstrumentation.h"
#include "KeyframeList.h"
#include "MainFrame.h"
+#include "Page.h"
#include "PluginViewBase.h"
#include "ProgressTracker.h"
#include "RenderFlowThread.h"
Modified: trunk/Source/WebCore/style/StyleResolveForDocument.cpp (202004 => 202005)
--- trunk/Source/WebCore/style/StyleResolveForDocument.cpp 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/style/StyleResolveForDocument.cpp 2016-06-13 21:58:53 UTC (rev 202005)
@@ -36,6 +36,7 @@
#include "HTMLIFrameElement.h"
#include "LocaleToScriptMapping.h"
#include "NodeRenderStyle.h"
+#include "Page.h"
#include "RenderObject.h"
#include "RenderStyle.h"
#include "RenderView.h"
Modified: trunk/Source/WebCore/style/StyleTreeResolver.cpp (202004 => 202005)
--- trunk/Source/WebCore/style/StyleTreeResolver.cpp 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/style/StyleTreeResolver.cpp 2016-06-13 21:58:53 UTC (rev 202005)
@@ -39,6 +39,7 @@
#include "LoaderStrategy.h"
#include "MainFrame.h"
#include "NodeRenderStyle.h"
+#include "Page.h"
#include "PlatformStrategies.h"
#include "Settings.h"
#include "ShadowRoot.h"
Modified: trunk/Source/WebCore/svg/graphics/SVGImage.cpp (202004 => 202005)
--- trunk/Source/WebCore/svg/graphics/SVGImage.cpp 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/svg/graphics/SVGImage.cpp 2016-06-13 21:58:53 UTC (rev 202005)
@@ -39,6 +39,7 @@
#include "IntRect.h"
#include "JSDOMWindowBase.h"
#include "MainFrame.h"
+#include "Page.h"
#include "PageConfiguration.h"
#include "RenderSVGRoot.h"
#include "RenderStyle.h"
@@ -379,7 +380,7 @@
return true;
if (allDataReceived) {
- PageConfiguration pageConfiguration(makeUniqueRef<EmptyEditorClient>());
+ PageConfiguration pageConfiguration(makeUniqueRef<EmptyEditorClient>(), makeUniqueRef<EmptySocketProvider>());
fillWithEmptyClients(pageConfiguration);
m_chromeClient = std::make_unique<SVGImageChromeClient>(this);
pageConfiguration.chromeClient = m_chromeClient.get();
Modified: trunk/Source/WebCore/testing/MockPageOverlayClient.cpp (202004 => 202005)
--- trunk/Source/WebCore/testing/MockPageOverlayClient.cpp 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebCore/testing/MockPageOverlayClient.cpp 2016-06-13 21:58:53 UTC (rev 202005)
@@ -30,6 +30,7 @@
#include "GraphicsContext.h"
#include "GraphicsLayer.h"
#include "MainFrame.h"
+#include "Page.h"
#include "PageOverlayController.h"
#include "PlatformMouseEvent.h"
#include <wtf/NeverDestroyed.h>
Modified: trunk/Source/WebKit/ChangeLog (202004 => 202005)
--- trunk/Source/WebKit/ChangeLog 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebKit/ChangeLog 2016-06-13 21:58:53 UTC (rev 202005)
@@ -1,3 +1,12 @@
+2016-06-13 Alex Christensen <[email protected]>
+
+ Add WebSocketProvider stub
+ https://bugs.webkit.org/show_bug.cgi?id=158702
+
+ Reviewed by Brady Eidson.
+
+ * WebKit.xcodeproj/project.pbxproj:
+
2016-06-10 Alex Christensen <[email protected]>
Fix CMake build.
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (202004 => 202005)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2016-06-13 21:58:53 UTC (rev 202005)
@@ -146,6 +146,7 @@
598AD9281201CF3200ABAE4E /* WebDeviceOrientationProviderMock.mm in Sources */ = {isa = PBXBuildFile; fileRef = 598AD9271201CF3200ABAE4E /* WebDeviceOrientationProviderMock.mm */; };
598AD92A1201CF3B00ABAE4E /* WebDeviceOrientationProviderMockInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 598AD9291201CF3B00ABAE4E /* WebDeviceOrientationProviderMockInternal.h */; };
598ADA461202275000ABAE4E /* WebDeviceOrientationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 598ADA451202275000ABAE4E /* WebDeviceOrientationProvider.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 5C7C88DA1D0F3BF2009D2F6D /* WebSocketProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C7C88D91D0F3BF2009D2F6D /* WebSocketProvider.h */; };
5D7BF8140C2A1D90008CE06D /* WebInspector.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D7BF8120C2A1D90008CE06D /* WebInspector.h */; settings = {ATTRIBUTES = (Private, ); }; };
5D7BF8150C2A1D90008CE06D /* WebInspector.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5D7BF8130C2A1D90008CE06D /* WebInspector.mm */; };
5DE83A7A0D0F7F9400CAD12A /* WebJavaScriptTextInputPanel.nib in Resources */ = {isa = PBXBuildFile; fileRef = 5DE83A740D0F7F9400CAD12A /* WebJavaScriptTextInputPanel.nib */; };
@@ -646,6 +647,7 @@
598AD9271201CF3200ABAE4E /* WebDeviceOrientationProviderMock.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebDeviceOrientationProviderMock.mm; sourceTree = "<group>"; };
598AD9291201CF3B00ABAE4E /* WebDeviceOrientationProviderMockInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDeviceOrientationProviderMockInternal.h; sourceTree = "<group>"; };
598ADA451202275000ABAE4E /* WebDeviceOrientationProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDeviceOrientationProvider.h; sourceTree = "<group>"; };
+ 5C7C88D91D0F3BF2009D2F6D /* WebSocketProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketProvider.h; sourceTree = "<group>"; };
5D7BF8120C2A1D90008CE06D /* WebInspector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebInspector.h; sourceTree = "<group>"; };
5D7BF8130C2A1D90008CE06D /* WebInspector.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebInspector.mm; sourceTree = "<group>"; };
5DE83A750D0F7F9400CAD12A /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/WebJavaScriptTextInputPanel.nib; sourceTree = SOURCE_ROOT; };
@@ -1090,6 +1092,7 @@
254DC334016E1D3F0ECA149E /* Misc */ = {
isa = PBXGroup;
children = (
+ 5C7C88D91D0F3BF2009D2F6D /* WebSocketProvider.h */,
A10C1D2018202FAF0036883A /* ios */,
1CCFFD120B1F81F2002EE926 /* OldWebAssertions.c */,
29AEF95D134C755400FE5096 /* OutlookQuirksUserScript.js */,
@@ -1794,6 +1797,7 @@
939810530824BF01008DF038 /* WebFrame.h in Headers */,
9398109C0824BF01008DF038 /* WebFrameInternal.h in Headers */,
A10C1D6B1820300E0036883A /* WebFrameIOS.h in Headers */,
+ 5C7C88DA1D0F3BF2009D2F6D /* WebSocketProvider.h in Headers */,
A10C1D6D1820300E0036883A /* WebFrameIPhone.h in Headers */,
9398105B0824BF01008DF038 /* WebFrameLoadDelegate.h in Headers */,
C0B88E8B10A08F3D00FBB3F5 /* WebFrameLoadDelegatePrivate.h in Headers */,
Modified: trunk/Source/WebKit/mac/ChangeLog (202004 => 202005)
--- trunk/Source/WebKit/mac/ChangeLog 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-06-13 21:58:53 UTC (rev 202005)
@@ -1,3 +1,15 @@
+2016-06-13 Alex Christensen <[email protected]>
+
+ Add WebSocketProvider stub
+ https://bugs.webkit.org/show_bug.cgi?id=158702
+
+ Reviewed by Brady Eidson.
+
+ * Misc/WebSocketProvider.h: Added.
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+ (-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):
+
2016-06-10 Alex Christensen <[email protected]>
Introduce WTF::UniqueRef
Added: trunk/Source/WebKit/mac/Misc/WebSocketProvider.h (0 => 202005)
--- trunk/Source/WebKit/mac/Misc/WebSocketProvider.h (rev 0)
+++ trunk/Source/WebKit/mac/Misc/WebSocketProvider.h 2016-06-13 21:58:53 UTC (rev 202005)
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <WebCore/SocketProvider.h>
+
+class WebSocketProvider final : public WebCore::SocketProvider {
+};
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (202004 => 202005)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-06-13 21:58:53 UTC (rev 202005)
@@ -99,6 +99,7 @@
#import "WebScriptDebugDelegate.h"
#import "WebScriptWorldInternal.h"
#import "WebSelectionServiceController.h"
+#import "WebSocketProvider.h"
#import "WebStorageManagerInternal.h"
#import "WebStorageNamespaceProvider.h"
#import "WebSystemInterface.h"
@@ -987,7 +988,7 @@
_private->group = WebViewGroup::getOrCreate(groupName, _private->preferences._localStorageDatabasePath);
_private->group->addWebView(self);
- PageConfiguration pageConfiguration(makeUniqueRef<WebEditorClient>(self));
+ PageConfiguration pageConfiguration(makeUniqueRef<WebEditorClient>(self), makeUniqueRef<WebSocketProvider>());
#if !PLATFORM(IOS)
pageConfiguration.chromeClient = new WebChromeClient(self);
pageConfiguration.contextMenuClient = new WebContextMenuClient(self);
@@ -1237,7 +1238,7 @@
_private->group = WebViewGroup::getOrCreate(groupName, _private->preferences._localStorageDatabasePath);
_private->group->addWebView(self);
- PageConfiguration pageConfiguration(makeUniqueRef<WebEditorClient>(self));
+ PageConfiguration pageConfiguration(makeUniqueRef<WebEditorClient>(self), makeUniqueRef<WebSocketProvider>());
pageConfiguration.chromeClient = new WebChromeClientIOS(self);
#if ENABLE(DRAG_SUPPORT)
pageConfiguration.dragClient = new WebDragClient(self);
Modified: trunk/Source/WebKit/win/ChangeLog (202004 => 202005)
--- trunk/Source/WebKit/win/ChangeLog 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebKit/win/ChangeLog 2016-06-13 21:58:53 UTC (rev 202005)
@@ -1,3 +1,14 @@
+2016-06-13 Alex Christensen <[email protected]>
+
+ Add WebSocketProvider stub
+ https://bugs.webkit.org/show_bug.cgi?id=158702
+
+ Reviewed by Brady Eidson.
+
+ * WebSocketProvider.h: Added.
+ * WebView.cpp:
+ (WebView::initWithFrame):
+
2016-06-10 Alex Christensen <[email protected]>
Introduce WTF::UniqueRef
Added: trunk/Source/WebKit/win/WebSocketProvider.h (0 => 202005)
--- trunk/Source/WebKit/win/WebSocketProvider.h (rev 0)
+++ trunk/Source/WebKit/win/WebSocketProvider.h 2016-06-13 21:58:53 UTC (rev 202005)
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <WebCore/SocketProvider.h>
+
+class WebSocketProvider final : public WebCore::SocketProvider {
+};
Modified: trunk/Source/WebKit/win/WebView.cpp (202004 => 202005)
--- trunk/Source/WebKit/win/WebView.cpp 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebKit/win/WebView.cpp 2016-06-13 21:58:53 UTC (rev 202005)
@@ -69,6 +69,7 @@
#include "WebPreferences.h"
#include "WebResourceLoadScheduler.h"
#include "WebScriptWorld.h"
+#include "WebSocketProvider.h"
#include "WebStorageNamespaceProvider.h"
#include "WebViewGroup.h"
#include "WebVisitedLinkStore.h"
@@ -2909,7 +2910,7 @@
m_inspectorClient = new WebInspectorClient(this);
- PageConfiguration configuration(makeUniqueRef<WebEditorClient>(this));
+ PageConfiguration configuration(makeUniqueRef<WebEditorClient>(this), makeUniqueRef<WebSocketProvider>());
configuration.chromeClient = new WebChromeClient(this);
configuration.contextMenuClient = new WebContextMenuClient(this);
configuration.dragClient = new WebDragClient(this);
Modified: trunk/Source/WebKit2/ChangeLog (202004 => 202005)
--- trunk/Source/WebKit2/ChangeLog 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-13 21:58:53 UTC (rev 202005)
@@ -1,3 +1,15 @@
+2016-06-13 Alex Christensen <[email protected]>
+
+ Add WebSocketProvider stub
+ https://bugs.webkit.org/show_bug.cgi?id=158702
+
+ Reviewed by Brady Eidson.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/Network/WebSocketProvider.h: Added.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::m_shouldDispatchFakeMouseMoveEvents):
+
2016-06-10 Ada Chan <[email protected]>
Use the video element's video box when getting the inline video rect in WebVideoFullscreenManager
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (202004 => 202005)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-06-13 21:58:53 UTC (rev 202005)
@@ -3063,6 +3063,7 @@
5C20CB9B1BB0DCD200895BB1 /* NetworkSessionCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NetworkSessionCocoa.mm; path = NetworkProcess/cocoa/NetworkSessionCocoa.mm; sourceTree = "<group>"; };
5C20CB9E1BB0DD1800895BB1 /* NetworkSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkSession.h; path = NetworkProcess/NetworkSession.h; sourceTree = "<group>"; };
5C298D9E1C3DEF2900470AFE /* PendingDownload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PendingDownload.h; path = NetworkProcess/Downloads/PendingDownload.h; sourceTree = "<group>"; };
+ 5C7C88DC1D0F41A0009D2F6D /* WebSocketProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebSocketProvider.h; path = Network/WebSocketProvider.h; sourceTree = "<group>"; };
5C85C7861C3F23C50061A4FA /* PendingDownload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PendingDownload.cpp; path = NetworkProcess/Downloads/PendingDownload.cpp; sourceTree = "<group>"; };
5CBC9B891C6524A500A8FDCF /* NetworkDataTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkDataTask.h; path = NetworkProcess/NetworkDataTask.h; sourceTree = "<group>"; };
5CBC9B8B1C65257300A8FDCF /* NetworkDataTaskCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NetworkDataTaskCocoa.mm; path = NetworkProcess/cocoa/NetworkDataTaskCocoa.mm; sourceTree = "<group>"; };
@@ -5253,6 +5254,7 @@
5105B0D2162F7A5E00E27709 /* Network */ = {
isa = PBXGroup;
children = (
+ 5C7C88DC1D0F41A0009D2F6D /* WebSocketProvider.h */,
5105B0D4162F7A7A00E27709 /* NetworkProcessConnection.cpp */,
5105B0D5162F7A7A00E27709 /* NetworkProcessConnection.h */,
51FB0902163A3B1C00EC324A /* NetworkProcessConnection.messages.in */,
Added: trunk/Source/WebKit2/WebProcess/Network/WebSocketProvider.h (0 => 202005)
--- trunk/Source/WebKit2/WebProcess/Network/WebSocketProvider.h (rev 0)
+++ trunk/Source/WebKit2/WebProcess/Network/WebSocketProvider.h 2016-06-13 21:58:53 UTC (rev 202005)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <WebCore/SocketProvider.h>
+
+namespace WebKit {
+
+class WebSocketProvider final : public WebCore::SocketProvider {
+};
+
+}
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (202004 => 202005)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-06-13 21:55:42 UTC (rev 202004)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-06-13 21:58:53 UTC (rev 202005)
@@ -101,6 +101,7 @@
#include "WebProcessPoolMessages.h"
#include "WebProcessProxyMessages.h"
#include "WebProgressTrackerClient.h"
+#include "WebSocketProvider.h"
#include "WebStorageNamespaceProvider.h"
#include "WebUndoStep.h"
#include "WebUserContentController.h"
@@ -384,7 +385,7 @@
Settings::setShouldManageAudioSessionCategory(true);
#endif
- PageConfiguration pageConfiguration(makeUniqueRef<WebEditorClient>(this));
+ PageConfiguration pageConfiguration(makeUniqueRef<WebEditorClient>(this), makeUniqueRef<WebSocketProvider>());
pageConfiguration.chromeClient = new WebChromeClient(this);
#if ENABLE(CONTEXT_MENUS)
pageConfiguration.contextMenuClient = new WebContextMenuClient(this);
