[DevTools] Generate separate copies of inspector_protocol.

third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp

 /*
  * Copyright (C) 2011 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 39 matching lines @@
 #include "core/html/VoidCallback.h"
 #include "core/html/imports/HTMLImportLoader.h"
 #include "core/html/imports/HTMLImportsController.h"
 #include "core/html/parser/TextResourceDecoder.h"
 #include "core/inspector/DOMPatchSupport.h"
 #include "core/inspector/IdentifiersFactory.h"
 #include "core/inspector/InspectedFrames.h"
 #include "core/inspector/InspectorCSSAgent.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/inspector/InspectorResourceContentLoader.h"
+#include "core/inspector/V8InspectorStringConversion.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/loader/FrameLoader.h"
 #include "platform/MIMETypeRegistry.h"
 #include "platform/PlatformResourceLoader.h"
 #include "platform/UserGestureIndicator.h"
 #include "platform/v8_inspector/public/V8InspectorSession.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/ListHashSet.h"
 #include "wtf/Vector.h"
@@ skipping 274 matching lines @@
 {
 }
 
 void InspectorPageAgent::restore()
 {
     ErrorString error;
     if (m_state->booleanProperty(PageAgentState::pageAgentEnabled, false))
         enable(&error);
     setBlockedEventsWarningThreshold(&error, m_state->doubleProperty(PageAgentState::blockedEventsWarningThreshold, 0.0));
     if (m_client) {
-        String16 overlayMessage;
+        String overlayMessage;
         m_state->getString(PageAgentState::overlayMessage, &overlayMessage);
-        m_client->configureOverlay(m_state->booleanProperty(PageAgentState::overlaySuspended, false), overlayMessage.isEmpty() ? String() : String(overlayMessage));
+        m_client->configureOverlay(m_state->booleanProperty(PageAgentState::overlaySuspended, false), overlayMessage.isEmpty() ? String() : overlayMessage);

[caseq, 2016/08/19 02:50:36]

remove ternary operator here.

     }
 }
 
 void InspectorPageAgent::enable(ErrorString*)
 {
     m_enabled = true;
     m_state->setBoolean(PageAgentState::pageAgentEnabled, true);
     m_instrumentingAgents->addInspectorPageAgent(this);
 }
 
@@ skipping 148 matching lines @@
         callback->sendFailure("No frame for given id found");
         return;
     }
     String content;
     bool base64Encoded;
     if (!InspectorPageAgent::cachedResourceContent(InspectorPageAgent::cachedResource(frame, KURL(ParsedURLString, url)), &content, &base64Encoded)) {
         callback->sendFailure("No resource with given URL found");
         return;
     }
 
-    callback->sendSuccess(m_v8Session->searchInTextByLines(content, query, caseSensitive, isRegex));
+    std::vector<std::unique_ptr<v8_inspector::protocol::Debugger::API::SearchMatch>> matches = m_v8Session->searchInTextByLines(toV8InspectorString(content), toV8InspectorString(query), caseSensitive, isRegex);
+    std::unique_ptr<protocol::Array<v8_inspector::protocol::Debugger::API::SearchMatch>> results = protocol::Array<v8_inspector::protocol::Debugger::API::SearchMatch>::create();

[caseq, 2016/08/19 02:50:36]

auto results = ....::create()?

+    for (size_t i = 0; i < matches.size(); ++i)
+        results->addItem(std::move(matches[i]));
+    callback->sendSuccess(std::move(results));
 }
 
 void InspectorPageAgent::searchInResource(const String& frameId, const String& url, const String& query, const Maybe<bool>& optionalCaseSensitive, const Maybe<bool>& optionalIsRegex, std::unique_ptr<SearchInResourceCallback> callback)
 {
     if (!m_enabled) {
         callback->sendFailure("Agent is not enabled.");
         return;
     }
     m_inspectorResourceContentLoader->ensureResourcesContentLoaded(m_resourceContentLoaderClientId, WTF::bind(&InspectorPageAgent::searchContentAfterResourcesContentLoaded, wrapPersistent(this), frameId, url, query, optionalCaseSensitive.fromMaybe(false), optionalIsRegex.fromMaybe(false), passed(std::move(callback))));
 }
@@ skipping 16 matching lines @@
 
 void InspectorPageAgent::didClearDocumentOfWindowObject(LocalFrame* frame)
 {
     if (!frontend())
         return;
 
     protocol::DictionaryValue* scripts = m_state->getObject(PageAgentState::pageAgentScriptsToEvaluateOnLoad);
     if (scripts) {
         for (size_t i = 0; i < scripts->size(); ++i) {
             auto script = scripts->at(i);
-            String16 scriptText;
+            String scriptText;
             if (script.second->asString(&scriptText))
                 frame->script().executeScriptInMainWorld(scriptText);
         }
     }
     if (!m_scriptToEvaluateOnLoadOnce.isEmpty())
         frame->script().executeScriptInMainWorld(m_scriptToEvaluateOnLoadOnce);
 }
 
 void InspectorPageAgent::domContentLoadedEventFired(LocalFrame* frame)
 {
@@ skipping 191 matching lines @@
 }
 
 DEFINE_TRACE(InspectorPageAgent)
 {
     visitor->trace(m_inspectedFrames);
     visitor->trace(m_inspectorResourceContentLoader);
     InspectorBaseAgent::trace(visitor);
 }
 
 } // namespace blink