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 501 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
512 } | 512 } |
513 WebKit::setNamedColors(color_names.get(), web_colors.get(), num_colors); | 513 WebKit::setNamedColors(color_names.get(), web_colors.get(), num_colors); |
514 } | 514 } |
515 | 515 |
516 void RenderThread::OnCreateNewView(const ViewMsg_New_Params& params) { | 516 void RenderThread::OnCreateNewView(const ViewMsg_New_Params& params) { |
517 EnsureWebKitInitialized(); | 517 EnsureWebKitInitialized(); |
518 // When bringing in render_view, also bring in webkit's glue and jsbindings. | 518 // When bringing in render_view, also bring in webkit's glue and jsbindings. |
519 RenderView::Create( | 519 RenderView::Create( |
520 this, | 520 this, |
521 params.parent_window, | 521 params.parent_window, |
| 522 params.compositing_surface, |
522 MSG_ROUTING_NONE, | 523 MSG_ROUTING_NONE, |
523 params.renderer_preferences, | 524 params.renderer_preferences, |
524 params.web_preferences, | 525 params.web_preferences, |
525 new SharedRenderViewCounter(0), | 526 new SharedRenderViewCounter(0), |
526 params.view_id, | 527 params.view_id, |
527 params.session_storage_namespace_id, | 528 params.session_storage_namespace_id, |
528 params.frame_name); | 529 params.frame_name); |
529 } | 530 } |
530 | 531 |
531 void RenderThread::OnSetCacheCapacities(size_t min_dead_capacity, | 532 void RenderThread::OnSetCacheCapacities(size_t min_dead_capacity, |
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
858 return true; | 859 return true; |
859 } | 860 } |
860 | 861 |
861 return false; | 862 return false; |
862 } | 863 } |
863 | 864 |
864 void RenderThread::RegisterExtension(v8::Extension* extension) { | 865 void RenderThread::RegisterExtension(v8::Extension* extension) { |
865 WebScriptController::registerExtension(extension); | 866 WebScriptController::registerExtension(extension); |
866 v8_extensions_.insert(extension->name()); | 867 v8_extensions_.insert(extension->name()); |
867 } | 868 } |
OLD | NEW |