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

Side by Side Diff: Source/core/platform/graphics/chromium/IconChromium.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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2011, Google Inc. All rights reserved. 2 * Copyright (c) 2011, Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 29 matching lines...) Expand all
40 : m_icon(icon) 40 : m_icon(icon)
41 { 41 {
42 } 42 }
43 43
44 Icon::~Icon() 44 Icon::~Icon()
45 { 45 {
46 } 46 }
47 47
48 void Icon::paint(GraphicsContext* context, const IntRect& rect) 48 void Icon::paint(GraphicsContext* context, const IntRect& rect)
49 { 49 {
50 if (context->paintingDisabled()) 50 context->drawImage(m_icon.get(), rect);
51 return;
52
53 // An Icon doesn't know the color space of the file upload control.
54 // So use ColorSpaceDeviceRGB.
55 context->drawImage(m_icon.get(), ColorSpaceDeviceRGB, rect);
56 } 51 }
57 52
58 } // namespace WebCore 53 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/platform/graphics/ShadowBlur.cpp ('k') | Source/core/platform/graphics/chromium/TransparencyWin.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698