| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index 0d0b86ed03312d638868dc3fe4585d1cf84fe04e..9a5459b538d05261011ebeafcea4866515e8a2c9 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "content/renderer/render_frame_impl.h"
|
|
|
| +#include <algorithm>
|
| #include <map>
|
| #include <string>
|
| #include <utility>
|
| @@ -2897,9 +2898,9 @@ RenderFrameImpl::CreateApplicationCacheHost(
|
| std::unique_ptr<blink::WebContentSettingsClient>
|
| RenderFrameImpl::CreateWorkerContentSettingsClient() {
|
| if (!frame_ || !frame_->View())
|
| - return NULL;
|
| + return nullptr;
|
| return GetContentClient()->renderer()->CreateWorkerContentSettingsClient(
|
| - this, frame_);
|
| + this);
|
| }
|
|
|
| std::unique_ptr<blink::WebWorkerFetchContext>
|
| @@ -3764,7 +3765,7 @@ void RenderFrameImpl::DidCreateDocumentElement(blink::WebLocalFrame* frame) {
|
| // them different).
|
| render_view_->Send(new ViewHostMsg_DocumentAvailableInMainFrame(
|
| render_view_->GetRoutingID(),
|
| - main_frame->GetDocument().IsPluginDocument()));
|
| + frame->GetDocument().IsPluginDocument()));
|
| }
|
| }
|
|
|
| @@ -4910,6 +4911,7 @@ void RenderFrameImpl::SendDidCommitProvisionalLoad(
|
| if (render_view_->webview()->MainFrame()->IsWebLocalFrame() &&
|
| render_view_->webview()
|
| ->MainFrame()
|
| + ->ToWebLocalFrame()
|
| ->GetDocument()
|
| .IsPluginDocument()) {
|
| // Reset the zoom levels for plugins.
|
| @@ -6739,7 +6741,7 @@ void RenderFrameImpl::SendFindReply(int request_id,
|
| int ordinal,
|
| const WebRect& selection_rect,
|
| bool final_status_update) {
|
| - DCHECK(ordinal >= -1);
|
| + DCHECK_GE(ordinal, -1);
|
|
|
| Send(new FrameHostMsg_Find_Reply(routing_id_,
|
| request_id,
|
|
|