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

Side by Side Diff: third_party/WebKit/Source/core/dom/DOMMatrixReadOnly.cpp

Issue 1414553002: Fix out-of-memory crashes related to ArrayBuffer allocation Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase+more tweaks 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/dom/DOMMatrix.h" 6 #include "core/dom/DOMMatrix.h"
7 7
8 namespace blink { 8 namespace blink {
9 9
10 bool DOMMatrixReadOnly::is2D() const 10 bool DOMMatrixReadOnly::is2D() const
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 } 44 }
45 45
46 PassRefPtr<DOMFloat32Array> DOMMatrixReadOnly::toFloat32Array() const 46 PassRefPtr<DOMFloat32Array> DOMMatrixReadOnly::toFloat32Array() const
47 { 47 {
48 float array[] = { 48 float array[] = {
49 static_cast<float>(m_matrix->m11()), static_cast<float>(m_matrix->m12()) , static_cast<float>(m_matrix->m13()), static_cast<float>(m_matrix->m14()), 49 static_cast<float>(m_matrix->m11()), static_cast<float>(m_matrix->m12()) , static_cast<float>(m_matrix->m13()), static_cast<float>(m_matrix->m14()),
50 static_cast<float>(m_matrix->m21()), static_cast<float>(m_matrix->m22()) , static_cast<float>(m_matrix->m23()), static_cast<float>(m_matrix->m24()), 50 static_cast<float>(m_matrix->m21()), static_cast<float>(m_matrix->m22()) , static_cast<float>(m_matrix->m23()), static_cast<float>(m_matrix->m24()),
51 static_cast<float>(m_matrix->m31()), static_cast<float>(m_matrix->m32()) , static_cast<float>(m_matrix->m33()), static_cast<float>(m_matrix->m34()), 51 static_cast<float>(m_matrix->m31()), static_cast<float>(m_matrix->m32()) , static_cast<float>(m_matrix->m33()), static_cast<float>(m_matrix->m34()),
52 static_cast<float>(m_matrix->m41()), static_cast<float>(m_matrix->m42()) , static_cast<float>(m_matrix->m43()), static_cast<float>(m_matrix->m44()) 52 static_cast<float>(m_matrix->m41()), static_cast<float>(m_matrix->m42()) , static_cast<float>(m_matrix->m43()), static_cast<float>(m_matrix->m44())
53 }; 53 };
54 54 // TODO(junov): crbug.com/536816 Should we throw a RangeError instead
55 return DOMFloat32Array::create(array, 16); 55 // of crashing when allocation fails?
56 RefPtr<DOMFloat32Array> domArray = DOMFloat32Array::deprecatedCreateOrCrash( array, 16);
57 return domArray.release();
56 } 58 }
57 59
58 PassRefPtr<DOMFloat64Array> DOMMatrixReadOnly::toFloat64Array() const 60 PassRefPtr<DOMFloat64Array> DOMMatrixReadOnly::toFloat64Array() const
59 { 61 {
60 double array[] = { 62 double array[] = {
61 m_matrix->m11(), m_matrix->m12(), m_matrix->m13(), m_matrix->m14(), 63 m_matrix->m11(), m_matrix->m12(), m_matrix->m13(), m_matrix->m14(),
62 m_matrix->m21(), m_matrix->m22(), m_matrix->m23(), m_matrix->m24(), 64 m_matrix->m21(), m_matrix->m22(), m_matrix->m23(), m_matrix->m24(),
63 m_matrix->m31(), m_matrix->m32(), m_matrix->m33(), m_matrix->m34(), 65 m_matrix->m31(), m_matrix->m32(), m_matrix->m33(), m_matrix->m34(),
64 m_matrix->m41(), m_matrix->m42(), m_matrix->m43(), m_matrix->m44() 66 m_matrix->m41(), m_matrix->m42(), m_matrix->m43(), m_matrix->m44()
65 }; 67 };
66 68 // TODO(junov): crbug.com/536816 Should we throw a RangeError instead
67 return DOMFloat64Array::create(array, 16); 69 // of crashing when allocation fails?
70 RefPtr<DOMFloat64Array> domArray = DOMFloat64Array::deprecatedCreateOrCrash (array, 16);
71 return domArray.release();
68 } 72 }
69 73
70 } // namespace blink 74 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/DOMMatrixReadOnly.h ('k') | third_party/WebKit/Source/core/dom/DOMSharedArrayBuffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698