webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 6 insertions, 7 deletions

diff --git a/Source/JavaScriptCore/runtime/RegExpKey.h b/Source/JavaScriptCore/runtime/RegExpKey.h
index 58fa38725..57a3f359b 100644
--- a/Source/JavaScriptCore/runtime/RegExpKey.h
+++ b/Source/JavaScriptCore/runtime/RegExpKey.h
@@ -25,8 +25,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef RegExpKey_h
-#define RegExpKey_h
+#pragma once
 
 #include <wtf/text/StringHash.h>
 #include <wtf/text/WTFString.h>
@@ -38,7 +37,9 @@ enum RegExpFlags {
     FlagGlobal = 1,
     FlagIgnoreCase = 2,
     FlagMultiline = 4,
-    InvalidFlags = 8,
+    FlagSticky = 8,
+    FlagUnicode = 16,
+    InvalidFlags = 32,
     DeletedValueFlags = -1
 };
 
@@ -62,9 +63,9 @@ struct RegExpKey {
     {
     }
 
-    RegExpKey(RegExpFlags flags, const PassRefPtr<StringImpl> pattern)
+    RegExpKey(RegExpFlags flags, RefPtr<StringImpl>&& pattern)
         : flagsValue(flags)
-        , pattern(pattern)
+        , pattern(WTFMove(pattern))
     {
     }
 
@@ -109,5 +110,3 @@ template<> struct HashTraits<JSC::RegExpKey> : GenericHashTraits<JSC::RegExpKey>
     static bool isDeletedValue(const JSC::RegExpKey& value) { return value.flagsValue == JSC::DeletedValueFlags; }
 };
 } // namespace WTF
-
-#endif // RegExpKey_h