| 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_widget.h" | 5 #include "content/renderer/render_widget.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 1337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1348 DCHECK(routing_id_ != MSG_ROUTING_NONE); | 1348 DCHECK(routing_id_ != MSG_ROUTING_NONE); |
| 1349 DCHECK(!show_callback_.is_null()); | 1349 DCHECK(!show_callback_.is_null()); |
| 1350 | 1350 |
| 1351 if (did_show_) | 1351 if (did_show_) |
| 1352 return; | 1352 return; |
| 1353 | 1353 |
| 1354 did_show_ = true; | 1354 did_show_ = true; |
| 1355 | 1355 |
| 1356 // The opener is responsible for actually showing this widget. | 1356 // The opener is responsible for actually showing this widget. |
| 1357 show_callback_.Run(this, policy, initial_rect_); | 1357 show_callback_.Run(this, policy, initial_rect_); |
| 1358 show_callback_.Reset(); |
| 1358 | 1359 |
| 1359 // NOTE: initial_rect_ may still have its default values at this point, but | 1360 // NOTE: initial_rect_ may still have its default values at this point, but |
| 1360 // that's okay. It'll be ignored if as_popup is false, or the browser | 1361 // that's okay. It'll be ignored if as_popup is false, or the browser |
| 1361 // process will impose a default position otherwise. | 1362 // process will impose a default position otherwise. |
| 1362 SetPendingWindowRect(initial_rect_); | 1363 SetPendingWindowRect(initial_rect_); |
| 1363 } | 1364 } |
| 1364 | 1365 |
| 1365 void RenderWidget::DoDeferredClose() { | 1366 void RenderWidget::DoDeferredClose() { |
| 1366 WillCloseLayerTreeView(); | 1367 WillCloseLayerTreeView(); |
| 1367 Send(new ViewHostMsg_Close(routing_id_)); | 1368 Send(new ViewHostMsg_Close(routing_id_)); |
| (...skipping 887 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2255 // browser side (https://crbug.com/669219). | 2256 // browser side (https://crbug.com/669219). |
| 2256 // If there is no WebFrameWidget, then there will be no | 2257 // If there is no WebFrameWidget, then there will be no |
| 2257 // InputMethodControllers for a WebLocalFrame. | 2258 // InputMethodControllers for a WebLocalFrame. |
| 2258 return nullptr; | 2259 return nullptr; |
| 2259 } | 2260 } |
| 2260 return static_cast<blink::WebFrameWidget*>(GetWebWidget()) | 2261 return static_cast<blink::WebFrameWidget*>(GetWebWidget()) |
| 2261 ->getActiveWebInputMethodController(); | 2262 ->getActiveWebInputMethodController(); |
| 2262 } | 2263 } |
| 2263 | 2264 |
| 2264 } // namespace content | 2265 } // namespace content |
| OLD | NEW |