| Index: components/web_cache/renderer/web_cache_render_process_observer.cc
|
| diff --git a/components/web_cache/renderer/web_cache_render_process_observer.cc b/components/web_cache/renderer/web_cache_render_process_observer.cc
|
| index 4e7ee6a49023dde5143b884950f7c1d75c914616..acf11c133c2a6f7a91003a8f366dc43ee936f2a0 100644
|
| --- a/components/web_cache/renderer/web_cache_render_process_observer.cc
|
| +++ b/components/web_cache/renderer/web_cache_render_process_observer.cc
|
| @@ -14,16 +14,8 @@
|
|
|
| namespace web_cache {
|
|
|
| -namespace {
|
| -const size_t kUnitializedCacheCapacity = UINT_MAX;
|
| -}
|
| -
|
| WebCacheRenderProcessObserver::WebCacheRenderProcessObserver()
|
| - : clear_cache_pending_(false),
|
| - webkit_initialized_(false),
|
| - pending_cache_min_dead_capacity_(0),
|
| - pending_cache_max_dead_capacity_(0),
|
| - pending_cache_capacity_(kUnitializedCacheCapacity) {
|
| + : clear_cache_pending_(false) {
|
| content::ServiceRegistry* service_registry =
|
| content::RenderThread::Get()->GetServiceRegistry();
|
| service_registry->AddService(base::Bind(
|
| @@ -39,25 +31,12 @@ void WebCacheRenderProcessObserver::BindRequest(
|
| }
|
|
|
| void WebCacheRenderProcessObserver::ExecutePendingClearCache() {
|
| - if (clear_cache_pending_ && webkit_initialized_) {
|
| + if (clear_cache_pending_) {
|
| clear_cache_pending_ = false;
|
| blink::WebCache::clear();
|
| }
|
| }
|
|
|
| -void WebCacheRenderProcessObserver::WebKitInitialized() {
|
| - webkit_initialized_ = true;
|
| - if (pending_cache_capacity_ != kUnitializedCacheCapacity) {
|
| - blink::WebCache::setCapacities(pending_cache_min_dead_capacity_,
|
| - pending_cache_max_dead_capacity_,
|
| - pending_cache_capacity_);
|
| - }
|
| -}
|
| -
|
| -void WebCacheRenderProcessObserver::OnRenderProcessShutdown() {
|
| - webkit_initialized_ = false;
|
| -}
|
| -
|
| void WebCacheRenderProcessObserver::SetCacheCapacities(
|
| uint64_t min_dead_capacity,
|
| uint64_t max_dead_capacity,
|
| @@ -66,19 +45,12 @@ void WebCacheRenderProcessObserver::SetCacheCapacities(
|
| size_t max_dead_capacity2 = base::checked_cast<size_t>(max_dead_capacity);
|
| size_t capacity = base::checked_cast<size_t>(capacity64);
|
|
|
| - if (!webkit_initialized_) {
|
| - pending_cache_min_dead_capacity_ = min_dead_capacity2;
|
| - pending_cache_max_dead_capacity_ = max_dead_capacity2;
|
| - pending_cache_capacity_ = capacity;
|
| - return;
|
| - }
|
| -
|
| blink::WebCache::setCapacities(min_dead_capacity2, max_dead_capacity2,
|
| capacity);
|
| }
|
|
|
| void WebCacheRenderProcessObserver::ClearCache(bool on_navigation) {
|
| - if (on_navigation || !webkit_initialized_)
|
| + if (on_navigation)
|
| clear_cache_pending_ = true;
|
| else
|
| blink::WebCache::clear();
|
|
|