Attachment 372452 Details for Bug 198722 – Patch v2

[patch] Patch v2

bug-198722-20190619150712.patch (text/plain), 31.97 KB, created by Adrian Perez on 2019-06-19 05:07:13 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Perez

Created: 2019-06-19 05:07:13 PDT

Size: 31.97 KB

patch

obsolete

>Subversion Revision: 246582
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index b73d4e4b05ad9cbb75c9b5ac75d8b13225df48b3..2571ec5f51f60c6461e0e5151a818e9c1119d562 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,31 @@
>+2019-06-18  Adrian Perez de Castro  <aperez@igalia.com>
>+
>+        [JSC] Linker fails when unified sources are not in use
>+        https://bugs.webkit.org/show_bug.cgi?id=198722
>+
>+        Reviewed by Keith Miller.
>+
>+        Added missing inclusions of headers in several files which make use of inline functions
>+        and/or types defined elsewhere.
>+
>+        * b3/B3AtomicValue.cpp:
>+        * b3/B3BlockInsertionSet.cpp:
>+        * b3/B3FenceValue.cpp:
>+        * b3/B3LowerMacrosAfterOptimizations.cpp:
>+        * b3/B3PureCSE.cpp:
>+        * b3/B3StackmapValue.cpp:
>+        * b3/B3SwitchValue.cpp:
>+        * b3/B3UseCounts.cpp:
>+        * b3/B3VariableValue.cpp:
>+        * b3/B3WasmAddressValue.cpp:
>+        * b3/B3WasmBoundsCheckValue.cpp:
>+        * ftl/FTLCompile.cpp:
>+        * runtime/WeakObjectRefConstructor.h:
>+        * wasm/WasmSectionParser.cpp:
>+        * wasm/WasmTable.cpp:
>+        * wasm/WasmValidate.cpp:
>+        * wasm/js/WebAssemblyFunction.h:
>+
> 2019-06-18  Yusuke Suzuki  <ysuzuki@apple.com>
> 
>         [JSC] JSLock should be WebThread aware
>@@ -1056,31 +1084,6 @@
> 
>         * Configurations/FeatureDefines.xcconfig:
> 
>-2019-06-10  Adrian Perez de Castro  <aperez@igalia.com>
>-
>-        [JSC] Linker fails when unified sources are not in use
>-        https://bugs.webkit.org/show_bug.cgi?id=198722
>-
>-        Reviewed by Keith Miller.
>-
>-        Added missing inclusions of headers in several files which make use of inline functions.
>-
>-        * b3/B3AtomicValue.cpp:
>-        * b3/B3BlockInsertionSet.cpp:
>-        * b3/B3FenceValue.cpp:
>-        * b3/B3LowerMacrosAfterOptimizations.cpp:
>-        * b3/B3PureCSE.cpp:
>-        * b3/B3StackmapValue.cpp:
>-        * b3/B3SwitchValue.cpp:
>-        * b3/B3UseCounts.cpp:
>-        * b3/B3VariableValue.cpp:
>-        * b3/B3WasmAddressValue.cpp:
>-        * b3/B3WasmBoundsCheckValue.cpp:
>-        * ftl/FTLCompile.cpp:
>-        * wasm/WasmSectionParser.cpp:
>-        * wasm/WasmTable.cpp:
>-        * wasm/WasmValidate.cpp:
>-
> 2019-06-10  Keith Miller  <keith_miller@apple.com>
> 
>         Make new Symbol/Promise API public
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 04935c45c8ffb831af2db0d0924dd371d374153e..03acd6ed935ff76bfce33c566f61c72670f0e896 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-06-18  Adrian Perez de Castro  <aperez@igalia.com>
>+
>+        [WPE][GTK] Fix build with unified sources disabled
>+        https://bugs.webkit.org/show_bug.cgi?id=198752
>+
>+        Reviewed by Michael Catanzaro.
>+
>+        * wtf/text/StringBuilder.h: Add missing include of StringConcatenateNumbers.h
>+
> 2019-06-18  Kenneth Russell  <kbr@chromium.org>
> 
>         Add preliminary ANGLE backend to WebCore
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index c571b58a80f3ebdd94d7bc2760647ccd15dac75f..0aca883817e4caf215b349b6ee80252d0c342ff4 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,33 @@
>+2019-06-18  Adrian Perez de Castro  <aperez@igalia.com>
>+
>+        [WPE][GTK] Fix build with unified sources disabled
>+        https://bugs.webkit.org/show_bug.cgi?id=198752
>+
>+        Reviewed by Michael Catanzaro.
>+
>+        No new tests needed.
>+
>+        * Modules/indexeddb/server/UniqueIDBDatabase.h: Add missing forward declaration for IDBGetRecordData,
>+        replace inclusion of UniqueIDBDatabaseConnection.h with a forward declaration.
>+        * Modules/indexeddb/server/UniqueIDBDatabaseConnection.h: Remove unneeded inclusion of
>+        UniqueIDBDatabaseTransaction.h, add missing inclusion of UniqueIDBDatabase.h
>+        * Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h: Remove unneeded inclusion of
>+        UniqueIDBDatabaseConnection.h inclusion.
>+        * bridge/c/c_class.cpp: Add inclusion of JSCJSValueInlines.h to avoid linker errors due
>+        to missing JSValue inline functions.
>+        * dom/DocumentParser.h: Replace forward declaration of Document with inclusion of Document.h,
>+        to avoid error due to usage of incomplete type in template expansion.
>+        * dom/Microtasks.h: Add missing forward declaration of JSC::VM
>+        * editing/markup.cpp: Add missing inclusion of PasteboardItemInfo.h
>+        * page/Quirks.h: Add missing forward declaration of WebCore::EventTarget
>+        * page/RuntimeEnabledFeatures.h: Add missing inclusion of wtf/Optional.h to avoid error due to
>+        expansion of undefined template.
>+        * page/SocketProvider.h: Add missing forward declaration for Document.
>+        * platform/graphics/GraphicsLayerClient.h: Add missing inclusion of wtf/OptionSet.h to avoid
>+        error due to expansion of undefined template.
>+        * rendering/RenderMultiColumnSpannerPlaceholder.h: Replace forward declaration of RenderMultiColumnFlow
>+        with inclusion of RenderMultiColumnFlow.h to avoid error due to usage of undefined class.
>+
> 2019-06-18  Saam Barati  <sbarati@apple.com>
> 
>         [WHLSL] Support matrices
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 6d600149b7a7ca7c23a5b4baf244b3881a6c2bc6..230d169dd4b8fcdebf70b2d9dbc36bc0bc4c122f 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,44 @@
>+2019-06-18  Adrian Perez de Castro  <aperez@igalia.com>
>+
>+        [WPE][GTK] Fix build with unified sources disabled
>+        https://bugs.webkit.org/show_bug.cgi?id=198752
>+
>+        Reviewed by Michael Catanzaro.
>+
>+        * NetworkProcess/NetworkHTTPSUpgradeChecker.cpp:
>+        (WebKit::NetworkHTTPSUpgradeChecker::NetworkHTTPSUpgradeChecker): Qualify SQLiteDatabase
>+        with its namespace.
>+        * UIProcess/WebFrameProxy.h: Replace forward declaration of WebPageProxy with inclusion
>+        of WebPageProxy.h to avoid build error due to usage of undefined class.
>+        * UIProcess/WebPageProxy.h: Replace inclusion of WebFrameProxy.h with
>+        forward declaration of WebFrameProxy
>+        * UIProcess/wpe/WebInspectorProxyWPE.cpp: Add missing forward declaration of
>+        WebCore::FloatRect.
>+        (WebKit::WebInspectorProxy::platformSetSheetRect): Qualify FloatRect with its namespace.
>+        * WebProcess/Automation/WebAutomationSessionProxy.cpp: Qualify all occurrences of
>+        PageIdentifier with its namespace.
>+        (WebKit::WebAutomationSessionProxy::evaluateJavaScriptFunction):
>+        (WebKit::WebAutomationSessionProxy::resolveChildFrameWithOrdinal):
>+        (WebKit::WebAutomationSessionProxy::resolveChildFrameWithNodeHandle):
>+        (WebKit::WebAutomationSessionProxy::resolveChildFrameWithName):
>+        (WebKit::WebAutomationSessionProxy::resolveParentFrame):
>+        (WebKit::WebAutomationSessionProxy::focusFrame):
>+        (WebKit::WebAutomationSessionProxy::computeElementLayout):
>+        (WebKit::WebAutomationSessionProxy::selectOptionElement):
>+        (WebKit::WebAutomationSessionProxy::takeScreenshot):
>+        (WebKit::WebAutomationSessionProxy::getCookiesForFrame):
>+        (WebKit::WebAutomationSessionProxy::deleteCookie):
>+        * WebProcess/Cache/WebCacheStorageConnection.cpp: Ditto.
>+        (WebKit::WebCacheStorageConnection::open):
>+        (WebKit::WebCacheStorageConnection::remove):
>+        (WebKit::WebCacheStorageConnection::retrieveCaches):
>+        (WebKit::WebCacheStorageConnection::retrieveRecords):
>+        (WebKit::WebCacheStorageConnection::batchDeleteOperation):
>+        (WebKit::WebCacheStorageConnection::batchPutOperation):
>+        * WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp: Add missing inclusion of WebPage.h
>+        * WebProcess/WebPage/gtk/WebPageGtk.cpp: Add missing inclusion of gtk/gtk.h
>+        * WebProcess/WebPage/wpe/WebPageWPE.cpp: Add missing inclusion of WebPageProxy.h
>+
> 2019-06-18  Ryan Haddad  <ryanhaddad@apple.com>
> 
>         Unreviewed, rolling out r246575.
>diff --git a/Source/JavaScriptCore/runtime/WeakObjectRefConstructor.h b/Source/JavaScriptCore/runtime/WeakObjectRefConstructor.h
>index 7f90ba405c051d10f914f593090c869206435d3f..1d54cf4f4627dfcb04f6c506b7fd8b30e772f24f 100644
>--- a/Source/JavaScriptCore/runtime/WeakObjectRefConstructor.h
>+++ b/Source/JavaScriptCore/runtime/WeakObjectRefConstructor.h
>@@ -25,8 +25,12 @@
> 
> #pragma once
> 
>+#include "InternalFunction.h"
>+
> namespace JSC {
> 
>+class WeakObjectRefPrototype;
>+
> class WeakObjectRefConstructor final : public InternalFunction {
> public:
>     using Base = InternalFunction;
>diff --git a/Source/JavaScriptCore/wasm/js/WebAssemblyFunction.cpp b/Source/JavaScriptCore/wasm/js/WebAssemblyFunction.cpp
>index d89715042605d73e3c7b4532b6399704c3f93558..f30a72098c9256821d4a84e81b954271e9720b80 100644
>--- a/Source/JavaScriptCore/wasm/js/WebAssemblyFunction.cpp
>+++ b/Source/JavaScriptCore/wasm/js/WebAssemblyFunction.cpp
>@@ -32,6 +32,7 @@
> #include "JSCInlines.h"
> #include "JSFunctionInlines.h"
> #include "JSObject.h"
>+#include "JSWebAssemblyHelpers.h"
> #include "JSWebAssemblyInstance.h"
> #include "JSWebAssemblyMemory.h"
> #include "JSWebAssemblyRuntimeError.h"
>diff --git a/Source/WTF/wtf/text/StringBuilder.h b/Source/WTF/wtf/text/StringBuilder.h
>index c36f01f6cf5af157440994c8e4cd743f2dd64f43..998b85763818e5cd61ebbccac65ad79aa5d45ce9 100644
>--- a/Source/WTF/wtf/text/StringBuilder.h
>+++ b/Source/WTF/wtf/text/StringBuilder.h
>@@ -29,6 +29,7 @@
> #include <wtf/CheckedArithmetic.h>
> #include <wtf/text/AtomString.h>
> #include <wtf/text/IntegerToStringConversion.h>
>+#include <wtf/text/StringConcatenateNumbers.h>
> #include <wtf/text/StringView.h>
> #include <wtf/text/WTFString.h>
> 
>diff --git a/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h b/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h
>index b302f03d821ddd9dc489e4bda6b5f95eef4ca368..669b2d6d0d0b4377e80caf464a69272efbda4851 100644
>--- a/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h
>+++ b/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h
>@@ -33,7 +33,6 @@
> #include "IDBGetResult.h"
> #include "ServerOpenDBRequest.h"
> #include "Timer.h"
>-#include "UniqueIDBDatabaseConnection.h"
> #include "UniqueIDBDatabaseTransaction.h"
> #include <wtf/CrossThreadQueue.h>
> #include <wtf/CrossThreadTask.h>
>@@ -52,6 +51,7 @@ namespace WebCore {
> 
> class IDBError;
> class IDBGetAllResult;
>+struct IDBGetRecordData;
> class IDBRequestData;
> class IDBTransactionInfo;
> class StorageQuotaManager;
>@@ -66,6 +66,7 @@ namespace IDBServer {
> 
> class IDBConnectionToClient;
> class IDBServer;
>+class UniqueIDBDatabaseConnection;
> 
> typedef Function<void(const IDBError&)> ErrorCallback;
> typedef Function<void(const IDBError&, const IDBKeyData&)> KeyDataCallback;
>diff --git a/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.h b/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.h
>index 41a13c925040b28043455f16b5022bc1f0c4b517..01d181320494149e78daa5a335e969b2a84ed55b 100644
>--- a/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.h
>+++ b/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.h
>@@ -27,7 +27,7 @@
> 
> #if ENABLE(INDEXED_DATABASE)
> 
>-#include "UniqueIDBDatabaseTransaction.h"
>+#include "UniqueIDBDatabase.h"
> #include <wtf/HashMap.h>
> #include <wtf/Identified.h>
> #include <wtf/Ref.h>
>diff --git a/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h b/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h
>index f4af505bd82bf3ed33e69f20ad5e909b4c7c2f82..d75d011bd9985cf2dd01ddced1d9b4ecddf40c73 100644
>--- a/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h
>+++ b/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h
>@@ -29,7 +29,6 @@
> 
> #include "IDBError.h"
> #include "IDBTransactionInfo.h"
>-#include "UniqueIDBDatabaseConnection.h"
> #include <wtf/Ref.h>
> #include <wtf/RefCounted.h>
> #include <wtf/WeakPtr.h>
>diff --git a/Source/WebCore/bridge/c/c_class.cpp b/Source/WebCore/bridge/c/c_class.cpp
>index 93b982a428b91b81be0114fe8bfc678a9e236d15..29c8186836ea05411e8f1ed641c0570ce8176815 100644
>--- a/Source/WebCore/bridge/c/c_class.cpp
>+++ b/Source/WebCore/bridge/c/c_class.cpp
>@@ -33,6 +33,7 @@
> #include "c_runtime.h"
> #include "npruntime_impl.h"
> #include <JavaScriptCore/Identifier.h>
>+#include <JavaScriptCore/JSCJSValueInlines.h>
> #include <JavaScriptCore/JSGlobalObject.h>
> #include <JavaScriptCore/JSObject.h>
> #include <wtf/text/StringHash.h>
>diff --git a/Source/WebCore/dom/DocumentParser.h b/Source/WebCore/dom/DocumentParser.h
>index 960b4a86ac629f10adb400bedae3ffc403ba5ba1..e8a216e477ac6f60447129199eef26d855a20d56 100644
>--- a/Source/WebCore/dom/DocumentParser.h
>+++ b/Source/WebCore/dom/DocumentParser.h
>@@ -23,13 +23,13 @@
> 
> #pragma once
> 
>+#include "Document.h"
> #include <wtf/Forward.h>
> #include <wtf/RefCounted.h>
> #include <wtf/WeakPtr.h>
> 
> namespace WebCore {
> 
>-class Document;
> class DocumentWriter;
> class SegmentedString;
> class ScriptableDocumentParser;
>diff --git a/Source/WebCore/dom/Microtasks.h b/Source/WebCore/dom/Microtasks.h
>index 27d7e7a8144d74e2d74bd730eb1998ce3c9718aa..b63184150f5a3914252b842ed9d07deaaf6b4036 100644
>--- a/Source/WebCore/dom/Microtasks.h
>+++ b/Source/WebCore/dom/Microtasks.h
>@@ -25,6 +25,10 @@
> #include <wtf/Forward.h>
> #include <wtf/Vector.h>
> 
>+namespace JSC {
>+class VM;
>+} // namespace JSC
>+
> namespace WebCore {
> 
> class MicrotaskQueue;
>diff --git a/Source/WebCore/editing/markup.cpp b/Source/WebCore/editing/markup.cpp
>index d4ea36dd01fd3c2da57b8948a67b426fde3b0303..0f7cea703e5fcb8c26e15ac03d041e0140ad6c91 100644
>--- a/Source/WebCore/editing/markup.cpp
>+++ b/Source/WebCore/editing/markup.cpp
>@@ -67,6 +67,7 @@
> #include "NodeList.h"
> #include "Page.h"
> #include "PageConfiguration.h"
>+#include "PasteboardItemInfo.h"
> #include "Range.h"
> #include "RenderBlock.h"
> #include "RuntimeEnabledFeatures.h"
>diff --git a/Source/WebCore/page/Quirks.h b/Source/WebCore/page/Quirks.h
>index cbd2fd23e6878a1139bb65199f00c3362e3735b2..088b83ea07937f607e8d09f038da48552b65b7c3 100644
>--- a/Source/WebCore/page/Quirks.h
>+++ b/Source/WebCore/page/Quirks.h
>@@ -30,6 +30,7 @@
> namespace WebCore {
> 
> class Document;
>+class EventTarget;
> class HTMLElement;
> class LayoutUnit;
> 
>diff --git a/Source/WebCore/page/RuntimeEnabledFeatures.h b/Source/WebCore/page/RuntimeEnabledFeatures.h
>index 5c1737ebb34a1b407632a3836f4681888f9d6717..420e59c014e19a9d3c084dba2112bd84630a08b4 100644
>--- a/Source/WebCore/page/RuntimeEnabledFeatures.h
>+++ b/Source/WebCore/page/RuntimeEnabledFeatures.h
>@@ -33,6 +33,7 @@
> 
> #include <wtf/Forward.h>
> #include <wtf/Noncopyable.h>
>+#include <wtf/Optional.h>
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/page/SocketProvider.h b/Source/WebCore/page/SocketProvider.h
>index 5f56f150255ab9b3c86f9dbd1ecdb60685ccc9c7..c5778b25be7738db63c97d5732f03d5a5678b2f8 100644
>--- a/Source/WebCore/page/SocketProvider.h
>+++ b/Source/WebCore/page/SocketProvider.h
>@@ -31,6 +31,7 @@
> 
> namespace WebCore {
> 
>+class Document;
> class ThreadableWebSocketChannel;
> class ScriptExecutionContext;
> class StorageSessionProvider;
>diff --git a/Source/WebCore/platform/graphics/GraphicsLayerClient.h b/Source/WebCore/platform/graphics/GraphicsLayerClient.h
>index 53fcb282df040ebcdc15e6174e5e0cd337645f90..4056280540092f4b7e6caad55096a5311c9530fe 100644
>--- a/Source/WebCore/platform/graphics/GraphicsLayerClient.h
>+++ b/Source/WebCore/platform/graphics/GraphicsLayerClient.h
>@@ -27,6 +27,7 @@
> 
> #include "TiledBacking.h"
> #include <wtf/Forward.h>
>+#include <wtf/OptionSet.h>
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/rendering/RenderMultiColumnSpannerPlaceholder.h b/Source/WebCore/rendering/RenderMultiColumnSpannerPlaceholder.h
>index a059561a81eaa214796be8bce022cd1576e99d49..650d4914cd222691646d91fce7cb37f43ae7f2fa 100644
>--- a/Source/WebCore/rendering/RenderMultiColumnSpannerPlaceholder.h
>+++ b/Source/WebCore/rendering/RenderMultiColumnSpannerPlaceholder.h
>@@ -30,11 +30,10 @@
> #pragma once
> 
> #include "RenderBox.h"
>+#include "RenderMultiColumnFlow.h"
> 
> namespace WebCore {
> 
>-class RenderMultiColumnFlow;
>-
> class RenderMultiColumnSpannerPlaceholder final : public RenderBox {
>     WTF_MAKE_ISO_ALLOCATED(RenderMultiColumnSpannerPlaceholder);
> public:
>diff --git a/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp b/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp
>index f4ae37023ab3db3d96b8b58b096599120fabb809..f6542958b47103d381f8cc5370d9d6b594dc116c 100644
>--- a/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp
>@@ -67,7 +67,7 @@ NetworkHTTPSUpgradeChecker::NetworkHTTPSUpgradeChecker()
>             return;
>         }
> 
>-        m_database = std::make_unique<SQLiteDatabase>();
>+        m_database = std::make_unique<WebCore::SQLiteDatabase>();
>         bool isDatabaseOpen = m_database->open(path, WebCore::SQLiteDatabase::OpenMode::ReadOnly);
>         if (!isDatabaseOpen) {
> #if PLATFORM(COCOA)
>@@ -80,7 +80,7 @@ NetworkHTTPSUpgradeChecker::NetworkHTTPSUpgradeChecker()
>         // Since we are using a workerQueue, the sequential dispatch blocks may be called by different threads.
>         m_database->disableThreadingChecks();
> 
>-        m_statement = std::make_unique<SQLiteStatement>(*m_database, httpsUpgradeCheckerQuery);
>+        m_statement = std::make_unique<WebCore::SQLiteStatement>(*m_database, httpsUpgradeCheckerQuery);
>         int isStatementPrepared = (m_statement->prepare() == SQLITE_OK);
>         ASSERT(isStatementPrepared);
>         if (!isStatementPrepared)
>diff --git a/Source/WebKit/UIProcess/WebFrameProxy.cpp b/Source/WebKit/UIProcess/WebFrameProxy.cpp
>index 5c851b72755e98412f21dfce5506fa03f7f38a42..b43926c9c4206c93d88c16842a424dbce66691fc 100644
>--- a/Source/WebKit/UIProcess/WebFrameProxy.cpp
>+++ b/Source/WebKit/UIProcess/WebFrameProxy.cpp
>@@ -31,7 +31,6 @@
> #include "WebCertificateInfo.h"
> #include "WebFramePolicyListenerProxy.h"
> #include "WebPageMessages.h"
>-#include "WebPageProxy.h"
> #include "WebPasteboardProxy.h"
> #include "WebProcessPool.h"
> #include "WebsiteDataStore.h"
>@@ -44,6 +43,8 @@
> namespace WebKit {
> using namespace WebCore;
> 
>+class WebPageProxy;
>+
> WebFrameProxy::WebFrameProxy(WebPageProxy& page, uint64_t frameID)
>     : m_page(makeWeakPtr(page))
>     , m_isFrameSet(false)
>diff --git a/Source/WebKit/UIProcess/WebFrameProxy.h b/Source/WebKit/UIProcess/WebFrameProxy.h
>index 71b5eca62b67008f4819bf0628177e204d7efd2b..29da35148338ba7dc1fd9906ff29390909d2fa62 100644
>--- a/Source/WebKit/UIProcess/WebFrameProxy.h
>+++ b/Source/WebKit/UIProcess/WebFrameProxy.h
>@@ -29,6 +29,7 @@
> #include "FrameLoadState.h"
> #include "GenericCallback.h"
> #include "WebFramePolicyListenerProxy.h"
>+#include "WebPageProxy.h"
> #include <WebCore/FrameLoaderTypes.h>
> #include <wtf/Forward.h>
> #include <wtf/Function.h>
>@@ -51,7 +52,6 @@ namespace WebKit {
> class SafeBrowsingWarning;
> class WebCertificateInfo;
> class WebFramePolicyListenerProxy;
>-class WebPageProxy;
> class WebsiteDataStore;
> enum class ShouldExpectSafeBrowsingResult;
> enum class ProcessSwapRequestedByClient;
>diff --git a/Source/WebKit/UIProcess/wpe/WebInspectorProxyWPE.cpp b/Source/WebKit/UIProcess/wpe/WebInspectorProxyWPE.cpp
>index 0f426563293dbf2ccdff646467a446b172be38f3..552771bb51ac6042d34d3c0a60ab50b797c16d18 100644
>--- a/Source/WebKit/UIProcess/wpe/WebInspectorProxyWPE.cpp
>+++ b/Source/WebKit/UIProcess/wpe/WebInspectorProxyWPE.cpp
>@@ -30,6 +30,10 @@
> #include <WebCore/NotImplemented.h>
> #include <wtf/text/WTFString.h>
> 
>+namespace WebCore {
>+class FloatRect;
>+}
>+
> namespace WebKit {
> 
> WebPageProxy* WebInspectorProxy::platformCreateFrontendPage()
>@@ -134,7 +138,7 @@ void WebInspectorProxy::platformSetAttachedWindowWidth(unsigned)
>     notImplemented();
> }
> 
>-void WebInspectorProxy::platformSetSheetRect(const FloatRect&)
>+void WebInspectorProxy::platformSetSheetRect(const WebCore::FloatRect&)
> {
>     notImplemented();
> }
>diff --git a/Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.cpp b/Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.cpp
>index 454ca6bc844983f5998ffee4da374ccfcc6225da..68b3d89cbdc668e218fad704bf25a363dcd349ba 100644
>--- a/Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.cpp
>+++ b/Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.cpp
>@@ -231,7 +231,7 @@ void WebAutomationSessionProxy::didClearWindowObjectForFrame(WebFrame& frame)
>         WebProcess::singleton().parentProcessConnection()->send(Messages::WebAutomationSession::DidEvaluateJavaScriptFunction(callbackID, errorMessage, errorType), 0);
> }
> 
>-void WebAutomationSessionProxy::evaluateJavaScriptFunction(PageIdentifier pageID, uint64_t frameID, const String& function, Vector<String> arguments, bool expectsImplicitCallbackArgument, int callbackTimeout, uint64_t callbackID)
>+void WebAutomationSessionProxy::evaluateJavaScriptFunction(WebCore::PageIdentifier pageID, uint64_t frameID, const String& function, Vector<String> arguments, bool expectsImplicitCallbackArgument, int callbackTimeout, uint64_t callbackID)
> {
>     WebPage* page = WebProcess::singleton().webPage(pageID);
>     if (!page) {
>@@ -312,7 +312,7 @@ void WebAutomationSessionProxy::didEvaluateJavaScriptFunction(uint64_t frameID,
>     WebProcess::singleton().parentProcessConnection()->send(Messages::WebAutomationSession::DidEvaluateJavaScriptFunction(callbackID, result, errorType), 0);
> }
> 
>-void WebAutomationSessionProxy::resolveChildFrameWithOrdinal(PageIdentifier pageID, uint64_t frameID, uint32_t ordinal, CompletionHandler<void(Optional<String>, uint64_t)>&& completionHandler)
>+void WebAutomationSessionProxy::resolveChildFrameWithOrdinal(WebCore::PageIdentifier pageID, uint64_t frameID, uint32_t ordinal, CompletionHandler<void(Optional<String>, uint64_t)>&& completionHandler)
> {
>     WebPage* page = WebProcess::singleton().webPage(pageID);
>     if (!page) {
>@@ -350,7 +350,7 @@ void WebAutomationSessionProxy::resolveChildFrameWithOrdinal(PageIdentifier page
>     completionHandler(WTF::nullopt, childFrame->frameID());
> }
> 
>-void WebAutomationSessionProxy::resolveChildFrameWithNodeHandle(PageIdentifier pageID, uint64_t frameID, const String& nodeHandle, CompletionHandler<void(Optional<String>, uint64_t)>&& completionHandler)
>+void WebAutomationSessionProxy::resolveChildFrameWithNodeHandle(WebCore::PageIdentifier pageID, uint64_t frameID, const String& nodeHandle, CompletionHandler<void(Optional<String>, uint64_t)>&& completionHandler)
> {
>     WebPage* page = WebProcess::singleton().webPage(pageID);
>     if (!page) {
>@@ -388,7 +388,7 @@ void WebAutomationSessionProxy::resolveChildFrameWithNodeHandle(PageIdentifier p
>     completionHandler(WTF::nullopt, frameFromElement->frameID());
> }
> 
>-void WebAutomationSessionProxy::resolveChildFrameWithName(PageIdentifier pageID, uint64_t frameID, const String& name, CompletionHandler<void(Optional<String>, uint64_t)>&& completionHandler)
>+void WebAutomationSessionProxy::resolveChildFrameWithName(WebCore::PageIdentifier pageID, uint64_t frameID, const String& name, CompletionHandler<void(Optional<String>, uint64_t)>&& completionHandler)
> {
>     WebPage* page = WebProcess::singleton().webPage(pageID);
>     if (!page) {
>@@ -426,7 +426,7 @@ void WebAutomationSessionProxy::resolveChildFrameWithName(PageIdentifier pageID,
>     completionHandler(WTF::nullopt, childFrame->frameID());
> }
> 
>-void WebAutomationSessionProxy::resolveParentFrame(PageIdentifier pageID, uint64_t frameID, CompletionHandler<void(Optional<String>, uint64_t)>&& completionHandler)
>+void WebAutomationSessionProxy::resolveParentFrame(WebCore::PageIdentifier pageID, uint64_t frameID, CompletionHandler<void(Optional<String>, uint64_t)>&& completionHandler)
> {
>     WebPage* page = WebProcess::singleton().webPage(pageID);
>     if (!page) {
>@@ -452,7 +452,7 @@ void WebAutomationSessionProxy::resolveParentFrame(PageIdentifier pageID, uint64
>     completionHandler(WTF::nullopt, parentFrame->frameID());
> }
> 
>-void WebAutomationSessionProxy::focusFrame(PageIdentifier pageID, uint64_t frameID)
>+void WebAutomationSessionProxy::focusFrame(WebCore::PageIdentifier pageID, uint64_t frameID)
> {
>     WebPage* page = WebProcess::singleton().webPage(pageID);
>     if (!page)
>@@ -527,7 +527,7 @@ static WebCore::FloatPoint convertPointFromFrameClientToRootView(WebCore::FrameV
>     return clientPoint;
> }
> 
>-void WebAutomationSessionProxy::computeElementLayout(PageIdentifier pageID, uint64_t frameID, String nodeHandle, bool scrollIntoViewIfNeeded, CoordinateSystem coordinateSystem, CompletionHandler<void(Optional<String>, WebCore::IntRect, Optional<WebCore::IntPoint>, bool)>&& completionHandler)
>+void WebAutomationSessionProxy::computeElementLayout(WebCore::PageIdentifier pageID, uint64_t frameID, String nodeHandle, bool scrollIntoViewIfNeeded, CoordinateSystem coordinateSystem, CompletionHandler<void(Optional<String>, WebCore::IntRect, Optional<WebCore::IntPoint>, bool)>&& completionHandler)
> {
>     WebPage* page = WebProcess::singleton().webPage(pageID);
>     if (!page) {
>@@ -635,7 +635,7 @@ void WebAutomationSessionProxy::computeElementLayout(PageIdentifier pageID, uint
>     completionHandler(WTF::nullopt, resultElementBounds, resultInViewCenterPoint, isObscured);
> }
> 
>-void WebAutomationSessionProxy::selectOptionElement(PageIdentifier pageID, uint64_t frameID, String nodeHandle, CompletionHandler<void(Optional<String>)>&& completionHandler)
>+void WebAutomationSessionProxy::selectOptionElement(WebCore::PageIdentifier pageID, uint64_t frameID, String nodeHandle, CompletionHandler<void(Optional<String>)>&& completionHandler)
> {
>     WebPage* page = WebProcess::singleton().webPage(pageID);
>     if (!page) {
>@@ -703,7 +703,7 @@ static WebCore::IntRect snapshotRectForScreenshot(WebPage& page, WebCore::Elemen
>     return { };
> }
> 
>-void WebAutomationSessionProxy::takeScreenshot(PageIdentifier pageID, uint64_t frameID, String nodeHandle, bool scrollIntoViewIfNeeded, bool clipToViewport, uint64_t callbackID)
>+void WebAutomationSessionProxy::takeScreenshot(WebCore::PageIdentifier pageID, uint64_t frameID, String nodeHandle, bool scrollIntoViewIfNeeded, bool clipToViewport, uint64_t callbackID)
> {
>     ShareableBitmap::Handle handle;
> 
>@@ -751,7 +751,7 @@ void WebAutomationSessionProxy::takeScreenshot(PageIdentifier pageID, uint64_t f
>     WebProcess::singleton().parentProcessConnection()->send(Messages::WebAutomationSession::DidTakeScreenshot(callbackID, handle, { }), 0);
> }
> 
>-void WebAutomationSessionProxy::getCookiesForFrame(PageIdentifier pageID, uint64_t frameID, CompletionHandler<void(Optional<String>, Vector<WebCore::Cookie>)>&& completionHandler)
>+void WebAutomationSessionProxy::getCookiesForFrame(WebCore::PageIdentifier pageID, uint64_t frameID, CompletionHandler<void(Optional<String>, Vector<WebCore::Cookie>)>&& completionHandler)
> {
>     WebPage* page = WebProcess::singleton().webPage(pageID);
>     if (!page) {
>@@ -776,7 +776,7 @@ void WebAutomationSessionProxy::getCookiesForFrame(PageIdentifier pageID, uint64
>     completionHandler(WTF::nullopt, foundCookies);
> }
> 
>-void WebAutomationSessionProxy::deleteCookie(PageIdentifier pageID, uint64_t frameID, String cookieName, CompletionHandler<void(Optional<String>)>&& completionHandler)
>+void WebAutomationSessionProxy::deleteCookie(WebCore::PageIdentifier pageID, uint64_t frameID, String cookieName, CompletionHandler<void(Optional<String>)>&& completionHandler)
> {
>     WebPage* page = WebProcess::singleton().webPage(pageID);
>     if (!page) {
>diff --git a/Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.cpp b/Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.cpp
>index 213ec86ced4ab656d1340b2a798edb0c35b21b86..6a6b3f6364697e02f730ae5c688f10c42260bcb2 100644
>--- a/Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.cpp
>+++ b/Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.cpp
>@@ -56,32 +56,32 @@ IPC::Connection& WebCacheStorageConnection::connection()
>     return WebProcess::singleton().ensureNetworkProcessConnection().connection();
> }
> 
>-void WebCacheStorageConnection::open(const WebCore::ClientOrigin& origin, const String& cacheName, DOMCacheEngine::CacheIdentifierCallback&& callback)
>+void WebCacheStorageConnection::open(const WebCore::ClientOrigin& origin, const String& cacheName, WebCore::DOMCacheEngine::CacheIdentifierCallback&& callback)
> {
>     connection().sendWithAsyncReply(Messages::CacheStorageEngineConnection::Open(m_sessionID, origin, cacheName), WTFMove(callback));
> }
> 
>-void WebCacheStorageConnection::remove(uint64_t cacheIdentifier, DOMCacheEngine::CacheIdentifierCallback&& callback)
>+void WebCacheStorageConnection::remove(uint64_t cacheIdentifier, WebCore::DOMCacheEngine::CacheIdentifierCallback&& callback)
> {
>     connection().sendWithAsyncReply(Messages::CacheStorageEngineConnection::Remove(m_sessionID, cacheIdentifier), WTFMove(callback));
> }
> 
>-void WebCacheStorageConnection::retrieveCaches(const WebCore::ClientOrigin& origin, uint64_t updateCounter, DOMCacheEngine::CacheInfosCallback&& callback)
>+void WebCacheStorageConnection::retrieveCaches(const WebCore::ClientOrigin& origin, uint64_t updateCounter, WebCore::DOMCacheEngine::CacheInfosCallback&& callback)
> {
>     connection().sendWithAsyncReply(Messages::CacheStorageEngineConnection::Caches(m_sessionID, origin, updateCounter), WTFMove(callback));
> }
> 
>-void WebCacheStorageConnection::retrieveRecords(uint64_t cacheIdentifier, const URL& url, DOMCacheEngine::RecordsCallback&& callback)
>+void WebCacheStorageConnection::retrieveRecords(uint64_t cacheIdentifier, const URL& url, WebCore::DOMCacheEngine::RecordsCallback&& callback)
> {
>     connection().sendWithAsyncReply(Messages::CacheStorageEngineConnection::RetrieveRecords(m_sessionID, cacheIdentifier, url), WTFMove(callback));
> }
> 
>-void WebCacheStorageConnection::batchDeleteOperation(uint64_t cacheIdentifier, const WebCore::ResourceRequest& request, WebCore::CacheQueryOptions&& options, DOMCacheEngine::RecordIdentifiersCallback&& callback)
>+void WebCacheStorageConnection::batchDeleteOperation(uint64_t cacheIdentifier, const WebCore::ResourceRequest& request, WebCore::CacheQueryOptions&& options, WebCore::DOMCacheEngine::RecordIdentifiersCallback&& callback)
> {
>     connection().sendWithAsyncReply(Messages::CacheStorageEngineConnection::DeleteMatchingRecords(m_sessionID, cacheIdentifier, request, options), WTFMove(callback));
> }
> 
>-void WebCacheStorageConnection::batchPutOperation(uint64_t cacheIdentifier, Vector<Record>&& records, DOMCacheEngine::RecordIdentifiersCallback&& callback)
>+void WebCacheStorageConnection::batchPutOperation(uint64_t cacheIdentifier, Vector<Record>&& records, WebCore::DOMCacheEngine::RecordIdentifiersCallback&& callback)
> {
>     connection().sendWithAsyncReply(Messages::CacheStorageEngineConnection::PutRecords(m_sessionID, cacheIdentifier, records), WTFMove(callback));
> }
>diff --git a/Source/WebKit/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp b/Source/WebKit/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp
>index b275dea67281258172e941780e9fafdbb12ac143..1ebbc0773ecb0172a8348b561e3657c6052281de 100644
>--- a/Source/WebKit/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp
>+++ b/Source/WebKit/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp
>@@ -28,6 +28,7 @@
> #include <WebCore/Pasteboard.h>
> #include <WebCore/PlatformKeyboardEvent.h>
> #include <WebCore/markup.h>
>+#include <WebPage.h>
> #include <wtf/Variant.h>
> #include <wtf/glib/GRefPtr.h>
> 
>diff --git a/Source/WebKit/WebProcess/WebPage/gtk/WebPageGtk.cpp b/Source/WebKit/WebProcess/WebPage/gtk/WebPageGtk.cpp
>index 8c3a3d17107975e48c8fc030cfb97b87723a1a16..6ed5b33e6b27f661d516d4e560e05df5d7b11e01 100644
>--- a/Source/WebKit/WebProcess/WebPage/gtk/WebPageGtk.cpp
>+++ b/Source/WebKit/WebProcess/WebPage/gtk/WebPageGtk.cpp
>@@ -49,6 +49,7 @@
> #include <WebCore/SharedBuffer.h>
> #include <WebCore/UserAgent.h>
> #include <WebCore/WindowsKeyboardCodes.h>
>+#include <gtk/gtk.h>
> #include <wtf/glib/GUniquePtr.h>
> 
> namespace WebKit {
>diff --git a/Source/WebKit/WebProcess/WebPage/wpe/WebPageWPE.cpp b/Source/WebKit/WebProcess/WebPage/wpe/WebPageWPE.cpp
>index 5c1f255edf7459379db33bb05cfe85b77c3915f5..1005f3e851b347b619901956f10dfa3c99959580 100644
>--- a/Source/WebKit/WebProcess/WebPage/wpe/WebPageWPE.cpp
>+++ b/Source/WebKit/WebProcess/WebPage/wpe/WebPageWPE.cpp
>@@ -27,6 +27,7 @@
> #include "WebPage.h"
> 
> #include "WebKitWebPageAccessibilityObject.h"
>+#include "WebPageProxy.h"
> #include "WebPreferencesKeys.h"
> #include "WebPreferencesStore.h"
> #include <WebCore/NotImplemented.h>

Actions: View | Formatted Diff | Diff

Attachments on bug 198722: 371752 | 371754 | 372452