OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 2618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2629 return new RendererWebApplicationCacheHostImpl( | 2629 return new RendererWebApplicationCacheHostImpl( |
2630 FromWebView(frame->view()), client, | 2630 FromWebView(frame->view()), client, |
2631 RenderThreadImpl::current()->appcache_dispatcher()->backend_proxy()); | 2631 RenderThreadImpl::current()->appcache_dispatcher()->backend_proxy()); |
2632 } | 2632 } |
2633 | 2633 |
2634 WebCookieJar* RenderViewImpl::cookieJar(WebFrame* frame) { | 2634 WebCookieJar* RenderViewImpl::cookieJar(WebFrame* frame) { |
2635 return &cookie_jar_; | 2635 return &cookie_jar_; |
2636 } | 2636 } |
2637 | 2637 |
2638 void RenderViewImpl::didCreateFrame(WebFrame* parent, WebFrame* child) { | 2638 void RenderViewImpl::didCreateFrame(WebFrame* parent, WebFrame* child) { |
2639 if (is_loading_) { | |
2640 pending_frame_tree_update_ = true; | |
2641 return; | |
2642 } | |
2643 if (!updating_frame_tree_) | 2639 if (!updating_frame_tree_) |
2644 SendUpdatedFrameTree(NULL); | 2640 SendUpdatedFrameTree(NULL); |
2645 } | 2641 } |
2646 | 2642 |
2647 void RenderViewImpl::frameDetached(WebFrame* frame) { | 2643 void RenderViewImpl::frameDetached(WebFrame* frame) { |
2648 if (is_loading_) { | 2644 if (is_loading_) { |
2649 pending_frame_tree_update_ = true; | 2645 pending_frame_tree_update_ = true; |
2650 // Make sure observers are notified, even if we return right away. | 2646 // Make sure observers are notified, even if we return right away. |
2651 FOR_EACH_OBSERVER(RenderViewObserver, observers_, FrameDetached(frame)); | 2647 FOR_EACH_OBSERVER(RenderViewObserver, observers_, FrameDetached(frame)); |
2652 return; | 2648 return; |
(...skipping 3635 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6288 | 6284 |
6289 updating_frame_tree_ = true; | 6285 updating_frame_tree_ = true; |
6290 active_frame_id_map_.clear(); | 6286 active_frame_id_map_.clear(); |
6291 | 6287 |
6292 target_process_id_ = process_id; | 6288 target_process_id_ = process_id; |
6293 target_routing_id_ = route_id; | 6289 target_routing_id_ = route_id; |
6294 CreateFrameTree(webview()->mainFrame(), frames); | 6290 CreateFrameTree(webview()->mainFrame(), frames); |
6295 | 6291 |
6296 updating_frame_tree_ = false; | 6292 updating_frame_tree_ = false; |
6297 } | 6293 } |
OLD | NEW |