Removing ANDROID_INSTRUMENTATION code

This has not been used for years, and due to WebKit merges the
results are not accurate anymore.

The resulting code is cleaner, less likely to create merge conflicts,
and does not give the impression that this can be turned on and
it will still work.

Needs CL:
https://android-git.corp.google.com/g/#/c/148912/

Change-Id: I617ad00c103ab72038371a3203452d2ccec0e50c

5 files changed, 0 insertions, 87 deletions

diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
index 6e21dc3..5bdf9dd 100644
--- a/Source/WebCore/dom/Document.cpp
+++ b/Source/WebCore/dom/Document.cpp
@@ -194,10 +194,6 @@
 #include "HTMLTextAreaElement.h"
 #endif
 
-#ifdef ANDROID_INSTRUMENT
-#include "TimeCounter.h"
-#endif
-
 #if ENABLE(TOUCH_EVENTS)
 #if USE(V8)
 #include "RuntimeEnabledFeatures.h"
@@ -1475,10 +1471,6 @@ void Document::recalcStyle(StyleChange change)
         frameView->beginDeferredRepaints();
     }
 
-#ifdef ANDROID_INSTRUMENT
-    android::TimeCounter::start(android::TimeCounter::CalculateStyleTimeCounter);
-#endif
-
     ASSERT(!renderer() || renderArena());
     if (!renderer() || !renderArena())
         goto bail_out;
@@ -1500,10 +1492,6 @@ void Document::recalcStyle(StyleChange change)
         if (change >= Inherit || n->childNeedsStyleRecalc() || n->needsStyleRecalc())
             n->recalcStyle(change);
 
-#ifdef ANDROID_INSTRUMENT
-    android::TimeCounter::record(android::TimeCounter::CalculateStyleTimeCounter, __FUNCTION__);
-#endif
-
 #if USE(ACCELERATED_COMPOSITING)
     if (view()) {
         bool layoutPending = view()->layoutPending() || renderer()->needsLayout();
diff --git a/Source/WebCore/dom/Node.cpp b/Source/WebCore/dom/Node.cpp
index 1fd4b92..0967ef5 100644
--- a/Source/WebCore/dom/Node.cpp
+++ b/Source/WebCore/dom/Node.cpp
@@ -2498,39 +2498,6 @@ Node* Node::enclosingLinkEventParentOrSelf()
     return 0;
 }
 
-#ifdef ANDROID_INSTRUMENT
-static size_t nodeSize = 0;
-
-void* Node::operator new(size_t size)
-{
-    nodeSize += size;
-    return ::operator new(size);
-}
-
-void* Node::operator new[](size_t size)
-{
-    nodeSize += size;
-    return ::operator new[](size);
-}
-
-void Node::operator delete(void* p, size_t size)
-{
-    nodeSize -= size;
-    ::operator delete(p);
-}
-
-void Node::operator delete[](void* p, size_t size)
-{
-    nodeSize -= size;
-    ::operator delete[](p);
-}
-
-size_t Node::reportDOMNodesSize()
-{
-    return nodeSize;
-}
-#endif
-
 // --------
 
 ScriptExecutionContext* Node::scriptExecutionContext() const
diff --git a/Source/WebCore/dom/Node.h b/Source/WebCore/dom/Node.h
index 1fe30ad..08b1921 100644
--- a/Source/WebCore/dom/Node.h
+++ b/Source/WebCore/dom/Node.h
@@ -528,18 +528,6 @@ public:
 
     unsigned short compareDocumentPosition(Node*);
 
-#ifdef ANDROID_INSTRUMENT
-    // Overridden to prevent the normal new from being called.
-    void* operator new(size_t size);
-    void* operator new[](size_t size);
-
-    // Overridden to prevent the normal delete from being called.
-    void operator delete(void* p, size_t size);
-    void operator delete[](void* p, size_t size);
-
-    static size_t reportDOMNodesSize();
-#endif
-
     virtual Node* toNode() { return this; }
 
     virtual InputElement* toInputElement();
diff --git a/Source/WebCore/dom/ProcessingInstruction.cpp b/Source/WebCore/dom/ProcessingInstruction.cpp
index 7135644..30111d8 100644
--- a/Source/WebCore/dom/ProcessingInstruction.cpp
+++ b/Source/WebCore/dom/ProcessingInstruction.cpp
@@ -297,26 +297,4 @@ void ProcessingInstruction::finishParsingChildren()
     ContainerNode::finishParsingChildren();
 }
 
-#ifdef ANDROID_INSTRUMENT
-void* ProcessingInstruction::operator new(size_t size)
-{
-    return Node::operator new(size);
-}
-
-void* ProcessingInstruction::operator new[](size_t size)
-{
-    return Node::operator new[](size);
-}
-
-void ProcessingInstruction::operator delete(void* p, size_t size)
-{
-    Node::operator delete(p, size);
-}
-
-void ProcessingInstruction::operator delete[](void* p, size_t size)
-{
-    Node::operator delete[](p, size);
-}
-#endif
-
 } // namespace
diff --git a/Source/WebCore/dom/ProcessingInstruction.h b/Source/WebCore/dom/ProcessingInstruction.h
index fd98566..1be8710 100644
--- a/Source/WebCore/dom/ProcessingInstruction.h
+++ b/Source/WebCore/dom/ProcessingInstruction.h
@@ -56,14 +56,6 @@ public:
 private:
     ProcessingInstruction(Document*, const String& target, const String& data);
 
-#ifdef ANDROID_INSTRUMENT
-    // Overridden to resolve the ambiguous
-    void* operator new(size_t size);
-    void* operator new[](size_t size);
-    void operator delete(void* p, size_t size);
-    void operator delete[](void* p, size_t size);
-#endif
-
     virtual String nodeName() const;
     virtual NodeType nodeType() const;
     virtual String nodeValue() const;