Rename StringCallback to FunctionStringCallback.

Rename StringCallback to FunctionStringCallback
in DataTransferItem interface.

spec:
https://html.spec.whatwg.org/#the-datatransferitem-interface

BUG=701477

Review-Url: https://codereview.chromium.org/2896183002
Cr-Commit-Position: refs/heads/master@{#474955}

third_party/WebKit/Source/core/clipboard/DataTransferItem.cpp

@@ -34,7 +34,7 @@
 #include "core/clipboard/DataObjectItem.h"
 #include "core/clipboard/DataTransfer.h"
 #include "core/dom/ExecutionContext.h"
-#include "core/dom/StringCallback.h"
+#include "core/dom/FunctionStringCallback.h"
 #include "core/dom/TaskRunnerHelper.h"
 #include "core/probe/CoreProbes.h"
 #include "platform/wtf/StdLibExtras.h"
@@ -70,7 +70,7 @@ String DataTransferItem::type() const {
 }
 
 static void RunGetAsStringTask(ExecutionContext* context,
-                               StringCallback* callback,
+                               FunctionStringCallback* callback,
                                const String& data) {
   probe::AsyncTask async_task(context, callback);
   if (context)
@@ -78,7 +78,7 @@ static void RunGetAsStringTask(ExecutionContext* context,
 }
 
 void DataTransferItem::getAsString(ScriptState* script_state,
-                                   StringCallback* callback) const {
+                                   FunctionStringCallback* callback) const {
   if (!data_transfer_->CanReadData())
     return;
   if (!callback || item_->Kind() != DataObjectItem::kStringKind)

third_party/WebKit/Source/core/clipboard/DataTransferItem.h

@@ -41,8 +41,8 @@ namespace blink {
 class DataObjectItem;
 class DataTransfer;
 class File;
+class FunctionStringCallback;
 class ScriptState;
-class StringCallback;
 
 class CORE_EXPORT DataTransferItem final
     : public GarbageCollected<DataTransferItem>,
@@ -56,7 +56,7 @@ class CORE_EXPORT DataTransferItem final
   String kind() const;
   String type() const;
 
-  void getAsString(ScriptState*, StringCallback*) const;
+  void getAsString(ScriptState*, FunctionStringCallback*) const;
   File* getAsFile() const;
 
   DataTransfer* GetDataTransfer() { return data_transfer_.Get(); }

third_party/WebKit/Source/core/clipboard/DataTransferItem.idl

@@ -33,7 +33,6 @@
 interface DataTransferItem {
     readonly attribute DOMString kind;
     readonly attribute DOMString type;
-    // TODO(foolip): The callback argument should be a FunctionStringCallback.
-    [CallWith=ScriptState] void getAsString(StringCallback? callback);
+    [CallWith=ScriptState] void getAsString(FunctionStringCallback? callback);
     File? getAsFile();
-};
+};
\ No newline at end of file

third_party/WebKit/Source/core/core_idl_files.gni

@@ -113,6 +113,7 @@ core_idl_files = get_path_info([
                                  "dom/Float32Array.idl",
                                  "dom/Float64Array.idl",
                                  "dom/FrameRequestCallback.idl",
+                                 "dom/FunctionStringCallback.idl",
                                  "dom/IdleDeadline.idl",
                                  "dom/IdleRequestCallback.idl",
                                  "dom/Int16Array.idl",
@@ -137,7 +138,6 @@ core_idl_files = get_path_info([
                                  "dom/ResizeObserverEntry.idl",
                                  "dom/SharedArrayBuffer.idl",
                                  "dom/StaticRange.idl",
-                                 "dom/StringCallback.idl",
                                  "dom/Text.idl",
                                  "dom/Touch.idl",
                                  "dom/TouchList.idl",

third_party/WebKit/Source/core/dom/BUILD.gn

@@ -166,6 +166,7 @@ blink_core_sources("dom") {
     "FrameRequestCallbackCollection.h",
     "Fullscreen.cpp",
     "Fullscreen.h",
+    "FunctionStringCallback.h",
     "GlobalEventHandlers.h",
     "IconURL.cpp",
     "IconURL.h",
@@ -307,7 +308,6 @@ blink_core_sources("dom") {
     "StaticNodeList.h",
     "StaticRange.cpp",
     "StaticRange.h",
-    "StringCallback.h",
     "StyleChangeReason.cpp",
     "StyleChangeReason.h",
     "StyleElement.cpp",

third_party/WebKit/Source/core/dom/StringCallback.h → third_party/WebKit/Source/core/dom/FunctionStringCallback.h

@@ -28,21 +28,22 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef StringCallback_h
-#define StringCallback_h
+#ifndef FunctionStringCallback_h
+#define FunctionStringCallback_h
 
 #include "platform/heap/Handle.h"
 #include "platform/wtf/Forward.h"
 
 namespace blink {
 
-class StringCallback : public GarbageCollectedFinalized<StringCallback> {
+class FunctionStringCallback
+    : public GarbageCollectedFinalized<FunctionStringCallback> {
  public:
-  virtual ~StringCallback() {}
+  virtual ~FunctionStringCallback() {}
   DEFINE_INLINE_VIRTUAL_TRACE() {}
   virtual void handleEvent(const String& data) = 0;
 };
 
 }  // namespace blink
 
-#endif  // StringCallback_h
+#endif  // FunctionStringCallback_h

third_party/WebKit/Source/core/dom/StringCallback.idl → third_party/WebKit/Source/core/dom/FunctionStringCallback.idl

@@ -30,7 +30,6 @@
 
 // https://html.spec.whatwg.org/#the-datatransferitem-interface
 
-// TODO(markdittmer): Spec defines this as FunctionStringCallback.
-callback interface StringCallback {
+callback interface FunctionStringCallback {
     void handleEvent(DOMString data);
 };