DOMMatrix: add missing propagation of exceptions.

third_party/WebKit/Source/core/dom/DOMMatrix.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/dom/DOMMatrix.h"
 
 #include "core/css/CSSIdentifierValue.h"
 #include "core/css/CSSToLengthConversionData.h"
 #include "core/css/CSSValueList.h"
 #include "core/css/parser/CSSParser.h"
@@ skipping 53 matching lines @@
 
 template <typename T>
 DOMMatrix::DOMMatrix(T sequence, int size)
     : DOMMatrixReadOnly(sequence, size) {}
 
 DOMMatrix::DOMMatrix(const TransformationMatrix& matrix, bool is2D)
     : DOMMatrixReadOnly(matrix, is2D) {}
 
 DOMMatrix* DOMMatrix::fromMatrix(DOMMatrixInit& other,
                                  ExceptionState& exceptionState) {
-  validateAndFixup(other, exceptionState);
-  if (exceptionState.hadException())
+  if (!validateAndFixup(other, exceptionState)) {
+    DCHECK(exceptionState.hadException());
     return nullptr;
-
+  }
   if (other.is2D()) {
     return new DOMMatrix({other.m11(), other.m12(), other.m21(), other.m22(),
                           other.m41(), other.m42()},
                          other.is2D());
   }
 
   return new DOMMatrix({other.m11(), other.m12(), other.m13(), other.m14(),
                         other.m21(), other.m22(), other.m23(), other.m24(),
                         other.m31(), other.m32(), other.m33(), other.m34(),
                         other.m41(), other.m42(), other.m43(), other.m44()},
@@ skipping 20 matching lines @@
   m_matrix->setM34(NAN);
   m_matrix->setM41(NAN);
   m_matrix->setM42(NAN);
   m_matrix->setM43(NAN);
   m_matrix->setM44(NAN);
 }
 
 DOMMatrix* DOMMatrix::multiplySelf(DOMMatrixInit& other,
                                    ExceptionState& exceptionState) {
   DOMMatrix* otherMatrix = DOMMatrix::fromMatrix(other, exceptionState);
+  if (!otherMatrix) {
+    DCHECK(exceptionState.hadException());
+    return nullptr;
+  }
   if (!otherMatrix->is2D())
     m_is2D = false;
 
   *m_matrix *= otherMatrix->matrix();
 
   return this;
 }
 
 DOMMatrix* DOMMatrix::preMultiplySelf(DOMMatrixInit& other,
                                       ExceptionState& exceptionState) {
   DOMMatrix* otherMatrix = DOMMatrix::fromMatrix(other, exceptionState);
+  if (!otherMatrix) {
+    DCHECK(exceptionState.hadException());
+    return nullptr;
+  }
   if (!otherMatrix->is2D())
     m_is2D = false;
 
   TransformationMatrix& matrix = *m_matrix;
   *m_matrix = otherMatrix->matrix() * matrix;
 
   return this;
 }
 
 DOMMatrix* DOMMatrix::translateSelf(double tx, double ty, double tz) {
@@ skipping 155 matching lines @@
 
   m_matrix->makeIdentity();
   operations.apply(FloatSize(0, 0), *m_matrix);
 
   m_is2D = !operations.has3DOperation();
 
   return this;
 }
 
 }  // namespace blink