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

Side by Side Diff: content/renderer/render_thread_impl.cc

Issue 1182083006: Call EnsureWebKitInitialized() before registering extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Workaround for tests Created 5 years, 5 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 // 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 "content/renderer/render_thread_impl.h" 5 #include "content/renderer/render_thread_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
(...skipping 1234 matching lines...) Expand 10 before | Expand all | Expand 10 after
1245 scoped_ptr<base::SharedMemory> 1245 scoped_ptr<base::SharedMemory>
1246 RenderThreadImpl::HostAllocateSharedMemoryBuffer(size_t size) { 1246 RenderThreadImpl::HostAllocateSharedMemoryBuffer(size_t size) {
1247 return ChildThreadImpl::AllocateSharedMemory(size, thread_safe_sender()); 1247 return ChildThreadImpl::AllocateSharedMemory(size, thread_safe_sender());
1248 } 1248 }
1249 1249
1250 cc::SharedBitmapManager* RenderThreadImpl::GetSharedBitmapManager() { 1250 cc::SharedBitmapManager* RenderThreadImpl::GetSharedBitmapManager() {
1251 return shared_bitmap_manager(); 1251 return shared_bitmap_manager();
1252 } 1252 }
1253 1253
1254 void RenderThreadImpl::RegisterExtension(v8::Extension* extension) { 1254 void RenderThreadImpl::RegisterExtension(v8::Extension* extension) {
1255 EnsureWebKitInitialized();
1255 WebScriptController::registerExtension(extension); 1256 WebScriptController::registerExtension(extension);
1256 } 1257 }
1257 1258
1258 void RenderThreadImpl::ScheduleIdleHandler(int64 initial_delay_ms) { 1259 void RenderThreadImpl::ScheduleIdleHandler(int64 initial_delay_ms) {
1259 idle_notification_delay_in_ms_ = initial_delay_ms; 1260 idle_notification_delay_in_ms_ = initial_delay_ms;
1260 idle_timer_.Stop(); 1261 idle_timer_.Stop();
1261 idle_timer_.Start(FROM_HERE, 1262 idle_timer_.Start(FROM_HERE,
1262 base::TimeDelta::FromMilliseconds(initial_delay_ms), 1263 base::TimeDelta::FromMilliseconds(initial_delay_ms),
1263 this, &RenderThreadImpl::IdleHandler); 1264 this, &RenderThreadImpl::IdleHandler);
1264 } 1265 }
(...skipping 706 matching lines...) Expand 10 before | Expand all | Expand 10 after
1971 } 1972 }
1972 1973
1973 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { 1974 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() {
1974 size_t erased = 1975 size_t erased =
1975 RenderThreadImpl::current()->pending_render_frame_connects_.erase( 1976 RenderThreadImpl::current()->pending_render_frame_connects_.erase(
1976 routing_id_); 1977 routing_id_);
1977 DCHECK_EQ(1u, erased); 1978 DCHECK_EQ(1u, erased);
1978 } 1979 }
1979 1980
1980 } // namespace content 1981 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698