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

Unified Diff: Source/modules/filesystem/FileSystemCallbacks.cpp

Issue 1194093002: Remove unused FS callback partial specializations. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/modules/filesystem/FileSystemCallbacks.h ('k') | Source/modules/filesystem/FileWriter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/filesystem/FileSystemCallbacks.cpp
diff --git a/Source/modules/filesystem/FileSystemCallbacks.cpp b/Source/modules/filesystem/FileSystemCallbacks.cpp
index 20e0f7076aa9f47b0c9325f75b4c1776b3d7e817..66ad923a0422aaeb2ac5466d108769dbfa93b702 100644
--- a/Source/modules/filesystem/FileSystemCallbacks.cpp
+++ b/Source/modules/filesystem/FileSystemCallbacks.cpp
@@ -87,14 +87,6 @@ bool FileSystemCallbacksBase::shouldScheduleCallback() const
return !shouldBlockUntilCompletion() && m_executionContext && m_executionContext->activeDOMObjectsAreSuspended();
}
-#if !ENABLE(OILPAN)
-template <typename CB, typename CBArg>
-void FileSystemCallbacksBase::handleEventOrScheduleCallback(RawPtr<CB> callback, RawPtr<CBArg> arg)
-{
- handleEventOrScheduleCallback(callback, arg.get());
-}
-#endif
-
template <typename CB, typename CBArg>
void FileSystemCallbacksBase::handleEventOrScheduleCallback(RawPtr<CB> callback, CBArg* arg)
{
@@ -108,19 +100,6 @@ void FileSystemCallbacksBase::handleEventOrScheduleCallback(RawPtr<CB> callback,
InspectorInstrumentation::traceAsyncCallbackCompleted(cookie);
}
-template <typename CB, typename CBArg>
-void FileSystemCallbacksBase::handleEventOrScheduleCallback(RawPtr<CB> callback, PassRefPtrWillBeRawPtr<CBArg> arg)
-{
- ASSERT(callback);
- InspectorInstrumentationCookie cookie = InspectorInstrumentation::traceAsyncOperationCompletedCallbackStarting(m_executionContext.get(), m_asyncOperationId);
- if (shouldScheduleCallback())
- DOMFileSystem::scheduleCallback(m_executionContext.get(), callback.get(), arg);
- else if (callback)
- callback->handleEvent(arg.get());
- m_executionContext.clear();
- InspectorInstrumentation::traceAsyncCallbackCompleted(cookie);
-}
-
template <typename CB>
void FileSystemCallbacksBase::handleEventOrScheduleCallback(RawPtr<CB> callback)
{
@@ -268,14 +247,14 @@ void MetadataCallbacks::didReadMetadata(const FileMetadata& metadata)
// FileWriterBaseCallbacks ----------------------------------------------------
-PassOwnPtr<AsyncFileSystemCallbacks> FileWriterBaseCallbacks::create(PassRefPtrWillBeRawPtr<FileWriterBase> fileWriter, FileWriterBaseCallback* successCallback, ErrorCallback* errorCallback, ExecutionContext* context)
+PassOwnPtr<AsyncFileSystemCallbacks> FileWriterBaseCallbacks::create(FileWriterBase* fileWriter, FileWriterBaseCallback* successCallback, ErrorCallback* errorCallback, ExecutionContext* context)
{
return adoptPtr(new FileWriterBaseCallbacks(fileWriter, successCallback, errorCallback, context));
}
-FileWriterBaseCallbacks::FileWriterBaseCallbacks(PassRefPtrWillBeRawPtr<FileWriterBase> fileWriter, FileWriterBaseCallback* successCallback, ErrorCallback* errorCallback, ExecutionContext* context)
+FileWriterBaseCallbacks::FileWriterBaseCallbacks(FileWriterBase* fileWriter, FileWriterBaseCallback* successCallback, ErrorCallback* errorCallback, ExecutionContext* context)
: FileSystemCallbacksBase(errorCallback, nullptr, context)
- , m_fileWriter(fileWriter.get())
+ , m_fileWriter(fileWriter)
, m_successCallback(successCallback)
{
}
@@ -284,7 +263,7 @@ void FileWriterBaseCallbacks::didCreateFileWriter(PassOwnPtr<WebFileWriter> file
{
m_fileWriter->initialize(fileWriter, length);
if (m_successCallback)
- handleEventOrScheduleCallback(m_successCallback.release(), m_fileWriter.release());
+ handleEventOrScheduleCallback(m_successCallback.release(), m_fileWriter.release().get());
}
// SnapshotFileCallback -------------------------------------------------------
« no previous file with comments | « Source/modules/filesystem/FileSystemCallbacks.h ('k') | Source/modules/filesystem/FileWriter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698