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

Side by Side Diff: third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp

Issue 2655143002: Drop replacesCurrentHistoryItem, NavigationType (Closed)
Patch Set: More compile fixes Created 3 years, 10 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 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 CString content(""); 321 CString content("");
322 RefPtr<SharedBuffer> buffer( 322 RefPtr<SharedBuffer> buffer(
323 SharedBuffer::create(content.data(), content.length())); 323 SharedBuffer::create(content.data(), content.length()));
324 m_loadingShadowPage = true; 324 m_loadingShadowPage = true;
325 m_mainFrame->frame()->loader().load( 325 m_mainFrame->frame()->loader().load(
326 FrameLoadRequest(0, ResourceRequest(m_workerStartData.scriptURL), 326 FrameLoadRequest(0, ResourceRequest(m_workerStartData.scriptURL),
327 SubstituteData(buffer, "text/html", "UTF-8", KURL()))); 327 SubstituteData(buffer, "text/html", "UTF-8", KURL())));
328 } 328 }
329 329
330 void WebEmbeddedWorkerImpl::willSendRequest(WebLocalFrame* frame, 330 void WebEmbeddedWorkerImpl::willSendRequest(WebLocalFrame* frame,
331 WebURLRequest& request) { 331 WebURLRequest& request,
332 WebFrameLoadType loadType) {
332 if (m_networkProvider) 333 if (m_networkProvider)
333 m_networkProvider->willSendRequest(frame->dataSource(), request); 334 m_networkProvider->willSendRequest(frame->dataSource(), request);
334 } 335 }
335 336
336 void WebEmbeddedWorkerImpl::didFinishDocumentLoad(WebLocalFrame* frame) { 337 void WebEmbeddedWorkerImpl::didFinishDocumentLoad(WebLocalFrame* frame) {
337 DCHECK(!m_mainScriptLoader); 338 DCHECK(!m_mainScriptLoader);
338 DCHECK(!m_networkProvider); 339 DCHECK(!m_networkProvider);
339 DCHECK(m_mainFrame); 340 DCHECK(m_mainFrame);
340 DCHECK(m_workerContextClient); 341 DCHECK(m_workerContextClient);
341 DCHECK(m_loadingShadowPage); 342 DCHECK(m_loadingShadowPage);
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 *this, *document, *m_workerContextClient); 476 *this, *document, *m_workerContextClient);
476 m_loaderProxy = WorkerLoaderProxy::create(this); 477 m_loaderProxy = WorkerLoaderProxy::create(this);
477 m_workerThread = ServiceWorkerThread::create( 478 m_workerThread = ServiceWorkerThread::create(
478 m_loaderProxy, *m_workerGlobalScopeProxy, m_mainThreadTaskRunners.get()); 479 m_loaderProxy, *m_workerGlobalScopeProxy, m_mainThreadTaskRunners.get());
479 m_workerThread->start(std::move(startupData)); 480 m_workerThread->start(std::move(startupData));
480 m_workerInspectorProxy->workerThreadCreated(document, m_workerThread.get(), 481 m_workerInspectorProxy->workerThreadCreated(document, m_workerThread.get(),
481 scriptURL); 482 scriptURL);
482 } 483 }
483 484
484 } // namespace blink 485 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.h ('k') | third_party/WebKit/Source/web/WebLocalFrameImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698