Chromium Code Reviews| Index: include/v8.h |
| diff --git a/include/v8.h b/include/v8.h |
| index 62319203f418c4522b103b3d54ced4e43f09971b..1b463ab31f7ef7e906f0265106ea8e0228d99220 100644 |
| --- a/include/v8.h |
| +++ b/include/v8.h |
| @@ -1005,28 +1005,31 @@ class ScriptOriginOptions { |
| public: |
| V8_INLINE ScriptOriginOptions(bool is_embedder_debug_script = false, |
| bool is_shared_cross_origin = false, |
| - bool is_opaque = false) |
| + bool is_opaque = false, |
| + bool is_skip_html_comments = true) |
|
jochen (gone - plz use gerrit)
2016/03/18 10:50:29
can you drop the "is" prefix? Just skip_html_comme
vogelheim
2016/03/18 11:19:53
Done.
|
| : flags_((is_embedder_debug_script ? kIsEmbedderDebugScript : 0) | |
| (is_shared_cross_origin ? kIsSharedCrossOrigin : 0) | |
| - (is_opaque ? kIsOpaque : 0)) {} |
| + (is_opaque ? kIsOpaque : 0) | |
| + (is_skip_html_comments ? kIsSkipHtmlComments : 0)) {} |
| V8_INLINE ScriptOriginOptions(int flags) |
| - : 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; } |
| + : flags_(flags & (kIsEmbedderDebugScript | kIsSharedCrossOrigin | |
| + kIsOpaque | kIsSkipHtmlComments)) {} |
| + bool IsEmbedderDebugScript() const { return HasFlag(kIsEmbedderDebugScript); } |
| + bool IsSharedCrossOrigin() const { return HasFlag(kIsSharedCrossOrigin); } |
| + bool IsOpaque() const { return HasFlag(kIsOpaque); } |
| + bool IsSkipHtmlComments() const { return HasFlag(kIsSkipHtmlComments); } |
| int Flags() const { return flags_; } |
| private: |
| enum { |
| kIsEmbedderDebugScript = 1, |
| kIsSharedCrossOrigin = 1 << 1, |
| - kIsOpaque = 1 << 2 |
| + kIsOpaque = 1 << 2, |
| + kIsSkipHtmlComments = 1 << 3 |
| }; |
| + |
| + inline bool HasFlag(int flag) const { return (flags_ & flag) != 0; } |
| + |
| const int flags_; |
| }; |
| @@ -1043,7 +1046,8 @@ class ScriptOrigin { |
| 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> resource_is_opaque = Local<Boolean>(), |
| + Local<Boolean> skip_html_comments = Local<Boolean>()); |
| V8_INLINE Local<Value> ResourceName() const; |
| V8_INLINE Local<Integer> ResourceLineOffset() const; |
| V8_INLINE Local<Integer> ResourceColumnOffset() const; |
| @@ -7816,7 +7820,8 @@ ScriptOrigin::ScriptOrigin(Local<Value> resource_name, |
| Local<Integer> script_id, |
| Local<Boolean> resource_is_embedder_debug_script, |
| Local<Value> source_map_url, |
| - Local<Boolean> resource_is_opaque) |
| + Local<Boolean> resource_is_opaque, |
| + Local<Boolean> skip_html_comments) |
| : resource_name_(resource_name), |
| resource_line_offset_(resource_line_offset), |
| resource_column_offset_(resource_column_offset), |
| @@ -7824,7 +7829,8 @@ ScriptOrigin::ScriptOrigin(Local<Value> resource_name, |
| 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()), |
| + !resource_is_opaque.IsEmpty() && resource_is_opaque->IsTrue(), |
| + skip_html_comments.IsEmpty() || skip_html_comments->IsTrue()), |
| script_id_(script_id), |
| source_map_url_(source_map_url) {} |