Title: [176700] trunk/Source/_javascript_Core
- Revision
- 176700
- Author
- msab...@apple.com
- Date
- 2014-12-02 16:49:19 -0800 (Tue, 02 Dec 2014)
Log Message
Change CallFrame::globalThisValue() to not use CallFrame::scope()
https://bugs.webkit.org/show_bug.cgi?id=139202
Reviewed by Mark Lam.
Changed to use the globalThis() on the globalObject associated with the
callee. Moved the inline definition to JSGlobalObject.h instead of
including JSGlobalObject.h in JSScope.h. Also moved it as JSScope
objects are no longer involved in getting the value.
* runtime/JSGlobalObject.h:
(JSC::ExecState::globalThisValue):
* runtime/JSScope.h:
(JSC::ExecState::globalThisValue): Deleted.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (176699 => 176700)
--- trunk/Source/_javascript_Core/ChangeLog 2014-12-03 00:39:34 UTC (rev 176699)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-12-03 00:49:19 UTC (rev 176700)
@@ -1,3 +1,20 @@
+2014-12-02 Michael Saboff <msab...@apple.com>
+
+ Change CallFrame::globalThisValue() to not use CallFrame::scope()
+ https://bugs.webkit.org/show_bug.cgi?id=139202
+
+ Reviewed by Mark Lam.
+
+ Changed to use the globalThis() on the globalObject associated with the
+ callee. Moved the inline definition to JSGlobalObject.h instead of
+ including JSGlobalObject.h in JSScope.h. Also moved it as JSScope
+ objects are no longer involved in getting the value.
+
+ * runtime/JSGlobalObject.h:
+ (JSC::ExecState::globalThisValue):
+ * runtime/JSScope.h:
+ (JSC::ExecState::globalThisValue): Deleted.
+
2014-12-02 Matthew Mirman <mmir...@apple.com>
Fixes inline cache fast path accessing nonexistant getters.
Modified: trunk/Source/_javascript_Core/runtime/JSGlobalObject.h (176699 => 176700)
--- trunk/Source/_javascript_Core/runtime/JSGlobalObject.h 2014-12-03 00:39:34 UTC (rev 176699)
+++ trunk/Source/_javascript_Core/runtime/JSGlobalObject.h 2014-12-03 00:49:19 UTC (rev 176700)
@@ -674,6 +674,11 @@
return constructArrayNegativeIndexed(exec, profile, exec->lexicalGlobalObject(), values, length);
}
+inline JSObject* ExecState::globalThisValue() const
+{
+ return lexicalGlobalObject()->globalThis();
+}
+
inline JSObject* JSScope::globalThis()
{
return globalObject()->globalThis();
Modified: trunk/Source/_javascript_Core/runtime/JSScope.h (176699 => 176700)
--- trunk/Source/_javascript_Core/runtime/JSScope.h 2014-12-03 00:39:34 UTC (rev 176699)
+++ trunk/Source/_javascript_Core/runtime/JSScope.h 2014-12-03 00:49:19 UTC (rev 176700)
@@ -244,11 +244,6 @@
return callee()->globalObject();
}
-inline JSObject* ExecState::globalThisValue() const
-{
- return scope()->globalThis();
-}
-
inline size_t JSScope::offsetOfNext()
{
return OBJECT_OFFSETOF(JSScope, m_next);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
