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

Side by Side Diff: third_party/WebKit/Source/modules/serviceworkers/ServiceWorker.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 m_wasStopped = true; 123 m_wasStopped = true;
124 } 124 }
125 125
126 ServiceWorker* ServiceWorker::getOrCreate(ExecutionContext* executionContext, Pa ssOwnPtr<WebServiceWorker::Handle> handle) 126 ServiceWorker* ServiceWorker::getOrCreate(ExecutionContext* executionContext, Pa ssOwnPtr<WebServiceWorker::Handle> handle)
127 { 127 {
128 if (!handle) 128 if (!handle)
129 return nullptr; 129 return nullptr;
130 130
131 ServiceWorker* existingWorker = static_cast<ServiceWorker*>(handle->serviceW orker()->proxy()); 131 ServiceWorker* existingWorker = static_cast<ServiceWorker*>(handle->serviceW orker()->proxy());
132 if (existingWorker) { 132 if (existingWorker) {
133 ASSERT(existingWorker->executionContext() == executionContext); 133 ASSERT(existingWorker->getExecutionContext() == executionContext);
134 return existingWorker; 134 return existingWorker;
135 } 135 }
136 136
137 ServiceWorker* newWorker = new ServiceWorker(executionContext, handle); 137 ServiceWorker* newWorker = new ServiceWorker(executionContext, handle);
138 newWorker->suspendIfNeeded(); 138 newWorker->suspendIfNeeded();
139 return newWorker; 139 return newWorker;
140 } 140 }
141 141
142 ServiceWorker::ServiceWorker(ExecutionContext* executionContext, PassOwnPtr<WebS erviceWorker::Handle> handle) 142 ServiceWorker::ServiceWorker(ExecutionContext* executionContext, PassOwnPtr<WebS erviceWorker::Handle> handle)
143 : AbstractWorker(executionContext) 143 : AbstractWorker(executionContext)
144 , m_handle(handle) 144 , m_handle(handle)
145 , m_wasStopped(false) 145 , m_wasStopped(false)
146 { 146 {
147 ASSERT(m_handle); 147 ASSERT(m_handle);
148 m_handle->serviceWorker()->setProxy(this); 148 m_handle->serviceWorker()->setProxy(this);
149 } 149 }
150 150
151 ServiceWorker::~ServiceWorker() 151 ServiceWorker::~ServiceWorker()
152 { 152 {
153 } 153 }
154 154
155 } // namespace blink 155 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698