Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(413)

Side by Side Diff: Source/WebCore/platform/ScrollView.cpp

Issue 6490004: Merge 77549 - Scroll thumb jumps to top when resizing horizontally.... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 532 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 m_verticalScrollbar->setSuppressInvalidation(false); 543 m_verticalScrollbar->setSuppressInvalidation(false);
544 } 544 }
545 545
546 if (hasHorizontalScrollbar != (m_horizontalScrollbar != 0) || hasVerticalScr ollbar != (m_verticalScrollbar != 0)) { 546 if (hasHorizontalScrollbar != (m_horizontalScrollbar != 0) || hasVerticalScr ollbar != (m_verticalScrollbar != 0)) {
547 frameRectsChanged(); 547 frameRectsChanged();
548 updateScrollCorner(); 548 updateScrollCorner();
549 } 549 }
550 550
551 ScrollableArea::scrollToOffsetWithoutAnimation(FloatPoint(scroll.width() + m _scrollOrigin.x(), scroll.height() + m_scrollOrigin.y())); 551 ScrollableArea::scrollToOffsetWithoutAnimation(FloatPoint(scroll.width() + m _scrollOrigin.x(), scroll.height() + m_scrollOrigin.y()));
552 552
553 // Make sure the scrollbar offsets are up to date.
554 if (m_horizontalScrollbar)
555 m_horizontalScrollbar->offsetDidChange();
556 if (m_verticalScrollbar)
557 m_verticalScrollbar->offsetDidChange();
558
553 m_inUpdateScrollbars = false; 559 m_inUpdateScrollbars = false;
554 } 560 }
555 561
556 const int panIconSizeLength = 16; 562 const int panIconSizeLength = 16;
557 563
558 void ScrollView::scrollContents(const IntSize& scrollDelta) 564 void ScrollView::scrollContents(const IntSize& scrollDelta)
559 { 565 {
560 if (!hostWindow()) 566 if (!hostWindow())
561 return; 567 return;
562 568
(...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after
1149 } 1155 }
1150 1156
1151 bool ScrollView::platformIsOffscreen() const 1157 bool ScrollView::platformIsOffscreen() const
1152 { 1158 {
1153 return false; 1159 return false;
1154 } 1160 }
1155 1161
1156 #endif 1162 #endif
1157 1163
1158 } 1164 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698