Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (246595 => 246596)
--- trunk/Source/_javascript_Core/ChangeLog 2019-06-19 17:38:43 UTC (rev 246595)
+++ trunk/Source/_javascript_Core/ChangeLog 2019-06-19 17:42:05 UTC (rev 246596)
@@ -1,3 +1,14 @@
+2019-06-19 Adrian Perez de Castro <[email protected]>
+
+ [WPE][GTK] Fix build with unified sources disabled
+ https://bugs.webkit.org/show_bug.cgi?id=198752
+
+ Reviewed by Michael Catanzaro.
+
+ * runtime/WeakObjectRefConstructor.h: Add missing inclusion of InternalFunction.h
+ and forward declaration of WeakObjectRefPrototype.
+ * wasm/js/WebAssemblyFunction.cpp: Add missing inclusion of JSWebAssemblyHelpers.h
+
2019-06-19 Justin Michaud <[email protected]>
[WASM-References] Rename anyfunc to funcref
Modified: trunk/Source/_javascript_Core/runtime/WeakObjectRefConstructor.h (246595 => 246596)
--- trunk/Source/_javascript_Core/runtime/WeakObjectRefConstructor.h 2019-06-19 17:38:43 UTC (rev 246595)
+++ trunk/Source/_javascript_Core/runtime/WeakObjectRefConstructor.h 2019-06-19 17:42:05 UTC (rev 246596)
@@ -25,8 +25,12 @@
#pragma once
+#include "InternalFunction.h"
+
namespace JSC {
+class WeakObjectRefPrototype;
+
class WeakObjectRefConstructor final : public InternalFunction {
public:
using Base = InternalFunction;
Modified: trunk/Source/_javascript_Core/wasm/js/WebAssemblyFunction.cpp (246595 => 246596)
--- trunk/Source/_javascript_Core/wasm/js/WebAssemblyFunction.cpp 2019-06-19 17:38:43 UTC (rev 246595)
+++ trunk/Source/_javascript_Core/wasm/js/WebAssemblyFunction.cpp 2019-06-19 17:42:05 UTC (rev 246596)
@@ -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"
Modified: trunk/Source/WTF/ChangeLog (246595 => 246596)
--- trunk/Source/WTF/ChangeLog 2019-06-19 17:38:43 UTC (rev 246595)
+++ trunk/Source/WTF/ChangeLog 2019-06-19 17:42:05 UTC (rev 246596)
@@ -1,3 +1,12 @@
+2019-06-19 Adrian Perez de Castro <[email protected]>
+
+ [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-19 Zan Dobersek <[email protected]>
USE_ANGLE macro can be evaluated without being defined
Modified: trunk/Source/WTF/wtf/text/StringBuilder.h (246595 => 246596)
--- trunk/Source/WTF/wtf/text/StringBuilder.h 2019-06-19 17:38:43 UTC (rev 246595)
+++ trunk/Source/WTF/wtf/text/StringBuilder.h 2019-06-19 17:42:05 UTC (rev 246596)
@@ -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>
Modified: trunk/Source/WebCore/ChangeLog (246595 => 246596)
--- trunk/Source/WebCore/ChangeLog 2019-06-19 17:38:43 UTC (rev 246595)
+++ trunk/Source/WebCore/ChangeLog 2019-06-19 17:42:05 UTC (rev 246596)
@@ -1,3 +1,33 @@
+2019-06-19 Adrian Perez de Castro <[email protected]>
+
+ [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-19 Antti Koivisto <[email protected]>
RequestedScrollPosition shouldn't be applied after node reattach
Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h (246595 => 246596)
--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h 2019-06-19 17:38:43 UTC (rev 246595)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h 2019-06-19 17:42:05 UTC (rev 246596)
@@ -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 @@
class IDBError;
class IDBGetAllResult;
+struct IDBGetRecordData;
class IDBRequestData;
class IDBTransactionInfo;
class StorageQuotaManager;
@@ -66,6 +66,7 @@
class IDBConnectionToClient;
class IDBServer;
+class UniqueIDBDatabaseConnection;
typedef Function<void(const IDBError&)> ErrorCallback;
typedef Function<void(const IDBError&, const IDBKeyData&)> KeyDataCallback;
Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.h (246595 => 246596)
--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.h 2019-06-19 17:38:43 UTC (rev 246595)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.h 2019-06-19 17:42:05 UTC (rev 246596)
@@ -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>
Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h (246595 => 246596)
--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h 2019-06-19 17:38:43 UTC (rev 246595)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h 2019-06-19 17:42:05 UTC (rev 246596)
@@ -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>
Modified: trunk/Source/WebCore/bridge/c/c_class.cpp (246595 => 246596)
--- trunk/Source/WebCore/bridge/c/c_class.cpp 2019-06-19 17:38:43 UTC (rev 246595)
+++ trunk/Source/WebCore/bridge/c/c_class.cpp 2019-06-19 17:42:05 UTC (rev 246596)
@@ -33,6 +33,7 @@
#include "c_runtime.h"
#include "npruntime_impl.h"
#include <_javascript_Core/Identifier.h>
+#include <_javascript_Core/JSCJSValueInlines.h>
#include <_javascript_Core/JSGlobalObject.h>
#include <_javascript_Core/JSObject.h>
#include <wtf/text/StringHash.h>
Modified: trunk/Source/WebCore/dom/DocumentParser.h (246595 => 246596)
--- trunk/Source/WebCore/dom/DocumentParser.h 2019-06-19 17:38:43 UTC (rev 246595)
+++ trunk/Source/WebCore/dom/DocumentParser.h 2019-06-19 17:42:05 UTC (rev 246596)
@@ -23,6 +23,7 @@
#pragma once
+#include "Document.h"
#include <wtf/Forward.h>
#include <wtf/RefCounted.h>
#include <wtf/WeakPtr.h>
@@ -29,7 +30,6 @@
namespace WebCore {
-class Document;
class DocumentWriter;
class SegmentedString;
class ScriptableDocumentParser;
Modified: trunk/Source/WebCore/dom/Microtasks.h (246595 => 246596)
--- trunk/Source/WebCore/dom/Microtasks.h 2019-06-19 17:38:43 UTC (rev 246595)
+++ trunk/Source/WebCore/dom/Microtasks.h 2019-06-19 17:42:05 UTC (rev 246596)
@@ -25,6 +25,10 @@
#include <wtf/Forward.h>
#include <wtf/Vector.h>
+namespace JSC {
+class VM;
+} // namespace JSC
+
namespace WebCore {
class MicrotaskQueue;
Modified: trunk/Source/WebCore/editing/markup.cpp (246595 => 246596)
--- trunk/Source/WebCore/editing/markup.cpp 2019-06-19 17:38:43 UTC (rev 246595)
+++ trunk/Source/WebCore/editing/markup.cpp 2019-06-19 17:42:05 UTC (rev 246596)
@@ -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"
Modified: trunk/Source/WebCore/page/Quirks.h (246595 => 246596)
--- trunk/Source/WebCore/page/Quirks.h 2019-06-19 17:38:43 UTC (rev 246595)
+++ trunk/Source/WebCore/page/Quirks.h 2019-06-19 17:42:05 UTC (rev 246596)
@@ -30,6 +30,7 @@
namespace WebCore {
class Document;
+class EventTarget;
class HTMLElement;
class LayoutUnit;
Modified: trunk/Source/WebCore/page/RuntimeEnabledFeatures.h (246595 => 246596)
--- trunk/Source/WebCore/page/RuntimeEnabledFeatures.h 2019-06-19 17:38:43 UTC (rev 246595)
+++ trunk/Source/WebCore/page/RuntimeEnabledFeatures.h 2019-06-19 17:42:05 UTC (rev 246596)
@@ -33,6 +33,7 @@
#include <wtf/Forward.h>
#include <wtf/Noncopyable.h>
+#include <wtf/Optional.h>
namespace WebCore {
Modified: trunk/Source/WebCore/page/SocketProvider.h (246595 => 246596)
--- trunk/Source/WebCore/page/SocketProvider.h 2019-06-19 17:38:43 UTC (rev 246595)
+++ trunk/Source/WebCore/page/SocketProvider.h 2019-06-19 17:42:05 UTC (rev 246596)
@@ -31,6 +31,7 @@
namespace WebCore {
+class Document;
class ThreadableWebSocketChannel;
class ScriptExecutionContext;
class StorageSessionProvider;
Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h (246595 => 246596)
--- trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h 2019-06-19 17:38:43 UTC (rev 246595)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h 2019-06-19 17:42:05 UTC (rev 246596)
@@ -27,6 +27,7 @@
#include "TiledBacking.h"
#include <wtf/Forward.h>
+#include <wtf/OptionSet.h>
namespace WebCore {
Modified: trunk/Source/WebCore/rendering/RenderMultiColumnSpannerPlaceholder.h (246595 => 246596)
--- trunk/Source/WebCore/rendering/RenderMultiColumnSpannerPlaceholder.h 2019-06-19 17:38:43 UTC (rev 246595)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnSpannerPlaceholder.h 2019-06-19 17:42:05 UTC (rev 246596)
@@ -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:
Modified: trunk/Source/WebKit/ChangeLog (246595 => 246596)
--- trunk/Source/WebKit/ChangeLog 2019-06-19 17:38:43 UTC (rev 246595)
+++ trunk/Source/WebKit/ChangeLog 2019-06-19 17:42:05 UTC (rev 246596)
@@ -1,3 +1,44 @@
+2019-06-19 Adrian Perez de Castro <[email protected]>
+
+ [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. Moved DataCallback
+ definition from WebPageProxy.h to avoid code using the type before its declaration.
+ * UIProcess/WebPageProxy.h: Remove definition of DataCallback.
+ * 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-19 Alexander Mikhaylenko <[email protected]>
[GTK] Page blinks after navigation swipe if it triggered PSON
Modified: trunk/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp (246595 => 246596)
--- trunk/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp 2019-06-19 17:38:43 UTC (rev 246595)
+++ trunk/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp 2019-06-19 17:42:05 UTC (rev 246596)
@@ -67,7 +67,7 @@
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 @@
// 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)
Modified: trunk/Source/WebKit/UIProcess/WebFrameProxy.cpp (246595 => 246596)
--- trunk/Source/WebKit/UIProcess/WebFrameProxy.cpp 2019-06-19 17:38:43 UTC (rev 246595)
+++ trunk/Source/WebKit/UIProcess/WebFrameProxy.cpp 2019-06-19 17:42:05 UTC (rev 246596)
@@ -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)
Modified: trunk/Source/WebKit/UIProcess/WebFrameProxy.h (246595 => 246596)
--- trunk/Source/WebKit/UIProcess/WebFrameProxy.h 2019-06-19 17:38:43 UTC (rev 246595)
+++ trunk/Source/WebKit/UIProcess/WebFrameProxy.h 2019-06-19 17:42:05 UTC (rev 246596)
@@ -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,14 +52,11 @@
class SafeBrowsingWarning;
class WebCertificateInfo;
class WebFramePolicyListenerProxy;
-class WebPageProxy;
class WebsiteDataStore;
enum class ShouldExpectSafeBrowsingResult;
enum class ProcessSwapRequestedByClient;
struct WebsitePoliciesData;
-typedef GenericCallback<API::Data*> DataCallback;
-
class WebFrameProxy : public API::ObjectImpl<API::Object::Type::Frame> {
public:
static Ref<WebFrameProxy> create(WebPageProxy& page, uint64_t frameID)
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (246595 => 246596)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2019-06-19 17:38:43 UTC (rev 246595)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2019-06-19 17:42:05 UTC (rev 246596)
@@ -298,6 +298,7 @@
class QuickLookDocumentData;
#endif
+typedef GenericCallback<API::Data*> DataCallback;
typedef GenericCallback<uint64_t> UnsignedCallback;
typedef GenericCallback<EditingRange> EditingRangeCallback;
typedef GenericCallback<const String&> StringCallback;
Modified: trunk/Source/WebKit/UIProcess/wpe/WebInspectorProxyWPE.cpp (246595 => 246596)
--- trunk/Source/WebKit/UIProcess/wpe/WebInspectorProxyWPE.cpp 2019-06-19 17:38:43 UTC (rev 246595)
+++ trunk/Source/WebKit/UIProcess/wpe/WebInspectorProxyWPE.cpp 2019-06-19 17:42:05 UTC (rev 246596)
@@ -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 @@
notImplemented();
}
-void WebInspectorProxy::platformSetSheetRect(const FloatRect&)
+void WebInspectorProxy::platformSetSheetRect(const WebCore::FloatRect&)
{
notImplemented();
}
Modified: trunk/Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.cpp (246595 => 246596)
--- trunk/Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.cpp 2019-06-19 17:38:43 UTC (rev 246595)
+++ trunk/Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.cpp 2019-06-19 17:42:05 UTC (rev 246596)
@@ -231,7 +231,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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) {
Modified: trunk/Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.cpp (246595 => 246596)
--- trunk/Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.cpp 2019-06-19 17:38:43 UTC (rev 246595)
+++ trunk/Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.cpp 2019-06-19 17:42:05 UTC (rev 246596)
@@ -56,32 +56,32 @@
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));
}
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp (246595 => 246596)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp 2019-06-19 17:38:43 UTC (rev 246595)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp 2019-06-19 17:42:05 UTC (rev 246596)
@@ -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>
Modified: trunk/Source/WebKit/WebProcess/WebPage/gtk/WebPageGtk.cpp (246595 => 246596)
--- trunk/Source/WebKit/WebProcess/WebPage/gtk/WebPageGtk.cpp 2019-06-19 17:38:43 UTC (rev 246595)
+++ trunk/Source/WebKit/WebProcess/WebPage/gtk/WebPageGtk.cpp 2019-06-19 17:42:05 UTC (rev 246596)
@@ -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 {
Modified: trunk/Source/WebKit/WebProcess/WebPage/wpe/WebPageWPE.cpp (246595 => 246596)
--- trunk/Source/WebKit/WebProcess/WebPage/wpe/WebPageWPE.cpp 2019-06-19 17:38:43 UTC (rev 246595)
+++ trunk/Source/WebKit/WebProcess/WebPage/wpe/WebPageWPE.cpp 2019-06-19 17:42:05 UTC (rev 246596)
@@ -27,6 +27,7 @@
#include "WebPage.h"
#include "WebKitWebPageAccessibilityObject.h"
+#include "WebPageProxy.h"
#include "WebPreferencesKeys.h"
#include "WebPreferencesStore.h"
#include <WebCore/NotImplemented.h>
