mirror of
https://github.com/flutter/flutter.git
synced 2026-02-20 02:29:02 +08:00
Remove ScriptRegexp.
I gave it life in https://codereview.chromium.org/13896017 and now I'm going to take it away. R=abarth@chromium.org Review URL: https://codereview.chromium.org/647323003
This commit is contained in:
Elliott Sprehn
parent
45e9dc8ca4
commit
326b3bb1a6
@ -1,107 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2004, 2008, 2009 Apple Inc. All rights reserved.
|
||||
* Copyright (C) 2008 Collabora Ltd.
|
||||
* Copyright (C) 2011 Peter Varga (pvarga@webkit.org), University of Szeged
|
||||
* 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
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
|
||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
||||
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
|
||||
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include "bindings/core/v8/ScriptRegexp.h"
|
||||
|
||||
#include "bindings/core/v8/V8Binding.h"
|
||||
#include "bindings/core/v8/V8PerIsolateData.h"
|
||||
#include "bindings/core/v8/V8ScriptRunner.h"
|
||||
#include "platform/ScriptForbiddenScope.h"
|
||||
|
||||
namespace blink {
|
||||
|
||||
ScriptRegexp::ScriptRegexp(const String& pattern, TextCaseSensitivity caseSensitivity, MultilineMode multilineMode)
|
||||
{
|
||||
v8::Isolate* isolate = v8::Isolate::GetCurrent();
|
||||
v8::HandleScope handleScope(isolate);
|
||||
v8::Context::Scope contextScope(V8PerIsolateData::from(isolate)->ensureScriptRegexpContext());
|
||||
v8::TryCatch tryCatch;
|
||||
|
||||
unsigned flags = v8::RegExp::kNone;
|
||||
if (caseSensitivity == TextCaseInsensitive)
|
||||
flags |= v8::RegExp::kIgnoreCase;
|
||||
if (multilineMode == MultilineEnabled)
|
||||
flags |= v8::RegExp::kMultiline;
|
||||
|
||||
v8::Local<v8::RegExp> regex = v8::RegExp::New(v8String(isolate, pattern), static_cast<v8::RegExp::Flags>(flags));
|
||||
|
||||
// If the regex failed to compile we'll get an empty handle.
|
||||
if (!regex.IsEmpty())
|
||||
m_regex.set(isolate, regex);
|
||||
}
|
||||
|
||||
int ScriptRegexp::match(const String& string, int startFrom, int* matchLength) const
|
||||
{
|
||||
if (matchLength)
|
||||
*matchLength = 0;
|
||||
|
||||
if (m_regex.isEmpty() || string.isNull())
|
||||
return -1;
|
||||
|
||||
// v8 strings are limited to int.
|
||||
if (string.length() > INT_MAX)
|
||||
return -1;
|
||||
|
||||
ScriptForbiddenScope::AllowUserAgentScript allowScript;
|
||||
|
||||
v8::Isolate* isolate = v8::Isolate::GetCurrent();
|
||||
v8::HandleScope handleScope(isolate);
|
||||
v8::Context::Scope contextScope(V8PerIsolateData::from(isolate)->ensureScriptRegexpContext());
|
||||
v8::TryCatch tryCatch;
|
||||
|
||||
v8::Local<v8::RegExp> regex = m_regex.newLocal(isolate);
|
||||
v8::Local<v8::Function> exec = regex->Get(v8AtomicString(isolate, "exec")).As<v8::Function>();
|
||||
v8::Handle<v8::Value> argv[] = { v8String(isolate, string.substring(startFrom)) };
|
||||
v8::Local<v8::Value> returnValue = V8ScriptRunner::callInternalFunction(exec, regex, WTF_ARRAY_LENGTH(argv), argv, isolate);
|
||||
|
||||
if (tryCatch.HasCaught())
|
||||
return -1;
|
||||
|
||||
// RegExp#exec returns null if there's no match, otherwise it returns an
|
||||
// Array of strings with the first being the whole match string and others
|
||||
// being subgroups. The Array also has some random properties tacked on like
|
||||
// "index" which is the offset of the match.
|
||||
//
|
||||
// https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/RegExp/exec
|
||||
|
||||
ASSERT(!returnValue.IsEmpty());
|
||||
if (!returnValue->IsArray())
|
||||
return -1;
|
||||
|
||||
v8::Local<v8::Array> result = returnValue.As<v8::Array>();
|
||||
int matchOffset = result->Get(v8AtomicString(isolate, "index"))->ToInt32()->Value();
|
||||
if (matchLength) {
|
||||
v8::Local<v8::String> match = result->Get(0).As<v8::String>();
|
||||
*matchLength = match->Length();
|
||||
}
|
||||
|
||||
return matchOffset + startFrom;
|
||||
}
|
||||
|
||||
} // namespace blink
|
||||
@ -1,57 +0,0 @@
|
||||
/*
|
||||
* 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
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
|
||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
||||
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
|
||||
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#ifndef ScriptRegexp_h
|
||||
#define ScriptRegexp_h
|
||||
|
||||
#include "bindings/core/v8/ScopedPersistent.h"
|
||||
#include "wtf/Noncopyable.h"
|
||||
#include "wtf/text/WTFString.h"
|
||||
#include <v8.h>
|
||||
|
||||
namespace blink {
|
||||
|
||||
enum MultilineMode {
|
||||
MultilineDisabled,
|
||||
MultilineEnabled
|
||||
};
|
||||
|
||||
class ScriptRegexp {
|
||||
WTF_MAKE_FAST_ALLOCATED; WTF_MAKE_NONCOPYABLE(ScriptRegexp);
|
||||
public:
|
||||
ScriptRegexp(const String&, TextCaseSensitivity, MultilineMode = MultilineDisabled);
|
||||
|
||||
int match(const String&, int startFrom = 0, int* matchLength = 0) const;
|
||||
|
||||
bool isValid() const { return !m_regex.isEmpty(); }
|
||||
|
||||
private:
|
||||
ScopedPersistent<v8::RegExp> m_regex;
|
||||
};
|
||||
|
||||
} // namespace blink
|
||||
|
||||
#endif // ScriptRegexp_h
|
||||
@ -86,8 +86,6 @@ V8PerIsolateData::V8PerIsolateData()
|
||||
|
||||
V8PerIsolateData::~V8PerIsolateData()
|
||||
{
|
||||
if (m_scriptRegexpScriptState)
|
||||
m_scriptRegexpScriptState->disposePerContextData();
|
||||
if (isMainThread())
|
||||
mainThreadPerIsolateData = 0;
|
||||
}
|
||||
@ -158,15 +156,6 @@ void V8PerIsolateData::setDOMTemplate(void* domTemplateKey, v8::Handle<v8::Funct
|
||||
currentDOMTemplateMap().add(domTemplateKey, v8::Eternal<v8::FunctionTemplate>(isolate(), v8::Local<v8::FunctionTemplate>(templ)));
|
||||
}
|
||||
|
||||
v8::Local<v8::Context> V8PerIsolateData::ensureScriptRegexpContext()
|
||||
{
|
||||
if (!m_scriptRegexpScriptState) {
|
||||
v8::Local<v8::Context> context(v8::Context::New(isolate()));
|
||||
m_scriptRegexpScriptState = ScriptState::create(context, DOMWrapperWorld::create());
|
||||
}
|
||||
return m_scriptRegexpScriptState->context();
|
||||
}
|
||||
|
||||
bool V8PerIsolateData::hasInstance(const WrapperTypeInfo* info, v8::Handle<v8::Value> value)
|
||||
{
|
||||
return hasInstance(info, value, m_domTemplateMapForMainWorld)
|
||||
|
||||
@ -94,8 +94,6 @@ public:
|
||||
bool hasInstance(const WrapperTypeInfo*, v8::Handle<v8::Value>);
|
||||
v8::Handle<v8::Object> findInstanceInPrototypeChain(const WrapperTypeInfo*, v8::Handle<v8::Value>);
|
||||
|
||||
v8::Local<v8::Context> ensureScriptRegexpContext();
|
||||
|
||||
const char* previousSamplingState() const { return m_previousSamplingState; }
|
||||
void setPreviousSamplingState(const char* name) { m_previousSamplingState = name; }
|
||||
|
||||
@ -115,7 +113,6 @@ private:
|
||||
OwnPtr<StringCache> m_stringCache;
|
||||
OwnPtr<V8HiddenValue> m_hiddenValue;
|
||||
ScopedPersistent<v8::Value> m_liveRoot;
|
||||
RefPtr<ScriptState> m_scriptRegexpScriptState;
|
||||
|
||||
const char* m_previousSamplingState;
|
||||
|
||||
|
||||
@ -71,8 +71,6 @@
|
||||
'ScriptPromiseProperty.h',
|
||||
'ScriptPromisePropertyBase.cpp',
|
||||
'ScriptPromisePropertyBase.h',
|
||||
'ScriptRegexp.cpp',
|
||||
'ScriptRegexp.h',
|
||||
'ScriptSourceCode.h',
|
||||
'ScriptState.cpp',
|
||||
'ScriptState.h',
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user