From 326b3bb1a6fdb331d7baff34ba0bd434967a16d4 Mon Sep 17 00:00:00 2001 From: Elliott Sprehn Date: Thu, 23 Oct 2014 14:48:06 -0700 Subject: [PATCH] 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 --- engine/bindings/core/v8/ScriptRegexp.cpp | 107 ------------------- engine/bindings/core/v8/ScriptRegexp.h | 57 ---------- engine/bindings/core/v8/V8PerIsolateData.cpp | 11 -- engine/bindings/core/v8/V8PerIsolateData.h | 3 - engine/bindings/core/v8/v8.gypi | 2 - 5 files changed, 180 deletions(-) delete mode 100644 engine/bindings/core/v8/ScriptRegexp.cpp delete mode 100644 engine/bindings/core/v8/ScriptRegexp.h diff --git a/engine/bindings/core/v8/ScriptRegexp.cpp b/engine/bindings/core/v8/ScriptRegexp.cpp deleted file mode 100644 index 42ec0c7e34a..00000000000 --- a/engine/bindings/core/v8/ScriptRegexp.cpp +++ /dev/null @@ -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 regex = v8::RegExp::New(v8String(isolate, pattern), static_cast(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 regex = m_regex.newLocal(isolate); - v8::Local exec = regex->Get(v8AtomicString(isolate, "exec")).As(); - v8::Handle argv[] = { v8String(isolate, string.substring(startFrom)) }; - v8::Local 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 result = returnValue.As(); - int matchOffset = result->Get(v8AtomicString(isolate, "index"))->ToInt32()->Value(); - if (matchLength) { - v8::Local match = result->Get(0).As(); - *matchLength = match->Length(); - } - - return matchOffset + startFrom; -} - -} // namespace blink diff --git a/engine/bindings/core/v8/ScriptRegexp.h b/engine/bindings/core/v8/ScriptRegexp.h deleted file mode 100644 index 4e768e9b969..00000000000 --- a/engine/bindings/core/v8/ScriptRegexp.h +++ /dev/null @@ -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 - -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 m_regex; -}; - -} // namespace blink - -#endif // ScriptRegexp_h diff --git a/engine/bindings/core/v8/V8PerIsolateData.cpp b/engine/bindings/core/v8/V8PerIsolateData.cpp index 298fd854b4d..a0910df7c13 100644 --- a/engine/bindings/core/v8/V8PerIsolateData.cpp +++ b/engine/bindings/core/v8/V8PerIsolateData.cpp @@ -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(isolate(), v8::Local(templ))); } -v8::Local V8PerIsolateData::ensureScriptRegexpContext() -{ - if (!m_scriptRegexpScriptState) { - v8::Local context(v8::Context::New(isolate())); - m_scriptRegexpScriptState = ScriptState::create(context, DOMWrapperWorld::create()); - } - return m_scriptRegexpScriptState->context(); -} - bool V8PerIsolateData::hasInstance(const WrapperTypeInfo* info, v8::Handle value) { return hasInstance(info, value, m_domTemplateMapForMainWorld) diff --git a/engine/bindings/core/v8/V8PerIsolateData.h b/engine/bindings/core/v8/V8PerIsolateData.h index a73c58ff1ee..04f39d64421 100644 --- a/engine/bindings/core/v8/V8PerIsolateData.h +++ b/engine/bindings/core/v8/V8PerIsolateData.h @@ -94,8 +94,6 @@ public: bool hasInstance(const WrapperTypeInfo*, v8::Handle); v8::Handle findInstanceInPrototypeChain(const WrapperTypeInfo*, v8::Handle); - v8::Local ensureScriptRegexpContext(); - const char* previousSamplingState() const { return m_previousSamplingState; } void setPreviousSamplingState(const char* name) { m_previousSamplingState = name; } @@ -115,7 +113,6 @@ private: OwnPtr m_stringCache; OwnPtr m_hiddenValue; ScopedPersistent m_liveRoot; - RefPtr m_scriptRegexpScriptState; const char* m_previousSamplingState; diff --git a/engine/bindings/core/v8/v8.gypi b/engine/bindings/core/v8/v8.gypi index 8fe8e46d6a4..5694de28d5e 100644 --- a/engine/bindings/core/v8/v8.gypi +++ b/engine/bindings/core/v8/v8.gypi @@ -71,8 +71,6 @@ 'ScriptPromiseProperty.h', 'ScriptPromisePropertyBase.cpp', 'ScriptPromisePropertyBase.h', - 'ScriptRegexp.cpp', - 'ScriptRegexp.h', 'ScriptSourceCode.h', 'ScriptState.cpp', 'ScriptState.h',