Index: include/v8.h |
diff --git a/include/v8.h b/include/v8.h |
index dee44687f0daed664a62a929fdacf951349018f8..6f2bba09bf14d88060da0225f417f3d7b40df098 100644 |
--- a/include/v8.h |
+++ b/include/v8.h |
@@ -1005,31 +1005,28 @@ |
public: |
V8_INLINE ScriptOriginOptions(bool is_embedder_debug_script = false, |
bool is_shared_cross_origin = false, |
- bool is_opaque = false, |
- bool allow_html_comments = false) |
+ bool is_opaque = false) |
: flags_((is_embedder_debug_script ? kIsEmbedderDebugScript : 0) | |
(is_shared_cross_origin ? kIsSharedCrossOrigin : 0) | |
- (is_opaque ? kIsOpaque : 0) | |
- (allow_html_comments ? kAllowHtmlComments : 0)) {} |
+ (is_opaque ? kIsOpaque : 0)) {} |
V8_INLINE ScriptOriginOptions(int flags) |
- : flags_(flags & (kIsEmbedderDebugScript | kIsSharedCrossOrigin | |
- kIsOpaque | kAllowHtmlComments)) {} |
- bool IsEmbedderDebugScript() const { return HasFlag(kIsEmbedderDebugScript); } |
- bool IsSharedCrossOrigin() const { return HasFlag(kIsSharedCrossOrigin); } |
- bool IsOpaque() const { return HasFlag(kIsOpaque); } |
- bool AllowHtmlComments() const { return HasFlag(kAllowHtmlComments); } |
+ : flags_(flags & |
+ (kIsEmbedderDebugScript | kIsSharedCrossOrigin | kIsOpaque)) {} |
+ bool IsEmbedderDebugScript() const { |
+ return (flags_ & kIsEmbedderDebugScript) != 0; |
+ } |
+ bool IsSharedCrossOrigin() const { |
+ return (flags_ & kIsSharedCrossOrigin) != 0; |
+ } |
+ bool IsOpaque() const { return (flags_ & kIsOpaque) != 0; } |
int Flags() const { return flags_; } |
private: |
enum { |
kIsEmbedderDebugScript = 1, |
kIsSharedCrossOrigin = 1 << 1, |
- kIsOpaque = 1 << 2, |
- kAllowHtmlComments = 1 << 3 |
+ kIsOpaque = 1 << 2 |
}; |
- |
- inline bool HasFlag(int flag) const { return (flags_ & flag) != 0; } |
- |
const int flags_; |
}; |
@@ -1046,8 +1043,7 @@ |
Local<Integer> script_id = Local<Integer>(), |
Local<Boolean> resource_is_embedder_debug_script = Local<Boolean>(), |
Local<Value> source_map_url = Local<Value>(), |
- Local<Boolean> resource_is_opaque = Local<Boolean>(), |
- Local<Boolean> allow_html_comments = Local<Boolean>()); |
+ Local<Boolean> resource_is_opaque = Local<Boolean>()); |
V8_INLINE Local<Value> ResourceName() const; |
V8_INLINE Local<Integer> ResourceLineOffset() const; |
V8_INLINE Local<Integer> ResourceColumnOffset() const; |
@@ -7832,8 +7828,7 @@ |
Local<Integer> script_id, |
Local<Boolean> resource_is_embedder_debug_script, |
Local<Value> source_map_url, |
- Local<Boolean> resource_is_opaque, |
- Local<Boolean> allow_html_comments) |
+ Local<Boolean> resource_is_opaque) |
: resource_name_(resource_name), |
resource_line_offset_(resource_line_offset), |
resource_column_offset_(resource_column_offset), |
@@ -7841,8 +7836,7 @@ |
resource_is_embedder_debug_script->IsTrue(), |
!resource_is_shared_cross_origin.IsEmpty() && |
resource_is_shared_cross_origin->IsTrue(), |
- !resource_is_opaque.IsEmpty() && resource_is_opaque->IsTrue(), |
- allow_html_comments.IsEmpty() || allow_html_comments->IsTrue()), |
+ !resource_is_opaque.IsEmpty() && resource_is_opaque->IsTrue()), |
script_id_(script_id), |
source_map_url_(source_map_url) {} |