Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(527)

Side by Side Diff: third_party/WebKit/Source/modules/fetch/DataConsumerHandleTestUtil.cpp

Issue 1915153004: [K5] Replace bind() + non-GC pointers with unretained() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Kuroneko_4
Patch Set: Rebase Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "modules/fetch/DataConsumerHandleTestUtil.h" 5 #include "modules/fetch/DataConsumerHandleTestUtil.h"
6 6
7 #include "bindings/core/v8/DOMWrapperWorld.h" 7 #include "bindings/core/v8/DOMWrapperWorld.h"
8 8
9 namespace blink { 9 namespace blink {
10 10
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 size_t size; 243 size_t size;
244 r = m_reader->read(buffer, sizeof(buffer), WebDataConsumerHandle::FlagNo ne, &size); 244 r = m_reader->read(buffer, sizeof(buffer), WebDataConsumerHandle::FlagNo ne, &size);
245 if (r == WebDataConsumerHandle::ShouldWait) 245 if (r == WebDataConsumerHandle::ShouldWait)
246 return; 246 return;
247 if (r != WebDataConsumerHandle::Ok) 247 if (r != WebDataConsumerHandle::Ok)
248 break; 248 break;
249 m_data.append(buffer, size); 249 m_data.append(buffer, size);
250 } 250 }
251 OwnPtr<HandleReadResult> result = adoptPtr(new HandleReadResult(r, m_data)); 251 OwnPtr<HandleReadResult> result = adoptPtr(new HandleReadResult(r, m_data));
252 m_data.clear(); 252 m_data.clear();
253 Platform::current()->currentThread()->getWebTaskRunner()->postTask(BLINK_FRO M_HERE, bind(&HandleReader::runOnFinishedReading, this, passed(result.release()) )); 253 Platform::current()->currentThread()->getWebTaskRunner()->postTask(BLINK_FRO M_HERE, bind(&HandleReader::runOnFinishedReading, unretained(this), passed(resul t.release())));
254 m_reader = nullptr; 254 m_reader = nullptr;
255 } 255 }
256 256
257 void DataConsumerHandleTestUtil::HandleReader::runOnFinishedReading(PassOwnPtr<H andleReadResult> result) 257 void DataConsumerHandleTestUtil::HandleReader::runOnFinishedReading(PassOwnPtr<H andleReadResult> result)
258 { 258 {
259 ASSERT(m_onFinishedReading); 259 ASSERT(m_onFinishedReading);
260 (*m_onFinishedReading.release())(std::move(result)); 260 (*m_onFinishedReading.release())(std::move(result));
261 } 261 }
262 262
263 DataConsumerHandleTestUtil::HandleTwoPhaseReader::HandleTwoPhaseReader(PassOwnPt r<WebDataConsumerHandle> handle, PassOwnPtr<OnFinishedReading> onFinishedReading ) 263 DataConsumerHandleTestUtil::HandleTwoPhaseReader::HandleTwoPhaseReader(PassOwnPt r<WebDataConsumerHandle> handle, PassOwnPtr<OnFinishedReading> onFinishedReading )
(...skipping 13 matching lines...) Expand all
277 return; 277 return;
278 if (r != WebDataConsumerHandle::Ok) 278 if (r != WebDataConsumerHandle::Ok)
279 break; 279 break;
280 // Read smaller than available in order to test |endRead|. 280 // Read smaller than available in order to test |endRead|.
281 size_t readSize = std::min(size, std::max(size * 2 / 3, static_cast<size _t>(1))); 281 size_t readSize = std::min(size, std::max(size * 2 / 3, static_cast<size _t>(1)));
282 m_data.append(static_cast<const char*>(buffer), readSize); 282 m_data.append(static_cast<const char*>(buffer), readSize);
283 m_reader->endRead(readSize); 283 m_reader->endRead(readSize);
284 } 284 }
285 OwnPtr<HandleReadResult> result = adoptPtr(new HandleReadResult(r, m_data)); 285 OwnPtr<HandleReadResult> result = adoptPtr(new HandleReadResult(r, m_data));
286 m_data.clear(); 286 m_data.clear();
287 Platform::current()->currentThread()->getWebTaskRunner()->postTask(BLINK_FRO M_HERE, bind(&HandleTwoPhaseReader::runOnFinishedReading, this, passed(result.re lease()))); 287 Platform::current()->currentThread()->getWebTaskRunner()->postTask(BLINK_FRO M_HERE, bind(&HandleTwoPhaseReader::runOnFinishedReading, unretained(this), pass ed(result.release())));
288 m_reader = nullptr; 288 m_reader = nullptr;
289 } 289 }
290 290
291 void DataConsumerHandleTestUtil::HandleTwoPhaseReader::runOnFinishedReading(Pass OwnPtr<HandleReadResult> result) 291 void DataConsumerHandleTestUtil::HandleTwoPhaseReader::runOnFinishedReading(Pass OwnPtr<HandleReadResult> result)
292 { 292 {
293 ASSERT(m_onFinishedReading); 293 ASSERT(m_onFinishedReading);
294 (*m_onFinishedReading.release())(std::move(result)); 294 (*m_onFinishedReading.release())(std::move(result));
295 } 295 }
296 296
297 } // namespace blink 297 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698