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

Side by Side Diff: third_party/WebKit/Source/platform/v8_inspector/V8Regex.cpp

Issue 2044343002: DevTools: update V8Inspector to work with the new v8_inspector API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comment addressed Created 4 years, 6 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "platform/v8_inspector/V8Regex.h" 5 #include "platform/v8_inspector/V8Regex.h"
6 6
7 #include "platform/v8_inspector/V8Compat.h" 7 #include "platform/v8_inspector/V8Compat.h"
8 #include "platform/v8_inspector/V8DebuggerImpl.h" 8 #include "platform/v8_inspector/V8DebuggerImpl.h"
9 #include "platform/v8_inspector/V8StringUtil.h" 9 #include "platform/v8_inspector/V8StringUtil.h"
10 #include "platform/v8_inspector/public/V8DebuggerClient.h" 10 #include "platform/v8_inspector/public/V8DebuggerClient.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 v8::Local<v8::Context> context = m_debugger->regexContext(); 52 v8::Local<v8::Context> context = m_debugger->regexContext();
53 v8::MicrotasksScope microtasks(isolate, v8::MicrotasksScope::kDoNotRunMicrot asks); 53 v8::MicrotasksScope microtasks(isolate, v8::MicrotasksScope::kDoNotRunMicrot asks);
54 v8::TryCatch tryCatch(isolate); 54 v8::TryCatch tryCatch(isolate);
55 55
56 v8::Local<v8::RegExp> regex = m_regex.Get(isolate); 56 v8::Local<v8::RegExp> regex = m_regex.Get(isolate);
57 v8::Local<v8::Value> exec; 57 v8::Local<v8::Value> exec;
58 if (!regex->Get(context, toV8StringInternalized(isolate, "exec")).ToLocal(&e xec)) 58 if (!regex->Get(context, toV8StringInternalized(isolate, "exec")).ToLocal(&e xec))
59 return -1; 59 return -1;
60 v8::Local<v8::Value> argv[] = { toV8String(isolate, string.substring(startFr om)) }; 60 v8::Local<v8::Value> argv[] = { toV8String(isolate, string.substring(startFr om)) };
61 v8::Local<v8::Value> returnValue; 61 v8::Local<v8::Value> returnValue;
62 if (!exec.As<v8::Function>()->Call(context, regex, WTF_ARRAY_LENGTH(argv), a rgv).ToLocal(&returnValue)) 62 if (!exec.As<v8::Function>()->Call(context, regex, PROTOCOL_ARRAY_LENGTH(arg v), argv).ToLocal(&returnValue))
63 return -1; 63 return -1;
64 64
65 // RegExp#exec returns null if there's no match, otherwise it returns an 65 // RegExp#exec returns null if there's no match, otherwise it returns an
66 // Array of strings with the first being the whole match string and others 66 // Array of strings with the first being the whole match string and others
67 // being subgroups. The Array also has some random properties tacked on like 67 // being subgroups. The Array also has some random properties tacked on like
68 // "index" which is the offset of the match. 68 // "index" which is the offset of the match.
69 // 69 //
70 // https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Obje cts/RegExp/exec 70 // https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Obje cts/RegExp/exec
71 71
72 DCHECK(!returnValue.IsEmpty()); 72 DCHECK(!returnValue.IsEmpty());
73 if (!returnValue->IsArray()) 73 if (!returnValue->IsArray())
74 return -1; 74 return -1;
75 75
76 v8::Local<v8::Array> result = returnValue.As<v8::Array>(); 76 v8::Local<v8::Array> result = returnValue.As<v8::Array>();
77 v8::Local<v8::Value> matchOffset; 77 v8::Local<v8::Value> matchOffset;
78 if (!result->Get(context, toV8StringInternalized(isolate, "index")).ToLocal( &matchOffset)) 78 if (!result->Get(context, toV8StringInternalized(isolate, "index")).ToLocal( &matchOffset))
79 return -1; 79 return -1;
80 if (matchLength) { 80 if (matchLength) {
81 v8::Local<v8::Value> match; 81 v8::Local<v8::Value> match;
82 if (!result->Get(context, 0).ToLocal(&match)) 82 if (!result->Get(context, 0).ToLocal(&match))
83 return -1; 83 return -1;
84 *matchLength = match.As<v8::String>()->Length(); 84 *matchLength = match.As<v8::String>()->Length();
85 } 85 }
86 86
87 return matchOffset.As<v8::Int32>()->Value() + startFrom; 87 return matchOffset.As<v8::Int32>()->Value() + startFrom;
88 } 88 }
89 89
90 } // namespace blink 90 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698