| 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 1732 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1743 | 1743 |
| 1744 void WebViewImpl::cancelPagePopup() | 1744 void WebViewImpl::cancelPagePopup() |
| 1745 { | 1745 { |
| 1746 if (m_pagePopup) | 1746 if (m_pagePopup) |
| 1747 m_pagePopup->cancel(); | 1747 m_pagePopup->cancel(); |
| 1748 } | 1748 } |
| 1749 | 1749 |
| 1750 void WebViewImpl::enablePopupMouseWheelEventListener() | 1750 void WebViewImpl::enablePopupMouseWheelEventListener() |
| 1751 { | 1751 { |
| 1752 // TODO(kenrb): Popup coordination for out-of-process iframes needs to be | 1752 // TODO(kenrb): Popup coordination for out-of-process iframes needs to be |
| 1753 // added. Because of the early return here (and also the one in | 1753 // added. Because of the early return here a select element |
| 1754 // ScrollingCoordinator::updateHaveWheelEventHandlers) a select element | |
| 1755 // popup can remain visible even when the element underneath it is | 1754 // popup can remain visible even when the element underneath it is |
| 1756 // scrolled to a new position. This is part of a larger set of issues with | 1755 // scrolled to a new position. This is part of a larger set of issues with |
| 1757 // popups. | 1756 // popups. |
| 1758 // See https://crbug.com/566130 | 1757 // See https://crbug.com/566130 |
| 1759 if (!mainFrameImpl() || !mainFrameImpl()->frame()->isLocalFrame()) | 1758 if (!mainFrameImpl() || !mainFrameImpl()->frame()->isLocalFrame()) |
| 1760 return; | 1759 return; |
| 1761 ASSERT(!m_popupMouseWheelEventListener); | 1760 ASSERT(!m_popupMouseWheelEventListener); |
| 1762 Document* document = mainFrameImpl()->frame()->document(); | 1761 Document* document = mainFrameImpl()->frame()->document(); |
| 1763 ASSERT(document); | 1762 ASSERT(document); |
| 1764 // We register an empty event listener, EmptyEventListener, so that mouse | 1763 // We register an empty event listener, EmptyEventListener, so that mouse |
| (...skipping 2866 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4631 { | 4630 { |
| 4632 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa
ctor rather than | 4631 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa
ctor rather than |
| 4633 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. | 4632 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. |
| 4634 if (!page()) | 4633 if (!page()) |
| 4635 return 1; | 4634 return 1; |
| 4636 | 4635 |
| 4637 return page()->deviceScaleFactor(); | 4636 return page()->deviceScaleFactor(); |
| 4638 } | 4637 } |
| 4639 | 4638 |
| 4640 } // namespace blink | 4639 } // namespace blink |
| OLD | NEW |