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

Side by Side Diff: Source/bindings/core/v8/ScriptRegexp.cpp

Issue 1036803002: binidngs: Make callInternalFunction return MaybeLocal (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2008, 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2008 Collabora Ltd. 3 * Copyright (C) 2008 Collabora Ltd.
4 * Copyright (C) 2011 Peter Varga (pvarga@webkit.org), University of Szeged 4 * Copyright (C) 2011 Peter Varga (pvarga@webkit.org), University of Szeged
5 * Copyright (C) 2013 Google Inc. All rights reserved. 5 * Copyright (C) 2013 Google Inc. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 ScriptForbiddenScope::AllowUserAgentScript allowScript; 71 ScriptForbiddenScope::AllowUserAgentScript allowScript;
72 72
73 v8::Isolate* isolate = v8::Isolate::GetCurrent(); 73 v8::Isolate* isolate = v8::Isolate::GetCurrent();
74 v8::HandleScope handleScope(isolate); 74 v8::HandleScope handleScope(isolate);
75 v8::Context::Scope contextScope(V8PerIsolateData::from(isolate)->ensureScrip tRegexpContext()); 75 v8::Context::Scope contextScope(V8PerIsolateData::from(isolate)->ensureScrip tRegexpContext());
76 v8::TryCatch tryCatch; 76 v8::TryCatch tryCatch;
77 77
78 v8::Local<v8::RegExp> regex = m_regex.newLocal(isolate); 78 v8::Local<v8::RegExp> regex = m_regex.newLocal(isolate);
79 v8::Local<v8::Function> exec = regex->Get(v8AtomicString(isolate, "exec")).A s<v8::Function>(); 79 v8::Local<v8::Function> exec = regex->Get(v8AtomicString(isolate, "exec")).A s<v8::Function>();
80 v8::Local<v8::Value> argv[] = { v8String(isolate, string.substring(startFrom )) }; 80 v8::Local<v8::Value> argv[] = { v8String(isolate, string.substring(startFrom )) };
81 v8::Local<v8::Value> returnValue = V8ScriptRunner::callInternalFunction(exec , regex, WTF_ARRAY_LENGTH(argv), argv, isolate); 81 v8::Local<v8::Value> returnValue;
82 82 if (!V8ScriptRunner::callInternalFunction(exec, regex, WTF_ARRAY_LENGTH(argv ), argv, isolate).ToLocal(&returnValue))
yurys 2015/03/25 12:21:48 I don't quite understand what's the advantage of r
83 if (tryCatch.HasCaught())
84 return -1; 83 return -1;
85 84
86 // RegExp#exec returns null if there's no match, otherwise it returns an 85 // RegExp#exec returns null if there's no match, otherwise it returns an
87 // Array of strings with the first being the whole match string and others 86 // Array of strings with the first being the whole match string and others
88 // being subgroups. The Array also has some random properties tacked on like 87 // being subgroups. The Array also has some random properties tacked on like
89 // "index" which is the offset of the match. 88 // "index" which is the offset of the match.
90 // 89 //
91 // https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Obje cts/RegExp/exec 90 // https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Obje cts/RegExp/exec
92 91
93 ASSERT(!returnValue.IsEmpty()); 92 ASSERT(!returnValue.IsEmpty());
94 if (!returnValue->IsArray()) 93 if (!returnValue->IsArray())
95 return -1; 94 return -1;
96 95
97 v8::Local<v8::Array> result = returnValue.As<v8::Array>(); 96 v8::Local<v8::Array> result = returnValue.As<v8::Array>();
98 int matchOffset = result->Get(v8AtomicString(isolate, "index"))->ToInt32(iso late)->Value(); 97 int matchOffset = result->Get(v8AtomicString(isolate, "index"))->ToInt32(iso late)->Value();
99 if (matchLength) { 98 if (matchLength) {
100 v8::Local<v8::String> match = result->Get(0).As<v8::String>(); 99 v8::Local<v8::String> match = result->Get(0).As<v8::String>();
101 *matchLength = match->Length(); 100 *matchLength = match->Length();
102 } 101 }
103 102
104 return matchOffset + startFrom; 103 return matchOffset + startFrom;
105 } 104 }
106 105
107 } // namespace blink 106 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698