Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(159)

Side by Side Diff: Source/core/platform/text/RegularExpression.h

Issue 13950014: Revert "Switch RegularExpression from YARR to V8" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/html/BaseTextInputType.cpp ('k') | Source/core/platform/text/RegularExpression.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2003, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2008, 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2013 Google Inc. All rights reserved.
4 * 3 *
5 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
7 * are met: 6 * are met:
8 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
13 * 12 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 24 */
26 25
27 #ifndef RegularExpression_h 26 #ifndef RegularExpression_h
28 #define RegularExpression_h 27 #define RegularExpression_h
29 28
30 #include "ScopedPersistent.h" 29 #include <wtf/BumpPointerAllocator.h>
31 #include <wtf/Noncopyable.h> 30 #include <wtf/Noncopyable.h>
31 #include <wtf/PassOwnPtr.h>
32 #include <wtf/text/WTFString.h> 32 #include <wtf/text/WTFString.h>
33 #include <v8.h> 33 #include <yarr/Yarr.h>
34 34
35 namespace WebCore { 35 namespace WebCore {
36 36
37 enum MultilineMode { 37 enum MultilineMode {
38 MultilineDisabled, 38 MultilineDisabled,
39 MultilineEnabled 39 MultilineEnabled
40 }; 40 };
41 41
42 class RegularExpression { 42 class RegularExpression {
43 WTF_MAKE_FAST_ALLOCATED; WTF_MAKE_NONCOPYABLE(RegularExpression); 43 WTF_MAKE_FAST_ALLOCATED; WTF_MAKE_NONCOPYABLE(RegularExpression);
44 public: 44 public:
45 RegularExpression(const String&, TextCaseSensitivity, MultilineMode = Multil ineDisabled); 45 RegularExpression(const String&, TextCaseSensitivity, MultilineMode = Multil ineDisabled);
46 46
47 int match(const String&, int startFrom = 0, int* matchLength = 0) const; 47 int match(const String&, int startFrom = 0, int* matchLength = 0) const;
48 48
49 bool isValid() const { return !m_regex.isEmpty(); } 49 private:
50 PassOwnPtr<JSC::Yarr::BytecodePattern> compile(const String&, TextCaseSensit ivity, MultilineMode);
50 51
51 private: 52 unsigned m_numSubpatterns;
52 ScopedPersistent<v8::RegExp> m_regex; 53 OwnPtr<JSC::Yarr::BytecodePattern> m_regExpByteCode;
54 BumpPointerAllocator m_regexAllocator;
53 }; 55 };
54 56
55 } // namespace WebCore 57 } // namespace WebCore
56 58
57 #endif // RegularExpression_h 59 #endif // RegularExpression_h
OLDNEW
« no previous file with comments | « Source/core/html/BaseTextInputType.cpp ('k') | Source/core/platform/text/RegularExpression.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698