| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 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 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 } | 151 } |
| 152 | 152 |
| 153 WebImage::WebImage(const PassRefPtr<Image>& image) | 153 WebImage::WebImage(const PassRefPtr<Image>& image) |
| 154 { | 154 { |
| 155 operator=(image); | 155 operator=(image); |
| 156 } | 156 } |
| 157 | 157 |
| 158 WebImage& WebImage::operator=(const PassRefPtr<Image>& image) | 158 WebImage& WebImage::operator=(const PassRefPtr<Image>& image) |
| 159 { | 159 { |
| 160 RefPtr<NativeImageSkia> p; | 160 RefPtr<NativeImageSkia> p; |
| 161 if (image && (p = image->nativeImageForCurrentFrame())) | 161 if (image && (p = image->nativeImageForCurrentFrame(Image::PreferDeviceScale
))) |
| 162 assign(p->bitmap()); | 162 assign(p->bitmap()); |
| 163 else | 163 else |
| 164 reset(); | 164 reset(); |
| 165 return *this; | 165 return *this; |
| 166 } | 166 } |
| 167 | 167 |
| 168 } // namespace blink | 168 } // namespace blink |
| OLD | NEW |