Changeset 191720 in webkit
- Timestamp:
- Oct 28, 2015 10:20:51 PM (8 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r191719 r191720 1 2015-10-28 Chris Dumez <cdumez@apple.com> 2 3 Regression(r191673): [WIN][EFL][GTK] layout tests using data URLs time out 4 https://bugs.webkit.org/show_bug.cgi?id=150661 5 6 Reviewed by Gyuyoung Kim. 7 8 Do a partial revert of r191673. For some reason, using a Timer in 9 DataURLDecoder does not work (it does not fire). Since non COCOA ports 10 don't support RunLoopTimer, this patch reintroduces the use of 11 callOnMainThread() on non-COCOA ports. 12 13 * platform/network/DataURLDecoder.cpp: 14 (WebCore::DataURLDecoder::decode): 15 (WebCore::DataURLDecoder::DecodingResultDispatcher::startTimer): Deleted. 16 1 17 2015-10-28 Joseph Pecoraro <pecoraro@apple.com> 2 18 -
trunk/Source/WebCore/platform/network/DataURLDecoder.cpp
r191673 r191720 30 30 #include "HTTPParsers.h" 31 31 #include "SharedBuffer.h" 32 #include "Timer.h"33 32 #include "URL.h" 34 33 #include <wtf/MainThread.h> … … 56 55 }; 57 56 57 #if HAVE(RUNLOOP_TIMER) 58 58 59 class DecodingResultDispatcher { 59 60 public: … … 74 75 { 75 76 m_timer.startOneShot(0); 76 #if HAVE(RUNLOOP_TIMER)77 77 m_timer.schedule(m_decodeTask->scheduleContext.scheduledPairs); 78 #endif79 78 } 80 79 … … 89 88 } 90 89 91 #if HAVE(RUNLOOP_TIMER) 92 typedef RunLoopTimer<DecodingResultDispatcher> DecodingResultDispatcherTimer; 93 #else 94 typedef Timer DecodingResultDispatcherTimer; 95 #endif 96 DecodingResultDispatcherTimer m_timer; 90 RunLoopTimer<DecodingResultDispatcher> m_timer; 97 91 std::unique_ptr<DecodeTask> m_decodeTask; 98 92 }; 93 94 #endif // HAVE(RUNLOOP_TIMER) 99 95 100 96 static Result parseMediaType(const String& mediaType) … … 178 174 decodeEscaped(decodeTask); 179 175 176 #if HAVE(RUNLOOP_TIMER) 180 177 DecodingResultDispatcher::dispatch(std::unique_ptr<DecodeTask>(decodeTaskPtr)); 178 #else 179 callOnMainThread([decodeTaskPtr] { 180 std::unique_ptr<DecodeTask> decodeTask(decodeTaskPtr); 181 if (!decodeTask->result.data) { 182 decodeTask->completionHandler({ }); 183 return; 184 } 185 decodeTask->completionHandler(WTF::move(decodeTask->result)); 186 }); 187 #endif 181 188 }); 182 189 }
Note: See TracChangeset
for help on using the changeset viewer.