Changeset 53758 in webkit


Ignore:
Timestamp:
Jan 22, 2010 9:11:26 PM (14 years ago)
Author:
eric@webkit.org
Message:

2010-01-22 Steve VanDeBogart <vandebo@chromium.org>

Reviewed by David Levin.

A new test to check that middle clicking on the primary scroll bars
does not trigger a paste event.
https://bugs.webkit.org/show_bug.cgi?id=33062

  • scrollbars/scrollbar-middleclick-nopaste-expected.txt: Added.
  • scrollbars/scrollbar-middleclick-nopaste.html: Added.

2010-01-22 Steve VanDeBogart <vandebo@chromium.org>

Reviewed by David Levin.

Middle clicking the main scroll bars should not trigger a paste event
in Linux chromium.
https://bugs.webkit.org/show_bug.cgi?id=33062

  • src/WebViewImpl.cpp: (WebKit::WebViewImpl::mouseUp):
Location:
trunk
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r53755 r53758  
     12010-01-22  Steve VanDeBogart  <vandebo@chromium.org>
     2
     3        Reviewed by David Levin.
     4
     5        A new test to check that middle clicking on the primary scroll bars
     6        does not trigger a paste event.
     7        https://bugs.webkit.org/show_bug.cgi?id=33062
     8
     9        * scrollbars/scrollbar-middleclick-nopaste-expected.txt: Added.
     10        * scrollbars/scrollbar-middleclick-nopaste.html: Added.
     11
    1122010-01-22  Gustavo Noronha Silva  <gns@gnome.org>
    213
  • trunk/WebKit/chromium/ChangeLog

    r53747 r53758  
     12010-01-22  Steve VanDeBogart  <vandebo@chromium.org>
     2
     3        Reviewed by David Levin.
     4
     5        Middle clicking the main scroll bars should not trigger a paste event
     6        in Linux chromium.
     7        https://bugs.webkit.org/show_bug.cgi?id=33062
     8
     9        * src/WebViewImpl.cpp:
     10        (WebKit::WebViewImpl::mouseUp):
     11
    1122010-01-22  Albert J. Wong  <ajwong@chromium.org>
    213
  • trunk/WebKit/chromium/src/WebViewImpl.cpp

    r53747 r53758  
    392392    if (event.button == WebMouseEvent::ButtonMiddle) {
    393393        Frame* focused = focusedWebCoreFrame();
     394        FrameView* view = m_page->mainFrame()->view();
    394395        IntPoint clickPoint(m_lastMouseDownPoint.x, m_lastMouseDownPoint.y);
    395         clickPoint = m_page->mainFrame()->view()->windowToContents(clickPoint);
    396         HitTestResult hitTestResult =
    397             focused->eventHandler()->hitTestResultAtPoint(clickPoint, false, false,
    398                                                           ShouldHitTestScrollbars);
     396        IntPoint contentPoint = view->windowToContents(clickPoint);
     397        HitTestResult hitTestResult = focused->eventHandler()->hitTestResultAtPoint(contentPoint, false, false, ShouldHitTestScrollbars);
    399398        // We don't want to send a paste when middle clicking a scroll bar or a
    400         // link (which will navigate later in the code).
    401         if (!hitTestResult.scrollbar() && !hitTestResult.isLiveLink() && focused) {
     399        // link (which will navigate later in the code).  The main scrollbars
     400        // have to be handled separately.
     401        if (!hitTestResult.scrollbar() && !hitTestResult.isLiveLink() && focused && !view->scrollbarAtPoint(clickPoint)) {
    402402            Editor* editor = focused->editor();
    403403            Pasteboard* pasteboard = Pasteboard::generalPasteboard();
Note: See TracChangeset for help on using the changeset viewer.