Commit 4c2fcd55 authored by Gary Kacmarcik's avatar Gary Kacmarcik Committed by Commit Bot

Move clipboard from core/ to modules/

This is requires so that the clipboard code can access the Permission
methods (since core/ can't reach into modules/). Permission checks
will be added in a follow-up cl.

Bug: 677564
Change-Id: Ia5dbf39a05ab5acb0b0aa5504bdf8a783751a6fb
Reviewed-on: https://chromium-review.googlesource.com/798125Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Commit-Queue: Gary Kacmarcik <garykac@chromium.org>
Cr-Commit-Position: refs/heads/master@{#520606}
parent deb6c7ea
...@@ -6,10 +6,6 @@ import("//third_party/WebKit/Source/core/core.gni") ...@@ -6,10 +6,6 @@ import("//third_party/WebKit/Source/core/core.gni")
blink_core_sources("clipboard") { blink_core_sources("clipboard") {
sources = [ sources = [
"Clipboard.cpp",
"Clipboard.h",
"ClipboardPromise.cpp",
"ClipboardPromise.h",
"DataObject.cpp", "DataObject.cpp",
"DataObject.h", "DataObject.h",
"DataObjectItem.cpp", "DataObjectItem.cpp",
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#ifndef DataTransferItemList_h #ifndef DataTransferItemList_h
#define DataTransferItemList_h #define DataTransferItemList_h
#include "core/CoreExport.h"
#include "platform/bindings/ScriptWrappable.h" #include "platform/bindings/ScriptWrappable.h"
#include "platform/heap/Handle.h" #include "platform/heap/Handle.h"
#include "platform/wtf/Forward.h" #include "platform/wtf/Forward.h"
...@@ -44,7 +45,7 @@ class File; ...@@ -44,7 +45,7 @@ class File;
class ExceptionState; class ExceptionState;
class DataTransferItemList final : public ScriptWrappable { class CORE_EXPORT DataTransferItemList final : public ScriptWrappable {
DEFINE_WRAPPERTYPEINFO(); DEFINE_WRAPPERTYPEINFO();
public: public:
......
...@@ -43,7 +43,6 @@ core_idl_files = ...@@ -43,7 +43,6 @@ core_idl_files =
"animation/KeyframeEffect.idl", "animation/KeyframeEffect.idl",
"animation/KeyframeEffectReadOnly.idl", "animation/KeyframeEffectReadOnly.idl",
"animation/ScrollTimeline.idl", "animation/ScrollTimeline.idl",
"clipboard/Clipboard.idl",
"clipboard/DataTransfer.idl", "clipboard/DataTransfer.idl",
"clipboard/DataTransferItemList.idl", "clipboard/DataTransferItemList.idl",
"css/CSSConditionRule.idl", "css/CSSConditionRule.idl",
...@@ -492,7 +491,6 @@ core_dependency_idl_files = ...@@ -492,7 +491,6 @@ core_dependency_idl_files =
"events/NavigatorEvents.idl", "events/NavigatorEvents.idl",
"fileapi/URLFileAPI.idl", "fileapi/URLFileAPI.idl",
"frame/NavigatorAutomationInformation.idl", "frame/NavigatorAutomationInformation.idl",
"frame/NavigatorClipboard.idl",
"frame/NavigatorConcurrentHardware.idl", "frame/NavigatorConcurrentHardware.idl",
"frame/NavigatorCookies.idl", "frame/NavigatorCookies.idl",
"frame/NavigatorID.idl", "frame/NavigatorID.idl",
......
...@@ -73,8 +73,6 @@ blink_core_sources("frame") { ...@@ -73,8 +73,6 @@ blink_core_sources("frame") {
"MessageReport.h", "MessageReport.h",
"Navigator.cpp", "Navigator.cpp",
"Navigator.h", "Navigator.h",
"NavigatorClipboard.cpp",
"NavigatorClipboard.h",
"NavigatorConcurrentHardware.cpp", "NavigatorConcurrentHardware.cpp",
"NavigatorConcurrentHardware.h", "NavigatorConcurrentHardware.h",
"NavigatorID.cpp", "NavigatorID.cpp",
......
...@@ -101,6 +101,7 @@ target("jumbo_" + modules_target_type, "modules") { ...@@ -101,6 +101,7 @@ target("jumbo_" + modules_target_type, "modules") {
"//third_party/WebKit/Source/modules/budget", "//third_party/WebKit/Source/modules/budget",
"//third_party/WebKit/Source/modules/cachestorage", "//third_party/WebKit/Source/modules/cachestorage",
"//third_party/WebKit/Source/modules/canvas", "//third_party/WebKit/Source/modules/canvas",
"//third_party/WebKit/Source/modules/clipboard",
"//third_party/WebKit/Source/modules/cookie_store", "//third_party/WebKit/Source/modules/cookie_store",
"//third_party/WebKit/Source/modules/credentialmanager", "//third_party/WebKit/Source/modules/credentialmanager",
"//third_party/WebKit/Source/modules/crypto", "//third_party/WebKit/Source/modules/crypto",
......
# Copyright 2017 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//third_party/WebKit/Source/modules/modules.gni")
blink_modules_sources("clipboard") {
sources = [
"Clipboard.cpp",
"Clipboard.h",
"ClipboardPromise.cpp",
"ClipboardPromise.h",
"NavigatorClipboard.cpp",
"NavigatorClipboard.h",
]
}
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "core/clipboard/Clipboard.h" #include "modules/clipboard/Clipboard.h"
#include "bindings/core/v8/ScriptPromiseResolver.h" #include "bindings/core/v8/ScriptPromiseResolver.h"
#include "core/clipboard/ClipboardPromise.h" #include "modules/clipboard/ClipboardPromise.h"
namespace blink { namespace blink {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "core/clipboard/ClipboardPromise.h" #include "modules/clipboard/ClipboardPromise.h"
#include "bindings/core/v8/ScriptPromiseResolver.h" #include "bindings/core/v8/ScriptPromiseResolver.h"
#include "core/clipboard/DataObject.h" #include "core/clipboard/DataObject.h"
......
include_rules = [
"+core/clipboard",
"-modules",
"+modules/EventModules.h",
"+modules/ModulesExport.h",
"+modules/clipboard",
"+modules/permissions",
]
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "core/frame/NavigatorClipboard.h" #include "modules/clipboard/NavigatorClipboard.h"
#include "core/clipboard/Clipboard.h"
#include "core/dom/Document.h" #include "core/dom/Document.h"
#include "core/frame/LocalFrame.h" #include "core/frame/LocalFrame.h"
#include "modules/clipboard/Clipboard.h"
namespace blink { namespace blink {
......
...@@ -87,6 +87,7 @@ modules_idl_files = ...@@ -87,6 +87,7 @@ modules_idl_files =
"canvas/canvas2d/CanvasPattern.idl", "canvas/canvas2d/CanvasPattern.idl",
"canvas/canvas2d/CanvasRenderingContext2D.idl", "canvas/canvas2d/CanvasRenderingContext2D.idl",
"canvas/canvas2d/Path2D.idl", "canvas/canvas2d/Path2D.idl",
"clipboard/Clipboard.idl",
"cookie_store/CookieStore.idl", "cookie_store/CookieStore.idl",
"credentialmanager/AuthenticatorAssertionResponse.idl", "credentialmanager/AuthenticatorAssertionResponse.idl",
"credentialmanager/AuthenticatorAttestationResponse.idl", "credentialmanager/AuthenticatorAttestationResponse.idl",
...@@ -636,6 +637,7 @@ modules_dictionary_idl_files = ...@@ -636,6 +637,7 @@ modules_dictionary_idl_files =
modules_dependency_idl_files = modules_dependency_idl_files =
get_path_info( get_path_info(
[ [
"animationworklet/WindowAnimationWorklet.idl",
"app_banner/WindowInstallation.idl", "app_banner/WindowInstallation.idl",
"audio_output_devices/HTMLMediaElementAudioOutputDevice.idl", "audio_output_devices/HTMLMediaElementAudioOutputDevice.idl",
"background_fetch/ServiceWorkerGlobalScopeBackgroundFetch.idl", "background_fetch/ServiceWorkerGlobalScopeBackgroundFetch.idl",
...@@ -651,7 +653,7 @@ modules_dependency_idl_files = ...@@ -651,7 +653,7 @@ modules_dependency_idl_files =
"cachestorage/WorkerCacheStorage.idl", "cachestorage/WorkerCacheStorage.idl",
"canvas/htmlcanvas/HTMLCanvasElementModule.idl", "canvas/htmlcanvas/HTMLCanvasElementModule.idl",
"canvas/canvas2d/CanvasPath.idl", "canvas/canvas2d/CanvasPath.idl",
"animationworklet/WindowAnimationWorklet.idl", "clipboard/NavigatorClipboard.idl",
"cookie_store/WindowCookieStore.idl", "cookie_store/WindowCookieStore.idl",
"credentialmanager/CredentialUserData.idl", "credentialmanager/CredentialUserData.idl",
"credentialmanager/NavigatorCredentials.idl", "credentialmanager/NavigatorCredentials.idl",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment