Title: [180259] trunk/Source/_javascript_Core
- Revision
- 180259
- Author
- [email protected]
- Date
- 2015-02-18 00:57:36 -0800 (Wed, 18 Feb 2015)
Log Message
REGRESSION(r180235): It broke the !ENABLE(PROMISES) build
https://bugs.webkit.org/show_bug.cgi?id=141746
Unreviewed build fix.
* inspector/JSInjectedScriptHost.cpp:
(Inspector::JSInjectedScriptHost::getInternalProperties):
Wrap JSPromise related code in ENABLE(PROMISES) guard.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (180258 => 180259)
--- trunk/Source/_javascript_Core/ChangeLog 2015-02-18 08:01:01 UTC (rev 180258)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-02-18 08:57:36 UTC (rev 180259)
@@ -1,3 +1,14 @@
+2015-02-18 Joseph Pecoraro <[email protected]>
+
+ REGRESSION(r180235): It broke the !ENABLE(PROMISES) build
+ https://bugs.webkit.org/show_bug.cgi?id=141746
+
+ Unreviewed build fix.
+
+ * inspector/JSInjectedScriptHost.cpp:
+ (Inspector::JSInjectedScriptHost::getInternalProperties):
+ Wrap JSPromise related code in ENABLE(PROMISES) guard.
+
2015-02-18 Benjamin Poulain <[email protected]>
Fix the C-Loop LLInt build
Modified: trunk/Source/_javascript_Core/inspector/JSInjectedScriptHost.cpp (180258 => 180259)
--- trunk/Source/_javascript_Core/inspector/JSInjectedScriptHost.cpp 2015-02-18 08:01:01 UTC (rev 180258)
+++ trunk/Source/_javascript_Core/inspector/JSInjectedScriptHost.cpp 2015-02-18 08:57:36 UTC (rev 180259)
@@ -35,7 +35,6 @@
#include "JSFunction.h"
#include "JSInjectedScriptHostPrototype.h"
#include "JSMap.h"
-#include "JSPromise.h"
#include "JSSet.h"
#include "JSTypedArrays.h"
#include "JSWeakMap.h"
@@ -45,6 +44,10 @@
#include "TypedArrayInlines.h"
#include "WeakMapData.h"
+#if ENABLE(PROMISES)
+#include "JSPromise.h"
+#endif
+
using namespace JSC;
namespace Inspector {
@@ -209,6 +212,7 @@
JSValue value = exec->uncheckedArgument(0);
+#if ENABLE(PROMISES)
if (JSPromise* promise = jsDynamicCast<JSPromise*>(value)) {
unsigned index = 0;
JSArray* array = constructEmptyArray(exec, nullptr);
@@ -228,6 +232,7 @@
// FIXME: <https://webkit.org/b/141664> Web Inspector: ES6: Improved Support for Promises - Promise Reactions
return array;
}
+#endif
if (JSBoundFunction* boundFunction = jsDynamicCast<JSBoundFunction*>(value)) {
unsigned index = 0;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
