Changeset 246596 in webkit


Ignore:
Timestamp:
Jun 19, 2019 10:42:05 AM (5 years ago)
Author:
Adrian Perez de Castro
Message:

[WPE][GTK] Fix build with unified sources disabled
​https://bugs.webkit.org/show_bug.cgi?id=198752

Reviewed by Michael Catanzaro.

Source/JavaScriptCore:

  • runtime/WeakObjectRefConstructor.h: Add missing inclusion of InternalFunction.h

and forward declaration of WeakObjectRefPrototype.

  • wasm/js/WebAssemblyFunction.cpp: Add missing inclusion of JSWebAssemblyHelpers.h

Source/WebCore:

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.

Source/WebKit:

  • 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

Source/WTF:

  • wtf/text/StringBuilder.h: Add missing include of StringConcatenateNumbers.h
Location:
trunk/Source
Files:
29 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r246589 r246596  
     12019-06-19  Adrian Perez de Castro  <aperez@igalia.com>
     2
     3        [WPE][GTK] Fix build with unified sources disabled
     4        https://bugs.webkit.org/show_bug.cgi?id=198752
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        * runtime/WeakObjectRefConstructor.h: Add missing inclusion of InternalFunction.h
     9        and forward declaration of WeakObjectRefPrototype.
     10        * wasm/js/WebAssemblyFunction.cpp: Add missing inclusion of JSWebAssemblyHelpers.h
     11
    1122019-06-19  Justin Michaud  <justin_michaud@apple.com>
    213

  • trunk/Source/JavaScriptCore/runtime/WeakObjectRefConstructor.h

    r246565 r246596  
    2626#pragma once
    2727
     28#include "InternalFunction.h"
     29
    2830namespace JSC {
     31
     32class WeakObjectRefPrototype;
    2933
    3034class WeakObjectRefConstructor final : public InternalFunction {

  • trunk/Source/JavaScriptCore/wasm/js/WebAssemblyFunction.cpp

    r246589 r246596  
    3333#include "JSFunctionInlines.h"
    3434#include "JSObject.h"
     35#include "JSWebAssemblyHelpers.h"
    3536#include "JSWebAssemblyInstance.h"
    3637#include "JSWebAssemblyMemory.h"

  • trunk/Source/WTF/ChangeLog

    r246586 r246596  
     12019-06-19  Adrian Perez de Castro  <aperez@igalia.com>
     2
     3        [WPE][GTK] Fix build with unified sources disabled
     4        https://bugs.webkit.org/show_bug.cgi?id=198752
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        * wtf/text/StringBuilder.h: Add missing include of StringConcatenateNumbers.h
     9
    1102019-06-19  Zan Dobersek  <zdobersek@igalia.com>
    211

  • trunk/Source/WTF/wtf/text/StringBuilder.h

    r246490 r246596  
    3030#include <wtf/text/AtomString.h>
    3131#include <wtf/text/IntegerToStringConversion.h>
     32#include <wtf/text/StringConcatenateNumbers.h>
    3233#include <wtf/text/StringView.h>
    3334#include <wtf/text/WTFString.h>

  • trunk/Source/WebCore/ChangeLog

    r246593 r246596  
     12019-06-19  Adrian Perez de Castro  <aperez@igalia.com>
     2
     3        [WPE][GTK] Fix build with unified sources disabled
     4        https://bugs.webkit.org/show_bug.cgi?id=198752
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        No new tests needed.
     9
     10        * Modules/indexeddb/server/UniqueIDBDatabase.h: Add missing forward declaration for IDBGetRecordData,
     11        replace inclusion of UniqueIDBDatabaseConnection.h with a forward declaration.
     12        * Modules/indexeddb/server/UniqueIDBDatabaseConnection.h: Remove unneeded inclusion of
     13        UniqueIDBDatabaseTransaction.h, add missing inclusion of UniqueIDBDatabase.h
     14        * Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h: Remove unneeded inclusion of
     15        UniqueIDBDatabaseConnection.h inclusion.
     16        * bridge/c/c_class.cpp: Add inclusion of JSCJSValueInlines.h to avoid linker errors due
     17        to missing JSValue inline functions.
     18        * dom/DocumentParser.h: Replace forward declaration of Document with inclusion of Document.h,
     19        to avoid error due to usage of incomplete type in template expansion.
     20        * dom/Microtasks.h: Add missing forward declaration of JSC::VM
     21        * editing/markup.cpp: Add missing inclusion of PasteboardItemInfo.h
     22        * page/Quirks.h: Add missing forward declaration of WebCore::EventTarget
     23        * page/RuntimeEnabledFeatures.h: Add missing inclusion of wtf/Optional.h to avoid error due to
     24        expansion of undefined template.
     25        * page/SocketProvider.h: Add missing forward declaration for Document.
     26        * platform/graphics/GraphicsLayerClient.h: Add missing inclusion of wtf/OptionSet.h to avoid
     27        error due to expansion of undefined template.
     28        * rendering/RenderMultiColumnSpannerPlaceholder.h: Replace forward declaration of RenderMultiColumnFlow
     29        with inclusion of RenderMultiColumnFlow.h to avoid error due to usage of undefined class.
     30
    1312019-06-19  Antti Koivisto  <antti@apple.com>
    232

  • trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h

    r244687 r246596  
    3434#include "ServerOpenDBRequest.h"
    3535#include "Timer.h"
    36 #include "UniqueIDBDatabaseConnection.h"
    3736#include "UniqueIDBDatabaseTransaction.h"
    3837#include <wtf/CrossThreadQueue.h>
    … …  
    5352class IDBError;
    5453class IDBGetAllResult;
     54struct IDBGetRecordData;
    5555class IDBRequestData;
    5656class IDBTransactionInfo;
    … …  
    6767class IDBConnectionToClient;
    6868class IDBServer;
     69class UniqueIDBDatabaseConnection;
    6970
    7071typedef Function<void(const IDBError&)> ErrorCallback;

  • trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.h

    r240039 r246596  
    2828#if ENABLE(INDEXED_DATABASE)
    2929
    30 #include "UniqueIDBDatabaseTransaction.h"
     30#include "UniqueIDBDatabase.h"
    3131#include <wtf/HashMap.h>
    3232#include <wtf/Identified.h>

  • trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h

    r244740 r246596  
    3030#include "IDBError.h"
    3131#include "IDBTransactionInfo.h"
    32 #include "UniqueIDBDatabaseConnection.h"
    3332#include <wtf/Ref.h>
    3433#include <wtf/RefCounted.h>

  • trunk/Source/WebCore/bridge/c/c_class.cpp

    r228218 r246596  
    3434#include "npruntime_impl.h"
    3535#include <JavaScriptCore/Identifier.h>
     36#include <JavaScriptCore/JSCJSValueInlines.h>
    3637#include <JavaScriptCore/JSGlobalObject.h>
    3738#include <JavaScriptCore/JSObject.h>

  • trunk/Source/WebCore/dom/DocumentParser.h

    r243887 r246596  
    2424#pragma once
    2525
     26#include "Document.h"
    2627#include <wtf/Forward.h>
    2728#include <wtf/RefCounted.h>
    … …  
    3031namespace WebCore {
    3132
    32 class Document;
    3333class DocumentWriter;
    3434class SegmentedString;

  • trunk/Source/WebCore/dom/Microtasks.h

    r246565 r246596  
    2525#include <wtf/Forward.h>
    2626#include <wtf/Vector.h>
     27
     28namespace JSC {
     29class VM;
     30} // namespace JSC
    2731
    2832namespace WebCore {

  • trunk/Source/WebCore/editing/markup.cpp

    r246490 r246596  
    6868#include "Page.h"
    6969#include "PageConfiguration.h"
     70#include "PasteboardItemInfo.h"
    7071#include "Range.h"
    7172#include "RenderBlock.h"

  • trunk/Source/WebCore/page/Quirks.h

    r246444 r246596  
    3131
    3232class Document;
     33class EventTarget;
    3334class HTMLElement;
    3435class LayoutUnit;

  • trunk/Source/WebCore/page/RuntimeEnabledFeatures.h

    r246444 r246596  
    3434#include <wtf/Forward.h>
    3535#include <wtf/Noncopyable.h>
     36#include <wtf/Optional.h>
    3637
    3738namespace WebCore {

  • trunk/Source/WebCore/page/SocketProvider.h

    r246388 r246596  
    3232namespace WebCore {
    3333
     34class Document;
    3435class ThreadableWebSocketChannel;
    3536class ScriptExecutionContext;

  • trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h

    r245950 r246596  
    2828#include "TiledBacking.h"
    2929#include <wtf/Forward.h>
     30#include <wtf/OptionSet.h>
    3031
    3132namespace WebCore {

  • trunk/Source/WebCore/rendering/RenderMultiColumnSpannerPlaceholder.h

    r224537 r246596  
    3131
    3232#include "RenderBox.h"
     33#include "RenderMultiColumnFlow.h"
    3334
    3435namespace WebCore {
    35 
    36 class RenderMultiColumnFlow;
    3736
    3837class RenderMultiColumnSpannerPlaceholder final : public RenderBox {

  • trunk/Source/WebKit/ChangeLog

    r246592 r246596  
     12019-06-19  Adrian Perez de Castro  <aperez@igalia.com>
     2
     3        [WPE][GTK] Fix build with unified sources disabled
     4        https://bugs.webkit.org/show_bug.cgi?id=198752
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        * NetworkProcess/NetworkHTTPSUpgradeChecker.cpp:
     9        (WebKit::NetworkHTTPSUpgradeChecker::NetworkHTTPSUpgradeChecker): Qualify SQLiteDatabase
     10        with its namespace.
     11        * UIProcess/WebFrameProxy.h: Replace forward declaration of WebPageProxy with inclusion
     12        of WebPageProxy.h to avoid build error due to usage of undefined class. Moved DataCallback
     13        definition from WebPageProxy.h to avoid code using the type before its declaration.
     14        * UIProcess/WebPageProxy.h: Remove definition of DataCallback.
     15        * UIProcess/wpe/WebInspectorProxyWPE.cpp: Add missing forward declaration of
     16        WebCore::FloatRect.
     17        (WebKit::WebInspectorProxy::platformSetSheetRect): Qualify FloatRect with its namespace.
     18        * WebProcess/Automation/WebAutomationSessionProxy.cpp: Qualify all occurrences of
     19        PageIdentifier with its namespace.
     20        (WebKit::WebAutomationSessionProxy::evaluateJavaScriptFunction):
     21        (WebKit::WebAutomationSessionProxy::resolveChildFrameWithOrdinal):
     22        (WebKit::WebAutomationSessionProxy::resolveChildFrameWithNodeHandle):
     23        (WebKit::WebAutomationSessionProxy::resolveChildFrameWithName):
     24        (WebKit::WebAutomationSessionProxy::resolveParentFrame):
     25        (WebKit::WebAutomationSessionProxy::focusFrame):
     26        (WebKit::WebAutomationSessionProxy::computeElementLayout):
     27        (WebKit::WebAutomationSessionProxy::selectOptionElement):
     28        (WebKit::WebAutomationSessionProxy::takeScreenshot):
     29        (WebKit::WebAutomationSessionProxy::getCookiesForFrame):
     30        (WebKit::WebAutomationSessionProxy::deleteCookie):
     31        * WebProcess/Cache/WebCacheStorageConnection.cpp: Ditto.
     32        (WebKit::WebCacheStorageConnection::open):
     33        (WebKit::WebCacheStorageConnection::remove):
     34        (WebKit::WebCacheStorageConnection::retrieveCaches):
     35        (WebKit::WebCacheStorageConnection::retrieveRecords):
     36        (WebKit::WebCacheStorageConnection::batchDeleteOperation):
     37        (WebKit::WebCacheStorageConnection::batchPutOperation):
     38        * WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp: Add missing inclusion of WebPage.h
     39        * WebProcess/WebPage/gtk/WebPageGtk.cpp: Add missing inclusion of gtk/gtk.h
     40        * WebProcess/WebPage/wpe/WebPageWPE.cpp: Add missing inclusion of WebPageProxy.h
     41
    1422019-06-19  Alexander Mikhaylenko  <exalm7659@gmail.com>
    243

  • trunk/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp

    r246163 r246596  
    6868        }
    6969
    70         m_database = std::make_unique<SQLiteDatabase>();
     70        m_database = std::make_unique<WebCore::SQLiteDatabase>();
    7171        bool isDatabaseOpen = m_database->open(path, WebCore::SQLiteDatabase::OpenMode::ReadOnly);
    7272        if (!isDatabaseOpen) {
    … …  
    8181        m_database->disableThreadingChecks();
    8282
    83         m_statement = std::make_unique<SQLiteStatement>(*m_database, httpsUpgradeCheckerQuery);
     83        m_statement = std::make_unique<WebCore::SQLiteStatement>(*m_database, httpsUpgradeCheckerQuery);
    8484        int isStatementPrepared = (m_statement->prepare() == SQLITE_OK);
    8585        ASSERT(isStatementPrepared);

  • trunk/Source/WebKit/UIProcess/WebFrameProxy.cpp

    r244590 r246596  
    3232#include "WebFramePolicyListenerProxy.h"
    3333#include "WebPageMessages.h"
    34 #include "WebPageProxy.h"
    3534#include "WebPasteboardProxy.h"
    3635#include "WebProcessPool.h"
    … …  
    4544using namespace WebCore;
    4645
     46class WebPageProxy;
     47
    4748WebFrameProxy::WebFrameProxy(WebPageProxy& page, uint64_t frameID)
    4849    : m_page(makeWeakPtr(page))

  • trunk/Source/WebKit/UIProcess/WebFrameProxy.h

    r244590 r246596  
    3030#include "GenericCallback.h"
    3131#include "WebFramePolicyListenerProxy.h"
     32#include "WebPageProxy.h"
    3233#include <WebCore/FrameLoaderTypes.h>
    3334#include <wtf/Forward.h>
    … …  
    5253class WebCertificateInfo;
    5354class WebFramePolicyListenerProxy;
    54 class WebPageProxy;
    5555class WebsiteDataStore;
    5656enum class ShouldExpectSafeBrowsingResult;
    5757enum class ProcessSwapRequestedByClient;
    5858struct WebsitePoliciesData;
    59 
    60 typedef GenericCallback<API::Data*> DataCallback;
    6159
    6260class WebFrameProxy : public API::ObjectImpl<API::Object::Type::Frame> {

  • trunk/Source/WebKit/UIProcess/WebPageProxy.h

    r246514 r246596  
    299299#endif
    300300
     301typedef GenericCallback<API::Data*> DataCallback;
    301302typedef GenericCallback<uint64_t> UnsignedCallback;
    302303typedef GenericCallback<EditingRange> EditingRangeCallback;

  • trunk/Source/WebKit/UIProcess/wpe/WebInspectorProxyWPE.cpp

    r244180 r246596  
    3030#include <WebCore/NotImplemented.h>
    3131#include <wtf/text/WTFString.h>
     32
     33namespace WebCore {
     34class FloatRect;
     35}
    3236
    3337namespace WebKit {
    … …  
    135139}
    136140
    137 void WebInspectorProxy::platformSetSheetRect(const FloatRect&)
     141void WebInspectorProxy::platformSetSheetRect(const WebCore::FloatRect&)
    138142{
    139143    notImplemented();

  • trunk/Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.cpp

    r245796 r246596  
    232232}
    233233
    234 void WebAutomationSessionProxy::evaluateJavaScriptFunction(PageIdentifier pageID, uint64_t frameID, const String& function, Vector<String> arguments, bool expectsImplicitCallbackArgument, int callbackTimeout, uint64_t callbackID)
     234void WebAutomationSessionProxy::evaluateJavaScriptFunction(WebCore::PageIdentifier pageID, uint64_t frameID, const String& function, Vector<String> arguments, bool expectsImplicitCallbackArgument, int callbackTimeout, uint64_t callbackID)
    235235{
    236236    WebPage* page = WebProcess::singleton().webPage(pageID);
    … …  
    313313}
    314314
    315 void WebAutomationSessionProxy::resolveChildFrameWithOrdinal(PageIdentifier pageID, uint64_t frameID, uint32_t ordinal, CompletionHandler<void(Optional<String>, uint64_t)>&& completionHandler)
     315void WebAutomationSessionProxy::resolveChildFrameWithOrdinal(WebCore::PageIdentifier pageID, uint64_t frameID, uint32_t ordinal, CompletionHandler<void(Optional<String>, uint64_t)>&& completionHandler)
    316316{
    317317    WebPage* page = WebProcess::singleton().webPage(pageID);
    … …  
    351351}
    352352
    353 void WebAutomationSessionProxy::resolveChildFrameWithNodeHandle(PageIdentifier pageID, uint64_t frameID, const String& nodeHandle, CompletionHandler<void(Optional<String>, uint64_t)>&& completionHandler)
     353void WebAutomationSessionProxy::resolveChildFrameWithNodeHandle(WebCore::PageIdentifier pageID, uint64_t frameID, const String& nodeHandle, CompletionHandler<void(Optional<String>, uint64_t)>&& completionHandler)
    354354{
    355355    WebPage* page = WebProcess::singleton().webPage(pageID);
    … …  
    389389}
    390390
    391 void WebAutomationSessionProxy::resolveChildFrameWithName(PageIdentifier pageID, uint64_t frameID, const String& name, CompletionHandler<void(Optional<String>, uint64_t)>&& completionHandler)
     391void WebAutomationSessionProxy::resolveChildFrameWithName(WebCore::PageIdentifier pageID, uint64_t frameID, const String& name, CompletionHandler<void(Optional<String>, uint64_t)>&& completionHandler)
    392392{
    393393    WebPage* page = WebProcess::singleton().webPage(pageID);
    … …  
    427427}
    428428
    429 void WebAutomationSessionProxy::resolveParentFrame(PageIdentifier pageID, uint64_t frameID, CompletionHandler<void(Optional<String>, uint64_t)>&& completionHandler)
     429void WebAutomationSessionProxy::resolveParentFrame(WebCore::PageIdentifier pageID, uint64_t frameID, CompletionHandler<void(Optional<String>, uint64_t)>&& completionHandler)
    430430{
    431431    WebPage* page = WebProcess::singleton().webPage(pageID);
    … …  
    453453}
    454454
    455 void WebAutomationSessionProxy::focusFrame(PageIdentifier pageID, uint64_t frameID)
     455void WebAutomationSessionProxy::focusFrame(WebCore::PageIdentifier pageID, uint64_t frameID)
    456456{
    457457    WebPage* page = WebProcess::singleton().webPage(pageID);
    … …  
    528528}
    529529
    530 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)
     530void 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)
    531531{
    532532    WebPage* page = WebProcess::singleton().webPage(pageID);
    … …  
    636636}
    637637
    638 void WebAutomationSessionProxy::selectOptionElement(PageIdentifier pageID, uint64_t frameID, String nodeHandle, CompletionHandler<void(Optional<String>)>&& completionHandler)
     638void WebAutomationSessionProxy::selectOptionElement(WebCore::PageIdentifier pageID, uint64_t frameID, String nodeHandle, CompletionHandler<void(Optional<String>)>&& completionHandler)
    639639{
    640640    WebPage* page = WebProcess::singleton().webPage(pageID);
    … …  
    704704}
    705705
    706 void WebAutomationSessionProxy::takeScreenshot(PageIdentifier pageID, uint64_t frameID, String nodeHandle, bool scrollIntoViewIfNeeded, bool clipToViewport, uint64_t callbackID)
     706void WebAutomationSessionProxy::takeScreenshot(WebCore::PageIdentifier pageID, uint64_t frameID, String nodeHandle, bool scrollIntoViewIfNeeded, bool clipToViewport, uint64_t callbackID)
    707707{
    708708    ShareableBitmap::Handle handle;
    … …  
    752752}
    753753
    754 void WebAutomationSessionProxy::getCookiesForFrame(PageIdentifier pageID, uint64_t frameID, CompletionHandler<void(Optional<String>, Vector<WebCore::Cookie>)>&& completionHandler)
     754void WebAutomationSessionProxy::getCookiesForFrame(WebCore::PageIdentifier pageID, uint64_t frameID, CompletionHandler<void(Optional<String>, Vector<WebCore::Cookie>)>&& completionHandler)
    755755{
    756756    WebPage* page = WebProcess::singleton().webPage(pageID);
    … …  
    777777}
    778778
    779 void WebAutomationSessionProxy::deleteCookie(PageIdentifier pageID, uint64_t frameID, String cookieName, CompletionHandler<void(Optional<String>)>&& completionHandler)
     779void WebAutomationSessionProxy::deleteCookie(WebCore::PageIdentifier pageID, uint64_t frameID, String cookieName, CompletionHandler<void(Optional<String>)>&& completionHandler)
    780780{
    781781    WebPage* page = WebProcess::singleton().webPage(pageID);

  • trunk/Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.cpp

    r245715 r246596  
    5757}
    5858
    59 void WebCacheStorageConnection::open(const WebCore::ClientOrigin& origin, const String& cacheName, DOMCacheEngine::CacheIdentifierCallback&& callback)
     59void WebCacheStorageConnection::open(const WebCore::ClientOrigin& origin, const String& cacheName, WebCore::DOMCacheEngine::CacheIdentifierCallback&& callback)
    6060{
    6161    connection().sendWithAsyncReply(Messages::CacheStorageEngineConnection::Open(m_sessionID, origin, cacheName), WTFMove(callback));
    6262}
    6363
    64 void WebCacheStorageConnection::remove(uint64_t cacheIdentifier, DOMCacheEngine::CacheIdentifierCallback&& callback)
     64void WebCacheStorageConnection::remove(uint64_t cacheIdentifier, WebCore::DOMCacheEngine::CacheIdentifierCallback&& callback)
    6565{
    6666    connection().sendWithAsyncReply(Messages::CacheStorageEngineConnection::Remove(m_sessionID, cacheIdentifier), WTFMove(callback));
    6767}
    6868
    69 void WebCacheStorageConnection::retrieveCaches(const WebCore::ClientOrigin& origin, uint64_t updateCounter, DOMCacheEngine::CacheInfosCallback&& callback)
     69void WebCacheStorageConnection::retrieveCaches(const WebCore::ClientOrigin& origin, uint64_t updateCounter, WebCore::DOMCacheEngine::CacheInfosCallback&& callback)
    7070{
    7171    connection().sendWithAsyncReply(Messages::CacheStorageEngineConnection::Caches(m_sessionID, origin, updateCounter), WTFMove(callback));
    7272}
    7373
    74 void WebCacheStorageConnection::retrieveRecords(uint64_t cacheIdentifier, const URL& url, DOMCacheEngine::RecordsCallback&& callback)
     74void WebCacheStorageConnection::retrieveRecords(uint64_t cacheIdentifier, const URL& url, WebCore::DOMCacheEngine::RecordsCallback&& callback)
    7575{
    7676    connection().sendWithAsyncReply(Messages::CacheStorageEngineConnection::RetrieveRecords(m_sessionID, cacheIdentifier, url), WTFMove(callback));
    7777}
    7878
    79 void WebCacheStorageConnection::batchDeleteOperation(uint64_t cacheIdentifier, const WebCore::ResourceRequest& request, WebCore::CacheQueryOptions&& options, DOMCacheEngine::RecordIdentifiersCallback&& callback)
     79void WebCacheStorageConnection::batchDeleteOperation(uint64_t cacheIdentifier, const WebCore::ResourceRequest& request, WebCore::CacheQueryOptions&& options, WebCore::DOMCacheEngine::RecordIdentifiersCallback&& callback)
    8080{
    8181    connection().sendWithAsyncReply(Messages::CacheStorageEngineConnection::DeleteMatchingRecords(m_sessionID, cacheIdentifier, request, options), WTFMove(callback));
    8282}
    8383
    84 void WebCacheStorageConnection::batchPutOperation(uint64_t cacheIdentifier, Vector<Record>&& records, DOMCacheEngine::RecordIdentifiersCallback&& callback)
     84void WebCacheStorageConnection::batchPutOperation(uint64_t cacheIdentifier, Vector<Record>&& records, WebCore::DOMCacheEngine::RecordIdentifiersCallback&& callback)
    8585{
    8686    connection().sendWithAsyncReply(Messages::CacheStorageEngineConnection::PutRecords(m_sessionID, cacheIdentifier, records), WTFMove(callback));

  • trunk/Source/WebKit/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp

    r245460 r246596  
    2929#include <WebCore/PlatformKeyboardEvent.h>
    3030#include <WebCore/markup.h>
     31#include <WebPage.h>
    3132#include <wtf/Variant.h>
    3233#include <wtf/glib/GRefPtr.h>

  • trunk/Source/WebKit/WebProcess/WebPage/gtk/WebPageGtk.cpp

    r245460 r246596  
    5050#include <WebCore/UserAgent.h>
    5151#include <WebCore/WindowsKeyboardCodes.h>
     52#include <gtk/gtk.h>
    5253#include <wtf/glib/GUniquePtr.h>
    5354

  • trunk/Source/WebKit/WebProcess/WebPage/wpe/WebPageWPE.cpp

    r245565 r246596  
    2828
    2929#include "WebKitWebPageAccessibilityObject.h"
     30#include "WebPageProxy.h"
    3031#include "WebPreferencesKeys.h"
    3132#include "WebPreferencesStore.h"
Note: See TracChangeset for help on using the changeset viewer.