Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1708)

Unified Diff: Source/web/PopupListBox.cpp

Issue 967213004: Removed FrameView's windowToContents and contentsToWindow methods. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/web/PopupListBox.h ('k') | Source/web/TextFinder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/PopupListBox.cpp
diff --git a/Source/web/PopupListBox.cpp b/Source/web/PopupListBox.cpp
index 3378f5895f67f4dd243d371d5e4457f5cc8b8faf..a21534ae565588f81ca469f83b412d826af8d3f3 100644
--- a/Source/web/PopupListBox.cpp
+++ b/Source/web/PopupListBox.cpp
@@ -109,7 +109,7 @@ DEFINE_TRACE(PopupListBox)
bool PopupListBox::handleMouseDownEvent(const PlatformMouseEvent& event)
{
- Scrollbar* scrollbar = scrollbarAtWindowPoint(event.position());
+ Scrollbar* scrollbar = scrollbarAtRootFramePoint(event.position());
if (scrollbar) {
m_capturingScrollbar = scrollbar;
m_capturingScrollbar->mouseDown(event);
@@ -129,7 +129,7 @@ bool PopupListBox::handleMouseMoveEvent(const PlatformMouseEvent& event)
return true;
}
- Scrollbar* scrollbar = scrollbarAtWindowPoint(event.position());
+ Scrollbar* scrollbar = scrollbarAtRootFramePoint(event.position());
if (m_lastScrollbarUnderMouse != scrollbar) {
// Send mouse exited to the old scrollbar.
if (m_lastScrollbarUnderMouse)
@@ -912,10 +912,10 @@ void PopupListBox::setHasVerticalScrollbar(bool hasBar)
}
}
-Scrollbar* PopupListBox::scrollbarAtWindowPoint(const IntPoint& windowPoint)
+Scrollbar* PopupListBox::scrollbarAtRootFramePoint(const IntPoint& pointInRootFrame)
{
return m_verticalScrollbar && m_verticalScrollbar->frameRect().contains(
- convertFromContainingWindow(windowPoint)) ? m_verticalScrollbar.get() : 0;
+ convertFromContainingWindow(pointInRootFrame)) ? m_verticalScrollbar.get() : 0;
}
IntRect PopupListBox::contentsToWindow(const IntRect& contentsRect) const
« no previous file with comments | « Source/web/PopupListBox.h ('k') | Source/web/TextFinder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698