Changeset 218040 in webkit


Ignore:
Timestamp:
Jun 9, 2017, 9:30:11 PM (8 years ago)
Author:
Chris Dumez
Message:

Unreviewed attempt to fix Mac build after r218039.

  • loader/ResourceLoader.cpp:

(WebCore::ResourceLoader::loadDataURL):

  • platform/network/DataURLDecoder.h:
Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r218039 r218040  
     12017-06-09  Chris Dumez  <cdumez@apple.com>
     2
     3        Unreviewed attempt to fix Mac build after r218039.
     4
     5        * loader/ResourceLoader.cpp:
     6        (WebCore::ResourceLoader::loadDataURL):
     7        * platform/network/DataURLDecoder.h:
     8
    192017-06-09  Chris Dumez  <cdumez@apple.com>
    210

  • trunk/Source/WebCore/loader/ResourceLoader.cpp

    r217407 r218040  
    246246    ASSERT(url.protocolIsData());
    247247
    248     RefPtr<ResourceLoader> protectedThis(this);
    249248    DataURLDecoder::ScheduleContext scheduleContext;
    250249#if HAVE(RUNLOOP_TIMER)
    … …  
    252251        scheduleContext.scheduledPairs = *scheduledPairs;
    253252#endif
    254     DataURLDecoder::decode(url, scheduleContext, [protectedThis, url](auto decodeResult) {
     253    DataURLDecoder::decode(url, scheduleContext, [protectedThis = makeRef(*this), url](auto decodeResult) {
    255254        if (protectedThis->reachedTerminalState())
    256255            return;

  • trunk/Source/WebCore/platform/network/DataURLDecoder.h

    r218039 r218040  
    2828
    2929
    30 #include <functional>
     30#include <wtf/Function.h>
    3131#include <wtf/Optional.h>
    3232#include <wtf/text/WTFString.h>
    … …  
    5050};
    5151
    52 using DecodeCompletionHandler = Function<void (std::optional<Result>)>;
     52using DecodeCompletionHandler = WTF::Function<void (std::optional<Result>)>;
    5353struct ScheduleContext {
    5454#if HAVE(RUNLOOP_TIMER)
Note: See TracChangeset for help on using the changeset viewer.