| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 1665 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1676 } | 1676 } |
| 1677 | 1677 |
| 1678 void WebViewImpl::closePagePopup(PagePopup* popup) | 1678 void WebViewImpl::closePagePopup(PagePopup* popup) |
| 1679 { | 1679 { |
| 1680 ASSERT(popup); | 1680 ASSERT(popup); |
| 1681 WebPagePopupImpl* popupImpl = toWebPagePopupImpl(popup); | 1681 WebPagePopupImpl* popupImpl = toWebPagePopupImpl(popup); |
| 1682 ASSERT(m_pagePopup.get() == popupImpl); | 1682 ASSERT(m_pagePopup.get() == popupImpl); |
| 1683 if (m_pagePopup.get() != popupImpl) | 1683 if (m_pagePopup.get() != popupImpl) |
| 1684 return; | 1684 return; |
| 1685 m_pagePopup->closePopup(); | 1685 m_pagePopup->closePopup(); |
| 1686 cleanupPagePopup(); | |
| 1687 } | 1686 } |
| 1688 | 1687 |
| 1689 void WebViewImpl::cleanupPagePopup() | 1688 void WebViewImpl::cleanupPagePopup() |
| 1690 { | 1689 { |
| 1691 m_pagePopup = nullptr; | 1690 m_pagePopup = nullptr; |
| 1692 disablePopupMouseWheelEventListener(); | 1691 disablePopupMouseWheelEventListener(); |
| 1693 } | 1692 } |
| 1694 | 1693 |
| 1695 void WebViewImpl::cancelPagePopup() | 1694 void WebViewImpl::cancelPagePopup() |
| 1696 { | 1695 { |
| (...skipping 2869 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4566 { | 4565 { |
| 4567 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa
ctor rather than | 4566 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa
ctor rather than |
| 4568 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. | 4567 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. |
| 4569 if (!page()) | 4568 if (!page()) |
| 4570 return 1; | 4569 return 1; |
| 4571 | 4570 |
| 4572 return page()->deviceScaleFactor(); | 4571 return page()->deviceScaleFactor(); |
| 4573 } | 4572 } |
| 4574 | 4573 |
| 4575 } // namespace blink | 4574 } // namespace blink |
| OLD | NEW |