diff options
author | Ben Murdoch <benm@google.com> | 2011-01-06 21:36:31 +0000 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-01-07 10:36:05 +0000 |
commit | 4a156157940f51b91eadd76f6c86f862ec0a1da0 (patch) | |
tree | ee905fa007e14522848f571215c1054734db9269 /WebKit/mac/WebView/WebHTMLView.mm | |
parent | 21d8d81a756ca7e60b5131e5f1006f52799179b0 (diff) | |
download | external_webkit-4a156157940f51b91eadd76f6c86f862ec0a1da0.zip external_webkit-4a156157940f51b91eadd76f6c86f862ec0a1da0.tar.gz external_webkit-4a156157940f51b91eadd76f6c86f862ec0a1da0.tar.bz2 |
Merge WebKit at Chromium 9.0.597.55: trivial merge by git
Change-Id: I2c6f2ebc4431d15ac82b5b1a9f08159e1731bc57
Diffstat (limited to 'WebKit/mac/WebView/WebHTMLView.mm')
-rw-r--r-- | WebKit/mac/WebView/WebHTMLView.mm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/WebKit/mac/WebView/WebHTMLView.mm b/WebKit/mac/WebView/WebHTMLView.mm index ec2473f..07e4876 100644 --- a/WebKit/mac/WebView/WebHTMLView.mm +++ b/WebKit/mac/WebView/WebHTMLView.mm @@ -1198,8 +1198,11 @@ static void _updateMouseoverTimerCallback(CFRunLoopTimerRef timer, void *info) - (void)_frameOrBoundsChanged { + WebView *webView = [self _webView]; + WebDynamicScrollBarsView *scrollView = [[[webView mainFrame] frameView] _scrollView]; + NSPoint origin = [[self superview] bounds].origin; - if (!NSEqualPoints(_private->lastScrollPosition, origin)) { + if (!NSEqualPoints(_private->lastScrollPosition, origin) && ![scrollView inProgramaticScroll]) { if (Frame* coreFrame = core([self _frame])) { if (FrameView* coreView = coreFrame->view()) { #ifndef BUILDING_ON_TIGER @@ -1214,7 +1217,6 @@ static void _updateMouseoverTimerCallback(CFRunLoopTimerRef timer, void *info) [_private->completionController endRevertingChange:NO moveLeft:NO]; - WebView *webView = [self _webView]; [[webView _UIDelegateForwarder] webView:webView didScrollDocumentInFrameView:[self _frameView]]; } _private->lastScrollPosition = origin; |