Imported WebKit commit e2c32e2f53e02d388e70b9db88b91d8d9d28fc84 (http://svn.webkit.org/repository/webkit/trunk@133952)

Revert back to an older snapshot that should build on ARM

18 files changed, 41 insertions, 44 deletions

diff --git a/Source/JavaScriptCore/heap/ConservativeRoots.cpp b/Source/JavaScriptCore/heap/ConservativeRoots.cpp
index 752ce2775..7fe22dfff 100644
--- a/Source/JavaScriptCore/heap/ConservativeRoots.cpp
+++ b/Source/JavaScriptCore/heap/ConservativeRoots.cpp
@@ -26,9 +26,9 @@
 #include "config.h"
 #include "ConservativeRoots.h"
 
-#include "CodeBlock.h"
 #include "CopiedSpace.h"
-#include "CopiedSpaceInlines.h"
+#include "CopiedSpaceInlineMethods.h"
+#include "CodeBlock.h"
 #include "DFGCodeBlocks.h"
 #include "JSCell.h"
 #include "JSObject.h"
diff --git a/Source/JavaScriptCore/heap/CopiedBlock.h b/Source/JavaScriptCore/heap/CopiedBlock.h
index 83fdb08da..af36f55df 100644
--- a/Source/JavaScriptCore/heap/CopiedBlock.h
+++ b/Source/JavaScriptCore/heap/CopiedBlock.h
@@ -29,7 +29,7 @@
 #include "BlockAllocator.h"
 #include "HeapBlock.h"
 #include "JSValue.h"
-#include "JSValueInlines.h"
+#include "JSValueInlineMethods.h"
 #include "Options.h"
 #include <wtf/Atomics.h>
 
diff --git a/Source/JavaScriptCore/heap/CopiedSpace.cpp b/Source/JavaScriptCore/heap/CopiedSpace.cpp
index e4141c1d7..c228f9460 100644
--- a/Source/JavaScriptCore/heap/CopiedSpace.cpp
+++ b/Source/JavaScriptCore/heap/CopiedSpace.cpp
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "CopiedSpace.h"
 
-#include "CopiedSpaceInlines.h"
+#include "CopiedSpaceInlineMethods.h"
 #include "GCActivityCallback.h"
 #include "Options.h"
 
diff --git a/Source/JavaScriptCore/heap/CopiedSpaceInlines.h b/Source/JavaScriptCore/heap/CopiedSpaceInlineMethods.h
index 9d222f549..c244015e7 100644
--- a/Source/JavaScriptCore/heap/CopiedSpaceInlines.h
+++ b/Source/JavaScriptCore/heap/CopiedSpaceInlineMethods.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef CopiedSpaceInlines_h
-#define CopiedSpaceInlines_h
+#ifndef CopiedSpaceInlineMethods_h
+#define CopiedSpaceInlineMethods_h
 
 #include "CopiedBlock.h"
 #include "CopiedSpace.h"
@@ -182,5 +182,4 @@ inline CopiedBlock* CopiedSpace::blockFor(void* ptr)
 
 } // namespace JSC
 
-#endif // CopiedSpaceInlines_h
-
+#endif
diff --git a/Source/JavaScriptCore/heap/CopyVisitor.cpp b/Source/JavaScriptCore/heap/CopyVisitor.cpp
index 22ab57882..ae826f0d2 100644
--- a/Source/JavaScriptCore/heap/CopyVisitor.cpp
+++ b/Source/JavaScriptCore/heap/CopyVisitor.cpp
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "CopyVisitor.h"
 
-#include "CopyVisitorInlines.h"
+#include "CopyVisitorInlineMethods.h"
 #include "GCThreadSharedData.h"
 #include "JSCell.h"
 #include "JSObject.h"
diff --git a/Source/JavaScriptCore/heap/CopyVisitorInlines.h b/Source/JavaScriptCore/heap/CopyVisitorInlineMethods.h
index bd7879429..eb7bd2e82 100644
--- a/Source/JavaScriptCore/heap/CopyVisitorInlines.h
+++ b/Source/JavaScriptCore/heap/CopyVisitorInlineMethods.h
@@ -23,8 +23,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef CopyVisitorInlines_h
-#define CopyVisitorInlines_h
+#ifndef CopyVisitorInlineMethods_h
+#define CopyVisitorInlineMethods_h
 
 #include "ClassInfo.h"
 #include "CopyVisitor.h"
@@ -116,5 +116,4 @@ inline void CopyVisitor::didCopy(void* ptr, size_t bytes)
 
 } // namespace JSC
 
-#endif // CopyVisitorInlines_h
-
+#endif
diff --git a/Source/JavaScriptCore/heap/GCThread.cpp b/Source/JavaScriptCore/heap/GCThread.cpp
index 7caa7d588..ce3bbedc9 100644
--- a/Source/JavaScriptCore/heap/GCThread.cpp
+++ b/Source/JavaScriptCore/heap/GCThread.cpp
@@ -27,7 +27,7 @@
 #include "GCThread.h"
 
 #include "CopyVisitor.h"
-#include "CopyVisitorInlines.h"
+#include "CopyVisitorInlineMethods.h"
 #include "GCThreadSharedData.h"
 #include "SlotVisitor.h"
 #include <wtf/MainThread.h>
diff --git a/Source/JavaScriptCore/heap/GCThreadSharedData.cpp b/Source/JavaScriptCore/heap/GCThreadSharedData.cpp
index cf12d4bcd..446b41c2f 100644
--- a/Source/JavaScriptCore/heap/GCThreadSharedData.cpp
+++ b/Source/JavaScriptCore/heap/GCThreadSharedData.cpp
@@ -27,12 +27,12 @@
 #include "GCThreadSharedData.h"
 
 #include "CopyVisitor.h"
-#include "CopyVisitorInlines.h"
+#include "CopyVisitorInlineMethods.h"
 #include "GCThread.h"
 #include "JSGlobalData.h"
 #include "MarkStack.h"
 #include "SlotVisitor.h"
-#include "SlotVisitorInlines.h"
+#include "SlotVisitorInlineMethods.h"
 
 namespace JSC {
 
diff --git a/Source/JavaScriptCore/heap/HandleStack.cpp b/Source/JavaScriptCore/heap/HandleStack.cpp
index a5653c748..42eb326a5 100644
--- a/Source/JavaScriptCore/heap/HandleStack.cpp
+++ b/Source/JavaScriptCore/heap/HandleStack.cpp
@@ -27,8 +27,8 @@
 #include "HandleStack.h"
 
 #include "HeapRootVisitor.h"
+#include "JSValueInlineMethods.h"
 #include "JSObject.h"
-#include "JSValueInlines.h"
 
 namespace JSC {
 
diff --git a/Source/JavaScriptCore/heap/Heap.cpp b/Source/JavaScriptCore/heap/Heap.cpp
index 0fb65e205..c455fc2b1 100644
--- a/Source/JavaScriptCore/heap/Heap.cpp
+++ b/Source/JavaScriptCore/heap/Heap.cpp
@@ -24,8 +24,8 @@
 #include "CodeBlock.h"
 #include "ConservativeRoots.h"
 #include "CopiedSpace.h"
-#include "CopiedSpaceInlines.h"
-#include "CopyVisitorInlines.h"
+#include "CopiedSpaceInlineMethods.h"
+#include "CopyVisitorInlineMethods.h"
 #include "GCActivityCallback.h"
 #include "HeapRootVisitor.h"
 #include "HeapStatistics.h"
diff --git a/Source/JavaScriptCore/heap/HeapRootVisitor.h b/Source/JavaScriptCore/heap/HeapRootVisitor.h
index 5b11a5ead..9849d7c39 100644
--- a/Source/JavaScriptCore/heap/HeapRootVisitor.h
+++ b/Source/JavaScriptCore/heap/HeapRootVisitor.h
@@ -27,7 +27,7 @@
 #define HeapRootVisitor_h
 
 #include "SlotVisitor.h"
-#include "SlotVisitorInlines.h"
+#include "SlotVisitorInlineMethods.h"
 
 namespace JSC {
 
diff --git a/Source/JavaScriptCore/heap/HeapStatistics.cpp b/Source/JavaScriptCore/heap/HeapStatistics.cpp
index 387621558..8340bfa37 100644
--- a/Source/JavaScriptCore/heap/HeapStatistics.cpp
+++ b/Source/JavaScriptCore/heap/HeapStatistics.cpp
@@ -41,8 +41,8 @@ namespace JSC {
 
 double HeapStatistics::s_startTime = 0.0;
 double HeapStatistics::s_endTime = 0.0;
-Vector<double>* HeapStatistics::s_pauseTimeStarts = 0;
-Vector<double>* HeapStatistics::s_pauseTimeEnds = 0;
+Deque<double>* HeapStatistics::s_pauseTimeStarts = 0;
+Deque<double>* HeapStatistics::s_pauseTimeEnds = 0;
 
 #if OS(UNIX) 
 
@@ -50,8 +50,8 @@ void HeapStatistics::initialize()
 {
     ASSERT(Options::recordGCPauseTimes());
     s_startTime = WTF::monotonicallyIncreasingTime();
-    s_pauseTimeStarts = new Vector<double>();
-    s_pauseTimeEnds = new Vector<double>();
+    s_pauseTimeStarts = new Deque<double>();
+    s_pauseTimeEnds = new Deque<double>();
 }
 
 void HeapStatistics::recordGCPauseTime(double start, double end)
@@ -82,8 +82,8 @@ void HeapStatistics::logStatistics()
 
     if (Options::recordGCPauseTimes()) {
         dataLog(", \"pause_times\": [");
-        Vector<double>::iterator startIt = s_pauseTimeStarts->begin();
-        Vector<double>::iterator endIt = s_pauseTimeEnds->begin();
+        Deque<double>::iterator startIt = s_pauseTimeStarts->begin();
+        Deque<double>::iterator endIt = s_pauseTimeEnds->begin();
         if (startIt != s_pauseTimeStarts->end() && endIt != s_pauseTimeEnds->end()) {
             dataLog("[%f, %f]", *startIt, *endIt);
             ++startIt;
diff --git a/Source/JavaScriptCore/heap/HeapStatistics.h b/Source/JavaScriptCore/heap/HeapStatistics.h
index ce7a40a79..0800f0c16 100644
--- a/Source/JavaScriptCore/heap/HeapStatistics.h
+++ b/Source/JavaScriptCore/heap/HeapStatistics.h
@@ -49,8 +49,8 @@ public:
 
 private:
     static void logStatistics();
-    static Vector<double>* s_pauseTimeStarts;
-    static Vector<double>* s_pauseTimeEnds;
+    static Deque<double>* s_pauseTimeStarts;
+    static Deque<double>* s_pauseTimeEnds;
     static double s_startTime;
     static double s_endTime;
 };
diff --git a/Source/JavaScriptCore/heap/MarkStack.cpp b/Source/JavaScriptCore/heap/MarkStack.cpp
index aa8785e9c..582439fd2 100644
--- a/Source/JavaScriptCore/heap/MarkStack.cpp
+++ b/Source/JavaScriptCore/heap/MarkStack.cpp
@@ -25,18 +25,18 @@
 
 #include "config.h"
 #include "MarkStack.h"
-#include "MarkStackInlines.h"
+#include "MarkStackInlineMethods.h"
 
-#include "ConservativeRoots.h"
 #include "CopiedSpace.h"
-#include "CopiedSpaceInlines.h"
+#include "CopiedSpaceInlineMethods.h"
+#include "ConservativeRoots.h"
 #include "Heap.h"
 #include "Options.h"
 #include "JSArray.h"
 #include "JSCell.h"
 #include "JSObject.h"
 
-#include "SlotVisitorInlines.h"
+#include "SlotVisitorInlineMethods.h"
 #include "Structure.h"
 #include "WriteBarrier.h"
 #include <wtf/Atomics.h>
diff --git a/Source/JavaScriptCore/heap/MarkStackInlines.h b/Source/JavaScriptCore/heap/MarkStackInlineMethods.h
index 841ac06b8..d3276d7fa 100644
--- a/Source/JavaScriptCore/heap/MarkStackInlines.h
+++ b/Source/JavaScriptCore/heap/MarkStackInlineMethods.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef MarkStackInlines_h
-#define MarkStackInlines_h
+#ifndef MarkStackInlineMethods_h
+#define MarkStackInlineMethods_h
 
 #include "GCThreadSharedData.h"
 #include "MarkStack.h"
@@ -37,14 +37,14 @@ inline size_t MarkStackArray::postIncTop()
     ASSERT(result == m_topSegment->m_top++);
     return result;
 }
-
+        
 inline size_t MarkStackArray::preDecTop()
 {
     size_t result = --m_top;
     ASSERT(result == --m_topSegment->m_top);
     return result;
 }
-
+        
 inline void MarkStackArray::setTopForFullSegment()
 {
     ASSERT(m_topSegment->m_top == m_segmentCapacity);
@@ -110,5 +110,4 @@ inline size_t MarkStackArray::size()
 
 } // namespace JSC
 
-#endif // MarkStackInlines_h
-
+#endif
diff --git a/Source/JavaScriptCore/heap/SlotVisitor.cpp b/Source/JavaScriptCore/heap/SlotVisitor.cpp
index 8b4d7397e..3919705d0 100644
--- a/Source/JavaScriptCore/heap/SlotVisitor.cpp
+++ b/Source/JavaScriptCore/heap/SlotVisitor.cpp
@@ -3,7 +3,7 @@
 
 #include "ConservativeRoots.h"
 #include "CopiedSpace.h"
-#include "CopiedSpaceInlines.h"
+#include "CopiedSpaceInlineMethods.h"
 #include "GCThread.h"
 #include "JSArray.h"
 #include "JSDestructibleObject.h"
diff --git a/Source/JavaScriptCore/heap/SlotVisitor.h b/Source/JavaScriptCore/heap/SlotVisitor.h
index 34b1bc80b..dcd4b75ef 100644
--- a/Source/JavaScriptCore/heap/SlotVisitor.h
+++ b/Source/JavaScriptCore/heap/SlotVisitor.h
@@ -27,7 +27,7 @@
 #define SlotVisitor_h
 
 #include "HandleTypes.h"
-#include "MarkStackInlines.h"
+#include "MarkStackInlineMethods.h"
 
 #include <wtf/text/StringHash.h>
 
diff --git a/Source/JavaScriptCore/heap/SlotVisitorInlines.h b/Source/JavaScriptCore/heap/SlotVisitorInlineMethods.h
index b0f30b6ca..e5908bf36 100644
--- a/Source/JavaScriptCore/heap/SlotVisitorInlines.h
+++ b/Source/JavaScriptCore/heap/SlotVisitorInlineMethods.h
@@ -23,10 +23,10 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SlotVisitorInlines_h
-#define SlotVisitorInlines_h
+#ifndef SlotVisitorInlineMethods_h
+#define SlotVisitorInlineMethods_h
 
-#include "CopiedSpaceInlines.h"
+#include "CopiedSpaceInlineMethods.h"
 #include "Options.h"
 #include "SlotVisitor.h"
 
@@ -170,5 +170,5 @@ inline void SlotVisitor::copyLater(void* ptr, size_t bytes)
     
 } // namespace JSC
 
-#endif // SlotVisitorInlines_h
+#endif // SlotVisitorInlineMethods_h