DevTools: consistently use Maybe for optional values in the protocol generator.

third_party/WebKit/Source/modules/indexeddb/InspectorIndexedDBAgent.cpp

 /*
  * Copyright (C) 2012 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 375 matching lines @@
         for (size_t i = 0; array && i < array->length(); ++i)
             keyArray.append(idbKeyFromInspectorObject(array->get(i)));
         idbKey = IDBKey::createArray(keyArray);
     } else {
         return nullptr;
     }
 
     return idbKey;
 }
 
-static IDBKeyRange* idbKeyRangeFromKeyRange(PassOwnPtr<protocol::IndexedDB::KeyRange> keyRange)
+static IDBKeyRange* idbKeyRangeFromKeyRange(const Maybe<protocol::IndexedDB::KeyRange>& maybeRange)
 {
+    protocol::IndexedDB::KeyRange* keyRange = maybeRange.fromJust();

[dgozman, 2016/02/24 23:17:43]

Let's pass raw pointer to this method since it already assumes that maybe is a
just.

[pfeldman, 2016/02/24 23:38:39]

Done.

     IDBKey* idbLower = idbKeyFromInspectorObject(keyRange->getLower(nullptr));
     if (keyRange->hasLower() && !idbLower)
         return nullptr;
 
     IDBKey* idbUpper = idbKeyFromInspectorObject(keyRange->getUpper(nullptr));
     if (keyRange->hasUpper() && !idbUpper)
         return nullptr;
 
     if (!keyRange->hasLowerOpen())
         return nullptr;
@@ skipping 271 matching lines @@
         return;
 
     ScriptState* scriptState = ScriptState::forMainWorld(frame);
     if (!scriptState)
         return;
     ScriptState::Scope scope(scriptState);
     RefPtr<DatabaseLoader> databaseLoader = DatabaseLoader::create(scriptState, requestCallback);
     databaseLoader->start(idbFactory, document->securityOrigin(), databaseName);
 }
 
-void InspectorIndexedDBAgent::requestData(ErrorString* errorString, const String& securityOrigin, const String& databaseName, const String& objectStoreName, const String& indexName, int skipCount, int pageSize, PassOwnPtr<protocol::IndexedDB::KeyRange> keyRange, const PassRefPtr<RequestDataCallback> requestCallback)
+void InspectorIndexedDBAgent::requestData(ErrorString* errorString,
+    const String& securityOrigin,
+    const String& databaseName,
+    const String& objectStoreName,
+    const String& indexName,
+    int skipCount,
+    int pageSize,
+    const Maybe<protocol::IndexedDB::KeyRange>& keyRange,
+    const PassRefPtr<RequestDataCallback> requestCallback)
 {
     LocalFrame* frame = m_inspectedFrames->frameWithSecurityOrigin(securityOrigin);
     Document* document = assertDocument(errorString, frame);
     if (!document)
         return;
     IDBFactory* idbFactory = assertIDBFactory(errorString, document);
     if (!idbFactory)
         return;
 
-    IDBKeyRange* idbKeyRange = keyRange ? idbKeyRangeFromKeyRange(keyRange) : nullptr;
-    if (keyRange && !idbKeyRange) {
+    IDBKeyRange* idbKeyRange = keyRange.isJust() ? idbKeyRangeFromKeyRange(keyRange) : nullptr;
+    if (keyRange.isJust() && !idbKeyRange) {
         *errorString = "Can not parse key range.";
         return;
     }
 
     ScriptState* scriptState = ScriptState::forMainWorld(frame);
     if (!scriptState)
         return;
     ScriptState::Scope scope(scriptState);
     RefPtr<DataLoader> dataLoader = DataLoader::create(scriptState, requestCallback, objectStoreName, indexName, idbKeyRange, skipCount, pageSize);
     dataLoader->start(idbFactory, document->securityOrigin(), databaseName);
@@ skipping 106 matching lines @@
     clearObjectStore->start(idbFactory, document->securityOrigin(), databaseName);
 }
 
 DEFINE_TRACE(InspectorIndexedDBAgent)
 {
     visitor->trace(m_inspectedFrames);
     InspectorBaseAgent::trace(visitor);
 }
 
 } // namespace blink