Title: [163228] trunk/Source/_javascript_Core
- Revision
- 163228
- Author
- [email protected]
- Date
- 2014-01-31 18:42:30 -0800 (Fri, 31 Jan 2014)
Log Message
Gardening: fix build breakage.
Not reviewed.
* interpreter/CallFrame.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (163227 => 163228)
--- trunk/Source/_javascript_Core/ChangeLog 2014-02-01 01:59:05 UTC (rev 163227)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-02-01 02:42:30 UTC (rev 163228)
@@ -1,5 +1,13 @@
2014-01-31 Mark Lam <[email protected]>
+ Gardening: fix build breakage.
+
+ Not reviewed.
+
+ * interpreter/CallFrame.h:
+
+2014-01-31 Mark Lam <[email protected]>
+
Gardening: Fix a merge problem to unbreak bots.
Not reviewed.
Modified: trunk/Source/_javascript_Core/interpreter/CallFrame.h (163227 => 163228)
--- trunk/Source/_javascript_Core/interpreter/CallFrame.h 2014-02-01 01:59:05 UTC (rev 163227)
+++ trunk/Source/_javascript_Core/interpreter/CallFrame.h 2014-02-01 02:42:30 UTC (rev 163228)
@@ -52,7 +52,7 @@
bool hasActivation() const { return !!uncheckedActivation(); }
JSActivation* activation() const;
- inline JSValue uncheckedActivation() const;
+ JSValue uncheckedActivation() const;
// Global object in which execution began.
JS_EXPORT_PRIVATE JSGlobalObject* vmEntryGlobalObject();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
