OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/net/sdch_dictionary_fetcher.h" | 5 #include "chrome/browser/net/sdch_dictionary_fetcher.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
42 if (attempted_load_.find(dictionary_url) != attempted_load_.end()) { | 42 if (attempted_load_.find(dictionary_url) != attempted_load_.end()) { |
43 net::SdchManager::SdchErrorRecovery( | 43 net::SdchManager::SdchErrorRecovery( |
44 net::SdchManager::DICTIONARY_ALREADY_TRIED_TO_DOWNLOAD); | 44 net::SdchManager::DICTIONARY_ALREADY_TRIED_TO_DOWNLOAD); |
45 return; | 45 return; |
46 } | 46 } |
47 attempted_load_.insert(dictionary_url); | 47 attempted_load_.insert(dictionary_url); |
48 fetch_queue_.push(dictionary_url); | 48 fetch_queue_.push(dictionary_url); |
49 ScheduleDelayedRun(); | 49 ScheduleDelayedRun(); |
50 } | 50 } |
51 | 51 |
52 void SdchDictionaryFetcher::Cancel() { | |
53 DCHECK(CalledOnValidThread()); | |
54 | |
55 current_fetch_.reset(NULL); | |
56 weak_factory_.InvalidateWeakPtrs(); | |
57 attempted_load_.clear(); | |
58 std::queue<GURL> trash_queue; | |
59 fetch_queue_.swap(trash_queue); | |
jar (doing other things)
2014/06/11 23:23:49
nit: (personal style): It is probably safer to fir
Randy Smith (Not in Mondays)
2014/06/12 18:15:45
Hmmm. So your comment made me think about orderin
| |
60 } | |
61 | |
52 void SdchDictionaryFetcher::ScheduleDelayedRun() { | 62 void SdchDictionaryFetcher::ScheduleDelayedRun() { |
53 if (fetch_queue_.empty() || current_fetch_.get() || task_is_pending_) | 63 if (fetch_queue_.empty() || current_fetch_.get() || task_is_pending_) |
54 return; | 64 return; |
55 base::MessageLoop::current()->PostDelayedTask(FROM_HERE, | 65 base::MessageLoop::current()->PostDelayedTask(FROM_HERE, |
56 base::Bind(&SdchDictionaryFetcher::StartFetching, | 66 base::Bind(&SdchDictionaryFetcher::StartFetching, |
57 weak_factory_.GetWeakPtr()), | 67 weak_factory_.GetWeakPtr()), |
58 base::TimeDelta::FromMilliseconds(kMsDelayFromRequestTillDownload)); | 68 base::TimeDelta::FromMilliseconds(kMsDelayFromRequestTillDownload)); |
59 task_is_pending_ = true; | 69 task_is_pending_ = true; |
60 } | 70 } |
61 | 71 |
(...skipping 17 matching lines...) Expand all Loading... | |
79 DCHECK(CalledOnValidThread()); | 89 DCHECK(CalledOnValidThread()); |
80 if ((200 == source->GetResponseCode()) && | 90 if ((200 == source->GetResponseCode()) && |
81 (source->GetStatus().status() == net::URLRequestStatus::SUCCESS)) { | 91 (source->GetStatus().status() == net::URLRequestStatus::SUCCESS)) { |
82 std::string data; | 92 std::string data; |
83 source->GetResponseAsString(&data); | 93 source->GetResponseAsString(&data); |
84 manager_->AddSdchDictionary(data, source->GetURL()); | 94 manager_->AddSdchDictionary(data, source->GetURL()); |
85 } | 95 } |
86 current_fetch_.reset(NULL); | 96 current_fetch_.reset(NULL); |
87 ScheduleDelayedRun(); | 97 ScheduleDelayedRun(); |
88 } | 98 } |
OLD | NEW |