diff --git a/src/core/ReactCompositeComponent.js b/src/core/ReactCompositeComponent.js index b8598e9b00..4f6f62a6a8 100644 --- a/src/core/ReactCompositeComponent.js +++ b/src/core/ReactCompositeComponent.js @@ -1267,25 +1267,29 @@ var ReactCompositeComponentMixin = { /** * @private */ - _renderValidatedComponent: function() { - var renderedComponent; - var previousContext = ReactContext.current; - ReactContext.current = this._processChildContext(this._currentContext); - ReactCurrentOwner.current = this; - try { - renderedComponent = this.render(); - } finally { - ReactContext.current = previousContext; - ReactCurrentOwner.current = null; + _renderValidatedComponent: ReactPerf.measure( + 'ReactCompositeComponent', + '_renderValidatedComponent', + function() { + var renderedComponent; + var previousContext = ReactContext.current; + ReactContext.current = this._processChildContext(this._currentContext); + ReactCurrentOwner.current = this; + try { + renderedComponent = this.render(); + } finally { + ReactContext.current = previousContext; + ReactCurrentOwner.current = null; + } + invariant( + ReactComponent.isValidComponent(renderedComponent), + '%s.render(): A valid ReactComponent must be returned. You may have ' + + 'returned null, undefined, an array, or some other invalid object.', + this.constructor.displayName || 'ReactCompositeComponent' + ); + return renderedComponent; } - invariant( - ReactComponent.isValidComponent(renderedComponent), - '%s.render(): A valid ReactComponent must be returned. You may have ' + - 'returned null, undefined, an array, or some other invalid object.', - this.constructor.displayName || 'ReactCompositeComponent' - ); - return renderedComponent; - }, + ), /** * @private