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 "chrome/renderer/render_thread.h" | 5 #include "chrome/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 642 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
653 } | 653 } |
654 WebKit::setNamedColors(color_names.get(), web_colors.get(), num_colors); | 654 WebKit::setNamedColors(color_names.get(), web_colors.get(), num_colors); |
655 } | 655 } |
656 | 656 |
657 void RenderThread::OnCreateNewView(const ViewMsg_New_Params& params) { | 657 void RenderThread::OnCreateNewView(const ViewMsg_New_Params& params) { |
658 EnsureWebKitInitialized(); | 658 EnsureWebKitInitialized(); |
659 // When bringing in render_view, also bring in webkit's glue and jsbindings. | 659 // When bringing in render_view, also bring in webkit's glue and jsbindings. |
660 RenderView::Create( | 660 RenderView::Create( |
661 this, | 661 this, |
662 params.parent_window, | 662 params.parent_window, |
| 663 params.compositing_surface, |
663 MSG_ROUTING_NONE, | 664 MSG_ROUTING_NONE, |
664 params.renderer_preferences, | 665 params.renderer_preferences, |
665 params.web_preferences, | 666 params.web_preferences, |
666 new SharedRenderViewCounter(0), | 667 new SharedRenderViewCounter(0), |
667 params.view_id, | 668 params.view_id, |
668 params.session_storage_namespace_id, | 669 params.session_storage_namespace_id, |
669 params.frame_name); | 670 params.frame_name); |
670 } | 671 } |
671 | 672 |
672 void RenderThread::OnSetCacheCapacities(size_t min_dead_capacity, | 673 void RenderThread::OnSetCacheCapacities(size_t min_dead_capacity, |
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1058 return true; | 1059 return true; |
1059 } | 1060 } |
1060 | 1061 |
1061 return false; | 1062 return false; |
1062 } | 1063 } |
1063 | 1064 |
1064 void RenderThread::RegisterExtension(v8::Extension* extension) { | 1065 void RenderThread::RegisterExtension(v8::Extension* extension) { |
1065 WebScriptController::registerExtension(extension); | 1066 WebScriptController::registerExtension(extension); |
1066 v8_extensions_.insert(extension->name()); | 1067 v8_extensions_.insert(extension->name()); |
1067 } | 1068 } |
OLD | NEW |