Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Side by Side Diff: chrome/renderer/render_thread.cc

Issue 2775003: Added plumbing to transport the frame name between RenderViewHost and the Webkit layer. (Closed)
Patch Set: Final version for the record Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/common/render_messages_internal.h ('k') | chrome/renderer/render_view.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 605 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 color_names[i] = it->first; 616 color_names[i] = it->first;
617 web_colors[i] = it->second; 617 web_colors[i] = it->second;
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,
627 params.web_preferences, new SharedRenderViewCounter(0), params.view_id, 627 params.parent_window,
628 params.session_storage_namespace_id); 628 MSG_ROUTING_NONE,
629 params.renderer_preferences,
630 params.web_preferences,
631 new SharedRenderViewCounter(0),
632 params.view_id,
633 params.session_storage_namespace_id,
634 params.frame_name);
629 } 635 }
630 636
631 void RenderThread::OnSetCacheCapacities(size_t min_dead_capacity, 637 void RenderThread::OnSetCacheCapacities(size_t min_dead_capacity,
632 size_t max_dead_capacity, 638 size_t max_dead_capacity,
633 size_t capacity) { 639 size_t capacity) {
634 EnsureWebKitInitialized(); 640 EnsureWebKitInitialized();
635 WebCache::setCapacities( 641 WebCache::setCapacities(
636 min_dead_capacity, max_dead_capacity, capacity); 642 min_dead_capacity, max_dead_capacity, capacity);
637 } 643 }
638 644
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after
1036 if (url.SchemeIs(chrome::kExtensionScheme)) 1042 if (url.SchemeIs(chrome::kExtensionScheme))
1037 return url.host(); 1043 return url.host();
1038 1044
1039 for (size_t i = 0; i < extension_extents_.size(); ++i) { 1045 for (size_t i = 0; i < extension_extents_.size(); ++i) {
1040 if (extension_extents_[i].web_extent.ContainsURL(url)) 1046 if (extension_extents_[i].web_extent.ContainsURL(url))
1041 return extension_extents_[i].extension_id; 1047 return extension_extents_[i].extension_id;
1042 } 1048 }
1043 1049
1044 return std::string(); 1050 return std::string();
1045 } 1051 }
OLDNEW
« no previous file with comments | « chrome/common/render_messages_internal.h ('k') | chrome/renderer/render_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698