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

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

Issue 12408009: Merge 144236 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 9 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 | « Source/WebCore/platform/ScrollView.h ('k') | Source/WebCore/platform/Widget.h » ('j') | 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 872 matching lines...) Expand 10 before | Expand all | Expand 10 after
883 void ScrollView::frameRectsChanged() 883 void ScrollView::frameRectsChanged()
884 { 884 {
885 if (platformWidget()) 885 if (platformWidget())
886 return; 886 return;
887 887
888 HashSet<RefPtr<Widget> >::const_iterator end = m_children.end(); 888 HashSet<RefPtr<Widget> >::const_iterator end = m_children.end();
889 for (HashSet<RefPtr<Widget> >::const_iterator current = m_children.begin(); current != end; ++current) 889 for (HashSet<RefPtr<Widget> >::const_iterator current = m_children.begin(); current != end; ++current)
890 (*current)->frameRectsChanged(); 890 (*current)->frameRectsChanged();
891 } 891 }
892 892
893 void ScrollView::clipRectChanged()
894 {
895 HashSet<RefPtr<Widget> >::const_iterator end = m_children.end();
896 for (HashSet<RefPtr<Widget> >::const_iterator current = m_children.begin(); current != end; ++current)
897 (*current)->clipRectChanged();
898 }
899
893 #if USE(ACCELERATED_COMPOSITING) 900 #if USE(ACCELERATED_COMPOSITING)
894 static void positionScrollbarLayer(GraphicsLayer* graphicsLayer, Scrollbar* scro llbar) 901 static void positionScrollbarLayer(GraphicsLayer* graphicsLayer, Scrollbar* scro llbar)
895 { 902 {
896 if (!graphicsLayer || !scrollbar) 903 if (!graphicsLayer || !scrollbar)
897 return; 904 return;
898 905
899 IntRect scrollbarRect = scrollbar->frameRect(); 906 IntRect scrollbarRect = scrollbar->frameRect();
900 graphicsLayer->setPosition(scrollbarRect.location()); 907 graphicsLayer->setPosition(scrollbarRect.location());
901 908
902 if (scrollbarRect.size() == graphicsLayer->size()) 909 if (scrollbarRect.size() == graphicsLayer->size())
(...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after
1424 } 1431 }
1425 1432
1426 bool ScrollView::platformIsOffscreen() const 1433 bool ScrollView::platformIsOffscreen() const
1427 { 1434 {
1428 return false; 1435 return false;
1429 } 1436 }
1430 1437
1431 #endif 1438 #endif
1432 1439
1433 } 1440 }
OLDNEW
« no previous file with comments | « Source/WebCore/platform/ScrollView.h ('k') | Source/WebCore/platform/Widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698