| OLD | NEW |
| 1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2014 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 "web/PopupMenuImpl.h" | 5 #include "web/PopupMenuImpl.h" |
| 6 | 6 |
| 7 #include "core/HTMLNames.h" | 7 #include "core/HTMLNames.h" |
| 8 #include "core/css/CSSFontSelector.h" | 8 #include "core/css/CSSFontSelector.h" |
| 9 #include "core/dom/ElementTraversal.h" | 9 #include "core/dom/ElementTraversal.h" |
| 10 #include "core/dom/ExecutionContextTask.h" | 10 #include "core/dom/ExecutionContextTask.h" |
| (...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 473 if (m_needsUpdate) | 473 if (m_needsUpdate) |
| 474 return; | 474 return; |
| 475 m_needsUpdate = true; | 475 m_needsUpdate = true; |
| 476 ownerElement().document().postTask(BLINK_FROM_HERE, createSameThreadTask(&Po
pupMenuImpl::update, this)); | 476 ownerElement().document().postTask(BLINK_FROM_HERE, createSameThreadTask(&Po
pupMenuImpl::update, this)); |
| 477 } | 477 } |
| 478 | 478 |
| 479 void PopupMenuImpl::update() | 479 void PopupMenuImpl::update() |
| 480 { | 480 { |
| 481 if (!m_popup || !m_ownerElement) | 481 if (!m_popup || !m_ownerElement) |
| 482 return; | 482 return; |
| 483 ownerElement().document().updateLayoutTree(); | 483 ownerElement().document().updateStyleAndLayoutTree(); |
| 484 // disconnectClient() might have been called. | 484 // disconnectClient() might have been called. |
| 485 if (!m_ownerElement) | 485 if (!m_ownerElement) |
| 486 return; | 486 return; |
| 487 m_needsUpdate = false; | 487 m_needsUpdate = false; |
| 488 | 488 |
| 489 if (!ownerElement().document().frame()->view()->visibleContentRect().interse
cts(ownerElement().pixelSnappedBoundingBox())) { | 489 if (!ownerElement().document().frame()->view()->visibleContentRect().interse
cts(ownerElement().pixelSnappedBoundingBox())) { |
| 490 hide(); | 490 hide(); |
| 491 return; | 491 return; |
| 492 } | 492 } |
| 493 | 493 |
| (...skipping 26 matching lines...) Expand all Loading... |
| 520 | 520 |
| 521 void PopupMenuImpl::disconnectClient() | 521 void PopupMenuImpl::disconnectClient() |
| 522 { | 522 { |
| 523 m_ownerElement = nullptr; | 523 m_ownerElement = nullptr; |
| 524 // Cannot be done during finalization, so instead done when the | 524 // Cannot be done during finalization, so instead done when the |
| 525 // layout object is destroyed and disconnected. | 525 // layout object is destroyed and disconnected. |
| 526 dispose(); | 526 dispose(); |
| 527 } | 527 } |
| 528 | 528 |
| 529 } // namespace blink | 529 } // namespace blink |
| OLD | NEW |