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

Side by Side Diff: Source/modules/filesystem/InspectorFileSystemAgent.cpp

Issue 212263002: remove use of {,un}setPendingActivity from DOMFileSystem. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/modules/filesystem/FileSystemCallbacks.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 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 547 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 558
559 FileSystemType type; 559 FileSystemType type;
560 String path; 560 String path;
561 if (!DOMFileSystemBase::crackFileSystemURL(m_url, type, path)) { 561 if (!DOMFileSystemBase::crackFileSystemURL(m_url, type, path)) {
562 errorCallback->handleEvent(FileError::create(FileError::SYNTAX_ERR).get( )); 562 errorCallback->handleEvent(FileError::create(FileError::SYNTAX_ERR).get( ));
563 return; 563 return;
564 } 564 }
565 565
566 if (path == "/") { 566 if (path == "/") {
567 OwnPtr<VoidCallback> successCallback = adoptPtr(new VoidCallbackImpl(thi s)); 567 OwnPtr<VoidCallback> successCallback = adoptPtr(new VoidCallbackImpl(thi s));
568 OwnPtr<AsyncFileSystemCallbacks> fileSystemCallbacks = VoidCallbacks::cr eate(successCallback.release(), errorCallback.release(), 0); 568 OwnPtr<AsyncFileSystemCallbacks> fileSystemCallbacks = VoidCallbacks::cr eate(successCallback.release(), errorCallback.release(), nullptr);
569 LocalFileSystem::from(*executionContext)->deleteFileSystem(executionCont ext, type, fileSystemCallbacks.release()); 569 LocalFileSystem::from(*executionContext)->deleteFileSystem(executionCont ext, type, fileSystemCallbacks.release());
570 } else { 570 } else {
571 OwnPtr<EntryCallback> successCallback = CallbackDispatcherFactory<EntryC allback>::create(this, &DeleteEntryRequest::didGetEntry); 571 OwnPtr<EntryCallback> successCallback = CallbackDispatcherFactory<EntryC allback>::create(this, &DeleteEntryRequest::didGetEntry);
572 OwnPtr<AsyncFileSystemCallbacks> fileSystemCallbacks = ResolveURICallbac ks::create(successCallback.release(), errorCallback.release(), executionContext) ; 572 OwnPtr<AsyncFileSystemCallbacks> fileSystemCallbacks = ResolveURICallbac ks::create(successCallback.release(), errorCallback.release(), executionContext) ;
573 LocalFileSystem::from(*executionContext)->resolveURL(executionContext, m _url, fileSystemCallbacks.release()); 573 LocalFileSystem::from(*executionContext)->resolveURL(executionContext, m _url, fileSystemCallbacks.release());
574 } 574 }
575 } 575 }
576 576
577 bool DeleteEntryRequest::didGetEntry(Entry* entry) 577 bool DeleteEntryRequest::didGetEntry(Entry* entry)
578 { 578 {
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
718 for (LocalFrame* frame = m_page->mainFrame(); frame; frame = frame->tree().t raverseNext()) { 718 for (LocalFrame* frame = m_page->mainFrame(); frame; frame = frame->tree().t raverseNext()) {
719 if (frame->document() && frame->document()->securityOrigin()->isSameSche meHostPort(origin)) 719 if (frame->document() && frame->document()->securityOrigin()->isSameSche meHostPort(origin))
720 return frame->document(); 720 return frame->document();
721 } 721 }
722 722
723 *error = "No frame is available for the request"; 723 *error = "No frame is available for the request";
724 return 0; 724 return 0;
725 } 725 }
726 726
727 } // namespace WebCore 727 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/modules/filesystem/FileSystemCallbacks.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698