Changeset 260818 in webkit


Ignore:
Timestamp:
Apr 28, 2020 4:57:47 AM (4 years ago)
Author:
Adrian Perez de Castro
Message:

Non-unified build fixes late April 2020 edition
https://bugs.webkit.org/show_bug.cgi?id=211099

Unreviewed build fix.

Source/WebCore:

No new tests needed.

  • Modules/cache/DOMCacheStorage.cpp: Sprinkle DOMCacheEngine:: namespace prefixes as needed.

(WebCore::DOMCacheStorage::findCacheOrCreate):
(WebCore::DOMCacheStorage::retrieveCaches):
(WebCore::DOMCacheStorage::doOpen):
(WebCore::DOMCacheStorage::doRemove):

  • bindings/js/JSExecStateInstrumentation.h: Ditto for JSC:: namespace prefixes.

(WebCore::JSExecState::instrumentFunction):

  • dom/ScriptedAnimationController.h: Add missing ReducedResolutionSeconds.h header.
  • editing/TextCheckingHelper.h: Add missing forward declaration for Position.
  • html/URLSearchParams.h: Add missing ExceptionOr.h header.

Source/WebKit:

  • NetworkProcess/NetworkLoad.cpp: Add mising WebCoreArgumentCoders.h header.
  • WebProcess/Automation/WebAutomationDOMWindowObserver.cpp:

(WebKit::WebAutomationDOMWindowObserver::WebAutomationDOMWindowObserver): Add namespace to
WebCore::DOMWindow usage.

Location:
trunk/Source
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r260815 r260818  
     12020-04-28  Adrian Perez de Castro  <aperez@igalia.com>
     2
     3        Non-unified build fixes late April 2020 edition
     4        https://bugs.webkit.org/show_bug.cgi?id=211099
     5
     6        Unreviewed build fix.
     7
     8        No new tests needed.
     9
     10        * Modules/cache/DOMCacheStorage.cpp: Sprinkle DOMCacheEngine:: namespace prefixes as needed.
     11        (WebCore::DOMCacheStorage::findCacheOrCreate):
     12        (WebCore::DOMCacheStorage::retrieveCaches):
     13        (WebCore::DOMCacheStorage::doOpen):
     14        (WebCore::DOMCacheStorage::doRemove):
     15        * bindings/js/JSExecStateInstrumentation.h: Ditto for JSC:: namespace prefixes.
     16        (WebCore::JSExecState::instrumentFunction):
     17        * dom/ScriptedAnimationController.h: Add missing ReducedResolutionSeconds.h header.
     18        * editing/TextCheckingHelper.h: Add missing forward declaration for Position.
     19        * html/URLSearchParams.h: Add missing ExceptionOr.h header.
     20
    1212020-04-28  Charlie Turner  <cturner@igalia.com>
    222
  • trunk/Source/WebCore/Modules/cache/DOMCacheStorage.cpp

    r260724 r260818  
    134134}
    135135
    136 Ref<DOMCache> DOMCacheStorage::findCacheOrCreate(CacheInfo&& info)
     136Ref<DOMCache> DOMCacheStorage::findCacheOrCreate(DOMCacheEngine::CacheInfo&& info)
    137137{
    138138   auto position = m_caches.findMatching([&] (const auto& cache) { return info.identifier == cache->identifier(); });
     
    150150    }
    151151
    152     m_connection->retrieveCaches(*origin, m_updateCounter, [this, callback = WTFMove(callback), pendingActivity = makePendingActivity(*this)](CacheInfosOrError&& result) mutable {
     152    m_connection->retrieveCaches(*origin, m_updateCounter, [this, callback = WTFMove(callback), pendingActivity = makePendingActivity(*this)](DOMCacheEngine::CacheInfosOrError&& result) mutable {
    153153        if (m_isStopped) {
    154154            callback(DOMCacheEngine::convertToException(DOMCacheEngine::Error::Stopped));
     
    165165            m_updateCounter = cachesInfo.updateCounter;
    166166
    167             m_caches = WTF::map(WTFMove(cachesInfo.infos), [this] (CacheInfo&& info) {
     167            m_caches = WTF::map(WTFMove(cachesInfo.infos), [this] (DOMCacheEngine::CacheInfo&& info) {
    168168                return findCacheOrCreate(WTFMove(info));
    169169            });
     
    200200    }
    201201
    202     m_connection->open(*origin(), name, [this, name, promise = WTFMove(promise), pendingActivity = makePendingActivity(*this)](const CacheIdentifierOrError& result) mutable {
     202    m_connection->open(*origin(), name, [this, name, promise = WTFMove(promise), pendingActivity = makePendingActivity(*this)](const DOMCacheEngine::CacheIdentifierOrError& result) mutable {
    203203        if (!result.has_value())
    204204            promise.reject(DOMCacheEngine::convertToExceptionAndLog(scriptExecutionContext(), result.error()));
     
    233233    }
    234234
    235     m_connection->remove(m_caches[position]->identifier(), [this, name, promise = WTFMove(promise), pendingActivity = makePendingActivity(*this)](const CacheIdentifierOrError& result) mutable {
     235    m_connection->remove(m_caches[position]->identifier(), [this, name, promise = WTFMove(promise), pendingActivity = makePendingActivity(*this)](const DOMCacheEngine::CacheIdentifierOrError& result) mutable {
    236236        if (!result.has_value())
    237237            promise.reject(DOMCacheEngine::convertToExceptionAndLog(scriptExecutionContext(), result.error()));
  • trunk/Source/WebCore/bindings/js/JSExecStateInstrumentation.h

    r260744 r260818  
    3333namespace WebCore {
    3434
    35 inline void JSExecState::instrumentFunction(ScriptExecutionContext* context, const CallData& callData)
     35inline void JSExecState::instrumentFunction(ScriptExecutionContext* context, const JSC::CallData& callData)
    3636{
    3737    if (!InspectorInstrumentation::timelineAgentTracking(context))
     
    4141    int lineNumber = 1;
    4242    int columnNumber = 1;
    43     if (callData.type == CallData::Type::JS) {
     43    if (callData.type == JSC::CallData::Type::JS) {
    4444        resourceName = callData.js.functionExecutable->sourceURL();
    4545        lineNumber = callData.js.functionExecutable->firstLine();
  • trunk/Source/WebCore/dom/ScriptedAnimationController.h

    r260736 r260818  
    2727
    2828#include "DOMHighResTimeStamp.h"
     29#include "ReducedResolutionSeconds.h"
    2930#include "Timer.h"
    3031#include <wtf/OptionSet.h>
  • trunk/Source/WebCore/editing/TextCheckingHelper.h

    r260725 r260818  
    2828namespace WebCore {
    2929
     30class Position;
    3031struct TextCheckingResult;
    3132
  • trunk/Source/WebCore/html/URLSearchParams.h

    r260724 r260818  
    2525#pragma once
    2626
     27#include "ExceptionOr.h"
    2728#include <wtf/Variant.h>
    2829#include <wtf/Vector.h>
  • trunk/Source/WebKit/ChangeLog

    r260817 r260818  
     12020-04-28  Adrian Perez de Castro  <aperez@igalia.com>
     2
     3        Non-unified build fixes late April 2020 edition
     4        https://bugs.webkit.org/show_bug.cgi?id=211099
     5
     6        Unreviewed build fix.
     7
     8        * NetworkProcess/NetworkLoad.cpp: Add mising WebCoreArgumentCoders.h header.
     9        * WebProcess/Automation/WebAutomationDOMWindowObserver.cpp:
     10        (WebKit::WebAutomationDOMWindowObserver::WebAutomationDOMWindowObserver): Add namespace to
     11        WebCore::DOMWindow usage.
     12
    1132020-04-26  Carlos Garcia Campos  <cgarcia@igalia.com>
    214
  • trunk/Source/WebKit/NetworkProcess/NetworkLoad.cpp

    r260658 r260818  
    3333#include "NetworkProcessProxyMessages.h"
    3434#include "NetworkSession.h"
     35#include "WebCoreArgumentCoders.h"
    3536#include "WebErrors.h"
    3637#include <WebCore/ResourceRequest.h>
  • trunk/Source/WebKit/WebProcess/Automation/WebAutomationDOMWindowObserver.cpp

    r260653 r260818  
    3232namespace WebKit {
    3333
    34 WebAutomationDOMWindowObserver::WebAutomationDOMWindowObserver(DOMWindow& window, WTF::Function<void(WebAutomationDOMWindowObserver&)>&& callback)
     34WebAutomationDOMWindowObserver::WebAutomationDOMWindowObserver(WebCore::DOMWindow& window, WTF::Function<void(WebAutomationDOMWindowObserver&)>&& callback)
    3535    : m_window(makeWeakPtr(window))
    3636    , m_callback(WTFMove(callback))
Note: See TracChangeset for help on using the changeset viewer.