Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 2187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2198 didCommitProvisionalLoad(frame, item, commit_type); | 2198 didCommitProvisionalLoad(frame, item, commit_type); |
| 2199 } | 2199 } |
| 2200 | 2200 |
| 2201 void RenderFrameImpl::didUpdateCurrentHistoryItem(blink::WebLocalFrame* frame) { | 2201 void RenderFrameImpl::didUpdateCurrentHistoryItem(blink::WebLocalFrame* frame) { |
| 2202 DCHECK(!frame_ || frame_ == frame); | 2202 DCHECK(!frame_ || frame_ == frame); |
| 2203 // TODO(nasko): Move implementation here. Needed methods: | 2203 // TODO(nasko): Move implementation here. Needed methods: |
| 2204 // * StartNavStateSyncTimerIfNecessary | 2204 // * StartNavStateSyncTimerIfNecessary |
| 2205 render_view_->didUpdateCurrentHistoryItem(frame); | 2205 render_view_->didUpdateCurrentHistoryItem(frame); |
| 2206 } | 2206 } |
| 2207 | 2207 |
| 2208 void RenderFrameImpl::didChangeBrandColor(blink::WebLocalFrame* frame) { | |
| 2209 DCHECK(!frame_ || frame_ == frame); | |
|
dcheng
2014/06/16 17:21:25
Can frame_ ever be NULL here?
michaelbai
2014/06/16 17:49:22
I don't know, but there is same code in the class,
dcheng
2014/06/16 18:52:19
Right, but things like that get called on the init
jam
2014/06/16 20:00:45
this isn't necessary. also, the WebFrameClient met
michaelbai
2014/06/16 21:09:37
Removed DCHECK().
hmm, as the |frame| parameter,
michaelbai
2014/06/16 21:09:37
Done.
dcheng
2014/06/16 21:16:54
That's all legacy code. Since WebFrame has a 1:1 r
| |
| 2210 if (frame->parent()) | |
|
dcheng
2014/06/16 17:21:25
Is there a design doc for this? I take it that we
michaelbai
2014/06/16 17:49:23
Feature description is in the linked bug.
I think
jam
2014/06/16 20:00:45
If blink is checking this (which I agree makes sen
michaelbai
2014/06/16 21:09:37
Currently blink isn't checking this, I will move i
jam
2014/06/18 00:36:43
since per abarth's comments he wants this to be in
michaelbai
2014/06/18 03:40:12
Done.
| |
| 2211 return; | |
| 2212 | |
| 2213 Send(new FrameHostMsg_DidChangeBrandColor( | |
| 2214 routing_id_, frame->document().brandColor())); | |
| 2215 } | |
| 2216 | |
| 2208 blink::WebNotificationPresenter* RenderFrameImpl::notificationPresenter() { | 2217 blink::WebNotificationPresenter* RenderFrameImpl::notificationPresenter() { |
| 2209 return notification_provider_; | 2218 return notification_provider_; |
| 2210 } | 2219 } |
| 2211 | 2220 |
| 2212 void RenderFrameImpl::didChangeSelection(bool is_empty_selection) { | 2221 void RenderFrameImpl::didChangeSelection(bool is_empty_selection) { |
| 2213 if (!GetRenderWidget()->handling_input_event() && !handling_select_range_) | 2222 if (!GetRenderWidget()->handling_input_event() && !handling_select_range_) |
| 2214 return; | 2223 return; |
| 2215 | 2224 |
| 2216 if (is_empty_selection) | 2225 if (is_empty_selection) |
| 2217 selection_text_.clear(); | 2226 selection_text_.clear(); |
| (...skipping 1371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3589 | 3598 |
| 3590 #if defined(ENABLE_BROWSER_CDMS) | 3599 #if defined(ENABLE_BROWSER_CDMS) |
| 3591 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 3600 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
| 3592 if (!cdm_manager_) | 3601 if (!cdm_manager_) |
| 3593 cdm_manager_ = new RendererCdmManager(this); | 3602 cdm_manager_ = new RendererCdmManager(this); |
| 3594 return cdm_manager_; | 3603 return cdm_manager_; |
| 3595 } | 3604 } |
| 3596 #endif // defined(ENABLE_BROWSER_CDMS) | 3605 #endif // defined(ENABLE_BROWSER_CDMS) |
| 3597 | 3606 |
| 3598 } // namespace content | 3607 } // namespace content |
| OLD | NEW |