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

Side by Side Diff: content/renderer/render_frame_proxy.cc

Issue 2561963002: base: Remove the string logging from CHECK(). (Closed)
Patch Set: checkstring: rebase Created 4 years 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_frame_proxy.h" 5 #include "content/renderer/render_frame_proxy.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <map> 8 #include <map>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 } 180 }
181 181
182 RenderFrameProxy::RenderFrameProxy(int routing_id, int frame_routing_id) 182 RenderFrameProxy::RenderFrameProxy(int routing_id, int frame_routing_id)
183 : routing_id_(routing_id), 183 : routing_id_(routing_id),
184 frame_routing_id_(frame_routing_id), 184 frame_routing_id_(frame_routing_id),
185 web_frame_(nullptr), 185 web_frame_(nullptr),
186 render_view_(nullptr), 186 render_view_(nullptr),
187 render_widget_(nullptr) { 187 render_widget_(nullptr) {
188 std::pair<RoutingIDProxyMap::iterator, bool> result = 188 std::pair<RoutingIDProxyMap::iterator, bool> result =
189 g_routing_id_proxy_map.Get().insert(std::make_pair(routing_id_, this)); 189 g_routing_id_proxy_map.Get().insert(std::make_pair(routing_id_, this));
190 CHECK(result.second) << "Inserting a duplicate item."; 190 // Inserting a duplicate item.
191 CHECK(result.second);
191 RenderThread::Get()->AddRoute(routing_id_, this); 192 RenderThread::Get()->AddRoute(routing_id_, this);
192 } 193 }
193 194
194 RenderFrameProxy::~RenderFrameProxy() { 195 RenderFrameProxy::~RenderFrameProxy() {
195 render_widget_->UnregisterRenderFrameProxy(this); 196 render_widget_->UnregisterRenderFrameProxy(this);
196 197
197 CHECK(!web_frame_); 198 CHECK(!web_frame_);
198 RenderThread::Get()->RemoveRoute(routing_id_); 199 RenderThread::Get()->RemoveRoute(routing_id_);
199 g_routing_id_proxy_map.Get().erase(routing_id_); 200 g_routing_id_proxy_map.Get().erase(routing_id_);
200 } 201 }
201 202
202 void RenderFrameProxy::Init(blink::WebRemoteFrame* web_frame, 203 void RenderFrameProxy::Init(blink::WebRemoteFrame* web_frame,
203 RenderViewImpl* render_view, 204 RenderViewImpl* render_view,
204 RenderWidget* render_widget) { 205 RenderWidget* render_widget) {
205 CHECK(web_frame); 206 CHECK(web_frame);
206 CHECK(render_view); 207 CHECK(render_view);
207 CHECK(render_widget); 208 CHECK(render_widget);
208 209
209 web_frame_ = web_frame; 210 web_frame_ = web_frame;
210 render_view_ = render_view; 211 render_view_ = render_view;
211 render_widget_ = render_widget; 212 render_widget_ = render_widget;
212 213
213 render_widget_->RegisterRenderFrameProxy(this); 214 render_widget_->RegisterRenderFrameProxy(this);
214 215
215 std::pair<FrameMap::iterator, bool> result = 216 std::pair<FrameMap::iterator, bool> result =
216 g_frame_map.Get().insert(std::make_pair(web_frame_, this)); 217 g_frame_map.Get().insert(std::make_pair(web_frame_, this));
217 CHECK(result.second) << "Inserted a duplicate item."; 218 // Inserted a duplicate item.
219 CHECK(result.second);
218 } 220 }
219 221
220 void RenderFrameProxy::WillBeginCompositorFrame() { 222 void RenderFrameProxy::WillBeginCompositorFrame() {
221 if (compositing_helper_) { 223 if (compositing_helper_) {
222 FrameHostMsg_HittestData_Params params; 224 FrameHostMsg_HittestData_Params params;
223 params.surface_id = compositing_helper_->surface_id(); 225 params.surface_id = compositing_helper_->surface_id();
224 params.ignored_for_hittest = web_frame_->isIgnoredForHitTest(); 226 params.ignored_for_hittest = web_frame_->isIgnoredForHitTest();
225 render_widget_->QueueMessage( 227 render_widget_->QueueMessage(
226 new FrameHostMsg_HittestData(render_widget_->routing_id(), params), 228 new FrameHostMsg_HittestData(render_widget_->routing_id(), params),
227 MESSAGE_DELIVERY_POLICY_WITH_VISUAL_STATE); 229 MESSAGE_DELIVERY_POLICY_WITH_VISUAL_STATE);
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
520 blink::WebLocalFrame* source) { 522 blink::WebLocalFrame* source) {
521 int source_routing_id = RenderFrameImpl::FromWebFrame(source)->GetRoutingID(); 523 int source_routing_id = RenderFrameImpl::FromWebFrame(source)->GetRoutingID();
522 Send(new FrameHostMsg_AdvanceFocus(routing_id_, type, source_routing_id)); 524 Send(new FrameHostMsg_AdvanceFocus(routing_id_, type, source_routing_id));
523 } 525 }
524 526
525 void RenderFrameProxy::frameFocused() { 527 void RenderFrameProxy::frameFocused() {
526 Send(new FrameHostMsg_FrameFocused(routing_id_)); 528 Send(new FrameHostMsg_FrameFocused(routing_id_));
527 } 529 }
528 530
529 } // namespace 531 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698