From 5af96e2c7b73ebc627c6894727826a7576d31758 Mon Sep 17 00:00:00 2001
From: Leon Clarke <leonclarke@google.com>
Date: Thu, 3 Jun 2010 14:33:32 +0100
Subject: Merge webkit.org at r60469 : Initial merge by git.

Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
---
 JavaScriptCore/yarr/RegexPattern.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'JavaScriptCore/yarr/RegexPattern.h')

diff --git a/JavaScriptCore/yarr/RegexPattern.h b/JavaScriptCore/yarr/RegexPattern.h
index 3271cc1..61d6ad6 100644
--- a/JavaScriptCore/yarr/RegexPattern.h
+++ b/JavaScriptCore/yarr/RegexPattern.h
@@ -271,7 +271,7 @@ struct RegexPattern {
         , m_multiline(multiline)
         , m_numSubpatterns(0)
         , m_maxBackReference(0)
-        , m_shouldFallBack(false)
+        , m_containsBackreferences(false)
         , newlineCached(0)
         , digitsCached(0)
         , spacesCached(0)
@@ -293,7 +293,7 @@ struct RegexPattern {
         m_numSubpatterns = 0;
         m_maxBackReference = 0;
 
-        m_shouldFallBack = false;
+        m_containsBackreferences = false;
 
         newlineCached = 0;
         digitsCached = 0;
@@ -361,7 +361,7 @@ struct RegexPattern {
     bool m_multiline;
     unsigned m_numSubpatterns;
     unsigned m_maxBackReference;
-    bool m_shouldFallBack;
+    bool m_containsBackreferences;
     PatternDisjunction* m_body;
     Vector<PatternDisjunction*, 4> m_disjunctions;
     Vector<CharacterClass*> m_userCharacterClasses;
-- 
cgit v1.1