Merge changes Ide388898,Ic49f367c,I1158a808,Iacb6ca5d,I2100dd3a,I5c1abe54,Ib0ef9902,I31dbc523,I570314b3

* changes:
  Merge WebKit at r75315: Update WebKit version
  Merge WebKit at r75315: Add FrameLoaderClient PageCache stubs
  Merge WebKit at r75315: Stub out AXObjectCache::remove()
  Merge WebKit at r75315: Fix ImageBuffer
  Merge WebKit at r75315: Fix PluginData::initPlugins()
  Merge WebKit at r75315: Fix conflicts
  Merge WebKit at r75315: Fix Makefiles
  Merge WebKit at r75315: Move Android-specific WebCore files to Source
  Merge WebKit at r75315: Initial merge by git.

1 files changed, 136 insertions, 0 deletions

diff --git a/Source/JavaScriptCore/profiler/Profile.cpp b/Source/JavaScriptCore/profiler/Profile.cpp
new file mode 100644
index 0000000..1a84518
--- /dev/null
+++ b/Source/JavaScriptCore/profiler/Profile.cpp
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2008 Apple Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "Profile.h"
+
+#include "ProfileNode.h"
+#include <stdio.h>
+
+namespace JSC {
+
+PassRefPtr<Profile> Profile::create(const UString& title, unsigned uid)
+{
+    return adoptRef(new Profile(title, uid));
+}
+
+Profile::Profile(const UString& title, unsigned uid)
+    : m_title(title)
+    , m_uid(uid)
+{
+    // FIXME: When multi-threading is supported this will be a vector and calls
+    // into the profiler will need to know which thread it is executing on.
+    m_head = ProfileNode::create(0, CallIdentifier("Thread_1", UString(), 0), 0, 0);
+}
+
+Profile::~Profile()
+{
+}
+
+void Profile::forEach(void (ProfileNode::*function)())
+{
+    ProfileNode* currentNode = m_head->firstChild();
+    for (ProfileNode* nextNode = currentNode; nextNode; nextNode = nextNode->firstChild())
+        currentNode = nextNode;
+
+    if (!currentNode)
+        currentNode = m_head.get();
+
+    ProfileNode* endNode = m_head->traverseNextNodePostOrder();
+    while (currentNode && currentNode != endNode) {
+        (currentNode->*function)();
+        currentNode = currentNode->traverseNextNodePostOrder();
+    } 
+}
+
+void Profile::focus(const ProfileNode* profileNode)
+{
+    if (!profileNode || !m_head)
+        return;
+
+    bool processChildren;
+    const CallIdentifier& callIdentifier = profileNode->callIdentifier();
+    for (ProfileNode* currentNode = m_head.get(); currentNode; currentNode = currentNode->traverseNextNodePreOrder(processChildren))
+        processChildren = currentNode->focus(callIdentifier);
+
+    // Set the visible time of all nodes so that the %s display correctly.
+    forEach(&ProfileNode::calculateVisibleTotalTime);
+}
+
+void Profile::exclude(const ProfileNode* profileNode)
+{
+    if (!profileNode || !m_head)
+        return;
+
+    const CallIdentifier& callIdentifier = profileNode->callIdentifier();
+
+    for (ProfileNode* currentNode = m_head.get(); currentNode; currentNode = currentNode->traverseNextNodePreOrder())
+        currentNode->exclude(callIdentifier);
+
+    // Set the visible time of the head so the %s display correctly.
+    m_head->setVisibleTotalTime(m_head->totalTime() - m_head->selfTime());
+    m_head->setVisibleSelfTime(0.0);
+}
+
+void Profile::restoreAll()
+{
+    forEach(&ProfileNode::restore);
+}
+
+#ifndef NDEBUG
+void Profile::debugPrintData() const
+{
+    printf("Call graph:\n");
+    m_head->debugPrintData(0);
+}
+
+typedef pair<StringImpl*, unsigned> NameCountPair;
+
+static inline bool functionNameCountPairComparator(const NameCountPair& a, const NameCountPair& b)
+{
+    return a.second > b.second;
+}
+
+void Profile::debugPrintDataSampleStyle() const
+{
+    typedef Vector<NameCountPair> NameCountPairVector;
+
+    FunctionCallHashCount countedFunctions;
+    printf("Call graph:\n");
+    m_head->debugPrintDataSampleStyle(0, countedFunctions);
+
+    printf("\nTotal number in stack:\n");
+    NameCountPairVector sortedFunctions(countedFunctions.size());
+    copyToVector(countedFunctions, sortedFunctions);
+
+    std::sort(sortedFunctions.begin(), sortedFunctions.end(), functionNameCountPairComparator);
+    for (NameCountPairVector::iterator it = sortedFunctions.begin(); it != sortedFunctions.end(); ++it)
+        printf("        %-12d%s\n", (*it).second, UString((*it).first).utf8().data());
+
+    printf("\nSort by top of stack, same collapsed (when >= 5):\n");
+}
+#endif
+
+} // namespace JSC