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 2008 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2019 } | 2019 } |
2020 | 2020 |
2021 void RenderFrameImpl::didCreateDocumentElement(blink::WebLocalFrame* frame) { | 2021 void RenderFrameImpl::didCreateDocumentElement(blink::WebLocalFrame* frame) { |
2022 DCHECK(!frame_ || frame_ == frame); | 2022 DCHECK(!frame_ || frame_ == frame); |
2023 | 2023 |
2024 // Notify the browser about non-blank documents loading in the top frame. | 2024 // Notify the browser about non-blank documents loading in the top frame. |
2025 GURL url = frame->document().url(); | 2025 GURL url = frame->document().url(); |
2026 if (url.is_valid() && url.spec() != kAboutBlankURL) { | 2026 if (url.is_valid() && url.spec() != kAboutBlankURL) { |
2027 // TODO(nasko): Check if webview()->mainFrame() is the same as the | 2027 // TODO(nasko): Check if webview()->mainFrame() is the same as the |
2028 // frame->tree()->top(). | 2028 // frame->tree()->top(). |
2029 if (frame == render_view_->webview()->mainFrame()) { | 2029 blink::WebFrame* main_frame = render_view_->webview()->mainFrame(); |
| 2030 if (frame == main_frame) { |
| 2031 // For now, don't remember plugin zoom values. We don't want to mix them |
| 2032 // with normal web content (i.e. a fixed layout plugin would usually want |
| 2033 // them different). |
2030 render_view_->Send(new ViewHostMsg_DocumentAvailableInMainFrame( | 2034 render_view_->Send(new ViewHostMsg_DocumentAvailableInMainFrame( |
2031 render_view_->GetRoutingID())); | 2035 render_view_->GetRoutingID(), |
| 2036 main_frame->document().isPluginDocument())); |
2032 } | 2037 } |
2033 } | 2038 } |
2034 | 2039 |
2035 FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(), | 2040 FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(), |
2036 DidCreateDocumentElement(frame)); | 2041 DidCreateDocumentElement(frame)); |
2037 } | 2042 } |
2038 | 2043 |
2039 void RenderFrameImpl::didReceiveTitle(blink::WebLocalFrame* frame, | 2044 void RenderFrameImpl::didReceiveTitle(blink::WebLocalFrame* frame, |
2040 const blink::WebString& title, | 2045 const blink::WebString& title, |
2041 blink::WebTextDirection direction) { | 2046 blink::WebTextDirection direction) { |
(...skipping 1444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3486 weak_factory_.GetWeakPtr(), | 3491 weak_factory_.GetWeakPtr(), |
3487 render_view_->media_player_manager_, | 3492 render_view_->media_player_manager_, |
3488 stream_texture_factory, | 3493 stream_texture_factory, |
3489 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(), | 3494 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(), |
3490 new RenderMediaLog()); | 3495 new RenderMediaLog()); |
3491 } | 3496 } |
3492 | 3497 |
3493 #endif | 3498 #endif |
3494 | 3499 |
3495 } // namespace content | 3500 } // namespace content |
OLD | NEW |