Changeset 427 for trunk/JavaScriptCore/VM/Machine.h

Timestamp:

08/01/08 14:47:24 (5 months ago)

Author:

sroret

Message:

merge with webkit revision 35510

Files:

• trunk/JavaScriptCore/VM/Machine.h (modified) (2 diffs)

trunk/JavaScriptCore/VM/Machine.h

@@ -49 +49 @@
-    class Register;
-    class ScopeChainNode;
+    class SamplingTool;
-
-    enum DebugHookID {
@@ -120 +121 @@
-            m_timeoutCheckCount = 0;
-        }
-
-
+
-        SamplingTool* m_sampler;
-#endif
-
-    private: