Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 607 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 618 } | 618 } |
| 619 WebKit::setNamedColors(color_names.get(), web_colors.get(), num_colors); | 619 WebKit::setNamedColors(color_names.get(), web_colors.get(), num_colors); |
| 620 } | 620 } |
| 621 | 621 |
| 622 void RenderThread::OnCreateNewView(const ViewMsg_New_Params& params) { | 622 void RenderThread::OnCreateNewView(const ViewMsg_New_Params& params) { |
| 623 EnsureWebKitInitialized(); | 623 EnsureWebKitInitialized(); |
| 624 // When bringing in render_view, also bring in webkit's glue and jsbindings. | 624 // When bringing in render_view, also bring in webkit's glue and jsbindings. |
| 625 RenderView::Create( | 625 RenderView::Create( |
| 626 this, params.parent_window, MSG_ROUTING_NONE, params.renderer_preferences, | 626 this, params.parent_window, MSG_ROUTING_NONE, params.renderer_preferences, |
| 627 params.web_preferences, new SharedRenderViewCounter(0), params.view_id, | 627 params.web_preferences, new SharedRenderViewCounter(0), params.view_id, |
| 628 params.session_storage_namespace_id); | 628 params.session_storage_namespace_id, params.frame_name); |
|
rafaelw
2010/06/10 22:48:05
This param line is getting nuts, can you stack the
| |
| 629 } | 629 } |
| 630 | 630 |
| 631 void RenderThread::OnSetCacheCapacities(size_t min_dead_capacity, | 631 void RenderThread::OnSetCacheCapacities(size_t min_dead_capacity, |
| 632 size_t max_dead_capacity, | 632 size_t max_dead_capacity, |
| 633 size_t capacity) { | 633 size_t capacity) { |
| 634 EnsureWebKitInitialized(); | 634 EnsureWebKitInitialized(); |
| 635 WebCache::setCapacities( | 635 WebCache::setCapacities( |
| 636 min_dead_capacity, max_dead_capacity, capacity); | 636 min_dead_capacity, max_dead_capacity, capacity); |
| 637 } | 637 } |
| 638 | 638 |
| (...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1036 if (url.SchemeIs(chrome::kExtensionScheme)) | 1036 if (url.SchemeIs(chrome::kExtensionScheme)) |
| 1037 return url.host(); | 1037 return url.host(); |
| 1038 | 1038 |
| 1039 for (size_t i = 0; i < extension_extents_.size(); ++i) { | 1039 for (size_t i = 0; i < extension_extents_.size(); ++i) { |
| 1040 if (extension_extents_[i].web_extent.ContainsURL(url)) | 1040 if (extension_extents_[i].web_extent.ContainsURL(url)) |
| 1041 return extension_extents_[i].extension_id; | 1041 return extension_extents_[i].extension_id; |
| 1042 } | 1042 } |
| 1043 | 1043 |
| 1044 return std::string(); | 1044 return std::string(); |
| 1045 } | 1045 } |
| OLD | NEW |