Title: [218040] trunk/Source/WebCore
- Revision
- 218040
- Author
- [email protected]
- Date
- 2017-06-09 21:30:11 -0700 (Fri, 09 Jun 2017)
Log Message
Unreviewed attempt to fix Mac build after r218039.
* loader/ResourceLoader.cpp:
(WebCore::ResourceLoader::loadDataURL):
* platform/network/DataURLDecoder.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (218039 => 218040)
--- trunk/Source/WebCore/ChangeLog 2017-06-10 04:07:22 UTC (rev 218039)
+++ trunk/Source/WebCore/ChangeLog 2017-06-10 04:30:11 UTC (rev 218040)
@@ -1,5 +1,13 @@
2017-06-09 Chris Dumez <[email protected]>
+ Unreviewed attempt to fix Mac build after r218039.
+
+ * loader/ResourceLoader.cpp:
+ (WebCore::ResourceLoader::loadDataURL):
+ * platform/network/DataURLDecoder.h:
+
+2017-06-09 Chris Dumez <[email protected]>
+
Use WTF::Function instead of std::function in DataURLDecoder
https://bugs.webkit.org/show_bug.cgi?id=173194
Modified: trunk/Source/WebCore/loader/ResourceLoader.cpp (218039 => 218040)
--- trunk/Source/WebCore/loader/ResourceLoader.cpp 2017-06-10 04:07:22 UTC (rev 218039)
+++ trunk/Source/WebCore/loader/ResourceLoader.cpp 2017-06-10 04:30:11 UTC (rev 218040)
@@ -245,13 +245,12 @@
auto url = ""
ASSERT(url.protocolIsData());
- RefPtr<ResourceLoader> protectedThis(this);
DataURLDecoder::ScheduleContext scheduleContext;
#if HAVE(RUNLOOP_TIMER)
if (auto* scheduledPairs = m_frame->page()->scheduledRunLoopPairs())
scheduleContext.scheduledPairs = *scheduledPairs;
#endif
- DataURLDecoder::decode(url, scheduleContext, [protectedThis, url](auto decodeResult) {
+ DataURLDecoder::decode(url, scheduleContext, [protectedThis = makeRef(*this), url](auto decodeResult) {
if (protectedThis->reachedTerminalState())
return;
if (!decodeResult) {
Modified: trunk/Source/WebCore/platform/network/DataURLDecoder.h (218039 => 218040)
--- trunk/Source/WebCore/platform/network/DataURLDecoder.h 2017-06-10 04:07:22 UTC (rev 218039)
+++ trunk/Source/WebCore/platform/network/DataURLDecoder.h 2017-06-10 04:30:11 UTC (rev 218040)
@@ -27,7 +27,7 @@
#define DataURLDecoder_h
-#include <functional>
+#include <wtf/Function.h>
#include <wtf/Optional.h>
#include <wtf/text/WTFString.h>
@@ -49,7 +49,7 @@
RefPtr<SharedBuffer> data;
};
-using DecodeCompletionHandler = Function<void (std::optional<Result>)>;
+using DecodeCompletionHandler = WTF::Function<void (std::optional<Result>)>;
struct ScheduleContext {
#if HAVE(RUNLOOP_TIMER)
SchedulePairHashSet scheduledPairs;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
