From 4e129220a6a081199b4cae16dfc11f2232a2c092 Mon Sep 17 00:00:00 2001
From: Jim <jsfb@github>
Date: Wed, 27 May 2015 16:37:11 -0700
Subject: [PATCH] Removed ReactElement._context (cleanup)

---
 src/isomorphic/classic/element/ReactElement.js           | 9 +++------
 src/isomorphic/deprecated/cloneWithProps.js              | 2 +-
 src/renderers/dom/shared/ReactDefaultInjection.js        | 1 -
 .../dom/shared/__tests__/ReactDOMComponent-test.js       | 1 -
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/isomorphic/classic/element/ReactElement.js b/src/isomorphic/classic/element/ReactElement.js
index 4760c6311d..de15253343 100644
--- a/src/isomorphic/classic/element/ReactElement.js
+++ b/src/isomorphic/classic/element/ReactElement.js
@@ -11,7 +11,6 @@
 
 'use strict';
 
-var ReactContext = require('ReactContext');
 var ReactCurrentOwner = require('ReactCurrentOwner');
 
 var assign = require('Object.assign');
@@ -85,12 +84,13 @@ function defineMutationMembrane(prototype) {
  * work with a dynamic instanceof check. Nothing should live on this prototype.
  *
  * @param {*} type
- * @param {string|object} ref
  * @param {*} key
+ * @param {string|object} ref
+ * @param {*} owner
  * @param {*} props
  * @internal
  */
-var ReactElement = function(type, key, ref, owner, context, props) {
+var ReactElement = function(type, key, ref, owner, props) {
   // Built-in properties that belong on the element
   this.type = type;
   this.key = key;
@@ -191,7 +191,6 @@ ReactElement.createElement = function(type, config, children) {
     key,
     ref,
     ReactCurrentOwner.current,
-    ReactContext.current,
     props
   );
 };
@@ -213,7 +212,6 @@ ReactElement.cloneAndReplaceProps = function(oldElement, newProps) {
     oldElement.key,
     oldElement.ref,
     oldElement._owner,
-    oldElement._context,
     newProps
   );
 
@@ -273,7 +271,6 @@ ReactElement.cloneElement = function(element, config, children) {
     key,
     ref,
     owner,
-    element._context,
     props
   );
 };
diff --git a/src/isomorphic/deprecated/cloneWithProps.js b/src/isomorphic/deprecated/cloneWithProps.js
index e0be89892d..3a5291e4da 100644
--- a/src/isomorphic/deprecated/cloneWithProps.js
+++ b/src/isomorphic/deprecated/cloneWithProps.js
@@ -47,7 +47,7 @@ function cloneWithProps(child, props) {
     newProps.children = child.props.children;
   }
 
-  // The current API doesn't retain _owner and _context, which is why this
+  // The current API doesn't retain _owner, which is why this
   // doesn't use ReactElement.cloneAndReplaceProps.
   return ReactElement.createElement(child.type, newProps);
 }
diff --git a/src/renderers/dom/shared/ReactDefaultInjection.js b/src/renderers/dom/shared/ReactDefaultInjection.js
index 32f0cf99da..0e18f6f8f3 100644
--- a/src/renderers/dom/shared/ReactDefaultInjection.js
+++ b/src/renderers/dom/shared/ReactDefaultInjection.js
@@ -59,7 +59,6 @@ function autoGenerateWrapperClass(type) {
         null,  // key
         null,  // ref
         internalInstance._currentElement._owner,  // owner
-        null,  // context
         this.props
       );
     }
diff --git a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
index 599dabd0ca..e45ad0b08b 100644
--- a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
@@ -400,7 +400,6 @@ describe('ReactDOMComponent', function() {
           type: StubNativeComponent,
           props: props,
           _owner: null,
-          _context: null
         });
         return stubComponent.mountComponent('test', transaction, {});
       };