diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-30 16:22:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-30 16:22:13 (GMT) |
| commit | 728023635d6b32ffe453b0cc9fdf49b15f694f51 (patch) | |
| tree | 031d9638891e9907c1445d92d3a498f46c29beed /src/3rdparty/webkit/JavaScriptCore/yarr/RegexInterpreter.cpp | |
| parent | e084de5fd15b6f8afadefbf6926e5632c0677cf0 (diff) | |
| parent | c71579118feb11420433979d8b18c928382cd468 (diff) | |
| download | Qt-728023635d6b32ffe453b0cc9fdf49b15f694f51.zip Qt-728023635d6b32ffe453b0cc9fdf49b15f694f51.tar.gz Qt-728023635d6b32ffe453b0cc9fdf49b15f694f51.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
Updated WebKit to e6e692bb056670e2781dd0bc473a60757ae53992
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/yarr/RegexInterpreter.cpp')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/yarr/RegexInterpreter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/yarr/RegexInterpreter.cpp b/src/3rdparty/webkit/JavaScriptCore/yarr/RegexInterpreter.cpp index c2cb1c2..647b20a 100644 --- a/src/3rdparty/webkit/JavaScriptCore/yarr/RegexInterpreter.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/yarr/RegexInterpreter.cpp @@ -1554,7 +1554,7 @@ public: } case PatternTerm::TypeParentheticalAssertion: { - unsigned alternativeFrameLocation = term.inputPosition + RegexStackSpaceForBackTrackInfoParentheticalAssertion; + unsigned alternativeFrameLocation = term.frameLocation + RegexStackSpaceForBackTrackInfoParentheticalAssertion; atomParentheticalAssertionBegin(term.parentheses.subpatternId, term.invertOrCapture, term.frameLocation, alternativeFrameLocation); emitDisjunction(term.parentheses.disjunction, currentCountAlreadyChecked, 0); |