OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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.h" | 5 #include "content/renderer/render_thread.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 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
430 } | 430 } |
431 WebKit::setNamedColors(color_names.get(), web_colors.get(), num_colors); | 431 WebKit::setNamedColors(color_names.get(), web_colors.get(), num_colors); |
432 } | 432 } |
433 | 433 |
434 void RenderThread::OnCreateNewView(const ViewMsg_New_Params& params) { | 434 void RenderThread::OnCreateNewView(const ViewMsg_New_Params& params) { |
435 EnsureWebKitInitialized(); | 435 EnsureWebKitInitialized(); |
436 // When bringing in render_view, also bring in webkit's glue and jsbindings. | 436 // When bringing in render_view, also bring in webkit's glue and jsbindings. |
437 RenderView::Create( | 437 RenderView::Create( |
438 this, | 438 this, |
439 params.parent_window, | 439 params.parent_window, |
440 params.compositing_surface, | |
441 MSG_ROUTING_NONE, | 440 MSG_ROUTING_NONE, |
442 params.renderer_preferences, | 441 params.renderer_preferences, |
443 params.web_preferences, | 442 params.web_preferences, |
444 new SharedRenderViewCounter(0), | 443 new SharedRenderViewCounter(0), |
445 params.view_id, | 444 params.view_id, |
446 params.session_storage_namespace_id, | 445 params.session_storage_namespace_id, |
447 params.frame_name); | 446 params.frame_name); |
448 } | 447 } |
449 | 448 |
450 void RenderThread::CloseCurrentConnections() { | 449 void RenderThread::CloseCurrentConnections() { |
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
678 | 677 |
679 void RenderThread::RegisterExtension(v8::Extension* extension) { | 678 void RenderThread::RegisterExtension(v8::Extension* extension) { |
680 WebScriptController::registerExtension(extension); | 679 WebScriptController::registerExtension(extension); |
681 v8_extensions_.insert(extension->name()); | 680 v8_extensions_.insert(extension->name()); |
682 } | 681 } |
683 | 682 |
684 bool RenderThread::IsRegisteredExtension( | 683 bool RenderThread::IsRegisteredExtension( |
685 const std::string& v8_extension_name) const { | 684 const std::string& v8_extension_name) const { |
686 return v8_extensions_.find(v8_extension_name) != v8_extensions_.end(); | 685 return v8_extensions_.find(v8_extension_name) != v8_extensions_.end(); |
687 } | 686 } |
OLD | NEW |