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

Unified Diff: Source/core/platform/text/RegularExpression.h

Issue 13896017: Switch RegularExpression from YARR to V8 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Remove the test I added, the same kind of test was added in r148951 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/inspector/InspectorStyleSheet.cpp ('k') | Source/core/platform/text/RegularExpression.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/platform/text/RegularExpression.h
diff --git a/Source/core/platform/text/RegularExpression.h b/Source/core/platform/text/RegularExpression.h
index 54491ef8c74bc2ad7a3f4e9ba4c9cdf0758b4198..2911b435af07292b66d9e2eb06b99873f8aba5da 100644
--- a/Source/core/platform/text/RegularExpression.h
+++ b/Source/core/platform/text/RegularExpression.h
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2003, 2008, 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2013 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -26,11 +27,10 @@
#ifndef RegularExpression_h
#define RegularExpression_h
-#include <wtf/BumpPointerAllocator.h>
+#include "ScopedPersistent.h"
#include <wtf/Noncopyable.h>
-#include <wtf/PassOwnPtr.h>
#include <wtf/text/WTFString.h>
-#include <yarr/Yarr.h>
+#include <v8.h>
namespace WebCore {
@@ -43,15 +43,13 @@ class RegularExpression {
WTF_MAKE_FAST_ALLOCATED; WTF_MAKE_NONCOPYABLE(RegularExpression);
public:
RegularExpression(const String&, TextCaseSensitivity, MultilineMode = MultilineDisabled);
- bool isValid() const { return m_regExpByteCode; }
+
int match(const String&, int startFrom = 0, int* matchLength = 0) const;
-private:
- PassOwnPtr<JSC::Yarr::BytecodePattern> compile(const String&, TextCaseSensitivity, MultilineMode);
+ bool isValid() const { return !m_regex.isEmpty(); }
- unsigned m_numSubpatterns;
- OwnPtr<JSC::Yarr::BytecodePattern> m_regExpByteCode;
- BumpPointerAllocator m_regexAllocator;
+private:
+ ScopedPersistent<v8::RegExp> m_regex;
};
} // namespace WebCore
« no previous file with comments | « Source/core/inspector/InspectorStyleSheet.cpp ('k') | Source/core/platform/text/RegularExpression.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698