<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[42668] trunk/WebKit/mac</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/42668">42668</a></dd>
<dt>Author</dt> <dd>adele@apple.com</dd>
<dt>Date</dt> <dd>2009-04-19 23:25:49 -0700 (Sun, 19 Apr 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-04-19  Adele Peterson  &lt;adele@apple.com&gt;

        Reviewed by Darin Adler.

        Fix for &lt;rdar://problem/6804809&gt; REGRESSION: In Mail, Home and End do not scroll message

        If no scrolling occurs, call tryToPerform on the next responder.  Then our WebResponderChainSink
        will correctly detect if no responders handle the selector.

        * WebView/WebFrameView.mm:
        (-[WebFrameView _scrollToBeginningOfDocument]):
        (-[WebFrameView _scrollToEndOfDocument]):
        (-[WebFrameView scrollToBeginningOfDocument:]):
        (-[WebFrameView scrollToEndOfDocument:]):
        (-[WebFrameView scrollLineUp:]):
        (-[WebFrameView scrollLineDown:]):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitmacChangeLog">trunk/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkWebKitmacWebViewWebFrameViewmm">trunk/WebKit/mac/WebView/WebFrameView.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/ChangeLog (42667 => 42668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/ChangeLog        2009-04-20 05:47:15 UTC (rev 42667)
+++ trunk/WebKit/mac/ChangeLog        2009-04-20 06:25:49 UTC (rev 42668)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2009-04-19  Adele Peterson  &lt;adele@apple.com&gt;
+
+        Reviewed by Darin Adler.
+
+        Fix for &lt;rdar://problem/6804809&gt; REGRESSION: In Mail, Home and End do not scroll message
+
+        If no scrolling occurs, call tryToPerform on the next responder.  Then our WebResponderChainSink
+        will correctly detect if no responders handle the selector.
+
+        * WebView/WebFrameView.mm:
+        (-[WebFrameView _scrollToBeginningOfDocument]):
+        (-[WebFrameView _scrollToEndOfDocument]):
+        (-[WebFrameView scrollToBeginningOfDocument:]):
+        (-[WebFrameView scrollToEndOfDocument:]):
+        (-[WebFrameView scrollLineUp:]):
+        (-[WebFrameView scrollLineDown:]):
+
</ins><span class="cx"> 2009-04-19  David Kilzer  &lt;ddkilzer@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Make FEATURE_DEFINES completely dynamic
</span></span></pre></div>
<a id="trunkWebKitmacWebViewWebFrameViewmm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/WebView/WebFrameView.mm (42667 => 42668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/WebView/WebFrameView.mm        2009-04-20 05:47:15 UTC (rev 42667)
+++ trunk/WebKit/mac/WebView/WebFrameView.mm        2009-04-20 06:25:49 UTC (rev 42668)
</span><span class="lines">@@ -519,31 +519,49 @@
</span><span class="cx">     return frame-&gt;eventHandler()-&gt;scrollOverflow(direction, granularity);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+- (BOOL)_scrollToBeginningOfDocument
+{
+    if ([self _scrollOverflowInDirection:ScrollUp granularity:ScrollByDocument])
+        return YES;
+    if (![self _hasScrollBars])
+        return NO;
+    NSPoint point = [[[self _scrollView] documentView] frame].origin;
+    return [[self _contentView] _scrollTo:&amp;point animate:YES];
+}
+
+- (BOOL)_scrollToEndOfDocument
+{
+    if ([self _scrollOverflowInDirection:ScrollDown granularity:ScrollByDocument])
+        return YES;
+    if (![self _hasScrollBars])
+        return NO;
+    NSRect frame = [[[self _scrollView] documentView] frame];
+    NSPoint point = NSMakePoint(frame.origin.x, NSMaxY(frame));
+    return [[self _contentView] _scrollTo:&amp;point animate:YES];
+}
+
</ins><span class="cx"> - (void)scrollToBeginningOfDocument:(id)sender
</span><span class="cx"> {
</span><del>-    if (![self _scrollOverflowInDirection:ScrollUp granularity:ScrollByDocument]) {
-
-        if (![self _hasScrollBars]) {
-            [[self _largestChildWithScrollBars] scrollToBeginningOfDocument:sender];
</del><ins>+    if ([self _scrollToBeginningOfDocument])
+        return;
+    
+    if (WebFrameView *child = [self _largestChildWithScrollBars]) {
+        if ([child _scrollToBeginningOfDocument])
</ins><span class="cx">             return;
</span><del>-        }
-
-        [[self _contentView] scrollPoint:[[[self _scrollView] documentView] frame].origin];
</del><span class="cx">     }
</span><ins>+    [[self nextResponder] tryToPerform:@selector(scrollToBeginningOfDocument:) with:sender];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)scrollToEndOfDocument:(id)sender
</span><span class="cx"> {
</span><del>-    if (![self _scrollOverflowInDirection:ScrollDown granularity:ScrollByDocument]) {
</del><ins>+    if ([self _scrollToEndOfDocument])
+        return;
</ins><span class="cx"> 
</span><del>-        if (![self _hasScrollBars]) {
-            [[self _largestChildWithScrollBars] scrollToEndOfDocument:sender];
</del><ins>+    if (WebFrameView *child = [self _largestChildWithScrollBars]) {
+        if ([child _scrollToEndOfDocument])
</ins><span class="cx">             return;
</span><del>-        }
-        
-        NSRect frame = [[[self _scrollView] documentView] frame];
-        [[self _contentView] scrollPoint:NSMakePoint(frame.origin.x, NSMaxY(frame))];
</del><span class="cx">     }
</span><ins>+    [[self nextResponder] tryToPerform:@selector(scrollToEndOfDocument:) with:sender];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)_goBack
</span><span class="lines">@@ -654,12 +672,14 @@
</span><span class="cx"> 
</span><span class="cx"> - (void)scrollLineUp:(id)sender
</span><span class="cx"> {
</span><del>-    [self _scrollLineVertically:YES];
</del><ins>+    if (![self _scrollLineVertically:YES])
+        [[self nextResponder] tryToPerform:@selector(scrollLineUp:) with:sender];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)scrollLineDown:(id)sender
</span><span class="cx"> {
</span><del>-    [self _scrollLineVertically:NO];
</del><ins>+    if (![self _scrollLineVertically:NO])
+        [[self nextResponder] tryToPerform:@selector(scrollLineDown:) with:sender];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (BOOL)_firstResponderIsFormControl
</span></span></pre>
</div>
</div>

</body>
</html>