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

Side by Side Diff: third_party/WebKit/Source/platform/graphics/Image.cpp

Issue 1447273003: Make the FloatSize constructor from an IntSize explicit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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) 2006 Samuel Weinig (sam.weinig@gmail.com) 2 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 91
92 int length = m_encodedImageData->size(); 92 int length = m_encodedImageData->size();
93 if (!length) 93 if (!length)
94 return true; 94 return true;
95 95
96 return dataChanged(allDataReceived); 96 return dataChanged(allDataReceived);
97 } 97 }
98 98
99 void Image::drawTiled(GraphicsContext* ctxt, const FloatRect& destRect, const Fl oatPoint& srcPoint, const FloatSize& scaledTileSize, SkXfermode::Mode op, const IntSize& repeatSpacing) 99 void Image::drawTiled(GraphicsContext* ctxt, const FloatRect& destRect, const Fl oatPoint& srcPoint, const FloatSize& scaledTileSize, SkXfermode::Mode op, const IntSize& repeatSpacing)
100 { 100 {
101 FloatSize intrinsicTileSize = size(); 101 FloatSize intrinsicTileSize = FloatSize(size());
102 if (hasRelativeWidth()) 102 if (hasRelativeWidth())
103 intrinsicTileSize.setWidth(scaledTileSize.width()); 103 intrinsicTileSize.setWidth(scaledTileSize.width());
104 if (hasRelativeHeight()) 104 if (hasRelativeHeight())
105 intrinsicTileSize.setHeight(scaledTileSize.height()); 105 intrinsicTileSize.setHeight(scaledTileSize.height());
106 106
107 FloatSize scale(scaledTileSize.width() / intrinsicTileSize.width(), 107 FloatSize scale(scaledTileSize.width() / intrinsicTileSize.width(),
108 scaledTileSize.height() / intrinsicTileSize.height()); 108 scaledTileSize.height() / intrinsicTileSize.height());
109 109
110 FloatSize actualTileSize(scaledTileSize.width() + repeatSpacing.width(), sca ledTileSize.height() + repeatSpacing.height()); 110 FloatSize actualTileSize(scaledTileSize.width() + repeatSpacing.width(), sca ledTileSize.height() + repeatSpacing.height());
111 FloatRect oneTileRect; 111 FloatRect oneTileRect;
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 paint.setShader(shader.get()); 255 paint.setShader(shader.get());
256 context->drawRect(destRect, paint); 256 context->drawRect(destRect, paint);
257 } 257 }
258 258
259 if (currentFrameIsLazyDecoded()) 259 if (currentFrameIsLazyDecoded())
260 PlatformInstrumentation::didDrawLazyPixelRef(imageID); 260 PlatformInstrumentation::didDrawLazyPixelRef(imageID);
261 } 261 }
262 262
263 void Image::computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsic Height, FloatSize& intrinsicRatio) 263 void Image::computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsic Height, FloatSize& intrinsicRatio)
264 { 264 {
265 intrinsicRatio = size(); 265 intrinsicRatio = FloatSize(size());
266 intrinsicWidth = Length(intrinsicRatio.width(), Fixed); 266 intrinsicWidth = Length(intrinsicRatio.width(), Fixed);
267 intrinsicHeight = Length(intrinsicRatio.height(), Fixed); 267 intrinsicHeight = Length(intrinsicRatio.height(), Fixed);
268 } 268 }
269 269
270 PassRefPtr<Image> Image::imageForDefaultFrame() 270 PassRefPtr<Image> Image::imageForDefaultFrame()
271 { 271 {
272 RefPtr<Image> image(this); 272 RefPtr<Image> image(this);
273 273
274 return image.release(); 274 return image.release();
275 } 275 }
276 276
277 bool Image::isTextureBacked() 277 bool Image::isTextureBacked()
278 { 278 {
279 return imageForCurrentFrame()->isTextureBacked(); 279 return imageForCurrentFrame()->isTextureBacked();
280 } 280 }
281 281
282 } // namespace blink 282 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698