Chromium Code Reviews| Index: third_party/WebKit/Source/core/clipboard/DataTransferItem.cpp |
| diff --git a/third_party/WebKit/Source/core/clipboard/DataTransferItem.cpp b/third_party/WebKit/Source/core/clipboard/DataTransferItem.cpp |
| index 910c50a9ab0ea6416dac200fd2a59ea2b8cb6ba5..f7557bd28a8975960b0f8417e8b70766b67bf88c 100644 |
| --- a/third_party/WebKit/Source/core/clipboard/DataTransferItem.cpp |
| +++ b/third_party/WebKit/Source/core/clipboard/DataTransferItem.cpp |
| @@ -33,10 +33,9 @@ |
| #include "bindings/core/v8/V8Binding.h" |
| #include "core/clipboard/DataObjectItem.h" |
| #include "core/clipboard/DataTransfer.h" |
| -#include "core/dom/ExecutionContext.h" |
| -#include "core/dom/ExecutionContextTask.h" |
| #include "core/dom/StringCallback.h" |
| #include "core/dom/TaskRunnerHelper.h" |
| +#include "core/inspector/InspectorInstrumentation.h" |
| #include "public/platform/WebTraceLocation.h" |
| #include "wtf/StdLibExtras.h" |
| #include "wtf/text/WTFString.h" |
| @@ -69,6 +68,13 @@ String DataTransferItem::type() const { |
| return m_item->type(); |
| } |
| +static void runGetAsStringTask(ExecutionContext* context, |
| + StringCallback* callback, |
| + const String& data) { |
| + InspectorInstrumentation::AsyncTask(context, callback); |
| + callback->handleEvent(data); |
| +} |
| + |
| void DataTransferItem::getAsString(ScriptState* scriptState, |
| StringCallback* callback) const { |
| if (!m_dataTransfer->canReadData()) |
| @@ -76,11 +82,13 @@ void DataTransferItem::getAsString(ScriptState* scriptState, |
| if (!callback || m_item->kind() != DataObjectItem::StringKind) |
| return; |
| - scriptState->getExecutionContext()->postTask( |
| - TaskType::UserInteraction, BLINK_FROM_HERE, |
| - createSameThreadTask(&StringCallback::handleEvent, |
| - wrapPersistent(callback), m_item->getAsString()), |
| - "DataTransferItem.getAsString"); |
| + ExecutionContext* context = scriptState->getExecutionContext(); |
| + InspectorInstrumentation::asyncTaskScheduled( |
| + context, "DataTransferItem.getAsString", callback); |
| + TaskRunnerHelper::get(TaskType::UserInteraction, context) |
| + ->postTask(BLINK_FROM_HERE, |
| + WTF::bind(&runGetAsStringTask, wrapPersistent(context), |
|
tzik
2017/02/09 12:15:34
Could you replace wrapPersistent(context) here wit
yuryu
2017/02/09 12:56:43
Done.
|
| + wrapPersistent(callback), m_item->getAsString())); |
| } |
| File* DataTransferItem::getAsFile() const { |