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 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 3226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3237 } | 3237 } |
3238 } | 3238 } |
3239 #endif // OS_MACOSX | 3239 #endif // OS_MACOSX |
3240 | 3240 |
3241 void RenderViewImpl::Close() { | 3241 void RenderViewImpl::Close() { |
3242 // We need to grab a pointer to the doomed WebView before we destroy it. | 3242 // We need to grab a pointer to the doomed WebView before we destroy it. |
3243 WebView* doomed = webview(); | 3243 WebView* doomed = webview(); |
3244 RenderWidget::Close(); | 3244 RenderWidget::Close(); |
3245 g_view_map.Get().erase(doomed); | 3245 g_view_map.Get().erase(doomed); |
3246 g_routing_id_view_map.Get().erase(routing_id_); | 3246 g_routing_id_view_map.Get().erase(routing_id_); |
| 3247 RenderThread::Get()->Send(new ViewHostMsg_Close_ACK(routing_id_)); |
3247 } | 3248 } |
3248 | 3249 |
3249 void RenderViewImpl::DidHandleKeyEvent() { | 3250 void RenderViewImpl::DidHandleKeyEvent() { |
3250 ClearEditCommands(); | 3251 ClearEditCommands(); |
3251 } | 3252 } |
3252 | 3253 |
3253 bool RenderViewImpl::WillHandleMouseEvent(const blink::WebMouseEvent& event) { | 3254 bool RenderViewImpl::WillHandleMouseEvent(const blink::WebMouseEvent& event) { |
3254 possible_drag_event_info_.event_source = | 3255 possible_drag_event_info_.event_source = |
3255 ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE; | 3256 ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE; |
3256 possible_drag_event_info_.event_location = | 3257 possible_drag_event_info_.event_location = |
(...skipping 810 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4067 std::vector<gfx::Size> sizes; | 4068 std::vector<gfx::Size> sizes; |
4068 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4069 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4069 if (!url.isEmpty()) | 4070 if (!url.isEmpty()) |
4070 urls.push_back( | 4071 urls.push_back( |
4071 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4072 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4072 } | 4073 } |
4073 SendUpdateFaviconURL(urls); | 4074 SendUpdateFaviconURL(urls); |
4074 } | 4075 } |
4075 | 4076 |
4076 } // namespace content | 4077 } // namespace content |
OLD | NEW |