Merge pull request #5209 from antoaravinth/5189

Don't instrument listeners for ReactDefaultPerf
facebook · Oct 27, 2015 · 65b9ceb · 65b9ceb
2 parents 5178728 + 59db07c
commit 65b9ceb
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 15 deletions.
diff --git a/src/renderers/shared/event/EventPluginHub.js b/src/renderers/shared/event/EventPluginHub.js
@@ -14,7 +14,6 @@
 var EventPluginRegistry = require('EventPluginRegistry');
 var EventPluginUtils = require('EventPluginUtils');
 var ReactErrorUtils = require('ReactErrorUtils');
-var ReactPerf = require('ReactPerf');
 
 var accumulateInto = require('accumulateInto');
 var forEachAccumulated = require('forEachAccumulated');
@@ -308,9 +307,4 @@ var EventPluginHub = {
 
 };
 
-ReactPerf.measureMethods(EventPluginHub, 'EventPluginHub', {
-  putListener: 'putListener',
-  deleteListener: 'deleteListener',
-});
-
 module.exports = EventPluginHub;
diff --git a/src/test/ReactDefaultPerf.js b/src/test/ReactDefaultPerf.js
@@ -165,7 +165,6 @@ var ReactDefaultPerf = {
         ].totalTime = performanceNow() - start;
         return rv;
       } else if (fnName === '_mountImageIntoNode' ||
-          moduleName === 'EventPluginHub' ||
           moduleName === 'ReactDOMIDOperations' ||
           moduleName === 'CSSPropertyOperations' ||
           moduleName === 'DOMChildrenOperations' ||

diff --git a/src/test/__tests__/ReactDefaultPerf-test.js b/src/test/__tests__/ReactDefaultPerf-test.js
@@ -16,6 +16,7 @@ describe('ReactDefaultPerf', function() {
   var ReactDOM;
   var ReactDefaultPerf;
   var ReactTestUtils;
+  var ReactDefaultPerfAnalysis;
 
   var App;
   var Box;
@@ -31,6 +32,7 @@ describe('ReactDefaultPerf', function() {
     ReactDOM = require('ReactDOM');
     ReactDefaultPerf = require('ReactDefaultPerf');
     ReactTestUtils = require('ReactTestUtils');
+    ReactDefaultPerfAnalysis = require('ReactDefaultPerfAnalysis');
 
     App = React.createClass({
       render: function() {
@@ -142,14 +144,6 @@ describe('ReactDefaultPerf', function() {
     });
   });
 
-  it('should not count listener update as waste', function() {
-    var container = document.createElement('div');
-    ReactDOM.render(<Div onClick={function() {}}>hey</Div>, container);
-    expectNoWaste(() => {
-      ReactDOM.render(<Div onClick={function() {}}>hey</Div>, container);
-    });
-  });
-
   it('should not count property removal as waste', function() {
     var container = document.createElement('div');
     ReactDOM.render(<Div className="yellow">hey</Div>, container);
@@ -188,4 +182,26 @@ describe('ReactDefaultPerf', function() {
     });
   });
 
+  it('putListener should not be instrumented', function() {
+    var container = document.createElement('div');
+    ReactDOM.render(<Div onClick={function() {}}>hey</Div>, container);
+    var measurements = measure(() => {
+      ReactDOM.render(<Div onClick={function() {}}>hey</Div>, container);
+    });
+
+    var summary = ReactDefaultPerfAnalysis.getDOMSummary(measurements);
+    expect(summary).toEqual([]);
+  });
+
+  it('deleteListener should not be instrumented', function() {
+    var container = document.createElement('div');
+    ReactDOM.render(<Div onClick={function() {}}>hey</Div>, container);
+    var measurements = measure(() => {
+      ReactDOM.render(<Div>hey</Div>, container);
+    });
+
+    var summary = ReactDefaultPerfAnalysis.getDOMSummary(measurements);
+    expect(summary).toEqual([]);
+  });
+
 });