[webkit-changes] cvs commit: WebCore/manual-tests/resources
lorem-text.html nestedframesets.html
Vicki
vicki at opensource.apple.com
Fri Dec 2 13:13:56 PST 2005
vicki 05/12/02 13:13:56
Modified: . ChangeLog
kwq KWQKHTMLPart.mm
Added: manual-tests scrolling-nestedframesets.html
manual-tests/resources lorem-text.html nestedframesets.html
Log:
Reviewed by Darin.
- fix <rdar://problem/4361048> Regression: Seed: scrolling with scrollwheel, trackpad
doesn't work for nested framesets at gmail.com
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPart::passWheelEventToChildWidget):
* manual-tests/resources/lorem-text.html: Added.
* manual-tests/resources/nestedframesets.html: Added.
* manual-tests/scrolling-nestedframesets.html: Added.
Revision Changes Path
1.454 +13 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -r1.453 -r1.454
--- ChangeLog 2 Dec 2005 20:57:57 -0000 1.453
+++ ChangeLog 2 Dec 2005 21:13:49 -0000 1.454
@@ -1,3 +1,16 @@
+2005-12-02 Vicki Murley <vicki at apple.com>
+
+ Reviewed by Darin.
+
+ - fix <rdar://problem/4361048> Regression: Seed: scrolling with scrollwheel, trackpad
+ doesn't work for nested framesets at gmail.com
+
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::passWheelEventToChildWidget):
+ * manual-tests/resources/lorem-text.html: Added.
+ * manual-tests/resources/nestedframesets.html: Added.
+ * manual-tests/scrolling-nestedframesets.html: Added.
+
2005-12-02 Andre Boule <aboule at apple.com>
Reviewed by rjw.
1.694 +5 -1 WebCore/kwq/KWQKHTMLPart.mm
Index: KWQKHTMLPart.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKHTMLPart.mm,v
retrieving revision 1.693
retrieving revision 1.694
diff -u -r1.693 -r1.694
--- KWQKHTMLPart.mm 2 Dec 2005 09:19:05 -0000 1.693
+++ KWQKHTMLPart.mm 2 Dec 2005 21:13:53 -0000 1.694
@@ -2651,7 +2651,11 @@
if (!widget)
return false;
- NSView *view = widget->getView();
+ NSView *nodeView = widget->getView();
+ ASSERT(nodeView);
+ ASSERT([nodeView superview]);
+ NSView *view = [nodeView hitTest:[[nodeView superview] convertPoint:[_currentEvent locationInWindow] fromView:nil]];
+
ASSERT(view);
_sendingEventToSubview = true;
[view scrollWheel:_currentEvent];
1.1 WebCore/manual-tests/scrolling-nestedframesets.html
Index: scrolling-nestedframesets.html
===================================================================
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">
<html lang="en">
<head>
</head>
<body>
<p><b>BUG ID:</b> <a href="rdar://problem/4361048">4361048</a> Glendale Regression: Seed: scrolling with scrollwheel, trackpad doesn't work for nested framesets at gmail.com</p>
<p id="test" style="background-color:skyblue; padding:3px;"><b>STEPS TO TEST:</b>
<ol>
<li>Place your mouse cursor over the leftmost frame below.</li>
<li>Try to scroll the contents of the frame up and down my using your mouse's scrollwheel.</li>
<li>Repeat for the other two frames.</li>
</ol>
</p>
<p id="success" style="background-color:palegreen; padding:3px;"><b>TEST PASS:</b>
The contents of the frame each frame should scroll.</p>
<p id="failure" style="background-color:#FF3300; padding:3px;"><b>TEST FAIL:</b>
The contents of each frame do NOT scroll.
</p>
<iframe width="800" height="500" src="resources/nestedframesets.html">
</body>
</html>
1.1 WebCore/manual-tests/resources/lorem-text.html
Index: lorem-text.html
===================================================================
<HTML><HEAD><META http-equiv="Content-Type" content="text/html; charset=UTF-8"></HEAD><BODY><P>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam
nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat,
sed diam voluptua. At vero eos et accusam et justo duo dolores et ea
rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem
ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing
elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna
aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo
dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus
est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur
sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et
dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam
et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea
takimata sanctus est Lorem ipsum dolor sit amet.
</P>
<P> Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse
molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero
eros et accumsan et iusto odio dignissim qui blandit praesent luptatum
zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum
dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh
euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
</P>
<P> Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper
suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem
vel eum iriure dolor in hendrerit in vulputate velit esse molestie
consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et
accumsan et iusto odio dignissim qui blandit praesent luptatum zzril
delenit augue duis dolore te feugait nulla facilisi.
</P>
<P> Nam liber tempor cum soluta nobis eleifend option congue nihil
imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum
dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh
euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut
wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper
suscipit lobortis nisl ut aliquip ex ea commodo consequat.</P></BODY></HTML>
1.1 WebCore/manual-tests/resources/nestedframesets.html
Index: nestedframesets.html
===================================================================
<frameset cols="300,300" rows="*">
<frame src="testframeset.html" >
<frame src="lorem-text.html">
</frameset>
More information about the webkit-changes
mailing list