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

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

Issue 12475008: Merge 144236 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
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 868 matching lines...) Expand 10 before | Expand all | Expand 10 after
879 void ScrollView::frameRectsChanged() 879 void ScrollView::frameRectsChanged()
880 { 880 {
881 if (platformWidget()) 881 if (platformWidget())
882 return; 882 return;
883 883
884 HashSet<RefPtr<Widget> >::const_iterator end = m_children.end(); 884 HashSet<RefPtr<Widget> >::const_iterator end = m_children.end();
885 for (HashSet<RefPtr<Widget> >::const_iterator current = m_children.begin(); current != end; ++current) 885 for (HashSet<RefPtr<Widget> >::const_iterator current = m_children.begin(); current != end; ++current)
886 (*current)->frameRectsChanged(); 886 (*current)->frameRectsChanged();
887 } 887 }
888 888
889 void ScrollView::clipRectChanged()
890 {
891 HashSet<RefPtr<Widget> >::const_iterator end = m_children.end();
892 for (HashSet<RefPtr<Widget> >::const_iterator current = m_children.begin(); current != end; ++current)
893 (*current)->clipRectChanged();
894 }
895
889 #if USE(ACCELERATED_COMPOSITING) 896 #if USE(ACCELERATED_COMPOSITING)
890 static void positionScrollbarLayer(GraphicsLayer* graphicsLayer, Scrollbar* scro llbar) 897 static void positionScrollbarLayer(GraphicsLayer* graphicsLayer, Scrollbar* scro llbar)
891 { 898 {
892 if (!graphicsLayer || !scrollbar) 899 if (!graphicsLayer || !scrollbar)
893 return; 900 return;
894 901
895 IntRect scrollbarRect = scrollbar->frameRect(); 902 IntRect scrollbarRect = scrollbar->frameRect();
896 graphicsLayer->setPosition(scrollbarRect.location()); 903 graphicsLayer->setPosition(scrollbarRect.location());
897 904
898 if (scrollbarRect.size() == graphicsLayer->size()) 905 if (scrollbarRect.size() == graphicsLayer->size())
(...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
1422 } 1429 }
1423 1430
1424 bool ScrollView::platformIsOffscreen() const 1431 bool ScrollView::platformIsOffscreen() const
1425 { 1432 {
1426 return false; 1433 return false;
1427 } 1434 }
1428 1435
1429 #endif 1436 #endif
1430 1437
1431 } 1438 }
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