| 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 410 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 421   } | 421   } | 
| 422   WebKit::setNamedColors(color_names.get(), web_colors.get(), num_colors); | 422   WebKit::setNamedColors(color_names.get(), web_colors.get(), num_colors); | 
| 423 } | 423 } | 
| 424 | 424 | 
| 425 void RenderThread::OnCreateNewView(const ViewMsg_New_Params& params) { | 425 void RenderThread::OnCreateNewView(const ViewMsg_New_Params& params) { | 
| 426   EnsureWebKitInitialized(); | 426   EnsureWebKitInitialized(); | 
| 427   // When bringing in render_view, also bring in webkit's glue and jsbindings. | 427   // When bringing in render_view, also bring in webkit's glue and jsbindings. | 
| 428   RenderView::Create( | 428   RenderView::Create( | 
| 429       this, | 429       this, | 
| 430       params.parent_window, | 430       params.parent_window, | 
|  | 431       params.compositing_surface, | 
| 431       MSG_ROUTING_NONE, | 432       MSG_ROUTING_NONE, | 
| 432       params.renderer_preferences, | 433       params.renderer_preferences, | 
| 433       params.web_preferences, | 434       params.web_preferences, | 
| 434       new SharedRenderViewCounter(0), | 435       new SharedRenderViewCounter(0), | 
| 435       params.view_id, | 436       params.view_id, | 
| 436       params.session_storage_namespace_id, | 437       params.session_storage_namespace_id, | 
| 437       params.frame_name); | 438       params.frame_name); | 
| 438 } | 439 } | 
| 439 | 440 | 
| 440 void RenderThread::CloseCurrentConnections() { | 441 void RenderThread::CloseCurrentConnections() { | 
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 684       return true; | 685       return true; | 
| 685   } | 686   } | 
| 686 | 687 | 
| 687   return false; | 688   return false; | 
| 688 } | 689 } | 
| 689 | 690 | 
| 690 void RenderThread::RegisterExtension(v8::Extension* extension) { | 691 void RenderThread::RegisterExtension(v8::Extension* extension) { | 
| 691   WebScriptController::registerExtension(extension); | 692   WebScriptController::registerExtension(extension); | 
| 692   v8_extensions_.insert(extension->name()); | 693   v8_extensions_.insert(extension->name()); | 
| 693 } | 694 } | 
| OLD | NEW | 
|---|