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

Side by Side Diff: third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp

Issue 1732563007: [NOT FOR COMMIT] Pass defaultObjectSize to get image size (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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) 2004, 2006, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
3 * Copyright (C) 2007 Alp Toker <alp@atoker.com> 3 * Copyright (C) 2007 Alp Toker <alp@atoker.com>
4 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved. 4 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 987 matching lines...) Expand 10 before | Expand all | Expand 10 after
998 998
999 *status = InvalidSourceImageStatus; 999 *status = InvalidSourceImageStatus;
1000 return nullptr; 1000 return nullptr;
1001 } 1001 }
1002 1002
1003 bool HTMLCanvasElement::wouldTaintOrigin(SecurityOrigin*) const 1003 bool HTMLCanvasElement::wouldTaintOrigin(SecurityOrigin*) const
1004 { 1004 {
1005 return !originClean(); 1005 return !originClean();
1006 } 1006 }
1007 1007
1008 FloatSize HTMLCanvasElement::elementSize() const 1008 FloatSize HTMLCanvasElement::elementSize(const FloatSize&) const
1009 { 1009 {
1010 return FloatSize(width(), height()); 1010 return FloatSize(width(), height());
1011 } 1011 }
1012 1012
1013 IntSize HTMLCanvasElement::bitmapSourceSize() const 1013 IntSize HTMLCanvasElement::bitmapSourceSize() const
1014 { 1014 {
1015 return IntSize(width(), height()); 1015 return IntSize(width(), height());
1016 } 1016 }
1017 1017
1018 ScriptPromise HTMLCanvasElement::createImageBitmap(ScriptState* scriptState, Eve ntTarget& eventTarget, int sx, int sy, int sw, int sh, const ImageBitmapOptions& options, ExceptionState& exceptionState) 1018 ScriptPromise HTMLCanvasElement::createImageBitmap(ScriptState* scriptState, Eve ntTarget& eventTarget, int sx, int sy, int sw, int sh, const ImageBitmapOptions& options, ExceptionState& exceptionState)
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
1082 || element.hasTagName(HTMLNames::tfootTag) 1082 || element.hasTagName(HTMLNames::tfootTag)
1083 || element.hasTagName(HTMLNames::trTag) 1083 || element.hasTagName(HTMLNames::trTag)
1084 || element.hasTagName(HTMLNames::tdTag) 1084 || element.hasTagName(HTMLNames::tdTag)
1085 || element.hasTagName(HTMLNames::thTag)) 1085 || element.hasTagName(HTMLNames::thTag))
1086 return true; 1086 return true;
1087 1087
1088 return false; 1088 return false;
1089 } 1089 }
1090 1090
1091 } // namespace blink 1091 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLCanvasElement.h ('k') | third_party/WebKit/Source/core/html/HTMLImageElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698