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

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

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years 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) 2010, 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2010, 2011, 2012 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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 Timer<ClientAdapter> m_errorTimer; 145 Timer<ClientAdapter> m_errorTimer;
146 bool m_enableErrorNotifications; 146 bool m_enableErrorNotifications;
147 bool m_didFail; 147 bool m_didFail;
148 }; 148 };
149 149
150 std::unique_ptr<WebAssociatedURLLoaderImpl::ClientAdapter> 150 std::unique_ptr<WebAssociatedURLLoaderImpl::ClientAdapter>
151 WebAssociatedURLLoaderImpl::ClientAdapter::create( 151 WebAssociatedURLLoaderImpl::ClientAdapter::create(
152 WebAssociatedURLLoaderImpl* loader, 152 WebAssociatedURLLoaderImpl* loader,
153 WebAssociatedURLLoaderClient* client, 153 WebAssociatedURLLoaderClient* client,
154 const WebAssociatedURLLoaderOptions& options) { 154 const WebAssociatedURLLoaderOptions& options) {
155 return wrapUnique(new ClientAdapter(loader, client, options)); 155 return WTF::wrapUnique(new ClientAdapter(loader, client, options));
156 } 156 }
157 157
158 WebAssociatedURLLoaderImpl::ClientAdapter::ClientAdapter( 158 WebAssociatedURLLoaderImpl::ClientAdapter::ClientAdapter(
159 WebAssociatedURLLoaderImpl* loader, 159 WebAssociatedURLLoaderImpl* loader,
160 WebAssociatedURLLoaderClient* client, 160 WebAssociatedURLLoaderClient* client,
161 const WebAssociatedURLLoaderOptions& options) 161 const WebAssociatedURLLoaderOptions& options)
162 : m_loader(loader), 162 : m_loader(loader),
163 m_client(client), 163 m_client(client),
164 m_options(options), 164 m_options(options),
165 m_errorTimer(this, &ClientAdapter::notifyError), 165 m_errorTimer(this, &ClientAdapter::notifyError),
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 // there could be a WebURLLoader instance behind the 486 // there could be a WebURLLoader instance behind the
487 // DocumentThreadableLoader instance. So, for safety, we chose to just 487 // DocumentThreadableLoader instance. So, for safety, we chose to just
488 // crash here. 488 // crash here.
489 CHECK(ThreadState::current()); 489 CHECK(ThreadState::current());
490 490
491 m_observer->dispose(); 491 m_observer->dispose();
492 m_observer = nullptr; 492 m_observer = nullptr;
493 } 493 }
494 494
495 } // namespace blink 495 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/UserMediaClientImpl.h ('k') | third_party/WebKit/Source/web/WebAssociatedURLLoaderImplTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698