Changeset 53069 in webkit
- Timestamp:
- Jan 11, 2010 1:44:58 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r53068 r53069 1 2010-01-11 Kim Grönholm <kim.gronholm@nomovok.com> 2 3 Reviewed by Antti Koivisto. 4 5 Touchevent coordinates are incorrect after page zoom and page scroll 6 https://bugs.webkit.org/show_bug.cgi?id=32899 7 8 * fast/events/touch-coords-in-zoom-and-scroll-expected.txt: Added. 9 * fast/events/touch-coords-in-zoom-and-scroll.html: Added. 10 * platform/gtk/Skipped: 11 * platform/mac/Skipped: 12 * platform/win/Skipped: 13 1 14 2010-01-11 Tony Chang <tony@chromium.org> 2 15 -
trunk/LayoutTests/platform/gtk/Skipped
r52988 r53069 5705 5705 fast/cookies/local-file-can-set-cookies.html 5706 5706 5707 # Th is test requirestouch support5707 # These tests require touch support 5708 5708 fast/events/basic-touch-events.html 5709 fast/events/touch-coords-in-zoom-and-scroll.html 5709 5710 5710 5711 # Javascript execution/mainloop problem -
trunk/LayoutTests/platform/mac/Skipped
r53019 r53069 94 94 media/media-can-play-ogg.html 95 95 96 # Th is test requirestouch support96 # These tests require touch support 97 97 fast/events/basic-touch-events.html 98 fast/events/touch-coords-in-zoom-and-scroll.html -
trunk/LayoutTests/platform/win/Skipped
r53002 r53069 718 718 media/media-can-play-ogg.html 719 719 720 # Th is test requirestouch support720 # These tests require touch support 721 721 fast/events/basic-touch-events.html 722 fast/events/touch-coords-in-zoom-and-scroll.html 722 723 723 724 # XSS auditor tests intermittently time out <http://webkit.org/b/32528> -
trunk/WebCore/ChangeLog
r53068 r53069 1 2010-01-11 Kim Grönholm <kim.gronholm@nomovok.com> 2 3 Reviewed by Antti Koivisto. 4 5 Touchevent coordinates are incorrect after page zoom and page scroll 6 https://bugs.webkit.org/show_bug.cgi?id=32899 7 8 Test: fast/events/touch-coords-in-zoom-and-scroll.html 9 10 * dom/Touch.cpp: 11 (WebCore::contentsX): 12 (WebCore::contentsY): 13 * page/EventHandler.cpp: 14 (WebCore::EventHandler::handleTouchEvent): 15 1 16 2010-01-11 Tony Chang <tony@chromium.org> 2 17 -
trunk/WebCore/dom/Touch.cpp
r51981 r53069 41 41 if (!frameView) 42 42 return 0; 43 return frameView->scrollX() ;43 return frameView->scrollX() / frame->pageZoomFactor(); 44 44 } 45 45 … … 51 51 if (!frameView) 52 52 return 0; 53 return frameView->scrollY() ;53 return frameView->scrollY() / frame->pageZoomFactor(); 54 54 } 55 55 -
trunk/WebCore/page/EventHandler.cpp
r52922 r53069 2564 2564 target = target->parentNode(); 2565 2565 2566 int adjustedPageX = lroundf(framePoint.x() / m_frame->pageZoomFactor()); 2567 int adjustedPageY = lroundf(framePoint.y() / m_frame->pageZoomFactor()); 2568 2566 2569 RefPtr<Touch> touch = Touch::create(m_frame, target, point.id(), 2567 2570 point.screenPos().x(), point.screenPos().y(), 2568 framePoint.x(), framePoint.y());2571 adjustedPageX, adjustedPageY); 2569 2572 2570 2573 if (event.type() == TouchStart && !i) {
Note: See TracChangeset
for help on using the changeset viewer.