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

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

Issue 16357011: Remove support for -webkit-color-correction (which we've never supported on (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: resolve merge conflicts, obey brace style changes Created 7 years, 6 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/core/platform/DragImage.cpp ('k') | Source/core/platform/ScrollbarTheme.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 892 matching lines...) Expand 10 before | Expand all | Expand 10 after
903 return; 903 return;
904 paintScrollCorner(context, scrollCornerRect()); 904 paintScrollCorner(context, scrollCornerRect());
905 } 905 }
906 906
907 void ScrollView::paintPanScrollIcon(GraphicsContext* context) 907 void ScrollView::paintPanScrollIcon(GraphicsContext* context)
908 { 908 {
909 static Image* panScrollIcon = Image::loadPlatformResource("panIcon").leakRef (); 909 static Image* panScrollIcon = Image::loadPlatformResource("panIcon").leakRef ();
910 IntPoint iconGCPoint = m_panScrollIconPoint; 910 IntPoint iconGCPoint = m_panScrollIconPoint;
911 if (parent()) 911 if (parent())
912 iconGCPoint = parent()->windowToContents(iconGCPoint); 912 iconGCPoint = parent()->windowToContents(iconGCPoint);
913 context->drawImage(panScrollIcon, ColorSpaceDeviceRGB, iconGCPoint); 913 context->drawImage(panScrollIcon, iconGCPoint);
914 } 914 }
915 915
916 void ScrollView::paint(GraphicsContext* context, const IntRect& rect) 916 void ScrollView::paint(GraphicsContext* context, const IntRect& rect)
917 { 917 {
918 if (context->paintingDisabled() && !context->updatingControlTints()) 918 if (context->paintingDisabled() && !context->updatingControlTints())
919 return; 919 return;
920 920
921 notifyPageThatContentAreaWillPaint(); 921 notifyPageThatContentAreaWillPaint();
922 922
923 IntRect documentDirtyRect = rect; 923 IntRect documentDirtyRect = rect;
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
1254 { 1254 {
1255 } 1255 }
1256 1256
1257 bool ScrollView::platformIsOffscreen() const 1257 bool ScrollView::platformIsOffscreen() const
1258 { 1258 {
1259 return false; 1259 return false;
1260 } 1260 }
1261 1261
1262 1262
1263 } 1263 }
OLDNEW
« no previous file with comments | « Source/core/platform/DragImage.cpp ('k') | Source/core/platform/ScrollbarTheme.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698