diff --git a/.gn b/.gn index 42fe8d1e..3ca54ab 100644 --- a/.gn +++ b/.gn
@@ -258,8 +258,6 @@ "//clank/java/BUILD.gn", "//clank/native/BUILD.gn", - "//components/domain_reliability/BUILD.gn", - "//components/sync/protocol/protocol_sources.gni", "//content/browser/browser.gni", "//content/child/child.gni", "//content/common/common.gni", @@ -298,7 +296,6 @@ "//third_party/WebKit/Source/config.gni", "//third_party/WebKit/Source/core/core.gni", "//third_party/WebKit/Source/modules/modules.gni", - "//third_party/WebKit/Source/platform/platform.gni", "//third_party/WebKit/Source/web/BUILD.gn", "//tools/gn/BUILD.gn", "//tools/gn/build_settings.h",
diff --git a/DEPS b/DEPS index e2e98d5..99cbcc0 100644 --- a/DEPS +++ b/DEPS
@@ -40,7 +40,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other. - 'v8_revision': '2bc7c2bdde2650a9fa5c9d29b10530fe29bf3f2f', + 'v8_revision': '12c67cec38958cf415e698ed0fabdfa0a45f7a1d', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling swarming_client # and whatever else without interference from each other. @@ -48,7 +48,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling ANGLE # and whatever else without interference from each other. - 'angle_revision': 'ad10a4aa7f121c410d35ce5429a0ca83ec7ff752', + 'angle_revision': 'a4e6f07433d219fbdc802fc438a5762f53822617', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling build tools # and whatever else without interference from each other. @@ -60,7 +60,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling PDFium # and whatever else without interference from each other. - 'pdfium_revision': '21b111fcf71e4e189035f29606ca9d3fdf3ebd92', + 'pdfium_revision': '380f53ec1d0a46648473e407934c9adede6cc1bd', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling openmax_dl # and whatever else without interference from each other. @@ -92,7 +92,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling catapult # and whatever else without interference from each other. - 'catapult_revision': 'ca10e840fb1eabf13a2909647258add3dc68fcb6', + 'catapult_revision': '9a90934ebf068f5e8af3ab3653e344fbfcf0e016', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libFuzzer # and whatever else without interference from each other.
diff --git a/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java b/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java index 9680600..e552fe0 100644 --- a/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java +++ b/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java
@@ -44,17 +44,6 @@ } /** - * @see Long#compare(long, long) - */ - public static int compareLong(long lhs, long rhs) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - return Long.compare(lhs, rhs); - } else { - return lhs < rhs ? -1 : (lhs == rhs ? 0 : 1); - } - } - - /** * Returns true if view's layout direction is right-to-left. * * @param view the View whose layout is being considered
diff --git a/blimp/client/BUILD.gn b/blimp/client/BUILD.gn index b1b574ef..ef410a6b 100644 --- a/blimp/client/BUILD.gn +++ b/blimp/client/BUILD.gn
@@ -176,7 +176,6 @@ sources = [ "app/android/java/src/org/chromium/blimp/BlimpLibraryLoader.java", "app/android/java/src/org/chromium/blimp/BlimpView.java", - "app/android/java/src/org/chromium/blimp/input/ImeHelperDialog.java", "app/android/java/src/org/chromium/blimp/session/BlimpClientSession.java", "app/android/java/src/org/chromium/blimp/session/TabControlFeature.java", "app/android/java/src/org/chromium/blimp/toolbar/Toolbar.java", @@ -250,7 +249,6 @@ "//blimp/client/core:core_java", "//blimp/client/public:public_headers_java", "//third_party/android_tools:android_support_annotations_java", - "//third_party/android_tools:android_support_v7_appcompat_java", # TODO(dtrainor): Remove the ui_java target once no more Android Toast # notifications are used. @@ -267,8 +265,6 @@ "app/android/java/src/org/chromium/blimp/BlimpRendererActivity.java", "app/android/java/src/org/chromium/blimp/BlimpView.java", "app/android/java/src/org/chromium/blimp/BrowserRestartActivity.java", - "app/android/java/src/org/chromium/blimp/input/ImeEditText.java", - "app/android/java/src/org/chromium/blimp/input/ImeHelperDialog.java", "app/android/java/src/org/chromium/blimp/preferences/PreferencesUtil.java", "app/android/java/src/org/chromium/blimp/session/BlimpClientSession.java", "app/android/java/src/org/chromium/blimp/session/EngineInfo.java", @@ -341,8 +337,6 @@ "app/android/blimp_library_loader.h", "app/android/blimp_view.cc", "app/android/blimp_view.h", - "app/android/ime_helper_dialog.cc", - "app/android/ime_helper_dialog.h", "app/android/tab_control_feature_android.cc", "app/android/tab_control_feature_android.h", "app/android/toolbar.cc",
diff --git a/blimp/client/app/android/AndroidManifest.xml.jinja2 b/blimp/client/app/android/AndroidManifest.xml.jinja2 index 50559f1..46909d88 100644 --- a/blimp/client/app/android/AndroidManifest.xml.jinja2 +++ b/blimp/client/app/android/AndroidManifest.xml.jinja2
@@ -19,7 +19,7 @@ android:icon="@mipmap/app_icon"> <activity android:name="org.chromium.blimp.BlimpRendererActivity" android:launchMode="singleTask" - android:theme="@android:style/Theme.Holo.Light.NoActionBar" + android:theme="@style/Theme.AppCompat.Light.NoActionBar" android:configChanges="orientation|keyboardHidden|keyboard|screenSize" android:windowSoftInputMode="adjustNothing" android:hardwareAccelerated="true">
diff --git a/blimp/client/app/android/blimp_app_jni_registrar.cc b/blimp/client/app/android/blimp_app_jni_registrar.cc index 2b9a036..ee1a0332 100644 --- a/blimp/client/app/android/blimp_app_jni_registrar.cc +++ b/blimp/client/app/android/blimp_app_jni_registrar.cc
@@ -8,9 +8,9 @@ #include "blimp/client/app/android/blimp_client_session_android.h" #include "blimp/client/app/android/blimp_library_loader.h" #include "blimp/client/app/android/blimp_view.h" -#include "blimp/client/app/android/ime_helper_dialog.h" #include "blimp/client/app/android/tab_control_feature_android.h" #include "blimp/client/app/android/toolbar.h" +#include "blimp/client/core/contents/android/ime_helper_dialog.h" #include "components/safe_json/android/component_jni_registrar.h" namespace blimp {
diff --git a/blimp/client/app/android/blimp_client_session_android.cc b/blimp/client/app/android/blimp_client_session_android.cc index 805ffc71..d2f63c8 100644 --- a/blimp/client/app/android/blimp_client_session_android.cc +++ b/blimp/client/app/android/blimp_client_session_android.cc
@@ -17,6 +17,7 @@ #include "components/version_info/version_info.h" #include "jni/BlimpClientSession_jni.h" #include "net/base/net_errors.h" +#include "ui/android/window_android.h" using base::android::JavaParamRef; @@ -35,9 +36,10 @@ static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& jobj, - const base::android::JavaParamRef<jstring>& jassigner_url) { - return reinterpret_cast<intptr_t>( - new BlimpClientSessionAndroid(env, jobj, jassigner_url)); + const base::android::JavaParamRef<jstring>& jassigner_url, + jlong window_android_ptr) { + return reinterpret_cast<intptr_t>(new BlimpClientSessionAndroid( + env, jobj, jassigner_url, window_android_ptr)); } // static @@ -56,11 +58,17 @@ BlimpClientSessionAndroid::BlimpClientSessionAndroid( JNIEnv* env, const base::android::JavaParamRef<jobject>& jobj, - const base::android::JavaParamRef<jstring>& jassigner_url) + const base::android::JavaParamRef<jstring>& jassigner_url, + jlong window_android_ptr) : BlimpClientSession(CreateAssignerGURL( base::android::ConvertJavaStringToUTF8(jassigner_url))) { java_obj_.Reset(env, jobj); + ui::WindowAndroid* window = + reinterpret_cast<ui::WindowAndroid*>(window_android_ptr); + ime_dialog_.reset(new ImeHelperDialog(window)); + GetImeFeature()->set_delegate(ime_dialog_.get()); + // Send OS info before creating any tab. GetSettingsFeature()->SendUserAgentOSVersionInfo( GetOSVersionInfoForUserAgent()); @@ -83,7 +91,9 @@ BlimpClientSession::Connect(client_auth_token); } -BlimpClientSessionAndroid::~BlimpClientSessionAndroid() {} +BlimpClientSessionAndroid::~BlimpClientSessionAndroid() { + GetImeFeature()->set_delegate(nullptr); +} void BlimpClientSessionAndroid::OnConnected() { JNIEnv* env = base::android::AttachCurrentThread();
diff --git a/blimp/client/app/android/blimp_client_session_android.h b/blimp/client/app/android/blimp_client_session_android.h index 77f12f5..5f0a78f 100644 --- a/blimp/client/app/android/blimp_client_session_android.h +++ b/blimp/client/app/android/blimp_client_session_android.h
@@ -8,6 +8,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_array.h" #include "base/macros.h" +#include "blimp/client/core/contents/android/ime_helper_dialog.h" #include "blimp/client/public/session/assignment.h" #include "blimp/client/session/blimp_client_session.h" @@ -24,7 +25,8 @@ BlimpClientSessionAndroid( JNIEnv* env, const base::android::JavaParamRef<jobject>& jobj, - const base::android::JavaParamRef<jstring>& jassigner_url); + const base::android::JavaParamRef<jstring>& jassigner_url, + jlong window_android_ptr); // Methods called from Java via JNI. // |jclient_auth_token| is an OAuth2 access token created by GoogleAuthUtil. @@ -52,6 +54,9 @@ void OnConnected() override; void OnDisconnected(int error_code) override; + // Helper class for text input. + std::unique_ptr<ImeHelperDialog> ime_dialog_; + // Reference to the Java object which owns this class. base::android::ScopedJavaGlobalRef<jobject> java_obj_;
diff --git a/blimp/client/app/android/ime_helper_dialog.cc b/blimp/client/app/android/ime_helper_dialog.cc deleted file mode 100644 index 69842478..0000000 --- a/blimp/client/app/android/ime_helper_dialog.cc +++ /dev/null
@@ -1,72 +0,0 @@ -// Copyright 2016 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. - -#include "blimp/client/app/android/ime_helper_dialog.h" - -#include "base/android/jni_string.h" -#include "blimp/client/app/android/blimp_client_session_android.h" -#include "blimp/client/core/contents/ime_feature.h" -#include "jni/ImeHelperDialog_jni.h" -#include "ui/base/ime/text_input_type.h" - -using base::android::JavaParamRef; - -namespace blimp { -namespace client { - -static jlong Init(JNIEnv* env, - const JavaParamRef<jobject>& jobj, - const JavaParamRef<jobject>& blimp_client_session) { - BlimpClientSession* client_session = - BlimpClientSessionAndroid::FromJavaObject(env, - blimp_client_session.obj()); - return reinterpret_cast<intptr_t>( - new ImeHelperDialog(env, jobj, client_session->GetImeFeature())); -} - -// static -bool ImeHelperDialog::RegisterJni(JNIEnv* env) { - return RegisterNativesImpl(env); -} - -ImeHelperDialog::ImeHelperDialog( - JNIEnv* env, - const base::android::JavaParamRef<jobject>& jobj, - ImeFeature* ime_feature) { - java_obj_.Reset(env, jobj); - ime_feature_ = ime_feature; - ime_feature_->set_delegate(this); -} - -ImeHelperDialog::~ImeHelperDialog() { - ime_feature_->set_delegate(nullptr); -} - -void ImeHelperDialog::Destroy(JNIEnv* env, const JavaParamRef<jobject>& jobj) { - delete this; -} - -void ImeHelperDialog::OnShowImeRequested(ui::TextInputType input_type, - const std::string& text) { - JNIEnv* env = base::android::AttachCurrentThread(); - DCHECK_NE(ui::TEXT_INPUT_TYPE_NONE, input_type); - Java_ImeHelperDialog_onShowImeRequested( - env, java_obj_, input_type, - base::android::ConvertUTF8ToJavaString(env, text)); -} - -void ImeHelperDialog::OnHideImeRequested() { - JNIEnv* env = base::android::AttachCurrentThread(); - Java_ImeHelperDialog_onHideImeRequested(env, java_obj_); -} - -void ImeHelperDialog::OnImeTextEntered(JNIEnv* env, - const JavaParamRef<jobject>& jobj, - const JavaParamRef<jstring>& text) { - std::string textInput = base::android::ConvertJavaStringToUTF8(env, text); - ime_feature_->OnImeTextEntered(textInput); -} - -} // namespace client -} // namespace blimp
diff --git a/blimp/client/app/android/ime_helper_dialog.h b/blimp/client/app/android/ime_helper_dialog.h deleted file mode 100644 index ce419b9..0000000 --- a/blimp/client/app/android/ime_helper_dialog.h +++ /dev/null
@@ -1,59 +0,0 @@ -// Copyright 2016 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. - -#ifndef BLIMP_CLIENT_APP_ANDROID_IME_HELPER_DIALOG_H_ -#define BLIMP_CLIENT_APP_ANDROID_IME_HELPER_DIALOG_H_ - -#include <string> - -#include "base/android/jni_android.h" -#include "base/macros.h" -#include "blimp/client/core/contents/ime_feature.h" -#include "ui/base/ime/text_input_type.h" - -namespace blimp { -namespace client { - -// The native component of org.chromium.blimp.input.ImeHelperDialog. -class ImeHelperDialog : public ImeFeature::Delegate { - public: - static bool RegisterJni(JNIEnv* env); - - // |ime_feature| is expected to outlive the ImeHelperDialog. - ImeHelperDialog(JNIEnv* env, - const base::android::JavaParamRef<jobject>& jobj, - ImeFeature* ime_feature); - - // Brings up IME for user to enter text. - void OnShowImeRequested(ui::TextInputType input_type, - const std::string& text) override; - - // Hides IME. - void OnHideImeRequested() override; - - // Methods called from Java via JNI. - void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& jobj); - - // Sends the text entered from IME to the blimp engine. - void OnImeTextEntered(JNIEnv* env, - const base::android::JavaParamRef<jobject>& jobj, - const base::android::JavaParamRef<jstring>& text); - - private: - ~ImeHelperDialog() override; - - // Reference to the Java object which owns this class. - base::android::ScopedJavaGlobalRef<jobject> java_obj_; - - // A bridge to the network layer which does the work of (de)serializing the - // outgoing and incoming BlimpMessage::IME messages from the engine. - ImeFeature* ime_feature_; - - DISALLOW_COPY_AND_ASSIGN(ImeHelperDialog); -}; - -} // namespace client -} // namespace blimp - -#endif // BLIMP_CLIENT_APP_ANDROID_IME_HELPER_DIALOG_H_
diff --git a/blimp/client/app/android/java/res/layout/text_input_popup.xml b/blimp/client/app/android/java/res/layout/text_input_popup.xml index 32a53f1f..456b2c10 100644 --- a/blimp/client/app/android/java/res/layout/text_input_popup.xml +++ b/blimp/client/app/android/java/res/layout/text_input_popup.xml
@@ -7,7 +7,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="start"> - <org.chromium.blimp.input.ImeEditText + <org.chromium.blimp.core.contents.input.ImeEditText android:id="@+id/ime_edit_text" android:inputType="text" android:layout_width="match_parent"
diff --git a/blimp/client/app/android/java/src/org/chromium/blimp/BlimpRendererActivity.java b/blimp/client/app/android/java/src/org/chromium/blimp/BlimpRendererActivity.java index ae60b5e..f4344f4c 100644 --- a/blimp/client/app/android/java/src/org/chromium/blimp/BlimpRendererActivity.java +++ b/blimp/client/app/android/java/src/org/chromium/blimp/BlimpRendererActivity.java
@@ -20,13 +20,13 @@ import org.chromium.blimp.auth.TokenSource; import org.chromium.blimp.auth.TokenSourceImpl; import org.chromium.blimp.core.BlimpClientSwitches; -import org.chromium.blimp.input.ImeHelperDialog; import org.chromium.blimp.preferences.PreferencesUtil; import org.chromium.blimp.session.BlimpClientSession; import org.chromium.blimp.session.EngineInfo; import org.chromium.blimp.session.TabControlFeature; import org.chromium.blimp.toolbar.Toolbar; import org.chromium.blimp.toolbar.ToolbarMenu; +import org.chromium.ui.base.WindowAndroid; import org.chromium.ui.widget.Toast; /** @@ -53,7 +53,7 @@ private Toolbar mToolbar; private BlimpClientSession mBlimpClientSession; private TabControlFeature mTabControlFeature; - private ImeHelperDialog mImeHelperDialog; + private WindowAndroid mWindowAndroid; private Handler mHandler = new Handler(); @@ -102,11 +102,6 @@ mToolbar = null; } - if (mImeHelperDialog != null) { - mImeHelperDialog.destroy(); - mImeHelperDialog = null; - } - if (mTokenSource != null) { mTokenSource.destroy(); mTokenSource = null; @@ -158,7 +153,9 @@ setContentView(R.layout.blimp_main); - mBlimpClientSession = new BlimpClientSession(PreferencesUtil.findAssignerUrl(this)); + mWindowAndroid = new WindowAndroid(BlimpRendererActivity.this); + mBlimpClientSession = + new BlimpClientSession(PreferencesUtil.findAssignerUrl(this), mWindowAndroid); mBlimpClientSession.addObserver(this); mBlimpView = (BlimpView) findViewById(R.id.renderer); @@ -167,9 +164,6 @@ mToolbar = (Toolbar) findViewById(R.id.toolbar); mToolbar.initialize(mBlimpClientSession, this); - mImeHelperDialog = new ImeHelperDialog(this); - mImeHelperDialog.initialize(mBlimpClientSession); - mTabControlFeature = new TabControlFeature(mBlimpClientSession, mBlimpView); handleUrlFromIntent(getIntent());
diff --git a/blimp/client/app/android/java/src/org/chromium/blimp/session/BlimpClientSession.java b/blimp/client/app/android/java/src/org/chromium/blimp/session/BlimpClientSession.java index d719956..7579a04 100644 --- a/blimp/client/app/android/java/src/org/chromium/blimp/session/BlimpClientSession.java +++ b/blimp/client/app/android/java/src/org/chromium/blimp/session/BlimpClientSession.java
@@ -8,6 +8,7 @@ import org.chromium.base.annotations.JNINamespace; import org.chromium.blimp.R; import org.chromium.blimp_public.session.AssignmentRequestResult; +import org.chromium.ui.base.WindowAndroid; import java.util.ArrayList; import java.util.List; @@ -61,10 +62,11 @@ private final List<ConnectionObserver> mObservers; private long mNativeBlimpClientSessionAndroidPtr; - public BlimpClientSession(String assignerUrl) { + public BlimpClientSession(String assignerUrl, WindowAndroid windowAndroid) { mAssignerUrl = assignerUrl; mObservers = new ArrayList<ConnectionObserver>(); - mNativeBlimpClientSessionAndroidPtr = nativeInit(mAssignerUrl); + mNativeBlimpClientSessionAndroidPtr = + nativeInit(mAssignerUrl, windowAndroid.getNativePointer()); } /** @@ -178,7 +180,7 @@ return nativeGetDebugInfo(mNativeBlimpClientSessionAndroidPtr); } - private native long nativeInit(String assignerUrl); + private native long nativeInit(String assignerUrl, long windowAndroidPtr); private native void nativeConnect(long nativeBlimpClientSessionAndroid, String token); private native void nativeDestroy(long nativeBlimpClientSessionAndroid); private native int[] nativeGetDebugInfo(long nativeBlimpClientSessionAndroid);
diff --git a/blimp/client/app/linux/blimp_client_session_linux.cc b/blimp/client/app/linux/blimp_client_session_linux.cc index 42952e26..704c1b8 100644 --- a/blimp/client/app/linux/blimp_client_session_linux.cc +++ b/blimp/client/app/linux/blimp_client_session_linux.cc
@@ -73,7 +73,8 @@ // ImeFeature::Delegate implementation. void OnShowImeRequested(ui::TextInputType input_type, - const std::string& text) override; + const std::string& text, + const ImeFeature::ShowImeCallback& callback) override; void OnHideImeRequested() override; private: @@ -84,8 +85,10 @@ FakeImeFeatureDelegate::~FakeImeFeatureDelegate() {} -void FakeImeFeatureDelegate::OnShowImeRequested(ui::TextInputType input_type, - const std::string& text) { +void FakeImeFeatureDelegate::OnShowImeRequested( + ui::TextInputType input_type, + const std::string& text, + const ImeFeature::ShowImeCallback& callback) { DVLOG(1) << "Show IME requested (input_type=" << input_type << ")"; }
diff --git a/blimp/client/core/contents/BUILD.gn b/blimp/client/core/contents/BUILD.gn index 874243f2..0b458f5 100644 --- a/blimp/client/core/contents/BUILD.gn +++ b/blimp/client/core/contents/BUILD.gn
@@ -58,6 +58,8 @@ "android/blimp_navigation_controller_impl_android.h", "android/blimp_view.cc", "android/blimp_view.h", + "android/ime_helper_dialog.cc", + "android/ime_helper_dialog.h", "blimp_contents_view_android.cc", "blimp_contents_view_android.h", ] @@ -147,11 +149,15 @@ "android/java/src/org/chromium/blimp/core/contents/BlimpContentsObserverProxy.java", "android/java/src/org/chromium/blimp/core/contents/BlimpNavigationControllerImpl.java", "android/java/src/org/chromium/blimp/core/contents/BlimpView.java", + "android/java/src/org/chromium/blimp/core/contents/input/ImeEditText.java", + "android/java/src/org/chromium/blimp/core/contents/input/ImeHelperDialog.java", ] deps = [ "//base:base_java", + "//blimp/client:blimp_java_resources", "//blimp/client/public:public_headers_java", + "//third_party/android_tools:android_support_v7_appcompat_java", "//ui/android:ui_java", ] } @@ -164,6 +170,7 @@ "android/java/src/org/chromium/blimp/core/contents/BlimpContentsObserverProxy.java", "android/java/src/org/chromium/blimp/core/contents/BlimpNavigationControllerImpl.java", "android/java/src/org/chromium/blimp/core/contents/BlimpView.java", + "android/java/src/org/chromium/blimp/core/contents/input/ImeHelperDialog.java", ] jni_package = "blimp/client/core/contents"
diff --git a/blimp/client/core/contents/android/blimp_contents_jni_registrar.cc b/blimp/client/core/contents/android/blimp_contents_jni_registrar.cc index 2db60753..dc55a4a0 100644 --- a/blimp/client/core/contents/android/blimp_contents_jni_registrar.cc +++ b/blimp/client/core/contents/android/blimp_contents_jni_registrar.cc
@@ -9,6 +9,7 @@ #include "blimp/client/core/contents/android/blimp_contents_observer_proxy.h" #include "blimp/client/core/contents/android/blimp_navigation_controller_impl_android.h" #include "blimp/client/core/contents/android/blimp_view.h" +#include "blimp/client/core/contents/android/ime_helper_dialog.h" namespace blimp { namespace client { @@ -19,6 +20,7 @@ {"BlimpContentsObserverProxy", BlimpContentsObserverProxy::RegisterJni}, {"BlimpNavigationControllerImplAndroid", BlimpNavigationControllerImplAndroid::RegisterJni}, + {"ImeHelperDialog", ImeHelperDialog::RegisterJni}, {"BlimpView", BlimpView::RegisterJni}, };
diff --git a/blimp/client/core/contents/android/ime_helper_dialog.cc b/blimp/client/core/contents/android/ime_helper_dialog.cc new file mode 100644 index 0000000..9bfcff1 --- /dev/null +++ b/blimp/client/core/contents/android/ime_helper_dialog.cc
@@ -0,0 +1,59 @@ +// Copyright 2016 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. + +#include "blimp/client/core/contents/android/ime_helper_dialog.h" + +#include "base/android/jni_string.h" +#include "base/callback_helpers.h" +#include "jni/ImeHelperDialog_jni.h" +#include "ui/android/window_android.h" + +using base::android::JavaParamRef; + +namespace blimp { +namespace client { + +// static +bool ImeHelperDialog::RegisterJni(JNIEnv* env) { + return RegisterNativesImpl(env); +} + +ImeHelperDialog::ImeHelperDialog(ui::WindowAndroid* window) { + JNIEnv* env = base::android::AttachCurrentThread(); + java_obj_.Reset(Java_ImeHelperDialog_create( + env, reinterpret_cast<intptr_t>(this), window->GetJavaObject())); +} + +ImeHelperDialog::~ImeHelperDialog() { + Java_ImeHelperDialog_clearNativePtr(base::android::AttachCurrentThread(), + java_obj_); +} + +void ImeHelperDialog::OnShowImeRequested( + ui::TextInputType input_type, + const std::string& text, + const ImeFeature::ShowImeCallback& callback) { + text_submit_callback_ = callback; + + JNIEnv* env = base::android::AttachCurrentThread(); + DCHECK_NE(ui::TEXT_INPUT_TYPE_NONE, input_type); + Java_ImeHelperDialog_onShowImeRequested( + env, java_obj_, input_type, + base::android::ConvertUTF8ToJavaString(env, text)); +} + +void ImeHelperDialog::OnHideImeRequested() { + JNIEnv* env = base::android::AttachCurrentThread(); + Java_ImeHelperDialog_onHideImeRequested(env, java_obj_); +} + +void ImeHelperDialog::OnImeTextEntered(JNIEnv* env, + const JavaParamRef<jobject>& jobj, + const JavaParamRef<jstring>& text) { + std::string text_input = base::android::ConvertJavaStringToUTF8(env, text); + base::ResetAndReturn(&text_submit_callback_).Run(text_input); +} + +} // namespace client +} // namespace blimp
diff --git a/blimp/client/core/contents/android/ime_helper_dialog.h b/blimp/client/core/contents/android/ime_helper_dialog.h new file mode 100644 index 0000000..497c65b --- /dev/null +++ b/blimp/client/core/contents/android/ime_helper_dialog.h
@@ -0,0 +1,54 @@ +// Copyright 2016 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. + +#ifndef BLIMP_CLIENT_CORE_CONTENTS_ANDROID_IME_HELPER_DIALOG_H_ +#define BLIMP_CLIENT_CORE_CONTENTS_ANDROID_IME_HELPER_DIALOG_H_ + +#include <string> + +#include "base/android/jni_android.h" +#include "base/macros.h" +#include "blimp/client/core/contents/ime_feature.h" +#include "ui/base/ime/text_input_type.h" + +namespace ui { +class WindowAndroid; +} // namespace ui + +namespace blimp { +namespace client { + +// The native component of +// org.chromium.blimp.core.contents.input.ImeHelperDialog +class ImeHelperDialog : public ImeFeature::Delegate { + public: + static bool RegisterJni(JNIEnv* env); + + explicit ImeHelperDialog(ui::WindowAndroid* window); + ~ImeHelperDialog() override; + + // ImeFeature::Delegate implementation. + void OnShowImeRequested(ui::TextInputType input_type, + const std::string& text, + const ImeFeature::ShowImeCallback& callback) override; + void OnHideImeRequested() override; + + // Sends the text entered from IME to the blimp engine. + void OnImeTextEntered(JNIEnv* env, + const base::android::JavaParamRef<jobject>& jobj, + const base::android::JavaParamRef<jstring>& text); + + private: + base::android::ScopedJavaGlobalRef<jobject> java_obj_; + + // A callback for the current request to be executed on text submission from + // the user. + ImeFeature::ShowImeCallback text_submit_callback_; + + DISALLOW_COPY_AND_ASSIGN(ImeHelperDialog); +}; + +} // namespace client +} // namespace blimp +#endif // BLIMP_CLIENT_CORE_CONTENTS_ANDROID_IME_HELPER_DIALOG_H_
diff --git a/blimp/client/app/android/java/src/org/chromium/blimp/input/ImeEditText.java b/blimp/client/core/contents/android/java/src/org/chromium/blimp/core/contents/input/ImeEditText.java similarity index 95% rename from blimp/client/app/android/java/src/org/chromium/blimp/input/ImeEditText.java rename to blimp/client/core/contents/android/java/src/org/chromium/blimp/core/contents/input/ImeEditText.java index 3aeb14d..3646ae6 100644 --- a/blimp/client/app/android/java/src/org/chromium/blimp/input/ImeEditText.java +++ b/blimp/client/core/contents/android/java/src/org/chromium/blimp/core/contents/input/ImeEditText.java
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package org.chromium.blimp.input; +package org.chromium.blimp.core.contents.input; import android.content.Context; import android.support.v7.app.AlertDialog;
diff --git a/blimp/client/app/android/java/src/org/chromium/blimp/input/ImeHelperDialog.java b/blimp/client/core/contents/android/java/src/org/chromium/blimp/core/contents/input/ImeHelperDialog.java similarity index 86% rename from blimp/client/app/android/java/src/org/chromium/blimp/input/ImeHelperDialog.java rename to blimp/client/core/contents/android/java/src/org/chromium/blimp/core/contents/input/ImeHelperDialog.java index ec9e7752..b33985c4 100644 --- a/blimp/client/app/android/java/src/org/chromium/blimp/input/ImeHelperDialog.java +++ b/blimp/client/core/contents/android/java/src/org/chromium/blimp/core/contents/input/ImeHelperDialog.java
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package org.chromium.blimp.input; +package org.chromium.blimp.core.contents.input; import android.app.Activity; import android.content.Context; @@ -19,7 +19,7 @@ import org.chromium.base.annotations.CalledByNative; import org.chromium.base.annotations.JNINamespace; import org.chromium.blimp.R; -import org.chromium.blimp.session.BlimpClientSession; +import org.chromium.ui.base.WindowAndroid; import org.chromium.ui.base.ime.TextInputType; /** @@ -30,38 +30,29 @@ @JNINamespace("blimp::client") public class ImeHelperDialog { private static final String TAG = "ImeHelperDialog"; - private long mNativeImeHelperDialog; private final Context mContext; + private AlertDialog mAlertDialog; + private long mNativeImeHelperDialog; + + @CalledByNative + private static ImeHelperDialog create(long nativeImeHelperDialog, WindowAndroid windowAndroid) { + return new ImeHelperDialog(nativeImeHelperDialog, + WindowAndroid.activityFromContext(windowAndroid.getContext().get())); + } /** - * Builds a new ImeHelperDialog. + * Builds a new {@link ImeHelperDialog}. + * @param nativeImeHelperDialog The pointer to the native ImeHelperDialog. * @param context The {@link Context} of the activity. */ - public ImeHelperDialog(Context context) { + private ImeHelperDialog(long nativeImeHelperDialog, Context context) { mContext = context; + mNativeImeHelperDialog = nativeImeHelperDialog; } - /** - * To be called when the native library is loaded so that this class can initialize its native - * components. - * @param blimpClientSession The {@link BlimpClientSession} that contains the features - * required by the native components of the ImeHelperDialog. - */ - public void initialize(BlimpClientSession blimpClientSession) { - assert mNativeImeHelperDialog == 0; - - mNativeImeHelperDialog = nativeInit(blimpClientSession); - } - - /** - * To be called when this class should be torn down. This {@link View} should not be used after - * this. - */ - public void destroy() { - if (mNativeImeHelperDialog == 0) return; - - nativeDestroy(mNativeImeHelperDialog); + @CalledByNative + private void clearNativePtr() { mNativeImeHelperDialog = 0; } @@ -190,7 +181,5 @@ editText.setImeOptions(imeOptions); } - private native long nativeInit(BlimpClientSession blimpClientSession); - private native void nativeDestroy(long nativeImeHelperDialog); private native void nativeOnImeTextEntered(long nativeImeHelperDialog, String text); }
diff --git a/blimp/client/core/contents/blimp_contents_impl.cc b/blimp/client/core/contents/blimp_contents_impl.cc index c9c30cd0..c7ae2fa 100644 --- a/blimp/client/core/contents/blimp_contents_impl.cc +++ b/blimp/client/core/contents/blimp_contents_impl.cc
@@ -36,14 +36,17 @@ : navigation_controller_(this, navigation_feature), compositor_manager_(render_widget_feature, compositor_deps), id_(id), + ime_feature_(ime_feature), window_(window), tab_control_feature_(tab_control_feature) { blimp_contents_view_ = BlimpContentsView::Create(this, compositor_manager_.layer()); + ime_feature_->set_delegate(blimp_contents_view_->GetImeDelegate()); } BlimpContentsImpl::~BlimpContentsImpl() { FOR_EACH_OBSERVER(BlimpContentsObserver, observers_, BlimpContentsDying()); + ime_feature_->set_delegate(nullptr); } #if defined(OS_ANDROID)
diff --git a/blimp/client/core/contents/blimp_contents_impl.h b/blimp/client/core/contents/blimp_contents_impl.h index cee07bb..e20a478d 100644 --- a/blimp/client/core/contents/blimp_contents_impl.h +++ b/blimp/client/core/contents/blimp_contents_impl.h
@@ -99,6 +99,9 @@ // BlimpContentsManager to control the life time of the its observer. int id_; + // Handles the text input for web forms. + ImeFeature* ime_feature_; + // The platform specific window that this BlimpContents is showed in. gfx::NativeWindow window_;
diff --git a/blimp/client/core/contents/blimp_contents_impl_unittest.cc b/blimp/client/core/contents/blimp_contents_impl_unittest.cc index 360a7df..31c5f86 100644 --- a/blimp/client/core/contents/blimp_contents_impl_unittest.cc +++ b/blimp/client/core/contents/blimp_contents_impl_unittest.cc
@@ -8,6 +8,7 @@ #include "base/run_loop.h" #include "blimp/client/core/compositor/blimp_compositor_dependencies.h" #include "blimp/client/core/contents/fake_navigation_feature.h" +#include "blimp/client/core/contents/ime_feature.h" #include "blimp/client/core/contents/tab_control_feature.h" #include "blimp/client/core/render_widget/render_widget_feature.h" #include "blimp/client/public/contents/blimp_contents_observer.h" @@ -69,12 +70,13 @@ TEST_F(BlimpContentsImplTest, LoadURLAndNotifyObservers) { base::MessageLoop loop; + ImeFeature ime_feature; FakeNavigationFeature navigation_feature; RenderWidgetFeature render_widget_feature; BlimpCompositorDependencies compositor_deps( base::MakeUnique<MockCompositorDependencies>()); BlimpContentsImpl blimp_contents(kDummyTabId, window_, &compositor_deps, - nullptr, &navigation_feature, + &ime_feature, &navigation_feature, &render_widget_feature, nullptr); BlimpNavigationControllerImpl& navigation_controller = @@ -105,14 +107,15 @@ int height = 15; float dp_to_px = 1.23f; + ImeFeature ime_feature; RenderWidgetFeature render_widget_feature; MockTabControlFeature tab_control_feature; base::MessageLoop loop; BlimpCompositorDependencies compositor_deps( base::MakeUnique<MockCompositorDependencies>()); - BlimpContentsImpl blimp_contents(kDummyTabId, window_, &compositor_deps, - nullptr, nullptr, &render_widget_feature, - &tab_control_feature); + BlimpContentsImpl blimp_contents( + kDummyTabId, window_, &compositor_deps, &ime_feature, nullptr, + &render_widget_feature, &tab_control_feature); EXPECT_CALL(tab_control_feature, SetSizeAndScale(gfx::Size(width, height), dp_to_px)).Times(1);
diff --git a/blimp/client/core/contents/blimp_contents_manager_unittest.cc b/blimp/client/core/contents/blimp_contents_manager_unittest.cc index 8baa89a8..a8fe2a5 100644 --- a/blimp/client/core/contents/blimp_contents_manager_unittest.cc +++ b/blimp/client/core/contents/blimp_contents_manager_unittest.cc
@@ -8,6 +8,7 @@ #include "base/message_loop/message_loop.h" #include "blimp/client/core/compositor/blimp_compositor_dependencies.h" #include "blimp/client/core/contents/blimp_contents_impl.h" +#include "blimp/client/core/contents/ime_feature.h" #include "blimp/client/core/contents/tab_control_feature.h" #include "blimp/client/core/render_widget/render_widget_feature.h" #include "blimp/client/support/compositor/mock_compositor_dependencies.h" @@ -60,12 +61,13 @@ TEST_F(BlimpContentsManagerTest, GetExistingBlimpContents) { base::MessageLoop loop; + ImeFeature ime_feature; RenderWidgetFeature render_widget_feature; MockTabControlFeature tab_control_feature; BlimpCompositorDependencies compositor_deps( base::MakeUnique<MockCompositorDependencies>()); - BlimpContentsManager blimp_contents_manager(&compositor_deps, nullptr, + BlimpContentsManager blimp_contents_manager(&compositor_deps, &ime_feature, nullptr, &render_widget_feature, &tab_control_feature); @@ -79,12 +81,13 @@ } TEST_F(BlimpContentsManagerTest, GetNonExistingBlimpContents) { + ImeFeature ime_feature; RenderWidgetFeature render_widget_feature; MockTabControlFeature tab_control_feature; BlimpCompositorDependencies compositor_deps( base::MakeUnique<MockCompositorDependencies>()); - BlimpContentsManager blimp_contents_manager(&compositor_deps, nullptr, + BlimpContentsManager blimp_contents_manager(&compositor_deps, &ime_feature, nullptr, &render_widget_feature, &tab_control_feature); @@ -95,11 +98,12 @@ TEST_F(BlimpContentsManagerTest, GetDestroyedBlimpContents) { base::MessageLoop loop; + ImeFeature ime_feature; RenderWidgetFeature render_widget_feature; MockTabControlFeature tab_control_feature; BlimpCompositorDependencies compositor_deps( base::MakeUnique<MockCompositorDependencies>()); - BlimpContentsManager blimp_contents_manager(&compositor_deps, nullptr, + BlimpContentsManager blimp_contents_manager(&compositor_deps, &ime_feature, nullptr, &render_widget_feature, &tab_control_feature); int id; @@ -122,11 +126,12 @@ // TODO(mlliu): remove this test case (http://crbug.com/642558) TEST_F(BlimpContentsManagerTest, CreateTwoBlimpContentsDestroyAndCreate) { base::MessageLoop loop; + ImeFeature ime_feature; RenderWidgetFeature render_widget_feature; MockTabControlFeature tab_control_feature; BlimpCompositorDependencies compositor_deps( base::MakeUnique<MockCompositorDependencies>()); - BlimpContentsManager blimp_contents_manager(&compositor_deps, nullptr, + BlimpContentsManager blimp_contents_manager(&compositor_deps, &ime_feature, nullptr, &render_widget_feature, &tab_control_feature);
diff --git a/blimp/client/core/contents/blimp_contents_observer_unittest.cc b/blimp/client/core/contents/blimp_contents_observer_unittest.cc index 527ffb2..6892abe 100644 --- a/blimp/client/core/contents/blimp_contents_observer_unittest.cc +++ b/blimp/client/core/contents/blimp_contents_observer_unittest.cc
@@ -7,6 +7,7 @@ #include "base/memory/ptr_util.h" #include "blimp/client/core/compositor/blimp_compositor_dependencies.h" #include "blimp/client/core/contents/blimp_contents_impl.h" +#include "blimp/client/core/contents/ime_feature.h" #include "blimp/client/core/render_widget/render_widget_feature.h" #include "blimp/client/support/compositor/mock_compositor_dependencies.h" #include "testing/gmock/include/gmock/gmock.h" @@ -55,11 +56,13 @@ }; TEST_F(BlimpContentsObserverTest, ObserverDies) { + ImeFeature ime_feature; RenderWidgetFeature render_widget_feature; BlimpCompositorDependencies compositor_deps( base::MakeUnique<MockCompositorDependencies>()); - BlimpContentsImpl contents(kDummyTabId, window_, &compositor_deps, nullptr, - nullptr, &render_widget_feature, nullptr); + BlimpContentsImpl contents(kDummyTabId, window_, &compositor_deps, + &ime_feature, nullptr, &render_widget_feature, + nullptr); std::unique_ptr<BlimpContentsObserver> observer = base::MakeUnique<TestBlimpContentsObserver>(&contents); @@ -72,13 +75,14 @@ TEST_F(BlimpContentsObserverTest, ContentsDies) { std::unique_ptr<TestBlimpContentsObserver> observer; + ImeFeature ime_feature; RenderWidgetFeature render_widget_feature; BlimpCompositorDependencies compositor_deps( base::MakeUnique<MockCompositorDependencies>()); std::unique_ptr<BlimpContentsImpl> contents = - base::MakeUnique<BlimpContentsImpl>(kDummyTabId, window_, - &compositor_deps, nullptr, nullptr, - &render_widget_feature, nullptr); + base::MakeUnique<BlimpContentsImpl>( + kDummyTabId, window_, &compositor_deps, &ime_feature, nullptr, + &render_widget_feature, nullptr); observer.reset(new TestBlimpContentsObserver(contents.get())); EXPECT_CALL(*observer, OnContentsDestroyed()).Times(1); EXPECT_EQ(observer->blimp_contents(), contents.get());
diff --git a/blimp/client/core/contents/blimp_contents_view.h b/blimp/client/core/contents/blimp_contents_view.h index a9017a4..64f80b89 100644 --- a/blimp/client/core/contents/blimp_contents_view.h +++ b/blimp/client/core/contents/blimp_contents_view.h
@@ -9,6 +9,7 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" +#include "blimp/client/core/contents/ime_feature.h" #include "ui/gfx/native_widget_types.h" namespace cc { @@ -28,6 +29,7 @@ virtual ~BlimpContentsView() {} virtual gfx::NativeView GetNativeView() = 0; + virtual ImeFeature::Delegate* GetImeDelegate() = 0; }; } // namespace client
diff --git a/blimp/client/core/contents/blimp_contents_view_android.cc b/blimp/client/core/contents/blimp_contents_view_android.cc index 031023f..8d5860a 100644 --- a/blimp/client/core/contents/blimp_contents_view_android.cc +++ b/blimp/client/core/contents/blimp_contents_view_android.cc
@@ -5,8 +5,9 @@ #include "blimp/client/core/contents/blimp_contents_view_android.h" #include "base/memory/ptr_util.h" -#include "blimp/client/core/contents/android/blimp_contents_impl_android.h" #include "blimp/client/core/contents/android/blimp_view.h" +#include "blimp/client/core/contents/android/ime_helper_dialog.h" +#include "blimp/client/core/contents/blimp_contents_impl.h" #include "cc/layers/layer.h" #include "ui/android/window_android.h" @@ -23,7 +24,8 @@ BlimpContentsViewAndroid::BlimpContentsViewAndroid( BlimpContentsImpl* blimp_contents, - scoped_refptr<cc::Layer> contents_layer) { + scoped_refptr<cc::Layer> contents_layer) + : ime_dialog_(new ImeHelperDialog(blimp_contents->GetNativeWindow())) { blimp_view_ = base::MakeUnique<BlimpView>(blimp_contents); view_ = base::MakeUnique<ui::ViewAndroid>( blimp_view_->CreateViewAndroidDelegate()); @@ -41,5 +43,9 @@ return blimp_view_.get(); } +ImeFeature::Delegate* BlimpContentsViewAndroid::GetImeDelegate() { + return ime_dialog_.get(); +} + } // namespace client } // namespace blimp
diff --git a/blimp/client/core/contents/blimp_contents_view_android.h b/blimp/client/core/contents/blimp_contents_view_android.h index 08b9af2..50a0f81 100644 --- a/blimp/client/core/contents/blimp_contents_view_android.h +++ b/blimp/client/core/contents/blimp_contents_view_android.h
@@ -13,6 +13,7 @@ namespace client { class BlimpContentsImpl; class BlimpView; +class ImeHelperDialog; class BlimpContentsViewAndroid : public BlimpContentsView { public: @@ -22,6 +23,7 @@ // BlimpContentsView implementation. gfx::NativeView GetNativeView() override; + ImeFeature::Delegate* GetImeDelegate() override; // Returns the JNI-bridge for the Android View for this BlimpContentsView. BlimpView* GetBlimpView(); @@ -32,6 +34,8 @@ // The JNI-bridge for the Android View for this BlimpContentsView. std::unique_ptr<BlimpView> blimp_view_; + std::unique_ptr<ImeHelperDialog> ime_dialog_; + DISALLOW_COPY_AND_ASSIGN(BlimpContentsViewAndroid); };
diff --git a/blimp/client/core/contents/blimp_contents_view_aura.cc b/blimp/client/core/contents/blimp_contents_view_aura.cc index f4112149..ba5fc04 100644 --- a/blimp/client/core/contents/blimp_contents_view_aura.cc +++ b/blimp/client/core/contents/blimp_contents_view_aura.cc
@@ -23,5 +23,9 @@ return nullptr; } +ImeFeature::Delegate* BlimpContentsViewAura::GetImeDelegate() { + return nullptr; +} + } // namespace client } // namespace blimp
diff --git a/blimp/client/core/contents/blimp_contents_view_aura.h b/blimp/client/core/contents/blimp_contents_view_aura.h index 4c5ae03e..262981f 100644 --- a/blimp/client/core/contents/blimp_contents_view_aura.h +++ b/blimp/client/core/contents/blimp_contents_view_aura.h
@@ -17,6 +17,7 @@ // BlimpContentsView implementation. gfx::NativeView GetNativeView() override; + ImeFeature::Delegate* GetImeDelegate() override; private: DISALLOW_COPY_AND_ASSIGN(BlimpContentsViewAura);
diff --git a/blimp/client/core/contents/ime_feature.cc b/blimp/client/core/contents/ime_feature.cc index 08ade40..4a4bcdb 100644 --- a/blimp/client/core/contents/ime_feature.cc +++ b/blimp/client/core/contents/ime_feature.cc
@@ -18,14 +18,16 @@ ImeFeature::~ImeFeature() {} -void ImeFeature::OnImeTextEntered(const std::string& text) { - DCHECK_LE(0, tab_id_); - DCHECK_LT(0, render_widget_id_); +void ImeFeature::OnImeTextEntered(int tab_id, + int render_widget_id, + const std::string& text) { + DCHECK_LE(0, tab_id); + DCHECK_LT(0, render_widget_id); ImeMessage* ime_message; std::unique_ptr<BlimpMessage> blimp_message = - CreateBlimpMessage(&ime_message, tab_id_); - ime_message->set_render_widget_id(render_widget_id_); + CreateBlimpMessage(&ime_message, tab_id); + ime_message->set_render_widget_id(render_widget_id); ime_message->set_type(ImeMessage::SET_TEXT); ime_message->set_ime_text(text); @@ -49,18 +51,17 @@ callback.Run(net::ERR_INVALID_ARGUMENT); return; } - - tab_id_ = message->target_tab_id(); - render_widget_id_ = ime_message.render_widget_id(); - - delegate_->OnShowImeRequested( - InputMessageConverter::TextInputTypeFromProto( - ime_message.text_input_type()), - ime_message.ime_text()); + { + ShowImeCallback show_ime_callback = base::Bind( + &ImeFeature::OnImeTextEntered, base::Unretained(this), + message->target_tab_id(), ime_message.render_widget_id()); + delegate_->OnShowImeRequested( + InputMessageConverter::TextInputTypeFromProto( + ime_message.text_input_type()), + ime_message.ime_text(), show_ime_callback); + } break; case ImeMessage::HIDE_IME: - tab_id_ = -1; - render_widget_id_ = 0; delegate_->OnHideImeRequested(); break; case ImeMessage::SET_TEXT:
diff --git a/blimp/client/core/contents/ime_feature.h b/blimp/client/core/contents/ime_feature.h index a1eebae2..c8ff6a4 100644 --- a/blimp/client/core/contents/ime_feature.h +++ b/blimp/client/core/contents/ime_feature.h
@@ -17,12 +17,9 @@ // Handles all incoming and outgoing protobuf messages for text input of type // BlimpMessage::IME for blimp client. -// Upon receiving a text input request from the engine, the ImeFeature caches -// the |tab_id_| and |render_widget_id_| for the request and -// delegates the request to the Delegate which then opens up the IME. -// After user is done typing, the text is passed back to ImeFeature, which then -// sends the text to the engine over network along with the same |tab_id_| and -// |render_widget_id_|. +// Upon receiving a text input request from the engine, the ImeFeature +// delegates the request to the appropriate Delegate to show IME along with a +// Callback bound with respective tab id and render widget id. // Any time user taps on an input text, ImeMessage::SHOW_IME message will be // sent to client. Similarly, any time the text input is out of focus (e.g. if // user navigates away from the currently page or the page loads for the first @@ -30,12 +27,16 @@ class ImeFeature : public BlimpMessageProcessor { public: + // A callback to show IME. + using ShowImeCallback = base::Callback<void(const std::string&)>; + // A delegate to be notified of text input requests. class Delegate { public: virtual ~Delegate() {} virtual void OnShowImeRequested(ui::TextInputType input_type, - const std::string& text) = 0; + const std::string& text, + const ShowImeCallback& callback) = 0; virtual void OnHideImeRequested() = 0; }; @@ -54,25 +55,19 @@ // to the ImeFeature for processing, until the last message is processed. void set_delegate(Delegate* delegate) { delegate_ = delegate; } - // Sends text from IME to the blimp engine. - void OnImeTextEntered(const std::string& text); - // BlimpMessageProcessor implementation. void ProcessMessage(std::unique_ptr<BlimpMessage> message, const net::CompletionCallback& callback) override; private: + // Sends text from IME to the blimp engine. + void OnImeTextEntered(int tab_id, + int render_widget_id, + const std::string& text); + // Used to actually show or hide the IME. See notes on |set_delegate|. Delegate* delegate_ = nullptr; - // Tab id and render widget id for the input field for which user input is - // being requested. - // The values are cached from the ImeMessage::SHOW_IME message and sent back - // to engine in the subsequent ImeMessage::SET_TEXT message. - // The cached values are cleared on receiving ImeMessage::HIDE_IME request. - int tab_id_ = -1; - int render_widget_id_ = 0; - // Used to send BlimpMessage::IME messages to the engine. std::unique_ptr<BlimpMessageProcessor> outgoing_message_processor_;
diff --git a/blimp/client/core/contents/mock_ime_feature_delegate.h b/blimp/client/core/contents/mock_ime_feature_delegate.h index 9857879..eeefe6f 100644 --- a/blimp/client/core/contents/mock_ime_feature_delegate.h +++ b/blimp/client/core/contents/mock_ime_feature_delegate.h
@@ -19,8 +19,10 @@ MockImeFeatureDelegate(); ~MockImeFeatureDelegate() override; - MOCK_METHOD2(OnShowImeRequested, - void(ui::TextInputType input_type, const std::string& text)); + MOCK_METHOD3(OnShowImeRequested, + void(ui::TextInputType input_type, + const std::string& text, + const ImeFeature::ShowImeCallback& callback)); MOCK_METHOD0(OnHideImeRequested, void()); };
diff --git a/chrome/VERSION b/chrome/VERSION index d30c0da..bd4f80a65 100644 --- a/chrome/VERSION +++ b/chrome/VERSION
@@ -1,4 +1,4 @@ MAJOR=55 MINOR=0 -BUILD=2846 +BUILD=2847 PATCH=0
diff --git a/chrome/android/OWNERS b/chrome/android/OWNERS index 792a9e471..f5a37b7 100644 --- a/chrome/android/OWNERS +++ b/chrome/android/OWNERS
@@ -8,3 +8,5 @@ yfriedman@chromium.org per-file java_sources.gni=* +per-file *.gn*=agrieve@chromium.org +per-file *.gyp*=agrieve@chromium.org
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java index 379023e4..6544d5dd 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
@@ -58,6 +58,7 @@ import org.chromium.chrome.browser.tabmodel.TabModelObserver; import org.chromium.chrome.browser.tabmodel.TabModelSelectorImpl; import org.chromium.chrome.browser.tabmodel.TabPersistencePolicy; +import org.chromium.chrome.browser.tabmodel.TabbedModeTabPersistencePolicy; import org.chromium.chrome.browser.toolbar.ToolbarControlContainer; import org.chromium.chrome.browser.util.ColorUtils; import org.chromium.chrome.browser.util.FeatureUtilities; @@ -263,8 +264,11 @@ @Override public void postInflationStartup() { super.postInflationStartup(); - TabPersistencePolicy persistencePolicy = new CustomTabTabPersistencePolicy( - getTaskId(), getSavedInstanceState() != null); + // TODO(tedchoc): Replace with an actual CCT implementation for the persistence policy. + // Currently, this relies on checks for CUSTOM_TABS_SELECTOR_INDEX in the + // main TabPersitentStore that ignores certain actions. + TabPersistencePolicy persistencePolicy = new TabbedModeTabPersistencePolicy( + this, TabModelSelectorImpl.CUSTOM_TABS_SELECTOR_INDEX); setTabModelSelector(new TabModelSelectorImpl( this, persistencePolicy, getWindowAndroid(), false));
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicy.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicy.java deleted file mode 100644 index f3ea43ad..0000000 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicy.java +++ /dev/null
@@ -1,387 +0,0 @@ -// Copyright 2016 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. - -package org.chromium.chrome.browser.customtabs; - -import android.app.Activity; -import android.os.AsyncTask; -import android.os.StrictMode; -import android.util.Pair; -import android.util.SparseBooleanArray; - -import org.chromium.base.ApiCompatibilityUtils; -import org.chromium.base.ApplicationStatus; -import org.chromium.base.Callback; -import org.chromium.base.Log; -import org.chromium.base.StreamUtil; -import org.chromium.base.ThreadUtils; -import org.chromium.chrome.browser.TabState; -import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager; -import org.chromium.chrome.browser.tabmodel.TabModel; -import org.chromium.chrome.browser.tabmodel.TabModelSelector; -import org.chromium.chrome.browser.tabmodel.TabPersistencePolicy; -import org.chromium.chrome.browser.tabmodel.TabPersistentStore; - -import java.io.BufferedInputStream; -import java.io.DataInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Executor; - -import javax.annotation.Nullable; - -/** - * Handles the Custom Tab specific behaviors of tab persistence. - */ -public class CustomTabTabPersistencePolicy implements TabPersistencePolicy { - - static final String SAVED_STATE_DIRECTORY = "custom_tabs"; - - /** Threshold where old state files should be deleted (30 days). */ - protected static final long STATE_EXPIRY_THRESHOLD = 30L * 24 * 60 * 60 * 1000; - - /** Maximum number of state files before we should start deleting old ones. */ - protected static final int MAXIMUM_STATE_FILES = 30; - - private static final String TAG = "tabmodel"; - - /** Prevents two state directories from getting created simultaneously. */ - private static final Object DIR_CREATION_LOCK = new Object(); - - /** - * Prevents two clean up tasks from getting created simultaneously. Also protects against - * incorrectly interleaving create/run/cancel on the task. - */ - private static final Object CLEAN_UP_TASK_LOCK = new Object(); - - private static File sStateDirectory; - private static AsyncTask<Void, Void, Void> sCleanupTask; - - /** - * The folder where the state should be saved to. - * @return A file representing the directory that contains TabModelSelector states. - */ - public static File getOrCreateCustomTabModeStateDirectory() { - synchronized (DIR_CREATION_LOCK) { - if (sStateDirectory == null) { - sStateDirectory = new File( - TabPersistentStore.getOrCreateBaseStateDirectory(), SAVED_STATE_DIRECTORY); - StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads(); - StrictMode.allowThreadDiskWrites(); - try { - if (!sStateDirectory.exists() && !sStateDirectory.mkdirs()) { - Log.e(TAG, "Failed to create state folder: " + sStateDirectory); - } - } finally { - StrictMode.setThreadPolicy(oldPolicy); - } - } - } - return sStateDirectory; - } - - private final int mTaskId; - private final boolean mShouldRestore; - - private AsyncTask<Void, Void, Void> mInitializationTask; - private boolean mDestroyed; - - /** - * Constructs a persistence policy for a given Custom Tab. - * - * @param taskId The task ID that the owning Custom Tab is in. - * @param shouldRestore Whether an attempt to restore tab state information should be done on - * startup. - */ - public CustomTabTabPersistencePolicy(int taskId, boolean shouldRestore) { - mTaskId = taskId; - mShouldRestore = shouldRestore; - } - - @Override - public File getOrCreateStateDirectory() { - return getOrCreateCustomTabModeStateDirectory(); - } - - @Override - public String getStateFileName() { - return TabPersistentStore.getStateFileName(Integer.toString(mTaskId)); - } - - @Override - @Nullable - public String getStateToBeMergedFileName() { - return null; - } - - @Override - public boolean performInitialization(Executor executor) { - mInitializationTask = new AsyncTask<Void, Void, Void>() { - @Override - protected Void doInBackground(Void... params) { - File stateDir = getOrCreateStateDirectory(); - File metadataFile = new File(stateDir, getStateFileName()); - if (metadataFile.exists()) { - if (mShouldRestore) { - if (!metadataFile.setLastModified(System.currentTimeMillis())) { - Log.e(TAG, "Unable to update last modified time: " + metadataFile); - } - } else { - if (!metadataFile.delete()) { - Log.e(TAG, "Failed to delete file: " + metadataFile); - } - } - } - return null; - } - }.executeOnExecutor(executor); - - return true; - } - - @Override - public void waitForInitializationToFinish() { - if (mInitializationTask == null) return; - try { - mInitializationTask.get(); - } catch (InterruptedException | ExecutionException e) { - // Ignore and proceed. - } - } - - @Override - public boolean isMergeInProgress() { - return false; - } - - @Override - public void setMergeInProgress(boolean isStarted) { - assert false : "Merge not supported in Custom Tabs"; - } - - @Override - public void cancelCleanupInProgress() { - synchronized (CLEAN_UP_TASK_LOCK) { - if (sCleanupTask != null) sCleanupTask.cancel(true); - } - } - - @Override - public void cleanupUnusedFiles(Callback<List<String>> filesToDelete) { - synchronized (CLEAN_UP_TASK_LOCK) { - if (sCleanupTask != null) sCleanupTask.cancel(true); - sCleanupTask = new CleanUpTabStateDataTask(filesToDelete); - sCleanupTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); - } - } - - @Override - public void setTabContentManager(TabContentManager cache) { - } - - @Override - public void destroy() { - mDestroyed = true; - } - - /** - * Given a list of metadata files, determine which are applicable for deletion based on the - * deletion strategy of Custom Tabs. - * - * @param currentTimeMillis The current time in milliseconds - * ({@link System#currentTimeMillis()}. - * @param allMetadataFiles The complete list of all metadata files to check. - * @return The list of metadata files that are applicable for deletion. - */ - protected static List<File> getMetadataFilesForDeletion( - long currentTimeMillis, List<File> allMetadataFiles) { - Collections.sort(allMetadataFiles, new Comparator<File>() { - @Override - public int compare(File lhs, File rhs) { - long lhsModifiedTime = lhs.lastModified(); - long rhsModifiedTime = rhs.lastModified(); - - // Sort such that older files (those with an lower timestamp number) are at the - // end of the sorted listed. - return ApiCompatibilityUtils.compareLong(rhsModifiedTime, lhsModifiedTime); - } - }); - - List<File> stateFilesApplicableForDeletion = new ArrayList<File>(); - for (int i = 0; i < allMetadataFiles.size(); i++) { - File file = allMetadataFiles.get(i); - long fileAge = currentTimeMillis - file.lastModified(); - if (i >= MAXIMUM_STATE_FILES || fileAge >= STATE_EXPIRY_THRESHOLD) { - stateFilesApplicableForDeletion.add(file); - } - } - return stateFilesApplicableForDeletion; - } - - /** - * Get all current Tab IDs used by the specified activity. - * - * @param activity The activity whose tab IDs are to be collected from. - * @param tabIds Where the tab IDs should be added to. - */ - private static void getAllTabIdsForActivity(CustomTabActivity activity, Set<Integer> tabIds) { - if (activity == null) return; - TabModelSelector selector = activity.getTabModelSelector(); - if (selector == null) return; - List<TabModel> models = selector.getModels(); - for (int i = 0; i < models.size(); i++) { - TabModel model = models.get(i); - for (int j = 0; j < model.getCount(); j++) { - tabIds.add(model.getTabAt(j).getId()); - } - } - } - - /** - * Gathers all of the tab IDs and task IDs for all currently live Custom Tabs. - * - * @param liveTabIds Where tab IDs will be added. - * @param liveTaskIds Where task IDs will be added. - */ - protected static void getAllLiveTabAndTaskIds( - Set<Integer> liveTabIds, Set<Integer> liveTaskIds) { - ThreadUtils.assertOnUiThread(); - - List<WeakReference<Activity>> activities = ApplicationStatus.getRunningActivities(); - for (int i = 0; i < activities.size(); i++) { - Activity activity = activities.get(i).get(); - if (activity == null) continue; - if (!(activity instanceof CustomTabActivity)) continue; - getAllTabIdsForActivity((CustomTabActivity) activity, liveTabIds); - liveTaskIds.add(activity.getTaskId()); - } - } - - private class CleanUpTabStateDataTask extends AsyncTask<Void, Void, Void> { - private final Callback<List<String>> mFilesToDeleteCallback; - - private Set<Integer> mUnreferencedTabIds; - private List<File> mDeletableMetadataFiles; - private Map<File, SparseBooleanArray> mTabIdsByMetadataFile; - - CleanUpTabStateDataTask(Callback<List<String>> filesToDelete) { - mFilesToDeleteCallback = filesToDelete; - } - - @Override - protected Void doInBackground(Void... voids) { - if (mDestroyed) return null; - - mTabIdsByMetadataFile = new HashMap<>(); - mUnreferencedTabIds = new HashSet<>(); - - File[] stateFiles = getOrCreateStateDirectory().listFiles(); - if (stateFiles == null) return null; - - Set<Integer> allTabIds = new HashSet<>(); - Set<Integer> allReferencedTabIds = new HashSet<>(); - List<File> metadataFiles = new ArrayList<>(); - for (File file : stateFiles) { - if (TabPersistentStore.isStateFile(file.getName())) { - metadataFiles.add(file); - - SparseBooleanArray tabIds = new SparseBooleanArray(); - mTabIdsByMetadataFile.put(file, tabIds); - getTabsFromStateFile(tabIds, file); - for (int i = 0; i < tabIds.size(); i++) { - allReferencedTabIds.add(tabIds.keyAt(i)); - } - continue; - } - - Pair<Integer, Boolean> tabInfo = TabState.parseInfoFromFilename(file.getName()); - if (tabInfo == null) continue; - allTabIds.add(tabInfo.first); - } - - mUnreferencedTabIds.addAll(allTabIds); - mUnreferencedTabIds.removeAll(allReferencedTabIds); - - mDeletableMetadataFiles = getMetadataFilesForDeletion( - System.currentTimeMillis(), metadataFiles); - return null; - } - - @Override - protected void onPostExecute(Void unused) { - List<String> filesToDelete = new ArrayList<>(); - if (mDestroyed) { - mFilesToDeleteCallback.onResult(filesToDelete); - return; - } - - if (mUnreferencedTabIds.isEmpty() && mDeletableMetadataFiles.isEmpty()) { - mFilesToDeleteCallback.onResult(filesToDelete); - return; - } - - Set<Integer> liveTabIds = new HashSet<>(); - Set<Integer> liveTaskIds = new HashSet<>(); - getAllLiveTabAndTaskIds(liveTabIds, liveTaskIds); - - for (Integer unreferencedTabId : mUnreferencedTabIds) { - // Ignore tabs that are referenced by live activities as they might not have been - // able to write out their state yet. - if (liveTabIds.contains(unreferencedTabId)) continue; - - // The tab state is not referenced by any current activities or any metadata files, - // so mark it for deletion. - filesToDelete.add(TabState.getTabStateFilename(unreferencedTabId, false)); - } - - for (int i = 0; i < mDeletableMetadataFiles.size(); i++) { - File metadataFile = mDeletableMetadataFiles.get(i); - String id = TabPersistentStore.getStateFileUniqueId(metadataFile.getName()); - try { - int taskId = Integer.parseInt(id); - - // Ignore the metadata file if it belongs to a currently live CustomTabActivity. - if (liveTaskIds.contains(taskId)) continue; - - filesToDelete.add(metadataFile.getName()); - - SparseBooleanArray unusedTabIds = mTabIdsByMetadataFile.get(metadataFile); - if (unusedTabIds == null) continue; - for (int j = 0; j < unusedTabIds.size(); j++) { - filesToDelete.add(TabState.getTabStateFilename( - unusedTabIds.keyAt(j), false)); - } - } catch (NumberFormatException ex) { - assert false : "Unexpected tab metadata file found: " + metadataFile.getName(); - continue; - } - } - - mFilesToDeleteCallback.onResult(filesToDelete); - } - - private void getTabsFromStateFile(SparseBooleanArray tabIds, File metadataFile) { - DataInputStream stream = null; - try { - stream = new DataInputStream( - new BufferedInputStream(new FileInputStream(metadataFile))); - TabPersistentStore.readSavedStateFile(stream, null, tabIds, false); - } catch (Exception e) { - Log.e(TAG, "Unable to read state for " + metadataFile.getName() + ": " + e); - } finally { - StreamUtil.closeQuietly(stream); - } - } - } -}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadManagerService.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadManagerService.java index 20aff1a..88bfd511 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadManagerService.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadManagerService.java
@@ -76,10 +76,6 @@ public static final int DOWNLOAD_STATUS_INTERRUPTED = 4; private static final String TAG = "DownloadService"; - // Deprecated shared preference entry. Keep this for a while so that it will be removed when - // user updates Chrome. - // TODO(qinmin): remove this when most users have upgraded to M49 or above. - private static final String DEPRECATED_DOWNLOAD_NOTIFICATION_IDS = "DownloadNotificationIds"; private static final String DOWNLOAD_DIRECTORY = "Download"; protected static final String PENDING_OMA_DOWNLOADS = "PendingOMADownloads"; private static final String UNKNOWN_MIME_TYPE = "application/unknown"; @@ -254,9 +250,6 @@ mOMADownloadHandler = new OMADownloadHandler(context); mDownloadSnackbarController = new DownloadSnackbarController(context); mDownloadManagerDelegate = new DownloadManagerDelegate(mContext); - if (mSharedPrefs.contains(DEPRECATED_DOWNLOAD_NOTIFICATION_IDS)) { - mSharedPrefs.edit().remove(DEPRECATED_DOWNLOAD_NOTIFICATION_IDS).apply(); - } // Note that this technically leaks the native object, however, DownloadManagerService // is a singleton that lives forever and there's no clean shutdown of Chrome on Android. init();
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java index aed2a388..fd043a2 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
@@ -1627,7 +1627,6 @@ reparentingParams.finalizeTabReparenting(); mIsDetachedForReparenting = false; - mIsTabStateDirty = true; for (TabObserver observer : mObservers) { observer.onReparentingFinished(this);
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java index c8726db..36ad1bdd 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java
@@ -227,17 +227,6 @@ }; } - /** - * Exposed to allow tests to initialize the selector with different tab models. - * @param normalModel The normal tab model. - * @param incognitoModel The incognito tab model. - */ - @VisibleForTesting - public void initializeForTesting(TabModel normalModel, TabModel incognitoModel) { - initialize(isIncognitoSelected(), normalModel, incognitoModel); - mActiveState = true; - } - @Override public void setCloseAllTabsDelegate(CloseAllTabsDelegate delegate) { mCloseAllTabsDelegate = delegate;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistencePolicy.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistencePolicy.java index a91bcde2..aedf958 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistencePolicy.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistencePolicy.java
@@ -43,21 +43,18 @@ String getStateToBeMergedFileName(); /** - * Performs any necessary initialization required before accessing the tab information. This - * can include cleanups or migrations that must occur before the tab state information can be - * read reliably. + * Performs any necessary migration required before accessing the tab information. * * @param executor The executor that any asynchronous tasks should be run on. - * @return Whether any blocking initialization is necessary. + * @return Whether any migration is necessary. */ - boolean performInitialization(Executor executor); + boolean performMigration(Executor executor); /** - * Waits for the any pending initialization to finish. - * - * @see #performInitialization(Executor) + * Waits for the task that migrates all state files to their new location to + * finish. */ - void waitForInitializationToFinish(); + void waitForMigrationToFinish(); /** * @return Whether a merge is currently in progress.
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java index 1bfbef6..8126adb8 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
@@ -219,12 +219,11 @@ mPreferences = ContextUtils.getAppSharedPreferences(); assert isStateFile(policy.getStateFileName()) : "State file name is not valid"; - boolean needsInitialization = mPersistencePolicy.performInitialization( - AsyncTask.SERIAL_EXECUTOR); + boolean needsMigration = mPersistencePolicy.performMigration(AsyncTask.SERIAL_EXECUTOR); if (mPersistencePolicy.isMergeInProgress()) return; - Executor executor = needsInitialization + Executor executor = needsMigration ? AsyncTask.SERIAL_EXECUTOR : AsyncTask.THREAD_POOL_EXECUTOR; mPrefetchTabListTask = @@ -248,7 +247,7 @@ */ @VisibleForTesting public void waitForMigrationToFinish() { - mPersistencePolicy.waitForInitializationToFinish(); + mPersistencePolicy.waitForMigrationToFinish(); } /** @@ -999,7 +998,7 @@ * @param forMerge Whether this state file was read as part of a merge. * @return The next available tab ID based on the maximum ID referenced in this state file. */ - public static int readSavedStateFile( + protected static int readSavedStateFile( DataInputStream stream, @Nullable OnTabStateReadCallback callback, @Nullable SparseBooleanArray tabIds, boolean forMerge) throws IOException { if (stream == null) return 0; @@ -1368,19 +1367,9 @@ } /** - * Parses the state file name and returns the unique ID encoded into it. - * @param stateFileName The state file name to be parsed. - * @return The unique ID used when generating the file name. - */ - public static String getStateFileUniqueId(String stateFileName) { - assert isStateFile(stateFileName); - return stateFileName.substring(TabPersistencePolicy.SAVED_STATE_FILE_PREFIX.length()); - } - - /** * @return Whether the specified filename matches the expected pattern of the tab state files. */ - public static boolean isStateFile(String fileName) { + private static boolean isStateFile(String fileName) { return fileName.startsWith(TabPersistencePolicy.SAVED_STATE_FILE_PREFIX); }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabbedModeTabPersistencePolicy.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabbedModeTabPersistencePolicy.java index 26f6bf6..96bb664 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabbedModeTabPersistencePolicy.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabbedModeTabPersistencePolicy.java
@@ -143,7 +143,7 @@ } @Override - public boolean performInitialization(Executor executor) { + public boolean performMigration(Executor executor) { ThreadUtils.assertOnUiThread(); final boolean hasRunLegacyMigration = @@ -291,7 +291,7 @@ } @Override - public void waitForInitializationToFinish() { + public void waitForMigrationToFinish() { if (sMigrationTask == null) return; try { sMigrationTask.get();
diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni index cf7f2ce..dafac92 100644 --- a/chrome/android/java_sources.gni +++ b/chrome/android/java_sources.gni
@@ -269,7 +269,6 @@ "java/src/org/chromium/chrome/browser/customtabs/CustomTabObserver.java", "java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java", "java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionService.java", - "java/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicy.java", "java/src/org/chromium/chrome/browser/customtabs/RequestThrottler.java", "java/src/org/chromium/chrome/browser/customtabs/SeparateTaskCustomTabActivity.java", "java/src/org/chromium/chrome/browser/customtabs/SeparateTaskCustomTabActivity0.java", @@ -1159,7 +1158,6 @@ "javatests/src/org/chromium/chrome/browser/customtabs/CustomTabExternalNavigationTest.java", "javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionTest.java", "javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsTestUtils.java", - "javatests/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicyTest.java", "javatests/src/org/chromium/chrome/browser/customtabs/RequestThrottlerTest.java", "javatests/src/org/chromium/chrome/browser/document/LauncherActivityTest.java", "javatests/src/org/chromium/chrome/browser/dom_distiller/DistillabilityServiceTest.java",
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicyTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicyTest.java deleted file mode 100644 index 499348c..0000000 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicyTest.java +++ /dev/null
@@ -1,432 +0,0 @@ -// Copyright 2016 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. - -package org.chromium.chrome.browser.customtabs; - -import static android.test.MoreAsserts.assertContentsInAnyOrder; -import static android.test.MoreAsserts.assertEmpty; - -import android.app.Activity; -import android.os.AsyncTask; -import android.test.InstrumentationTestCase; -import android.test.UiThreadTest; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.SmallTest; - -import org.chromium.base.ActivityState; -import org.chromium.base.ApplicationStatus; -import org.chromium.base.Callback; -import org.chromium.base.ContextUtils; -import org.chromium.base.StreamUtil; -import org.chromium.base.ThreadUtils; -import org.chromium.base.test.util.AdvancedMockContext; -import org.chromium.base.test.util.Feature; -import org.chromium.chrome.browser.ChromeTabbedActivity; -import org.chromium.chrome.browser.TabState; -import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager; -import org.chromium.chrome.browser.tab.Tab; -import org.chromium.chrome.browser.tabmodel.TabModelSelector; -import org.chromium.chrome.browser.tabmodel.TabModelSelectorImpl; -import org.chromium.chrome.browser.tabmodel.TabPersistencePolicy; -import org.chromium.chrome.browser.tabmodel.TabPersistentStore; -import org.chromium.chrome.browser.tabmodel.TestTabModelDirectory; -import org.chromium.chrome.test.util.browser.tabmodel.MockTabModel; -import org.chromium.content.browser.test.util.CallbackHelper; - -import java.io.File; -import java.io.FileOutputStream; -import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.concurrent.Callable; -import java.util.concurrent.Executor; -import java.util.concurrent.atomic.AtomicReference; - -import javax.annotation.Nullable; - -/** - * Tests for the Custom Tab persistence logic. - */ -public class CustomTabTabPersistencePolicyTest extends InstrumentationTestCase { - - private TestTabModelDirectory mMockDirectory; - private AdvancedMockContext mAppContext; - - @Override - public void setUp() throws Exception { - super.setUp(); - - mAppContext = new AdvancedMockContext( - getInstrumentation().getTargetContext().getApplicationContext()); - ContextUtils.initApplicationContextForTests(mAppContext); - - mMockDirectory = new TestTabModelDirectory( - mAppContext, "CustomTabTabPersistencePolicyTest", - CustomTabTabPersistencePolicy.SAVED_STATE_DIRECTORY); - TabPersistentStore.setBaseStateDirectoryForTests(mMockDirectory.getBaseDirectory()); - } - - @Override - public void tearDown() throws Exception { - mMockDirectory.tearDown(); - - List<WeakReference<Activity>> activities = ApplicationStatus.getRunningActivities(); - for (int i = 0; i < activities.size(); i++) { - Activity activity = activities.get(i).get(); - if (activity == null) continue; - ApplicationStatus.onStateChangeForTesting(activity, ActivityState.DESTROYED); - } - super.tearDown(); - } - - @Feature("TabPersistentStore") - @SmallTest - public void testDeletableMetadataSelection_NoFiles() { - List<File> deletableFiles = CustomTabTabPersistencePolicy.getMetadataFilesForDeletion( - System.currentTimeMillis(), new ArrayList<File>()); - assertEmpty(deletableFiles); - } - - @Feature("TabPersistentStore") - @SmallTest - public void testDeletableMetadataSelection_MaximumValidFiles() { - long currentTime = System.currentTimeMillis(); - - // Test the maximum allowed number of state files where they are all valid in terms of age. - List<File> filesToTest = new ArrayList<>(); - filesToTest.addAll(generateMaximumStateFiles(currentTime)); - List<File> deletableFiles = CustomTabTabPersistencePolicy.getMetadataFilesForDeletion( - currentTime, filesToTest); - assertEmpty(deletableFiles); - } - - @Feature("TabPersistentStore") - @SmallTest - public void testDeletableMetadataSelection_ExceedsMaximumValidFiles() { - long currentTime = System.currentTimeMillis(); - - // Test where we exceed the maximum number of allowed state files and ensure it chooses the - // older file to delete. - List<File> filesToTest = new ArrayList<>(); - filesToTest.addAll(generateMaximumStateFiles(currentTime)); - File slightlyOlderFile = buildTestFile("slightlyolderfile", currentTime - 1L); - // Insert it into the middle just to ensure it is not picking the last file. - filesToTest.add(filesToTest.size() / 2, slightlyOlderFile); - List<File> deletableFiles = CustomTabTabPersistencePolicy.getMetadataFilesForDeletion( - currentTime, filesToTest); - assertContentsInAnyOrder(deletableFiles, slightlyOlderFile); - } - - @Feature("TabPersistentStore") - @SmallTest - public void testDeletableMetadataSelection_ExceedExpiryThreshold() { - long currentTime = System.currentTimeMillis(); - - // Ensure that files that exceed the allowed time threshold are removed regardless of the - // number of possible files. - List<File> filesToTest = new ArrayList<>(); - File expiredFile = buildTestFile("expired_file", - currentTime - CustomTabTabPersistencePolicy.STATE_EXPIRY_THRESHOLD); - filesToTest.add(expiredFile); - List<File> deletableFiles = CustomTabTabPersistencePolicy.getMetadataFilesForDeletion( - currentTime, filesToTest); - assertContentsInAnyOrder(deletableFiles, expiredFile); - } - - /** - * Test to ensure that an existing metadata files are deleted if no restore is requested. - */ - @Feature("TabPersistentStore") - @MediumTest - public void testExistingMetadataFileDeletedIfNoRestore() throws Exception { - File baseStateDirectory = TabPersistentStore.getOrCreateBaseStateDirectory(); - assertNotNull(baseStateDirectory); - - CustomTabTabPersistencePolicy policy = new CustomTabTabPersistencePolicy(7, false); - File stateDirectory = policy.getOrCreateStateDirectory(); - assertNotNull(stateDirectory); - - String stateFileName = policy.getStateFileName(); - File existingStateFile = new File(stateDirectory, stateFileName); - assertTrue(existingStateFile.createNewFile()); - - assertTrue(existingStateFile.exists()); - policy.performInitialization(AsyncTask.SERIAL_EXECUTOR); - policy.waitForInitializationToFinish(); - assertFalse(existingStateFile.exists()); - } - - /** - * Test the logic that gets all the live tab and task IDs. - */ - @Feature("TabPersistentStore") - @SmallTest - @UiThreadTest - public void testGettingTabAndTaskIds() { - Set<Integer> tabIds = new HashSet<>(); - Set<Integer> taskIds = new HashSet<>(); - CustomTabTabPersistencePolicy.getAllLiveTabAndTaskIds(tabIds, taskIds); - assertEmpty(tabIds); - assertEmpty(taskIds); - - tabIds.clear(); - taskIds.clear(); - - CustomTabActivity cct1 = buildTestCustomTabActivity(1, new int[] {4, 8, 9}, null); - ApplicationStatus.onStateChangeForTesting(cct1, ActivityState.CREATED); - - CustomTabActivity cct2 = buildTestCustomTabActivity(5, new int[] {458}, new int[] {9878}); - ApplicationStatus.onStateChangeForTesting(cct2, ActivityState.CREATED); - - // Add a tabbed mode activity to ensure that its IDs are not included in the returned CCT - // ID sets. - final TabModelSelectorImpl tabbedSelector = - buildTestTabModelSelector(new int[] {12121212}, new int[] {1515151515}); - ChromeTabbedActivity tabbedActivity = new ChromeTabbedActivity() { - @Override - public int getTaskId() { - return 888; - } - - @Override - public TabModelSelector getTabModelSelector() { - return tabbedSelector; - } - }; - ApplicationStatus.onStateChangeForTesting(tabbedActivity, ActivityState.CREATED); - - CustomTabTabPersistencePolicy.getAllLiveTabAndTaskIds(tabIds, taskIds); - assertContentsInAnyOrder(tabIds, 4, 8, 9, 458, 9878); - assertContentsInAnyOrder(taskIds, 1, 5); - } - - /** - * Test the full cleanup task path that determines what files are eligible for deletion. - */ - @Feature("TabPersistentStore") - @MediumTest - public void testCleanupTask() throws Exception { - File baseStateDirectory = TabPersistentStore.getOrCreateBaseStateDirectory(); - assertNotNull(baseStateDirectory); - - CustomTabTabPersistencePolicy policy = new CustomTabTabPersistencePolicy(2, false); - File stateDirectory = policy.getOrCreateStateDirectory(); - assertNotNull(stateDirectory); - - final AtomicReference<List<String>> filesToDelete = new AtomicReference<>(); - final CallbackHelper callbackSignal = new CallbackHelper(); - Callback<List<String>> filesToDeleteCallback = new Callback<List<String>>() { - @Override - public void onResult(List<String> fileNames) { - filesToDelete.set(fileNames); - callbackSignal.notifyCalled(); - } - }; - - // Test when no files have been created. - policy.cleanupUnusedFiles(filesToDeleteCallback); - callbackSignal.waitForCallback(0); - assertEmpty(filesToDelete.get()); - - // Create an unreferenced tab state file and ensure it is marked for deletion. - File tab999File = TabState.getTabStateFile(stateDirectory, 999, false); - assertTrue(tab999File.createNewFile()); - policy.cleanupUnusedFiles(filesToDeleteCallback); - callbackSignal.waitForCallback(1); - assertContentsInAnyOrder(filesToDelete.get(), tab999File.getName()); - - // Reference the tab state file and ensure it is no longer marked for deletion. - CustomTabActivity cct1 = buildTestCustomTabActivity(1, new int[] {999}, null); - ApplicationStatus.onStateChangeForTesting(cct1, ActivityState.CREATED); - policy.cleanupUnusedFiles(filesToDeleteCallback); - callbackSignal.waitForCallback(2); - assertEmpty(filesToDelete.get()); - - // Create a tab model and associated tabs. Ensure it is not marked for deletion as it is - // new enough. - final TabModelSelectorImpl selectorImpl = buildTestTabModelSelector( - new int[] {111, 222, 333 }, null); - byte[] data = ThreadUtils.runOnUiThreadBlockingNoException(new Callable<byte[]>() { - @Override - public byte[] call() throws Exception { - return TabPersistentStore.serializeTabModelSelector(selectorImpl, null); - } - }); - FileOutputStream fos = null; - File metadataFile = new File( - stateDirectory, TabPersistentStore.getStateFileName("3")); - try { - fos = new FileOutputStream(metadataFile); - fos.write(data); - } finally { - StreamUtil.closeQuietly(fos); - } - File tab111File = TabState.getTabStateFile(stateDirectory, 111, false); - assertTrue(tab111File.createNewFile()); - File tab222File = TabState.getTabStateFile(stateDirectory, 222, false); - assertTrue(tab222File.createNewFile()); - File tab333File = TabState.getTabStateFile(stateDirectory, 333, false); - assertTrue(tab333File.createNewFile()); - policy.cleanupUnusedFiles(filesToDeleteCallback); - callbackSignal.waitForCallback(3); - assertEmpty(filesToDelete.get()); - - // Set the age of the metadata file to be past the expiration threshold and ensure it along - // with the associated tab files are marked for deletion. - assertTrue(metadataFile.setLastModified(1234)); - policy.cleanupUnusedFiles(filesToDeleteCallback); - callbackSignal.waitForCallback(4); - assertContentsInAnyOrder(filesToDelete.get(), tab111File.getName(), tab222File.getName(), - tab333File.getName(), metadataFile.getName()); - } - - /** - * Ensure that the metadata file's last modified timestamp is updated on initialization. - */ - @Feature("TabPersistentStore") - @MediumTest - public void testMetadataTimestampRefreshed() throws Exception { - File baseStateDirectory = TabPersistentStore.getOrCreateBaseStateDirectory(); - assertNotNull(baseStateDirectory); - - CustomTabTabPersistencePolicy policy = new CustomTabTabPersistencePolicy(2, true); - File stateDirectory = policy.getOrCreateStateDirectory(); - assertNotNull(stateDirectory); - - File metadataFile = new File(stateDirectory, policy.getStateFileName()); - assertTrue(metadataFile.createNewFile()); - - long previousTimestamp = - System.currentTimeMillis() - CustomTabTabPersistencePolicy.STATE_EXPIRY_THRESHOLD; - assertTrue(metadataFile.setLastModified(previousTimestamp)); - - policy.performInitialization(AsyncTask.SERIAL_EXECUTOR); - policy.waitForInitializationToFinish(); - - assertTrue(metadataFile.lastModified() > previousTimestamp); - } - - private static List<File> generateMaximumStateFiles(long currentTime) { - List<File> validFiles = new ArrayList<>(); - for (int i = 0; i < CustomTabTabPersistencePolicy.MAXIMUM_STATE_FILES; i++) { - validFiles.add(buildTestFile("testfile" + i, currentTime)); - } - return validFiles; - } - - private static File buildTestFile(String filename, final long lastModifiedTime) { - return new File(filename) { - @Override - public long lastModified() { - return lastModifiedTime; - } - }; - } - - private static CustomTabActivity buildTestCustomTabActivity( - final int taskId, int[] normalTabIds, int[] incognitoTabIds) { - final TabModelSelectorImpl selectorImpl = - buildTestTabModelSelector(normalTabIds, incognitoTabIds); - return new CustomTabActivity() { - @Override - public int getTaskId() { - return taskId; - } - - @Override - public TabModelSelectorImpl getTabModelSelector() { - return selectorImpl; - } - }; - } - - private static TabPersistencePolicy buildTestPersistencePolicy() { - return new TabPersistencePolicy() { - @Override - public void waitForInitializationToFinish() { - } - - @Override - public void setTabContentManager(TabContentManager cache) { - } - - @Override - public void setMergeInProgress(boolean isStarted) { - } - - @Override - public boolean performInitialization(Executor executor) { - return false; - } - - @Override - public boolean isMergeInProgress() { - return false; - } - - @Override - @Nullable - public String getStateToBeMergedFileName() { - return null; - } - - @Override - public String getStateFileName() { - return "testing_is_niftytown"; - } - - @Override - public File getOrCreateStateDirectory() { - return new File( - TabPersistentStore.getOrCreateBaseStateDirectory(), "cct_tests_zor"); - } - - @Override - public void destroy() { - } - - @Override - public void cleanupUnusedFiles(Callback<List<String>> filesToDelete) { - } - - @Override - public void cancelCleanupInProgress() { - } - }; - } - - private static TabModelSelectorImpl buildTestTabModelSelector( - int[] normalTabIds, int[] incognitoTabIds) { - MockTabModel.MockTabModelDelegate tabModelDelegate = - new MockTabModel.MockTabModelDelegate() { - @Override - public Tab createTab(int id, boolean incognito) { - return new Tab(id, incognito, null) { - @Override - public String getUrl() { - return "https://www.google.com"; - } - }; - } - }; - final MockTabModel normalTabModel = new MockTabModel(false, tabModelDelegate); - if (normalTabIds != null) { - for (int tabId : normalTabIds) normalTabModel.addTab(tabId); - } - final MockTabModel incognitoTabModel = new MockTabModel(true, tabModelDelegate); - if (incognitoTabIds != null) { - for (int tabId : incognitoTabIds) incognitoTabModel.addTab(tabId); - } - - CustomTabActivity activity = new CustomTabActivity(); - ApplicationStatus.onStateChangeForTesting(activity, ActivityState.CREATED); - TabModelSelectorImpl selector = new TabModelSelectorImpl( - activity, buildTestPersistencePolicy(), null, false); - selector.initializeForTesting(normalTabModel, incognitoTabModel); - ApplicationStatus.onStateChangeForTesting(activity, ActivityState.DESTROYED); - return selector; - } -}
diff --git a/chrome/browser/browsing_data/browsing_data_remover.cc b/chrome/browser/browsing_data/browsing_data_remover.cc index c3d9da8..c987b1b 100644 --- a/chrome/browser/browsing_data/browsing_data_remover.cc +++ b/chrome/browser/browsing_data/browsing_data_remover.cc
@@ -75,6 +75,8 @@ #include "content/public/browser/user_metrics.h" #include "net/base/net_errors.h" #include "net/cookies/cookie_store.h" +#include "net/http/http_network_session.h" +#include "net/http/http_transaction_factory.h" #include "net/http/transport_security_state.h" #include "net/ssl/channel_id_service.h" #include "net/ssl/channel_id_store.h" @@ -178,6 +180,20 @@ io_thread->ClearHostCache(host_filter); } +void ClearHttpAuthCacheOnIOThread( + scoped_refptr<net::URLRequestContextGetter> context_getter, + base::Time delete_begin) { + DCHECK_CURRENTLY_ON(BrowserThread::IO); + + net::HttpNetworkSession* http_session = context_getter->GetURLRequestContext() + ->http_transaction_factory() + ->GetSession(); + DCHECK(http_session); + http_session->http_auth_cache()->ClearEntriesAddedWithin(base::Time::Now() - + delete_begin); + http_session->CloseAllConnections(); +} + void ClearNetworkPredictorOnIOThread(chrome_browser_net::Predictor* predictor) { DCHECK_CURRENTLY_ON(BrowserThread::IO); DCHECK(predictor); @@ -994,6 +1010,18 @@ content_suggestions_service->ClearAllCachedSuggestions(); } + if (remove_mask & REMOVE_COOKIES || remove_mask & REMOVE_PASSWORDS) { + scoped_refptr<net::URLRequestContextGetter> request_context = + profile_->GetRequestContext(); + waiting_for_clear_http_auth_cache_ = true; + BrowserThread::PostTaskAndReply( + BrowserThread::IO, FROM_HERE, + base::Bind(&ClearHttpAuthCacheOnIOThread, std::move(request_context), + delete_begin_), + base::Bind(&BrowsingDataRemover::OnClearedHttpAuthCache, + weak_ptr_factory_.GetWeakPtr())); + } + // Content Decryption Modules used by Encrypted Media store licenses in a // private filesystem. These are different than content licenses used by // Flash (which are deleted father down in this method). @@ -1226,6 +1254,7 @@ !waiting_for_clear_domain_reliability_monitor_ && !waiting_for_clear_form_ && !waiting_for_clear_history_ && !waiting_for_clear_hostname_resolution_cache_ && + !waiting_for_clear_http_auth_cache_ && !waiting_for_clear_keyword_data_ && !waiting_for_clear_nacl_cache_ && !waiting_for_clear_network_predictor_ && !waiting_for_clear_networking_history_ && @@ -1326,6 +1355,12 @@ NotifyIfDone(); } +void BrowsingDataRemover::OnClearedHttpAuthCache() { + DCHECK_CURRENTLY_ON(BrowserThread::UI); + waiting_for_clear_http_auth_cache_ = false; + NotifyIfDone(); +} + void BrowsingDataRemover::OnClearedNetworkPredictor() { DCHECK_CURRENTLY_ON(BrowserThread::UI); waiting_for_clear_network_predictor_ = false;
diff --git a/chrome/browser/browsing_data/browsing_data_remover.h b/chrome/browser/browsing_data/browsing_data_remover.h index e52122a7..a37efb0f 100644 --- a/chrome/browser/browsing_data/browsing_data_remover.h +++ b/chrome/browser/browsing_data/browsing_data_remover.h
@@ -436,6 +436,10 @@ // Clears the respective waiting flag and invokes NotifyIfDone. void OnClearedHostnameResolutionCache(); + // Callback for when HTTP auth cache has been cleared. + // Clears the respective waiting flag and invokes NotifyIfDone. + void OnClearedHttpAuthCache(); + // Callback for when speculative data in the network Predictor has been // cleared. Clears the respective waiting flag and invokes // NotifyIfDone. @@ -566,6 +570,7 @@ bool waiting_for_clear_form_ = false; bool waiting_for_clear_history_ = false; bool waiting_for_clear_hostname_resolution_cache_ = false; + bool waiting_for_clear_http_auth_cache_ = false; bool waiting_for_clear_keyword_data_ = false; bool waiting_for_clear_nacl_cache_ = false; bool waiting_for_clear_network_predictor_ = false;
diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc index 618b9a8..6a8bd64 100644 --- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc +++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
@@ -80,6 +80,8 @@ #include "content/public/test/test_browser_thread_bundle.h" #include "content/public/test/test_utils.h" #include "net/cookies/cookie_store.h" +#include "net/http/http_network_session.h" +#include "net/http/http_transaction_factory.h" #include "net/ssl/channel_id_service.h" #include "net/ssl/channel_id_store.h" #include "net/ssl/ssl_client_cert_type.h" @@ -147,6 +149,9 @@ // For Autofill. const char kWebOrigin[] = "https://www.example.com/"; +// For HTTP auth. +const char kTestRealm[] = "TestRealm"; + const GURL kOrigin1(kTestOrigin1); const GURL kOrigin2(kTestOrigin2); const GURL kOrigin3(kTestOrigin3); @@ -2690,6 +2695,56 @@ host_settings[0].primary_pattern); } +// Test that removing cookies clears HTTP auth data. +TEST_F(BrowsingDataRemoverTest, ClearHttpAuthCache_RemoveCookies) { + net::HttpNetworkSession* http_session = GetProfile() + ->GetRequestContext() + ->GetURLRequestContext() + ->http_transaction_factory() + ->GetSession(); + DCHECK(http_session); + + net::HttpAuthCache* http_auth_cache = http_session->http_auth_cache(); + http_auth_cache->Add(kOrigin1, kTestRealm, net::HttpAuth::AUTH_SCHEME_BASIC, + "test challenge", + net::AuthCredentials(base::ASCIIToUTF16("foo"), + base::ASCIIToUTF16("bar")), + "/"); + CHECK(http_auth_cache->Lookup(kOrigin1, kTestRealm, + net::HttpAuth::AUTH_SCHEME_BASIC)); + + BlockUntilBrowsingDataRemoved(browsing_data::ALL_TIME, + BrowsingDataRemover::REMOVE_COOKIES, false); + + EXPECT_EQ(nullptr, http_auth_cache->Lookup(kOrigin1, kTestRealm, + net::HttpAuth::AUTH_SCHEME_BASIC)); +} + +// Test that removing passwords clears HTTP auth data. +TEST_F(BrowsingDataRemoverTest, ClearHttpAuthCache_RemovePasswords) { + net::HttpNetworkSession* http_session = GetProfile() + ->GetRequestContext() + ->GetURLRequestContext() + ->http_transaction_factory() + ->GetSession(); + DCHECK(http_session); + + net::HttpAuthCache* http_auth_cache = http_session->http_auth_cache(); + http_auth_cache->Add(kOrigin1, kTestRealm, net::HttpAuth::AUTH_SCHEME_BASIC, + "test challenge", + net::AuthCredentials(base::ASCIIToUTF16("foo"), + base::ASCIIToUTF16("bar")), + "/"); + CHECK(http_auth_cache->Lookup(kOrigin1, kTestRealm, + net::HttpAuth::AUTH_SCHEME_BASIC)); + + BlockUntilBrowsingDataRemoved(browsing_data::ALL_TIME, + BrowsingDataRemover::REMOVE_PASSWORDS, false); + + EXPECT_EQ(nullptr, http_auth_cache->Lookup(kOrigin1, kTestRealm, + net::HttpAuth::AUTH_SCHEME_BASIC)); +} + TEST_F(BrowsingDataRemoverTest, ClearPermissionPromptCounts) { RemovePermissionPromptCountsTest tester(GetProfile());
diff --git a/chrome/browser/chromeos/arc/arc_process_service.cc b/chrome/browser/chromeos/arc/arc_process_service.cc index e9f8b52..ab08b47 100644 --- a/chrome/browser/chromeos/arc/arc_process_service.cc +++ b/chrome/browser/chromeos/arc/arc_process_service.cc
@@ -9,10 +9,15 @@ #include "chrome/browser/chromeos/arc/arc_process_service.h" +#include <algorithm> #include <queue> -#include <set> #include <string> +#include <unordered_map> +#include <unordered_set> +#include <utility> +#include "base/callback.h" +#include "base/logging.h" #include "base/process/process.h" #include "base/process/process_iterator.h" #include "base/task_runner_util.h" @@ -21,42 +26,198 @@ namespace arc { -namespace { - -const char kSequenceToken[] = "arc_process_service"; - -// Weak pointer. This class is owned by ArcServiceManager. -ArcProcessService* g_arc_process_service = nullptr; - -} // namespace - using base::kNullProcessId; using base::Process; using base::ProcessId; using base::SequencedWorkerPool; -using std::map; -using std::set; using std::vector; +namespace { + +// Weak pointer. This class is owned by ArcServiceManager. +ArcProcessService* g_arc_process_service = nullptr; +static constexpr char kInitName[] = "/init"; +static constexpr bool kNotFocused = false; +static constexpr int64_t kNoActivityTimeInfo = 0L; + +// Matches the process name "/init" in the process tree and get the +// corresponding process ID. +base::ProcessId GetArcInitProcessId( + const base::ProcessIterator::ProcessEntries& entry_list) { + for (const base::ProcessEntry& entry : entry_list) { + if (entry.cmd_line_args().empty()) { + continue; + } + // TODO(nya): Add more constraints to avoid mismatches. + const std::string& process_name = entry.cmd_line_args()[0]; + if (process_name == kInitName) { + return entry.pid(); + } + } + return base::kNullProcessId; +} + +std::vector<arc::ArcProcess> GetArcSystemProcessList() { + std::vector<arc::ArcProcess> ret_processes; + const base::ProcessIterator::ProcessEntries& entry_list = + base::ProcessIterator(nullptr).Snapshot(); + const base::ProcessId arc_init_pid = GetArcInitProcessId(entry_list); + + if (arc_init_pid == base::kNullProcessId) { + return ret_processes; + } + + // Enumerate the child processes of ARC init for gathering ARC System + // Processes. + for (const base::ProcessEntry& entry : entry_list) { + if (entry.cmd_line_args().empty()) { + continue; + } + // TODO(hctsai): For now, we only gather direct child process of init, need + // to get the processes below. For example, installd might fork dex2oat and + // it can be executed for minutes. + if (entry.parent_pid() == arc_init_pid) { + const base::ProcessId child_pid = entry.pid(); + const base::ProcessId child_nspid = + base::Process(child_pid).GetPidInNamespace(); + if (child_nspid != base::kNullProcessId) { + const std::string& process_name = entry.cmd_line_args()[0]; + // The is_focused and last_activity_time is not needed thus mocked + ret_processes.emplace_back(child_nspid, child_pid, process_name, + mojom::ProcessState::PERSISTENT, kNotFocused, + kNoActivityTimeInfo); + } + } + } + return ret_processes; +} + +void UpdateNspidToPidMap( + scoped_refptr<ArcProcessService::NSPidToPidMap> pid_map) { + TRACE_EVENT0("browser", "ArcProcessService::UpdateNspidToPidMap"); + + // NB: Despite of its name, ProcessIterator::Snapshot() may return + // inconsistent information because it simply walks procfs. Especially + // we must not assume the parent-child relationships are consistent. + const base::ProcessIterator::ProcessEntries& entry_list = + base::ProcessIterator(nullptr).Snapshot(); + + // Construct the process tree. + // NB: This can contain a loop in case of race conditions. + std::unordered_map<ProcessId, std::vector<ProcessId>> process_tree; + for (const base::ProcessEntry& entry : entry_list) + process_tree[entry.parent_pid()].push_back(entry.pid()); + + ProcessId arc_init_pid = GetArcInitProcessId(entry_list); + + // Enumerate all processes under ARC init and create nspid -> pid map. + if (arc_init_pid != kNullProcessId) { + std::queue<ProcessId> queue; + std::unordered_set<ProcessId> visited; + queue.push(arc_init_pid); + while (!queue.empty()) { + ProcessId pid = queue.front(); + queue.pop(); + // Do not visit the same process twice. Otherwise we may enter an infinite + // loop if |process_tree| contains a loop. + if (!visited.insert(pid).second) + continue; + + const ProcessId nspid = base::Process(pid).GetPidInNamespace(); + + // All ARC processes should be in namespace so nspid is usually non-null, + // but this can happen if the process has already gone. + // Only add processes we're interested in (those appear as keys in + // |pid_map|). + if (nspid != kNullProcessId && pid_map->find(nspid) != pid_map->end()) + (*pid_map)[nspid] = pid; + + for (ProcessId child_pid : process_tree[pid]) + queue.push(child_pid); + } + } +} + +std::vector<ArcProcess> FilterProcessList( + const ArcProcessService::NSPidToPidMap& pid_map, + mojo::Array<arc::mojom::RunningAppProcessInfoPtr> processes) { + std::vector<ArcProcess> ret_processes; + for (const auto& entry : processes) { + const auto it = pid_map.find(entry->pid); + // The nspid could be missing due to race condition. For example, the + // process is still running when we get the process snapshot and ends when + // we update the nspid to pid mapping. + if (it == pid_map.end() || it->second == base::kNullProcessId) { + continue; + } + // Constructs the ArcProcess instance if the mapping is found. + ArcProcess arc_process(entry->pid, pid_map.at(entry->pid), + entry->process_name, entry->process_state, + entry->is_focused, entry->last_activity_time); + // |entry->packages| is provided only when process.mojom's verion is >=4. + if (entry->packages) { + for (const auto& package : entry->packages) { + arc_process.packages().push_back(package.get()); + } + } + ret_processes.push_back(std::move(arc_process)); + } + return ret_processes; +} + +std::vector<ArcProcess> UpdateAndReturnProcessList( + scoped_refptr<ArcProcessService::NSPidToPidMap> nspid_map, + mojo::Array<arc::mojom::RunningAppProcessInfoPtr> processes) { + ArcProcessService::NSPidToPidMap& pid_map = *nspid_map; + // Cleanup dead pids in the cache |pid_map|. + std::unordered_set<ProcessId> nspid_to_remove; + for (const auto& entry : pid_map) { + nspid_to_remove.insert(entry.first); + } + bool unmapped_nspid = false; + for (const auto& entry : processes) { + // erase() returns 0 if coudln't find the key. It means a new process. + if (nspid_to_remove.erase(entry->pid) == 0) { + pid_map[entry->pid] = base::kNullProcessId; + unmapped_nspid = true; + } + } + for (const auto& entry : nspid_to_remove) { + pid_map.erase(entry); + } + + // The operation is costly so avoid calling it when possible. + if (unmapped_nspid) { + UpdateNspidToPidMap(nspid_map); + } + + return FilterProcessList(pid_map, std::move(processes)); +} + +void Reset(scoped_refptr<ArcProcessService::NSPidToPidMap> pid_map) { + if (pid_map.get()) + pid_map->clear(); +} + +} // namespace + ArcProcessService::ArcProcessService(ArcBridgeService* bridge_service) : ArcService(bridge_service), - worker_pool_(new SequencedWorkerPool(1, - "arc_process_manager", - base::TaskPriority::USER_VISIBLE)), + heavy_task_thread_("ArcProcessServiceThread"), + nspid_to_pid_(new NSPidToPidMap()), weak_ptr_factory_(this) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); arc_bridge_service()->process()->AddObserver(this); DCHECK(!g_arc_process_service); g_arc_process_service = this; - // Not intended to be used from the creating thread. - thread_checker_.DetachFromThread(); + heavy_task_thread_.Start(); } ArcProcessService::~ArcProcessService() { DCHECK(g_arc_process_service == this); + heavy_task_thread_.Stop(); g_arc_process_service = nullptr; arc_bridge_service()->process()->RemoveObserver(this); - worker_pool_->Shutdown(); } // static @@ -67,19 +228,19 @@ void ArcProcessService::OnInstanceReady() { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - worker_pool_->PostNamedSequencedWorkerTask( - kSequenceToken, - FROM_HERE, - base::Bind(&ArcProcessService::Reset, - weak_ptr_factory_.GetWeakPtr())); + GetTaskRunner()->PostTask(FROM_HERE, base::Bind(&Reset, nspid_to_pid_)); } -void ArcProcessService::Reset() { - DCHECK(thread_checker_.CalledOnValidThread()); - nspid_to_pid_.clear(); +void ArcProcessService::RequestSystemProcessList( + RequestProcessListCallback callback) { + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); + + base::PostTaskAndReplyWithResult(GetTaskRunner().get(), FROM_HERE, + base::Bind(&GetArcSystemProcessList), + callback); } -bool ArcProcessService::RequestProcessList( +bool ArcProcessService::RequestAppProcessList( RequestProcessListCallback callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); @@ -90,165 +251,28 @@ } process_instance->RequestProcessList( base::Bind(&ArcProcessService::OnReceiveProcessList, - weak_ptr_factory_.GetWeakPtr(), - callback)); + weak_ptr_factory_.GetWeakPtr(), callback)); return true; } void ArcProcessService::OnReceiveProcessList( const RequestProcessListCallback& callback, - mojo::Array<arc::mojom::RunningAppProcessInfoPtr> mojo_processes) { + mojo::Array<arc::mojom::RunningAppProcessInfoPtr> instance_processes) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - auto* raw_processes = new vector<mojom::RunningAppProcessInfoPtr>(); - mojo_processes.Swap(raw_processes); - - auto* ret_processes = new vector<ArcProcess>(); - // Post to its dedicated worker thread to avoid race condition. - // Since no two tasks with the same token should be run at the same. - // Note: GetSequencedTaskRunner's shutdown behavior defaults to - // SKIP_ON_SHUTDOWN (ongoing task blocks shutdown). - // So in theory using Unretained(this) should be fine since the life cycle - // of |this| is the same as the main browser. - // To be safe I still use weak pointers, but weak_ptrs can only bind to - // methods without return values. That's why I can't use - // PostTaskAndReplyWithResult but handle the return object by myself. - auto runner = worker_pool_->GetSequencedTaskRunner( - worker_pool_->GetNamedSequenceToken(kSequenceToken)); - runner->PostTaskAndReply( - FROM_HERE, - base::Bind(&ArcProcessService::UpdateAndReturnProcessList, - weak_ptr_factory_.GetWeakPtr(), - base::Owned(raw_processes), - base::Unretained(ret_processes)), - base::Bind(&ArcProcessService::CallbackRelay, - weak_ptr_factory_.GetWeakPtr(), - callback, - base::Owned(ret_processes))); + base::PostTaskAndReplyWithResult( + GetTaskRunner().get(), FROM_HERE, + base::Bind(&UpdateAndReturnProcessList, nspid_to_pid_, + base::Passed(&instance_processes)), + callback); } -void ArcProcessService::CallbackRelay( - const RequestProcessListCallback& callback, - const vector<ArcProcess>* ret_processes) { - DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - callback.Run(*ret_processes); +scoped_refptr<base::SingleThreadTaskRunner> ArcProcessService::GetTaskRunner() { + return heavy_task_thread_.task_runner(); } -void ArcProcessService::UpdateAndReturnProcessList( - const vector<arc::mojom::RunningAppProcessInfoPtr>* raw_processes, - vector<ArcProcess>* ret_processes) { - DCHECK(thread_checker_.CalledOnValidThread()); +inline ArcProcessService::NSPidToPidMap::NSPidToPidMap() {} - // Cleanup dead pids in the cache |nspid_to_pid_|. - set<ProcessId> nspid_to_remove; - for (const auto& entry : nspid_to_pid_) { - nspid_to_remove.insert(entry.first); - } - bool unmapped_nspid = false; - for (const auto& entry : *raw_processes) { - // erase() returns 0 if coudln't find the key. It means a new process. - if (nspid_to_remove.erase(entry->pid) == 0) { - nspid_to_pid_[entry->pid] = kNullProcessId; - unmapped_nspid = true; - } - } - for (const auto& entry : nspid_to_remove) { - nspid_to_pid_.erase(entry); - } - - // The operation is costly so avoid calling it when possible. - if (unmapped_nspid) { - UpdateNspidToPidMap(); - } - - PopulateProcessList(raw_processes, ret_processes); -} - -void ArcProcessService::PopulateProcessList( - const vector<arc::mojom::RunningAppProcessInfoPtr>* raw_processes, - vector<ArcProcess>* ret_processes) { - DCHECK(thread_checker_.CalledOnValidThread()); - - for (const auto& entry : *raw_processes) { - const auto it = nspid_to_pid_.find(entry->pid); - // In case the process already dies so couldn't find corresponding pid. - if (it != nspid_to_pid_.end() && it->second != kNullProcessId) { - ArcProcess arc_process(entry->pid, it->second, entry->process_name, - entry->process_state, entry->is_focused, - entry->last_activity_time); - // |entry->packages| is provided only when process.mojom's verion is >=4. - if (entry->packages) { - for (const auto& package : entry->packages) { - arc_process.packages().push_back(package.get()); - } - } - ret_processes->push_back(std::move(arc_process)); - } - } -} - -// Computes a map from PID in ARC namespace to PID in system namespace. -// The returned map contains ARC processes only. -void ArcProcessService::UpdateNspidToPidMap() { - DCHECK(thread_checker_.CalledOnValidThread()); - - TRACE_EVENT0("browser", "ArcProcessService::UpdateNspidToPidMap"); - - // NB: Despite of its name, ProcessIterator::Snapshot() may return - // inconsistent information because it simply walks procfs. Especially - // we must not assume the parent-child relationships are consistent. - const base::ProcessIterator::ProcessEntries& entry_list = - base::ProcessIterator(nullptr).Snapshot(); - - // System may contain many different namespaces so several different - // processes may have the same nspid. We need to get the proper subset of - // processes to create correct nspid -> pid map. - - // Construct the process tree. - // NB: This can contain a loop in case of race conditions. - map<ProcessId, vector<ProcessId> > process_tree; - for (const base::ProcessEntry& entry : entry_list) - process_tree[entry.parent_pid()].push_back(entry.pid()); - - // Find the ARC init process. - ProcessId arc_init_pid = kNullProcessId; - for (const base::ProcessEntry& entry : entry_list) { - // TODO(nya): Add more constraints to avoid mismatches. - std::string process_name = - !entry.cmd_line_args().empty() ? entry.cmd_line_args()[0] : ""; - if (process_name == "/init") { - arc_init_pid = entry.pid(); - break; - } - } - - // Enumerate all processes under ARC init and create nspid -> pid map. - if (arc_init_pid != kNullProcessId) { - std::queue<ProcessId> queue; - std::set<ProcessId> visited; - queue.push(arc_init_pid); - while (!queue.empty()) { - ProcessId pid = queue.front(); - queue.pop(); - // Do not visit the same process twice. Otherwise we may enter an infinite - // loop if |process_tree| contains a loop. - if (!visited.insert(pid).second) - continue; - - ProcessId nspid = base::Process(pid).GetPidInNamespace(); - - // All ARC processes should be in namespace so nspid is usually non-null, - // but this can happen if the process has already gone. - // Only add processes we're interested in (those appear as keys in - // |nspid_to_pid_|). - if (nspid != kNullProcessId && - nspid_to_pid_.find(nspid) != nspid_to_pid_.end()) - nspid_to_pid_[nspid] = pid; - - for (ProcessId child_pid : process_tree[pid]) - queue.push(child_pid); - } - } -} +inline ArcProcessService::NSPidToPidMap::~NSPidToPidMap() {} } // namespace arc
diff --git a/chrome/browser/chromeos/arc/arc_process_service.h b/chrome/browser/chromeos/arc/arc_process_service.h index 32f1486..3ee704bf 100644 --- a/chrome/browser/chromeos/arc/arc_process_service.h +++ b/chrome/browser/chromeos/arc/arc_process_service.h
@@ -9,10 +9,12 @@ #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -#include "base/threading/sequenced_worker_pool.h" -#include "base/threading/thread_checker.h" +#include "base/process/process_iterator.h" +#include "base/single_thread_task_runner.h" +#include "base/threading/thread.h" #include "chrome/browser/chromeos/arc/arc_process.h" #include "components/arc/arc_bridge_service.h" #include "components/arc/arc_service.h" @@ -22,19 +24,26 @@ // A single global entry to get a list of ARC processes. // -// Call RequestProcessList() on the main UI thread to get a list of all ARC -// processes. It returns vector<arc::ArcProcess>, which includes pid <-> nspid -// mapping. +// Call RequestAppProcessList() / RequestSystemProcessList() on the main UI +// thread to get a list of all ARC app / system processes. It returns +// vector<arc::ArcProcess>, which includes pid <-> nspid mapping. // Example: // void OnUpdateProcessList(const vector<arc::ArcProcess>&) {...} // // arc::ArcProcessService* arc_process_service = // arc::ArcProcessService::Get(); // if (!arc_process_service || -// !arc_process_service->RequestProcessList( +// !arc_process_service->RequestAppProcessList( // base::Bind(&OnUpdateProcessList)) { // LOG(ERROR) << "ARC process instance not ready."; // } +// +// [System Process] +// The system process here is defined by the scope. If the process is produced +// under system_server in Android, we regard it as one of Android app process. +// Otherwise, the processes that are introduced by init would then be regarded +// as System Process. RequestAppProcessList() is responsible for app processes +// while RequestSystemProcessList() is responsible for System Processes. class ArcProcessService : public ArcService, public InstanceHolder<mojom::ProcessInstance>::Observer { @@ -53,38 +62,56 @@ // Returns true if ARC IPC is ready for process list request, // otherwise false. - bool RequestProcessList(RequestProcessListCallback callback); + bool RequestAppProcessList(RequestProcessListCallback callback); + void RequestSystemProcessList(RequestProcessListCallback callback); + + using PidMap = std::map<base::ProcessId, base::ProcessId>; + + class NSPidToPidMap : public base::RefCountedThreadSafe<NSPidToPidMap> { + public: + NSPidToPidMap(); + base::ProcessId& operator[](const base::ProcessId& key) { + return pidmap_[key]; + } + const base::ProcessId& at(const base::ProcessId& key) const { + return pidmap_.at(key); + } + PidMap::size_type erase(const base::ProcessId& key) { + return pidmap_.erase(key); + } + PidMap::const_iterator begin() const { return pidmap_.begin(); } + PidMap::const_iterator end() const { return pidmap_.end(); } + PidMap::const_iterator find(const base::ProcessId& key) const { + return pidmap_.find(key); + } + void clear() { pidmap_.clear(); } + + private: + friend base::RefCountedThreadSafe<NSPidToPidMap>; + ~NSPidToPidMap(); + + PidMap pidmap_; + DISALLOW_COPY_AND_ASSIGN(NSPidToPidMap); + }; private: - void Reset(); - void OnReceiveProcessList( const RequestProcessListCallback& callback, - mojo::Array<arc::mojom::RunningAppProcessInfoPtr> mojo_processes); + const mojo::Array<arc::mojom::RunningAppProcessInfoPtr> + instance_processes); - void CallbackRelay( - const RequestProcessListCallback& callback, - const std::vector<ArcProcess>* ret_processes); + scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner(); - void UpdateAndReturnProcessList( - const std::vector<arc::mojom::RunningAppProcessInfoPtr>* raw_processes, - std::vector<ArcProcess>* ret_processes); - - void PopulateProcessList( - const std::vector<arc::mojom::RunningAppProcessInfoPtr>* raw_processes, - std::vector<ArcProcess>* ret_processes); - - void UpdateNspidToPidMap(); + // There are some expensive tasks such as traverse whole process tree that + // we can't do it on the UI thread. Thus we need an additional thread to + // handle + // such tasks. + base::Thread heavy_task_thread_; // Keep a cache pid mapping of all arc processes so to minimize the number of // nspid lookup from /proc/<PID>/status. - // To play safe, always modify |nspid_to_pid_| on the worker thread. - std::map<base::ProcessId, base::ProcessId> nspid_to_pid_; - - scoped_refptr<base::SequencedWorkerPool> worker_pool_; - - // To ensure internal state changes are done on the same worker thread. - base::ThreadChecker thread_checker_; + // To play safe, always modify |nspid_to_pid_| on the |heavy_task_thread_|. + scoped_refptr<NSPidToPidMap> nspid_to_pid_; // Always keep this the last member of this class to make sure it's the // first thing to be destructed.
diff --git a/chrome/browser/chromeos/fileapi/file_system_backend.cc b/chrome/browser/chromeos/fileapi/file_system_backend.cc index fc0e1d1..d2c4176 100644 --- a/chrome/browser/chromeos/fileapi/file_system_backend.cc +++ b/chrome/browser/chromeos/fileapi/file_system_backend.cc
@@ -29,6 +29,17 @@ #include "storage/common/fileapi/file_system_mount_option.h" namespace chromeos { +namespace { + +// TODO(mtomasz): Remove this hacky whitelist. +// See: crbug.com/271946 +const char* kOemAccessibleExtensions[] = { + "mlbmkoenclnokonejhlfakkeabdlmpek", // TimeScapes, + "nhpmmldpbfjofkipjaieeomhnmcgihfm", // Retail Demo (public session), + "klimoghijjogocdbaikffefjfcfheiel", // Retail Demo (OOBE), +}; + +} // namespace // static bool FileSystemBackend::CanHandleURL(const storage::FileSystemURL& url) { @@ -181,12 +192,12 @@ if (url.origin().is_empty()) return true; - std::string extension_id = url.origin().host(); - // TODO(mtomasz): Temporarily whitelist TimeScapes. - // See: crbug.com/271946 - if (extension_id == "mlbmkoenclnokonejhlfakkeabdlmpek" && - url.type() == storage::kFileSystemTypeRestrictedNativeLocal) { - return true; + const std::string& extension_id = url.origin().host(); + if (url.type() == storage::kFileSystemTypeRestrictedNativeLocal) { + for (size_t i = 0; i < arraysize(kOemAccessibleExtensions); ++i) { + if (extension_id == kOemAccessibleExtensions[i]) + return true; + } } return file_access_permissions_->HasAccessPermission(extension_id,
diff --git a/chrome/browser/extensions/api/autofill_private/autofill_private_apitest.cc b/chrome/browser/extensions/api/autofill_private/autofill_private_apitest.cc index f584457..ea98788 100644 --- a/chrome/browser/extensions/api/autofill_private/autofill_private_apitest.cc +++ b/chrome/browser/extensions/api/autofill_private/autofill_private_apitest.cc
@@ -48,7 +48,13 @@ EXPECT_TRUE(RunAutofillSubtest("saveAddress")) << message_; } -IN_PROC_BROWSER_TEST_F(AutofillPrivateApiTest, GetCountryList) { +// TODO(crbug.com/643097) Disabled for flakiness. +#if defined(OS_WIN) +#define MAYBE_GetCountryList DISABLED_GetCountryList +#else +#define MAYBE_GetCountryList GetCountryList +#endif // defined(OS_WIN) +IN_PROC_BROWSER_TEST_F(AutofillPrivateApiTest, MAYBE_GetCountryList) { EXPECT_TRUE(RunAutofillSubtest("getCountryList")) << message_; } @@ -60,7 +66,13 @@ EXPECT_TRUE(RunAutofillSubtest("saveCreditCard")) << message_; } -IN_PROC_BROWSER_TEST_F(AutofillPrivateApiTest, RemoveEntry) { +// TODO(crbug.com/643097) Disabled for flakiness. +#if defined(OS_WIN) +#define MAYBE_RemoveEntry DISABLED_RemoveEntry +#else +#define MAYBE_RemoveEntry RemoveEntry +#endif // defined(OS_WIN) +IN_PROC_BROWSER_TEST_F(AutofillPrivateApiTest, MAYBE_RemoveEntry) { EXPECT_TRUE(RunAutofillSubtest("removeEntry")) << message_; }
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc index 2010fb2..35deee8 100644 --- a/chrome/browser/extensions/crx_installer.cc +++ b/chrome/browser/extensions/crx_installer.cc
@@ -188,7 +188,7 @@ if (!installer_task_runner_->PostTask( FROM_HERE, base::Bind(&SandboxedUnpacker::StartWithCrx, - unpacker.get(), source_file))) { + unpacker, source_file))) { NOTREACHED(); } }
diff --git a/chrome/browser/extensions/extension_creator.cc b/chrome/browser/extensions/extension_creator.cc index 35e01c2b..f78fdcf 100644 --- a/chrome/browser/extensions/extension_creator.cc +++ b/chrome/browser/extensions/extension_creator.cc
@@ -199,7 +199,7 @@ scoped_refptr<ExtensionCreatorFilter> filter = new ExtensionCreatorFilter(); const base::Callback<bool(const base::FilePath&)>& filter_cb = - base::Bind(&ExtensionCreatorFilter::ShouldPackageFile, filter.get()); + base::Bind(&ExtensionCreatorFilter::ShouldPackageFile, filter); if (!zip::ZipWithFilterCallback(extension_dir, *zip_path, filter_cb)) { error_message_ = l10n_util::GetStringUTF8(IDS_EXTENSION_FAILED_DURING_PACKAGING);
diff --git a/chrome/browser/extensions/zipfile_installer_unittest.cc b/chrome/browser/extensions/zipfile_installer_unittest.cc index 90cbdc1..04841377 100644 --- a/chrome/browser/extensions/zipfile_installer_unittest.cc +++ b/chrome/browser/extensions/zipfile_installer_unittest.cc
@@ -100,7 +100,7 @@ base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::Bind(&ZipFileInstaller::LoadFromZipFile, - zipfile_installer_.get(), + zipfile_installer_, original_path)); observer_.WaitForInstall(); }
diff --git a/chrome/browser/memory/tab_manager_delegate_chromeos.cc b/chrome/browser/memory/tab_manager_delegate_chromeos.cc index de53aaa..c1ab978 100644 --- a/chrome/browser/memory/tab_manager_delegate_chromeos.cc +++ b/chrome/browser/memory/tab_manager_delegate_chromeos.cc
@@ -437,7 +437,7 @@ const TabStatsList& tab_list) { arc::ArcProcessService* arc_process_service = arc::ArcProcessService::Get(); if (arc_process_service && - arc_process_service->RequestProcessList( + arc_process_service->RequestAppProcessList( base::Bind(&TabManagerDelegate::LowMemoryKillImpl, weak_ptr_factory_.GetWeakPtr(), tab_list))) { // LowMemoryKillImpl will be called asynchronously so nothing left to do. @@ -569,7 +569,7 @@ if (IsArcMemoryManagementEnabled()) { arc::ArcProcessService* arc_process_service = arc::ArcProcessService::Get(); if (arc_process_service && - arc_process_service->RequestProcessList( + arc_process_service->RequestAppProcessList( base::Bind(&TabManagerDelegate::AdjustOomPrioritiesImpl, weak_ptr_factory_.GetWeakPtr(), tab_list))) { return;
diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc index 07f6180..b208e6ae 100644 --- a/chrome/browser/printing/print_view_manager_base.cc +++ b/chrome/browser/printing/print_view_manager_base.cc
@@ -535,7 +535,7 @@ return; BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, - base::Bind(&PrinterQuery::StopWorker, printer_query.get())); + base::Bind(&PrinterQuery::StopWorker, printer_query)); } } // namespace printing
diff --git a/chrome/browser/process_singleton_browsertest.cc b/chrome/browser/process_singleton_browsertest.cc index c63d0e1..cb2feac 100644 --- a/chrome/browser/process_singleton_browsertest.cc +++ b/chrome/browser/process_singleton_browsertest.cc
@@ -262,7 +262,7 @@ chrome_starter_threads_[i]->task_runner()->PostTask( FROM_HERE, - base::Bind(&ChromeStarter::StartChrome, chrome_starters_[i].get(), + base::Bind(&ChromeStarter::StartChrome, chrome_starters_[i], &threads_waker_, first_run)); }
diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc index d8ea926e..d6ba965 100644 --- a/chrome/browser/process_singleton_posix.cc +++ b/chrome/browser/process_singleton_posix.cc
@@ -1008,7 +1008,7 @@ BrowserThread::IO, FROM_HERE, base::Bind(&ProcessSingleton::LinuxWatcher::StartListening, - watcher_.get(), + watcher_, sock)); return true;
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc index 9caf24f..7b40c03 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -449,7 +449,7 @@ // Finish the malware details collection, send it over. BrowserThread::PostDelayedTask( BrowserThread::IO, FROM_HERE, - base::Bind(&ThreatDetails::FinishCollection, threat_details_.get(), + base::Bind(&ThreatDetails::FinishCollection, threat_details_, did_proceed, num_visits), base::TimeDelta::FromMilliseconds(delay_ms)); }
diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/browser/supervised_user/supervised_user_service.cc index 84eed10..7d20cc5 100644 --- a/chrome/browser/supervised_user/supervised_user_service.cc +++ b/chrome/browser/supervised_user/supervised_user_service.cc
@@ -442,7 +442,7 @@ BrowserThread::IO, FROM_HERE, base::Bind(&SupervisedUserURLFilter::SetDefaultFilteringBehavior, - io_url_filter_.get(), behavior)); + io_url_filter_, behavior)); } void SupervisedUserService::URLFilterContext::LoadWhitelists(
diff --git a/chrome/browser/task_manager/providers/arc/arc_process_task_provider.cc b/chrome/browser/task_manager/providers/arc/arc_process_task_provider.cc index 23b545e..fe6dab0 100644 --- a/chrome/browser/task_manager/providers/arc/arc_process_task_provider.cc +++ b/chrome/browser/task_manager/providers/arc/arc_process_task_provider.cc
@@ -11,6 +11,7 @@ #include <utility> #include <vector> +#include "base/callback.h" #include "base/logging.h" #include "base/process/process.h" #include "base/threading/thread_task_runner_handle.h" @@ -23,7 +24,8 @@ namespace { -const int kUpdateProcessListDelaySeconds = 1; +const int kUpdateAppProcessListDelaySeconds = 1; +const int kUpdateSystemProcessListDelaySeconds = 3; } // namespace @@ -44,10 +46,9 @@ return nullptr; } -void ArcProcessTaskProvider::OnUpdateProcessList( +void ArcProcessTaskProvider::UpdateProcessList( + ArcTaskMap* pid_to_task, const std::vector<ArcProcess>& processes) { - TRACE_EVENT0("browser", "ArcProcessTaskProvider::OnUpdateProcessList"); - if (!is_updating_) return; @@ -56,13 +57,13 @@ // ArcProcessTaskProvider. set<ProcessId> nspid_to_remove; - for (const auto& entry : nspid_to_task_) + for (const auto& entry : *pid_to_task) nspid_to_remove.insert(entry.first); for (const auto& entry : processes) { if (nspid_to_remove.erase(entry.nspid()) == 0) { // New arc process. - std::unique_ptr<ArcProcessTask>& task = nspid_to_task_[entry.nspid()]; + std::unique_ptr<ArcProcessTask>& task = (*pid_to_task)[entry.nspid()]; // After calling NotifyObserverTaskAdded(), the raw pointer of |task| is // remebered somewhere else. One should not (implicitly) delete the // referenced object before calling NotifyObserverTaskRemoved() first @@ -75,7 +76,7 @@ NotifyObserverTaskAdded(task.get()); } else { // Update process state of existing process. - std::unique_ptr<ArcProcessTask>& task = nspid_to_task_[entry.nspid()]; + std::unique_ptr<ArcProcessTask>& task = (*pid_to_task)[entry.nspid()]; DCHECK(task.get()); task->SetProcessState(entry.process_state()); } @@ -83,48 +84,83 @@ for (const auto& entry : nspid_to_remove) { // Stale arc process. - NotifyObserverTaskRemoved(nspid_to_task_[entry].get()); - nspid_to_task_.erase(entry); + NotifyObserverTaskRemoved((*pid_to_task)[entry].get()); + pid_to_task->erase(entry); } - ScheduleNextRequest(); } -void ArcProcessTaskProvider::RequestProcessList() { +void ArcProcessTaskProvider::OnUpdateAppProcessList( + const std::vector<ArcProcess>& processes) { + TRACE_EVENT0("browser", "ArcProcessTaskProvider::OnUpdateAppProcessList"); + UpdateProcessList(&nspid_to_task_, processes); + ScheduleNextAppRequest(); +} + +void ArcProcessTaskProvider::OnUpdateSystemProcessList( + const std::vector<ArcProcess>& processes) { + UpdateProcessList(&nspid_to_sys_task_, processes); + ScheduleNextSystemRequest(); +} + +void ArcProcessTaskProvider::RequestAppProcessList() { arc::ArcProcessService* arc_process_service = arc::ArcProcessService::Get(); - auto callback = base::Bind(&ArcProcessTaskProvider::OnUpdateProcessList, + auto callback = base::Bind(&ArcProcessTaskProvider::OnUpdateAppProcessList, weak_ptr_factory_.GetWeakPtr()); if (!arc_process_service || - !arc_process_service->RequestProcessList(callback)) { + !arc_process_service->RequestAppProcessList(callback)) { VLOG(2) << "ARC process instance is not ready."; - // Update with the empty ARC process list. - // Note that this can happen in the middle of the session if the user has - // just opted out from ARC. - callback.Run(std::vector<ArcProcess>()); + ScheduleNextAppRequest(); + return; } } +void ArcProcessTaskProvider::RequestSystemProcessList() { + arc::ArcProcessService* arc_process_service = arc::ArcProcessService::Get(); + auto callback = base::Bind(&ArcProcessTaskProvider::OnUpdateSystemProcessList, + weak_ptr_factory_.GetWeakPtr()); + if (!arc_process_service) { + VLOG(2) << "ARC process instance is not ready."; + ScheduleNextSystemRequest(); + return; + } + arc_process_service->RequestSystemProcessList(callback); +} + void ArcProcessTaskProvider::StartUpdating() { is_updating_ = true; - RequestProcessList(); + RequestAppProcessList(); + RequestSystemProcessList(); } void ArcProcessTaskProvider::StopUpdating() { is_updating_ = false; nspid_to_task_.clear(); + nspid_to_sys_task_.clear(); } -void ArcProcessTaskProvider::ScheduleNextRequest() { +void ArcProcessTaskProvider::ScheduleNextRequest(const base::Closure& task, + const int delaySeconds) { if (!is_updating_) return; // TODO(nya): Remove this timer once ARC starts to send us UpdateProcessList // message when the process list changed. As of today, ARC does not send - // the process list unless we request it by RequestProcessList message. + // the process list unless we request it by RequestAppProcessList message. base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( - FROM_HERE, - base::Bind(&ArcProcessTaskProvider::RequestProcessList, + FROM_HERE, task, base::TimeDelta::FromSeconds(delaySeconds)); +} + +void ArcProcessTaskProvider::ScheduleNextAppRequest() { + ScheduleNextRequest(base::Bind(&ArcProcessTaskProvider::RequestAppProcessList, + weak_ptr_factory_.GetWeakPtr()), + kUpdateAppProcessListDelaySeconds); +} + +void ArcProcessTaskProvider::ScheduleNextSystemRequest() { + ScheduleNextRequest( + base::Bind(&ArcProcessTaskProvider::RequestSystemProcessList, weak_ptr_factory_.GetWeakPtr()), - base::TimeDelta::FromSeconds(kUpdateProcessListDelaySeconds)); + kUpdateSystemProcessListDelaySeconds); } } // namespace task_manager
diff --git a/chrome/browser/task_manager/providers/arc/arc_process_task_provider.h b/chrome/browser/task_manager/providers/arc/arc_process_task_provider.h index c87bb0b..b6ef8a5 100644 --- a/chrome/browser/task_manager/providers/arc/arc_process_task_provider.h +++ b/chrome/browser/task_manager/providers/arc/arc_process_task_provider.h
@@ -5,12 +5,11 @@ #ifndef CHROME_BROWSER_TASK_MANAGER_PROVIDERS_ARC_ARC_PROCESS_TASK_PROVIDER_H_ #define CHROME_BROWSER_TASK_MANAGER_PROVIDERS_ARC_ARC_PROCESS_TASK_PROVIDER_H_ -#include <map> #include <memory> -#include <set> -#include <string> +#include <unordered_map> #include <vector> +#include "base/callback.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/process/process.h" @@ -40,18 +39,28 @@ int route_id) override; private: - // Auto-retry if ARC bridge service is not ready. - void RequestProcessList(); + using ArcTaskMap = + std::unordered_map<base::ProcessId, std::unique_ptr<ArcProcessTask>>; + void ScheduleNextRequest(const base::Closure& task, const int delaySeconds); - void OnUpdateProcessList(const std::vector<arc::ArcProcess>& processes); + // Auto-retry if ARC bridge service is not ready. + void RequestAppProcessList(); + void RequestSystemProcessList(); + + void UpdateProcessList(ArcTaskMap* pid_to_task, + const std::vector<arc::ArcProcess>& processes); + void OnUpdateAppProcessList(const std::vector<arc::ArcProcess>& processes); + void OnUpdateSystemProcessList(const std::vector<arc::ArcProcess>& processes); // task_manager::TaskProvider: void StartUpdating() override; void StopUpdating() override; - void ScheduleNextRequest(); + void ScheduleNextAppRequest(); + void ScheduleNextSystemRequest(); - std::map<base::ProcessId, std::unique_ptr<ArcProcessTask>> nspid_to_task_; + ArcTaskMap nspid_to_task_; + ArcTaskMap nspid_to_sys_task_; // Whether to continue the periodical polling. bool is_updating_;
diff --git a/chrome/browser/ui/aura/accessibility/automation_manager_aura.cc b/chrome/browser/ui/aura/accessibility/automation_manager_aura.cc index c0de45ea..44dd073 100644 --- a/chrome/browser/ui/aura/accessibility/automation_manager_aura.cc +++ b/chrome/browser/ui/aura/accessibility/automation_manager_aura.cc
@@ -17,7 +17,6 @@ #include "content/public/browser/ax_event_notification_details.h" #include "content/public/browser/browser_context.h" #include "ui/aura/window.h" -#include "ui/views/accessibility/ax_aura_obj_cache.h" #include "ui/views/accessibility/ax_aura_obj_wrapper.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" @@ -41,6 +40,7 @@ ResetSerializer(); SendEvent(context, current_tree_->GetRoot(), ui::AX_EVENT_LOAD_COMPLETE); + views::AXAuraObjCache::GetInstance()->SetDelegate(this); #if defined(OS_CHROMEOS) aura::Window* active_window = ash::wm::GetActiveWindow(); @@ -65,17 +65,9 @@ if (!enabled_) return; - if (!context && g_browser_process->profile_manager()) - context = g_browser_process->profile_manager()->GetLastUsedProfile(); - - if (!context) { - LOG(WARNING) << "Accessibility notification but no browser context"; - return; - } - views::AXAuraObjWrapper* aura_obj = views::AXAuraObjCache::GetInstance()->GetOrCreate(view); - SendEvent(context, aura_obj, event_type); + SendEvent(nullptr, aura_obj, event_type); } void AutomationManagerAura::HandleAlert(content::BrowserContext* context, @@ -121,6 +113,17 @@ current_tree_->ShowContextMenu(id); } +void AutomationManagerAura::OnChildWindowRemoved( + views::AXAuraObjWrapper* parent) { + if (!enabled_) + return; + + if (!parent) + parent = current_tree_->GetRoot(); + + SendEvent(nullptr, parent, ui::AX_EVENT_CHILDREN_CHANGED); +} + AutomationManagerAura::AutomationManagerAura() : enabled_(false), processing_events_(false) {} @@ -135,6 +138,15 @@ void AutomationManagerAura::SendEvent(BrowserContext* context, views::AXAuraObjWrapper* aura_obj, ui::AXEvent event_type) { + if (!context && g_browser_process->profile_manager()) { + context = g_browser_process->profile_manager()->GetLastUsedProfile(); + } + + if (!context) { + LOG(WARNING) << "Accessibility notification but no browser context"; + return; + } + if (processing_events_) { pending_events_.push_back(std::make_pair(aura_obj, event_type)); return;
diff --git a/chrome/browser/ui/aura/accessibility/automation_manager_aura.h b/chrome/browser/ui/aura/accessibility/automation_manager_aura.h index 4a03023..19da0e9 100644 --- a/chrome/browser/ui/aura/accessibility/automation_manager_aura.h +++ b/chrome/browser/ui/aura/accessibility/automation_manager_aura.h
@@ -13,6 +13,7 @@ #include "chrome/browser/extensions/api/automation_internal/automation_action_adapter.h" #include "chrome/browser/ui/aura/accessibility/ax_tree_source_aura.h" #include "ui/accessibility/ax_tree_serializer.h" +#include "ui/views/accessibility/ax_aura_obj_cache.h" namespace base { template <typename T> @@ -34,7 +35,8 @@ ui::AXTreeData>; // Manages a tree of automation nodes. -class AutomationManagerAura : public extensions::AutomationActionAdapter { +class AutomationManagerAura : public extensions::AutomationActionAdapter, + views::AXAuraObjCache::Delegate { public: // Get the single instance of this class. static AutomationManagerAura* GetInstance(); @@ -62,6 +64,9 @@ int32_t focus_offset) override; void ShowContextMenu(int32_t id) override; + // views::AXAuraObjCache::Delegate implementation. + void OnChildWindowRemoved(views::AXAuraObjWrapper* parent) override; + private: friend struct base::DefaultSingletonTraits<AutomationManagerAura>;
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc index 752d928..0319b19 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
@@ -392,7 +392,7 @@ proxy_->OnWebUIDeleted(); // Notify the handler on the IO thread that the renderer is gone. BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, - base::Bind(&IOThreadImpl::Detach, proxy_.get())); + base::Bind(&IOThreadImpl::Detach, proxy_)); } }
diff --git a/chrome/service/cloud_print/cloud_print_proxy_backend.cc b/chrome/service/cloud_print/cloud_print_proxy_backend.cc index 1e86d7c8..4def70e1 100644 --- a/chrome/service/cloud_print/cloud_print_proxy_backend.cc +++ b/chrome/service/cloud_print/cloud_print_proxy_backend.cc
@@ -186,7 +186,7 @@ return false; PostCoreTask(FROM_HERE, base::Bind(&CloudPrintProxyBackend::Core::DoInitializeWithToken, - core_.get(), cloud_print_token)); + core_, cloud_print_token)); return true; } @@ -198,7 +198,7 @@ PostCoreTask( FROM_HERE, base::Bind(&CloudPrintProxyBackend::Core::DoInitializeWithRobotToken, - core_.get(), robot_oauth_refresh_token, robot_email)); + core_, robot_oauth_refresh_token, robot_email)); return true; } @@ -210,13 +210,13 @@ PostCoreTask( FROM_HERE, base::Bind(&CloudPrintProxyBackend::Core::DoInitializeWithRobotAuthCode, - core_.get(), robot_oauth_auth_code, robot_email)); + core_, robot_oauth_auth_code, robot_email)); return true; } void CloudPrintProxyBackend::Shutdown() { PostCoreTask(FROM_HERE, base::Bind(&CloudPrintProxyBackend::Core::DoShutdown, - core_.get())); + core_)); core_thread_.Stop(); core_ = nullptr; // Releases reference to |core_|. } @@ -224,7 +224,7 @@ void CloudPrintProxyBackend::UnregisterPrinters() { PostCoreTask(FROM_HERE, base::Bind(&CloudPrintProxyBackend::Core::DoUnregisterPrinters, - core_.get())); + core_)); } bool CloudPrintProxyBackend::PostCoreTask(
diff --git a/chrome/service/cloud_print/printer_job_handler.cc b/chrome/service/cloud_print/printer_job_handler.cc index 7547a0e..a8eecbf 100644 --- a/chrome/service/cloud_print/printer_job_handler.cc +++ b/chrome/service/cloud_print/printer_job_handler.cc
@@ -241,7 +241,7 @@ // and have them check for updates. for (const auto& it : job_status_updater_list_) { base::ThreadTaskRunnerHandle::Get()->PostTask( - FROM_HERE, base::Bind(&JobStatusUpdater::UpdateStatus, it.get())); + FROM_HERE, base::Bind(&JobStatusUpdater::UpdateStatus, it)); } } @@ -623,7 +623,7 @@ job_status_updater_list_.push_back(job_status_updater); base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE, - base::Bind(&JobStatusUpdater::UpdateStatus, job_status_updater.get())); + base::Bind(&JobStatusUpdater::UpdateStatus, job_status_updater)); CheckForJobs(kJobFetchReasonQueryMore);
diff --git a/chrome/test/chromedriver/chrome/devtools_http_client.cc b/chrome/test/chromedriver/chrome/devtools_http_client.cc index ea1f1dd..6409e8b 100644 --- a/chrome/test/chromedriver/chrome/devtools_http_client.cc +++ b/chrome/test/chromedriver/chrome/devtools_http_client.cc
@@ -160,9 +160,7 @@ bool DevToolsHttpClient::IsBrowserWindow(const WebViewInfo& view) const { return base::ContainsKey(*window_types_, view.type) || (view.type == WebViewInfo::kOther && - (base::StartsWith(view.url, "chrome-extension://", - base::CompareCase::SENSITIVE) || - view.url == "chrome://print/" || + (view.url == "chrome://print/" || view.url == "chrome://media-router/")); }
diff --git a/chrome/utility/profile_import_handler.cc b/chrome/utility/profile_import_handler.cc index a50eaec..ba2d45b3 100644 --- a/chrome/utility/profile_import_handler.cc +++ b/chrome/utility/profile_import_handler.cc
@@ -69,7 +69,7 @@ ImporterCleanup(); } import_thread_->task_runner()->PostTask( - FROM_HERE, base::Bind(&Importer::StartImport, importer_.get(), + FROM_HERE, base::Bind(&Importer::StartImport, importer_, source_profile, items, base::RetainedRef(bridge_))); }
diff --git a/chromecast/browser/metrics/cast_metrics_service_client.cc b/chromecast/browser/metrics/cast_metrics_service_client.cc index 24fdcfc..339170d 100644 --- a/chromecast/browser/metrics/cast_metrics_service_client.cc +++ b/chromecast/browser/metrics/cast_metrics_service_client.cc
@@ -167,7 +167,7 @@ int32_t CastMetricsServiceClient::GetProduct() { // Chromecast currently uses the same product identifier as Chrome. - return ::metrics::ChromeUserMetricsExtension::CHROME; + return ::metrics::ChromeUserMetricsExtension::CAST; } std::string CastMetricsServiceClient::GetApplicationLocale() {
diff --git a/chromeos/CHROMEOS_LKGM b/chromeos/CHROMEOS_LKGM index 13dc3dd..05493b1 100644 --- a/chromeos/CHROMEOS_LKGM +++ b/chromeos/CHROMEOS_LKGM
@@ -1 +1 @@ -8754.0.0 \ No newline at end of file +8760.0.0 \ No newline at end of file
diff --git a/chromeos/dbus/fake_permission_broker_client.cc b/chromeos/dbus/fake_permission_broker_client.cc index b76865b..cead1d84 100644 --- a/chromeos/dbus/fake_permission_broker_client.cc +++ b/chromeos/dbus/fake_permission_broker_client.cc
@@ -27,13 +27,12 @@ // function implements a simplified version of the method implemented by the // permission broker by opening the path specified and returning the resulting // file descriptor. -void OpenPathAndValidate( - const std::string& path, - const PermissionBrokerClient::OpenPathCallback& callback, - const PermissionBrokerClient::ErrorCallback& error_callback, - scoped_refptr<base::TaskRunner> task_runner) { - int fd = HANDLE_EINTR(open(path.c_str(), O_RDWR)); - if (fd < 0) { +void OpenPath(const std::string& path, + const PermissionBrokerClient::OpenPathCallback& callback, + const PermissionBrokerClient::ErrorCallback& error_callback, + scoped_refptr<base::TaskRunner> task_runner) { + base::ScopedFD fd(HANDLE_EINTR(open(path.c_str(), O_RDWR))); + if (!fd.is_valid()) { int error_code = logging::GetLastSystemErrorCode(); task_runner->PostTask( FROM_HERE, @@ -44,11 +43,7 @@ return; } - dbus::FileDescriptor dbus_fd; - dbus_fd.PutValue(fd); - dbus_fd.CheckValidity(); - task_runner->PostTask(FROM_HERE, - base::Bind(callback, base::Passed(&dbus_fd))); + task_runner->PostTask(FROM_HERE, base::Bind(callback, base::Passed(&fd))); } } // namespace @@ -69,27 +64,24 @@ const OpenPathCallback& callback, const ErrorCallback& error_callback) { base::WorkerPool::PostTask( - FROM_HERE, - base::Bind(&OpenPathAndValidate, path, callback, error_callback, - base::ThreadTaskRunnerHandle::Get()), + FROM_HERE, base::Bind(&chromeos::OpenPath, path, callback, error_callback, + base::ThreadTaskRunnerHandle::Get()), false); } void FakePermissionBrokerClient::RequestTcpPortAccess( uint16_t port, const std::string& interface, - const dbus::FileDescriptor& lifeline_fd, + int lifeline_fd, const ResultCallback& callback) { - DCHECK(lifeline_fd.is_valid()); callback.Run(true); } void FakePermissionBrokerClient::RequestUdpPortAccess( uint16_t port, const std::string& interface, - const dbus::FileDescriptor& lifeline_fd, + int lifeline_fd, const ResultCallback& callback) { - DCHECK(lifeline_fd.is_valid()); callback.Run(true); }
diff --git a/chromeos/dbus/fake_permission_broker_client.h b/chromeos/dbus/fake_permission_broker_client.h index 3ce9111..8949741 100644 --- a/chromeos/dbus/fake_permission_broker_client.h +++ b/chromeos/dbus/fake_permission_broker_client.h
@@ -27,11 +27,11 @@ const ErrorCallback& error_callback) override; void RequestTcpPortAccess(uint16_t port, const std::string& interface, - const dbus::FileDescriptor& lifeline_fd, + int lifeline_fd, const ResultCallback& callback) override; void RequestUdpPortAccess(uint16_t port, const std::string& interface, - const dbus::FileDescriptor& lifeline_fd, + int lifeline_fd, const ResultCallback& callback) override; void ReleaseTcpPort(uint16_t port, const std::string& interface,
diff --git a/chromeos/dbus/mock_permission_broker_client.h b/chromeos/dbus/mock_permission_broker_client.h index acc3efa..2380a21 100644 --- a/chromeos/dbus/mock_permission_broker_client.h +++ b/chromeos/dbus/mock_permission_broker_client.h
@@ -31,12 +31,12 @@ MOCK_METHOD4(RequestTcpPortAccess, void(uint16_t port, const std::string& interface, - const dbus::FileDescriptor& lifeline_fd, + int lifeline_fd, const ResultCallback& callback)); MOCK_METHOD4(RequestUdpPortAccess, void(uint16_t port, const std::string& interface, - const dbus::FileDescriptor& lifeline_fd, + int lifeline_fd, const ResultCallback& callback)); MOCK_METHOD3(ReleaseTcpPort, void(uint16_t port,
diff --git a/chromeos/dbus/permission_broker_client.cc b/chromeos/dbus/permission_broker_client.cc index c56d801..408a7ba 100644 --- a/chromeos/dbus/permission_broker_client.cc +++ b/chromeos/dbus/permission_broker_client.cc
@@ -61,7 +61,7 @@ void RequestTcpPortAccess(uint16_t port, const std::string& interface, - const dbus::FileDescriptor& lifeline_fd, + int lifeline_fd, const ResultCallback& callback) override { dbus::MethodCall method_call(kPermissionBrokerInterface, kRequestTcpPortAccess); @@ -76,7 +76,7 @@ void RequestUdpPortAccess(uint16_t port, const std::string& interface, - const dbus::FileDescriptor& lifeline_fd, + int lifeline_fd, const ResultCallback& callback) override { dbus::MethodCall method_call(kPermissionBrokerInterface, kRequestUdpPortAccess); @@ -139,7 +139,7 @@ void OnOpenPathResponse(const OpenPathCallback& callback, dbus::Response* response) { - dbus::FileDescriptor fd; + base::ScopedFD fd; dbus::MessageReader reader(response); if (!reader.PopFileDescriptor(&fd)) LOG(WARNING) << "Could not parse response: " << response->ToString();
diff --git a/chromeos/dbus/permission_broker_client.h b/chromeos/dbus/permission_broker_client.h index f56bfcc..83f496b 100644 --- a/chromeos/dbus/permission_broker_client.h +++ b/chromeos/dbus/permission_broker_client.h
@@ -10,10 +10,10 @@ #include <string> #include "base/callback.h" +#include "base/files/scoped_file.h" #include "base/macros.h" #include "chromeos/chromeos_export.h" #include "chromeos/dbus/dbus_client.h" -#include "dbus/file_descriptor.h" namespace chromeos { @@ -32,7 +32,7 @@ typedef base::Callback<void(bool)> ResultCallback; // An OpenPathCallback callback is run when an OpenPath request is completed. - typedef base::Callback<void(dbus::FileDescriptor)> OpenPathCallback; + typedef base::Callback<void(base::ScopedFD)> OpenPathCallback; // An ErrorCallback callback is run when an error is returned by the // permission broker. @@ -60,20 +60,24 @@ // Requests the |port| be opened on the firewall for incoming TCP/IP // connections received on |interface| (an empty string indicates all - // interfaces). An open pipe must be passed as |lifeline_fd| so that the - // permission broker can monitor the lifetime of the calling process. + // interfaces). One end of an open pipe must be passed as |lifeline_fd| so + // that the permission broker can monitor the lifetime of the calling process + // by being notified when the other end is closed. This method duplicates + // |lifeline_fd| so it's OK to close it without waiting for the result. virtual void RequestTcpPortAccess(uint16_t port, const std::string& interface, - const dbus::FileDescriptor& lifeline_fd, + int lifeline_fd, const ResultCallback& callback) = 0; // Requests the |port| be opened on the firewall for incoming UDP packets - // received on |interface| (an empty string indicates all interfaces). An open - // pipe must be passed as |lifeline_fd| so that the permission broker can - // monitor the lifetime of the calling process. + // received on |interface| (an empty string indicates all interfaces). One end + // of an open pipe must be passed as |lifeline_fd| so that the permission + // broker can monitor the lifetime of the calling process by being notified + // when the other end is closed. This method duplicates |lifeline_fd| so it's + // OK to close it without waiting for the result. virtual void RequestUdpPortAccess(uint16_t port, const std::string& interface, - const dbus::FileDescriptor& lifeline_fd, + int lifeline_fd, const ResultCallback& callback) = 0; // Releases a request for an open firewall port for TCP/IP connections. The
diff --git a/chromeos/network/firewall_hole.cc b/chromeos/network/firewall_hole.cc index 5dec89d..1f43eb7 100644 --- a/chromeos/network/firewall_hole.cc +++ b/chromeos/network/firewall_hole.cc
@@ -13,33 +13,15 @@ #include "base/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" +#include "base/threading/thread_task_runner_handle.h" #include "base/threading/worker_pool.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/permission_broker_client.h" -#include "dbus/file_descriptor.h" namespace chromeos { namespace { -// Creates a pair of file descriptors that form a "lifeline" between Chrome and -// firewalld. If this pipe is closed unexpectedly (i.e. Chrome crashes) then -// firewalld will notice and close the hole in the firewall. -void CreateValidLifeline(dbus::FileDescriptor* lifeline_local, - dbus::FileDescriptor* lifeline_remote) { - int lifeline[2] = {-1, -1}; - if (pipe2(lifeline, O_CLOEXEC) < 0) { - PLOG(ERROR) << "Failed to create a lifeline pipe"; - return; - } - - lifeline_local->PutValue(lifeline[0]); - lifeline_local->CheckValidity(); - - lifeline_remote->PutValue(lifeline[1]); - lifeline_remote->CheckValidity(); -} - const char* PortTypeToString(FirewallHole::PortType type) { switch (type) { case FirewallHole::PortType::TCP: @@ -54,7 +36,7 @@ void PortReleased(FirewallHole::PortType type, uint16_t port, const std::string& interface, - dbus::ScopedFileDescriptor lifeline_fd, + base::ScopedFD lifeline_fd, bool success) { if (!success) { LOG(WARNING) << "Failed to release firewall hole for " @@ -70,20 +52,34 @@ uint16_t port, const std::string& interface, const OpenCallback& callback) { - dbus::ScopedFileDescriptor lifeline_local(new dbus::FileDescriptor()); - dbus::ScopedFileDescriptor lifeline_remote(new dbus::FileDescriptor()); + int lifeline[2] = {-1, -1}; + if (pipe2(lifeline, O_CLOEXEC) < 0) { + PLOG(ERROR) << "Failed to create a lifeline pipe"; + base::ThreadTaskRunnerHandle::Get()->PostTask( + FROM_HERE, base::Bind(callback, nullptr)); + return; + } + base::ScopedFD lifeline_local(lifeline[0]); + base::ScopedFD lifeline_remote(lifeline[1]); - // This closure shares pointers with the one below. PostTaskAndReply - // guarantees that it will always be deleted first. - base::Closure create_lifeline_closure = base::Bind( - &CreateValidLifeline, lifeline_local.get(), lifeline_remote.get()); + base::Callback<void(bool)> access_granted_closure = + base::Bind(&FirewallHole::PortAccessGranted, type, port, interface, + base::Passed(&lifeline_local), callback); - base::WorkerPool::PostTaskAndReply( - FROM_HERE, create_lifeline_closure, - base::Bind(&FirewallHole::RequestPortAccess, type, port, interface, - base::Passed(&lifeline_local), base::Passed(&lifeline_remote), - callback), - false); + PermissionBrokerClient* client = + DBusThreadManager::Get()->GetPermissionBrokerClient(); + DCHECK(client) << "Could not get permission broker client."; + + switch (type) { + case PortType::TCP: + client->RequestTcpPortAccess(port, interface, lifeline_remote.get(), + access_granted_closure); + return; + case PortType::UDP: + client->RequestUdpPortAccess(port, interface, lifeline_remote.get(), + access_granted_closure); + return; + } } FirewallHole::~FirewallHole() { @@ -103,41 +99,10 @@ } } -void FirewallHole::RequestPortAccess(PortType type, - uint16_t port, - const std::string& interface, - dbus::ScopedFileDescriptor lifeline_local, - dbus::ScopedFileDescriptor lifeline_remote, - const OpenCallback& callback) { - if (!lifeline_local->is_valid() || !lifeline_remote->is_valid()) { - callback.Run(nullptr); - return; - } - - base::Callback<void(bool)> access_granted_closure = - base::Bind(&FirewallHole::PortAccessGranted, type, port, interface, - base::Passed(&lifeline_local), callback); - - PermissionBrokerClient* client = - DBusThreadManager::Get()->GetPermissionBrokerClient(); - DCHECK(client) << "Could not get permission broker client."; - - switch (type) { - case PortType::TCP: - client->RequestTcpPortAccess(port, interface, *lifeline_remote, - access_granted_closure); - return; - case PortType::UDP: - client->RequestUdpPortAccess(port, interface, *lifeline_remote, - access_granted_closure); - return; - } -} - void FirewallHole::PortAccessGranted(PortType type, uint16_t port, const std::string& interface, - dbus::ScopedFileDescriptor lifeline_fd, + base::ScopedFD lifeline_fd, const FirewallHole::OpenCallback& callback, bool success) { if (success) { @@ -151,7 +116,7 @@ FirewallHole::FirewallHole(PortType type, uint16_t port, const std::string& interface, - dbus::ScopedFileDescriptor lifeline_fd) + base::ScopedFD lifeline_fd) : type_(type), port_(port), interface_(interface),
diff --git a/chromeos/network/firewall_hole.h b/chromeos/network/firewall_hole.h index 63a7bc0e..61b0fc89 100644 --- a/chromeos/network/firewall_hole.h +++ b/chromeos/network/firewall_hole.h
@@ -11,8 +11,8 @@ #include <string> #include "base/callback_forward.h" +#include "base/files/scoped_file.h" #include "chromeos/chromeos_export.h" -#include "dbus/file_descriptor.h" namespace chromeos { @@ -38,31 +38,24 @@ ~FirewallHole(); private: - static void RequestPortAccess(PortType type, - uint16_t port, - const std::string& interface, - dbus::ScopedFileDescriptor lifeline_local, - dbus::ScopedFileDescriptor lifeline_remote, - const OpenCallback& callback); - static void PortAccessGranted(PortType type, uint16_t port, const std::string& interface, - dbus::ScopedFileDescriptor lifeline_fd, + base::ScopedFD lifeline_fd, const FirewallHole::OpenCallback& callback, bool success); FirewallHole(PortType type, uint16_t port, const std::string& interface, - dbus::ScopedFileDescriptor lifeline_fd); + base::ScopedFD lifeline_fd); const PortType type_; const uint16_t port_; const std::string interface_; // A file descriptor used by firewalld to track the lifetime of this process. - dbus::ScopedFileDescriptor lifeline_fd_; + base::ScopedFD lifeline_fd_; }; } // namespace chromeos
diff --git a/components/about_handler.gypi b/components/about_handler.gypi deleted file mode 100644 index fce5b8c8..0000000 --- a/components/about_handler.gypi +++ /dev/null
@@ -1,27 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/about_handler - 'target_name': 'about_handler', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'about_handler/about_protocol_handler.cc', - 'about_handler/about_protocol_handler.h', - 'about_handler/url_request_about_job.cc', - 'about_handler/url_request_about_job.h', - ], - }, - ], -}
diff --git a/components/app_modal.gypi b/components/app_modal.gypi deleted file mode 100644 index 045b1ec2..0000000 --- a/components/app_modal.gypi +++ /dev/null
@@ -1,47 +0,0 @@ -# Copyright 2014 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. -{ - 'targets': [ - { - 'target_name': 'app_modal', - 'type': 'static_library', - 'dependencies': [ - '../content/content.gyp:content_browser', - '../content/content.gyp:content_common', - '../skia/skia.gyp:skia', - 'components_strings.gyp:components_strings', - 'url_formatter/url_formatter.gyp:url_formatter', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'app_modal/app_modal_dialog.cc', - 'app_modal/app_modal_dialog.h', - 'app_modal/app_modal_dialog_queue.cc', - 'app_modal/app_modal_dialog_queue.h', - 'app_modal/javascript_app_modal_dialog.cc', - 'app_modal/javascript_app_modal_dialog.h', - 'app_modal/javascript_dialog_extensions_client.h', - 'app_modal/javascript_dialog_manager.cc', - 'app_modal/javascript_dialog_manager.h', - 'app_modal/javascript_native_dialog_factory.h', - 'app_modal/native_app_modal_dialog.h' - ], - 'conditions': [ - ['use_aura==1',{ - 'dependencies': [ - '../ui/aura/aura.gyp:aura', - ], - }], - ['toolkit_views==1', { - 'sources': [ - 'app_modal/views/javascript_app_modal_dialog_views.cc', - 'app_modal/views/javascript_app_modal_dialog_views.h', - ], - }], - ], - }, - ], -}
diff --git a/components/arc.gypi b/components/arc.gypi deleted file mode 100644 index ae10627..0000000 --- a/components/arc.gypi +++ /dev/null
@@ -1,244 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/arc - 'target_name': 'arc', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - 'arc_base', - 'arc_mojo_bindings', - 'components.gyp:exo', - 'components.gyp:onc_component', - '../base/base.gyp:base', - '../chromeos/chromeos.gyp:chromeos', - '../chromeos/chromeos.gyp:power_manager_proto', - '../device/bluetooth/bluetooth.gyp:device_bluetooth', - '../ipc/ipc.gyp:ipc', - '../third_party/re2/re2.gyp:re2', - '../skia/skia.gyp:skia', - '../ui/arc/arc.gyp:arc', - '../ui/aura/aura.gyp:aura', - '../ui/base/ime/ui_base_ime.gyp:ui_base_ime', - '../ui/base/ui_base.gyp:ui_base', - '../ui/base/ui_base.gyp:ui_base_test_support', - '../ui/events/events.gyp:events_base', - '../ui/keyboard/keyboard.gyp:keyboard', - '../url/url.gyp:url_lib', - ], - 'sources': [ - 'arc/arc_bridge_bootstrap.cc', - 'arc/arc_bridge_bootstrap.h', - 'arc/arc_bridge_host_impl.h', - 'arc/arc_bridge_host_impl.cc', - 'arc/arc_bridge_service_impl.cc', - 'arc/arc_bridge_service_impl.h', - 'arc/arc_service_manager.cc', - 'arc/arc_service_manager.h', - 'arc/audio/arc_audio_bridge.cc', - 'arc/audio/arc_audio_bridge.h', - 'arc/bluetooth/arc_bluetooth_bridge.cc', - 'arc/bluetooth/arc_bluetooth_bridge.h', - 'arc/bluetooth/bluetooth_type_converters.cc', - 'arc/bluetooth/bluetooth_type_converters.h', - 'arc/clipboard/arc_clipboard_bridge.cc', - 'arc/clipboard/arc_clipboard_bridge.h', - 'arc/crash_collector/arc_crash_collector_bridge.cc', - 'arc/crash_collector/arc_crash_collector_bridge.h', - 'arc/ime/arc_ime_bridge.h', - 'arc/ime/arc_ime_bridge_impl.cc', - 'arc/ime/arc_ime_bridge_impl.h', - 'arc/ime/arc_ime_service.cc', - 'arc/ime/arc_ime_service.h', - 'arc/instance_holder.h', - 'arc/intent_helper/activity_icon_loader.cc', - 'arc/intent_helper/activity_icon_loader.h', - 'arc/intent_helper/arc_intent_helper_bridge.cc', - 'arc/intent_helper/arc_intent_helper_bridge.h', - 'arc/intent_helper/font_size_util.cc', - 'arc/intent_helper/font_size_util.h', - 'arc/intent_helper/intent_filter.cc', - 'arc/intent_helper/intent_filter.h', - 'arc/intent_helper/link_handler_model_impl.cc', - 'arc/intent_helper/link_handler_model_impl.h', - 'arc/intent_helper/local_activity_resolver.cc', - 'arc/intent_helper/local_activity_resolver.h', - 'arc/metrics/arc_metrics_service.cc', - 'arc/metrics/arc_metrics_service.h', - 'arc/metrics/oom_kills_histogram.h', - 'arc/metrics/oom_kills_monitor.cc', - 'arc/metrics/oom_kills_monitor.h', - 'arc/net/arc_net_host_impl.cc', - 'arc/net/arc_net_host_impl.h', - 'arc/obb_mounter/arc_obb_mounter_bridge.cc', - 'arc/obb_mounter/arc_obb_mounter_bridge.h', - 'arc/power/arc_power_bridge.cc', - 'arc/power/arc_power_bridge.h', - 'arc/set_wallpaper_delegate.h', - 'arc/storage_manager/arc_storage_manager.cc', - 'arc/storage_manager/arc_storage_manager.h', - 'arc/user_data/arc_user_data_service.cc', - 'arc/user_data/arc_user_data_service.h', - ], - }, - { - # GN version: //components/arc:arc_base - 'target_name': 'arc_base', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../chromeos/chromeos.gyp:chromeos', - ], - 'sources': [ - 'arc/arc_bridge_service.cc', - 'arc/arc_bridge_service.h', - 'arc/arc_service.cc', - 'arc/arc_service.h', - ], - }, - { - # GN version: //components/arc:arc_bitmap - 'target_name': 'arc_bitmap', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../skia/skia.gyp:skia', - 'arc_mojo_bindings', - ], - 'sources': [ - 'arc/bitmap/bitmap_type_converters.cc', - 'arc/bitmap/bitmap_type_converters.h', - ], - }, - { - # GN version: //components/arc_test_support - 'target_name': 'arc_test_support', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - 'arc', - 'arc_mojo_bindings', - ], - 'sources': [ - 'arc/test/fake_app_instance.cc', - 'arc/test/fake_app_instance.h', - 'arc/test/fake_arc_bridge_bootstrap.cc', - 'arc/test/fake_arc_bridge_bootstrap.h', - 'arc/test/fake_arc_bridge_instance.cc', - 'arc/test/fake_arc_bridge_instance.h', - 'arc/test/fake_arc_bridge_service.cc', - 'arc/test/fake_arc_bridge_service.h', - 'arc/test/fake_notifications_instance.cc', - 'arc/test/fake_notifications_instance.h', - 'arc/test/fake_policy_instance.cc', - 'arc/test/fake_policy_instance.h', - ], - }, - { - # GN version: //components/arc:mojo_bindings - 'target_name': 'arc_mojo_bindings', - 'type': 'static_library', - 'variables': { - 'mojom_typemaps': [ - 'arc/common/app.typemap', - 'arc/common/bluetooth.typemap', - ], - 'use_new_wrapper_types': 'false', - }, - 'sources': [ - 'arc/common/app.mojom', - 'arc/common/arc_bridge.mojom', - 'arc/common/audio.mojom', - 'arc/common/auth.mojom', - 'arc/common/bitmap.mojom', - 'arc/common/bluetooth.mojom', - 'arc/common/clipboard.mojom', - 'arc/common/crash_collector.mojom', - 'arc/common/enterprise_reporting.mojom', - 'arc/common/file_system.mojom', - 'arc/common/ime.mojom', - 'arc/common/intent_helper.mojom', - 'arc/common/metrics.mojom', - 'arc/common/net.mojom', - 'arc/common/notifications.mojom', - 'arc/common/obb_mounter.mojom', - 'arc/common/policy.mojom', - 'arc/common/power.mojom', - 'arc/common/print.mojom', - 'arc/common/process.mojom', - 'arc/common/scale_factor.mojom', - 'arc/common/screen_rect.mojom', - 'arc/common/storage_manager.mojom', - 'arc/common/video.mojom', - 'arc/common/video_accelerator.mojom', - 'arc/common/app_struct_traits.cc', - ], - 'includes': [ '../mojo/mojom_bindings_generator.gypi' ], - 'dependencies': [ '../ui/gfx/gfx.gyp:gfx_geometry' ], - }, - { - # GN version: //components/arc:arc_standalone_service - 'target_name': 'arc_standalone_service', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../ipc/ipc.gyp:ipc', - '../mojo/mojo_edk.gyp:mojo_system_impl', - ], - 'sources': [ - 'arc/standalone/service_helper.cc', - 'arc/standalone/service_helper.h', - ], - }, - { - # GN version: //components/arc:arc_standalone - 'target_name': 'arc_standalone', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - 'arc', - '../base/base.gyp:base', - '../ipc/ipc.gyp:ipc', - '../mojo/mojo_edk.gyp:mojo_system_impl', - ], - 'sources': [ - 'arc/standalone/arc_standalone_bridge_runner.cc', - 'arc/standalone/arc_standalone_bridge_runner.h', - ] - }, - { - # GN version: //components/arc:arc_standalone_bridge - 'target_name': 'arc_standalone_bridge', - 'type': 'executable', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - 'arc_standalone', - 'arc_standalone_service', - '../base/base.gyp:base', - '../ipc/ipc.gyp:ipc', - '../mojo/mojo_edk.gyp:mojo_system_impl', - ], - 'sources': [ - 'arc/standalone/arc_standalone_bridge_main.cc', - ] - } - ], -}
diff --git a/components/arc/common/notifications.mojom b/components/arc/common/notifications.mojom index 22ebb8fc..0bba915 100644 --- a/components/arc/common/notifications.mojom +++ b/components/arc/common/notifications.mojom
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Next MinVersion: 7 +// Next MinVersion: 8 module arc.mojom; @@ -77,6 +77,11 @@ bool use_custom_notification; [MinVersion=6] ArcBitmap? small_icon; + // A snapshot image to show before the notification window is created. + [MinVersion=7] + ArcBitmap? snapshot_image; + [MinVersion=7] + float snapshot_image_scale; }; [MinVersion=2] @@ -121,4 +126,12 @@ // Sends an event from Chrome notification UI to Android. // |event| is a type of occured event. SendNotificationEventToAndroid@1(string key, ArcNotificationEvent event); + + // Requests to Android side to create the notification window. + [MinVersion=7] + CreateNotificationWindow@2(string key); + + // Requests to Android side to close the notification window. + [MinVersion=7] + CloseNotificationWindow@3(string key); };
diff --git a/components/arc/test/fake_notifications_instance.cc b/components/arc/test/fake_notifications_instance.cc index 070cb683..5f8b73da 100644 --- a/components/arc/test/fake_notifications_instance.cc +++ b/components/arc/test/fake_notifications_instance.cc
@@ -15,6 +15,12 @@ events_.emplace_back(key, event); } +void FakeNotificationsInstance::CreateNotificationWindow( + const mojo::String& key) {} + +void FakeNotificationsInstance::CloseNotificationWindow( + const mojo::String& key) {} + void FakeNotificationsInstance::Init(mojom::NotificationsHostPtr host_ptr) {} const std::vector<std::pair<mojo::String, mojom::ArcNotificationEvent>>&
diff --git a/components/arc/test/fake_notifications_instance.h b/components/arc/test/fake_notifications_instance.h index 1cc9180..a1f302c 100644 --- a/components/arc/test/fake_notifications_instance.h +++ b/components/arc/test/fake_notifications_instance.h
@@ -23,6 +23,8 @@ void SendNotificationEventToAndroid( const mojo::String& key, mojom::ArcNotificationEvent event) override; + void CreateNotificationWindow(const mojo::String& key) override; + void CloseNotificationWindow(const mojo::String& key) override; const std::vector<std::pair<mojo::String, mojom::ArcNotificationEvent>>& events() const;
diff --git a/components/auto_login_parser.gypi b/components/auto_login_parser.gypi deleted file mode 100644 index 1dae936..0000000 --- a/components/auto_login_parser.gypi +++ /dev/null
@@ -1,23 +0,0 @@ -# Copyright (c) 2013 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. - -{ - 'targets': [ - { - 'target_name': 'auto_login_parser', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'auto_login_parser/auto_login_parser.cc', - 'auto_login_parser/auto_login_parser.h', - ], - }, - ], -}
diff --git a/components/autofill.gypi b/components/autofill.gypi deleted file mode 100644 index 624777fe..0000000 --- a/components/autofill.gypi +++ /dev/null
@@ -1,669 +0,0 @@ -# Copyright (c) 2013 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. - -{ - 'targets': [ - { - # GN version: //components/autofill/core/common - 'target_name': 'autofill_core_common', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../base/base.gyp:base_i18n', - '../url/url.gyp:url_lib', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'autofill/core/common/autofill_constants.cc', - 'autofill/core/common/autofill_constants.h', - 'autofill/core/common/autofill_data_validation.cc', - 'autofill/core/common/autofill_data_validation.h', - 'autofill/core/common/autofill_l10n_util.cc', - 'autofill/core/common/autofill_l10n_util.h', - 'autofill/core/common/autofill_pref_names.cc', - 'autofill/core/common/autofill_pref_names.h', - 'autofill/core/common/autofill_regexes.cc', - 'autofill/core/common/autofill_regexes.h', - 'autofill/core/common/autofill_switches.cc', - 'autofill/core/common/autofill_switches.h', - 'autofill/core/common/autofill_util.cc', - 'autofill/core/common/autofill_util.h', - 'autofill/core/common/form_data.cc', - 'autofill/core/common/form_data.h', - 'autofill/core/common/form_data_predictions.cc', - 'autofill/core/common/form_data_predictions.h', - 'autofill/core/common/form_field_data.cc', - 'autofill/core/common/form_field_data.h', - 'autofill/core/common/form_field_data_predictions.cc', - 'autofill/core/common/form_field_data_predictions.h', - 'autofill/core/common/password_form.cc', - 'autofill/core/common/password_form.h', - 'autofill/core/common/password_form_field_prediction_map.h', - 'autofill/core/common/password_form_fill_data.cc', - 'autofill/core/common/password_form_fill_data.h', - 'autofill/core/common/password_form_generation_data.h', - 'autofill/core/common/password_generation_util.cc', - 'autofill/core/common/password_generation_util.h', - 'autofill/core/common/save_password_progress_logger.cc', - 'autofill/core/common/save_password_progress_logger.h', - ], - - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [4267, ], - }, - - { - # GN version: //components/autofill/core/browser - 'target_name': 'autofill_core_browser', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../base/base.gyp:base_i18n', - '../google_apis/google_apis.gyp:google_apis', - '../net/net.gyp:net', - '../skia/skia.gyp:skia', - '../sql/sql.gyp:sql', - '../components/sync.gyp:sync', - '../third_party/fips181/fips181.gyp:fips181', - '../third_party/icu/icu.gyp:icui18n', - '../third_party/icu/icu.gyp:icuuc', - '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_util', - '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', - '../third_party/re2/re2.gyp:re2', - '../ui/base/ui_base.gyp:ui_base', - '../ui/gfx/gfx.gyp:gfx', - '../ui/gfx/gfx.gyp:gfx_geometry', - '../ui/gfx/gfx.gyp:gfx_range', - '../ui/gfx/gfx.gyp:gfx_vector_icons', - '../url/url.gyp:url_lib', - 'autofill_core_common', - 'autofill_server_proto', - 'components_resources.gyp:components_resources', - 'components_strings.gyp:components_strings', - 'data_use_measurement_core', - 'infobars_core', - 'keyed_service_core', - 'os_crypt', - 'pref_registry', - 'prefs/prefs.gyp:prefs', - 'rappor', - 'signin_core_browser', - 'signin_core_common', - 'variations_net', - 'webdata_common', - ], - 'sources': [ - 'autofill/core/browser/address.cc', - 'autofill/core/browser/address.h', - 'autofill/core/browser/address_field.cc', - 'autofill/core/browser/address_field.h', - 'autofill/core/browser/address_i18n.cc', - 'autofill/core/browser/address_i18n.h', - 'autofill/core/browser/address_rewriter.cc', - 'autofill/core/browser/address_rewriter.h', - 'autofill/core/browser/address_rewriter_rules.cc', - 'autofill/core/browser/autocomplete_history_manager.cc', - 'autofill/core/browser/autocomplete_history_manager.h', - 'autofill/core/browser/autofill-inl.h', - 'autofill/core/browser/autofill_client.h', - 'autofill/core/browser/autofill_country.cc', - 'autofill/core/browser/autofill_country.h', - 'autofill/core/browser/autofill_data_model.cc', - 'autofill/core/browser/autofill_data_model.h', - 'autofill/core/browser/autofill_data_util.cc', - 'autofill/core/browser/autofill_data_util.h', - 'autofill/core/browser/autofill_download_manager.cc', - 'autofill/core/browser/autofill_download_manager.h', - 'autofill/core/browser/autofill_driver.h', - 'autofill/core/browser/autofill_experiments.cc', - 'autofill/core/browser/autofill_experiments.h', - 'autofill/core/browser/autofill_external_delegate.cc', - 'autofill/core/browser/autofill_external_delegate.h', - 'autofill/core/browser/autofill_field.cc', - 'autofill/core/browser/autofill_field.h', - 'autofill/core/browser/autofill_ie_toolbar_import_win.cc', - 'autofill/core/browser/autofill_ie_toolbar_import_win.h', - 'autofill/core/browser/autofill_manager.cc', - 'autofill/core/browser/autofill_manager.h', - 'autofill/core/browser/autofill_manager_test_delegate.h', - 'autofill/core/browser/autofill_metrics.cc', - 'autofill/core/browser/autofill_metrics.h', - 'autofill/core/browser/autofill_popup_delegate.h', - 'autofill/core/browser/autofill_profile.cc', - 'autofill/core/browser/autofill_profile.h', - 'autofill/core/browser/autofill_profile_comparator.cc', - 'autofill/core/browser/autofill_profile_comparator.h', - 'autofill/core/browser/autofill_regex_constants.cc', - 'autofill/core/browser/autofill_regex_constants.h', - 'autofill/core/browser/autofill_scanner.cc', - 'autofill/core/browser/autofill_scanner.h', - 'autofill/core/browser/autofill_sync_constants.cc', - 'autofill/core/browser/autofill_sync_constants.h', - 'autofill/core/browser/autofill_type.cc', - 'autofill/core/browser/autofill_type.h', - 'autofill/core/browser/autofill_wallet_data_type_controller.cc', - 'autofill/core/browser/autofill_wallet_data_type_controller.h', - 'autofill/core/browser/card_unmask_delegate.cc', - 'autofill/core/browser/card_unmask_delegate.h', - 'autofill/core/browser/contact_info.cc', - 'autofill/core/browser/contact_info.h', - 'autofill/core/browser/country_data.cc', - 'autofill/core/browser/country_data.h', - 'autofill/core/browser/country_names.cc', - 'autofill/core/browser/country_names.h', - 'autofill/core/browser/credit_card.cc', - 'autofill/core/browser/credit_card.h', - 'autofill/core/browser/credit_card_field.cc', - 'autofill/core/browser/credit_card_field.h', - 'autofill/core/browser/detail_input.cc', - 'autofill/core/browser/detail_input.h', - 'autofill/core/browser/dialog_section.h', - 'autofill/core/browser/email_field.cc', - 'autofill/core/browser/email_field.h', - 'autofill/core/browser/field_candidates.h', - 'autofill/core/browser/field_candidates.cc', - 'autofill/core/browser/field_types.h', - 'autofill/core/browser/form_field.cc', - 'autofill/core/browser/form_field.h', - 'autofill/core/browser/form_group.cc', - 'autofill/core/browser/form_group.h', - 'autofill/core/browser/form_structure.cc', - 'autofill/core/browser/form_structure.h', - 'autofill/core/browser/legal_message_line.cc', - 'autofill/core/browser/legal_message_line.h', - 'autofill/core/browser/name_field.cc', - 'autofill/core/browser/name_field.h', - 'autofill/core/browser/password_generator.cc', - 'autofill/core/browser/password_generator.h', - 'autofill/core/browser/payments/full_card_request.cc', - 'autofill/core/browser/payments/full_card_request.h', - 'autofill/core/browser/payments/payments_client.cc', - 'autofill/core/browser/payments/payments_client.h', - 'autofill/core/browser/payments/payments_request.h', - 'autofill/core/browser/payments/payments_service_url.cc', - 'autofill/core/browser/payments/payments_service_url.h', - 'autofill/core/browser/personal_data_manager.cc', - 'autofill/core/browser/personal_data_manager.h', - 'autofill/core/browser/personal_data_manager_observer.h', - 'autofill/core/browser/phone_field.cc', - 'autofill/core/browser/phone_field.h', - 'autofill/core/browser/phone_number.cc', - 'autofill/core/browser/phone_number.h', - 'autofill/core/browser/phone_number_i18n.cc', - 'autofill/core/browser/phone_number_i18n.h', - 'autofill/core/browser/popup_item_ids.h', - 'autofill/core/browser/server_field_types_util.cc', - 'autofill/core/browser/server_field_types_util.h', - 'autofill/core/browser/state_names.cc', - 'autofill/core/browser/state_names.h', - 'autofill/core/browser/suggestion.cc', - 'autofill/core/browser/suggestion.h', - 'autofill/core/browser/ui/card_unmask_prompt_controller.h', - 'autofill/core/browser/ui/card_unmask_prompt_controller_impl.cc', - 'autofill/core/browser/ui/card_unmask_prompt_controller_impl.h', - 'autofill/core/browser/ui/card_unmask_prompt_view.h', - 'autofill/core/browser/validation.cc', - 'autofill/core/browser/validation.h', - 'autofill/core/browser/webdata/autocomplete_syncable_service.cc', - 'autofill/core/browser/webdata/autocomplete_syncable_service.h', - 'autofill/core/browser/webdata/autofill_change.cc', - 'autofill/core/browser/webdata/autofill_change.h', - 'autofill/core/browser/webdata/autofill_data_type_controller.cc', - 'autofill/core/browser/webdata/autofill_data_type_controller.h', - 'autofill/core/browser/webdata/autofill_entry.cc', - 'autofill/core/browser/webdata/autofill_entry.h', - 'autofill/core/browser/webdata/autofill_profile_data_type_controller.cc', - 'autofill/core/browser/webdata/autofill_profile_data_type_controller.h', - 'autofill/core/browser/webdata/autofill_profile_syncable_service.cc', - 'autofill/core/browser/webdata/autofill_profile_syncable_service.h', - 'autofill/core/browser/webdata/autofill_table.cc', - 'autofill/core/browser/webdata/autofill_table.h', - 'autofill/core/browser/webdata/autofill_wallet_metadata_syncable_service.cc', - 'autofill/core/browser/webdata/autofill_wallet_metadata_syncable_service.h', - 'autofill/core/browser/webdata/autofill_wallet_syncable_service.cc', - 'autofill/core/browser/webdata/autofill_wallet_syncable_service.h', - 'autofill/core/browser/webdata/autofill_webdata.h', - 'autofill/core/browser/webdata/autofill_webdata_backend.h', - 'autofill/core/browser/webdata/autofill_webdata_backend_impl.cc', - 'autofill/core/browser/webdata/autofill_webdata_backend_impl.h', - 'autofill/core/browser/webdata/autofill_webdata_service.cc', - 'autofill/core/browser/webdata/autofill_webdata_service.h', - 'autofill/core/browser/webdata/autofill_webdata_service_observer.h', - ], - - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [4267, ], - - # This is needed because GYP's handling of transitive dependencies is - # not great. See https://goo.gl/QGtlae for details. - 'export_dependent_settings': [ - 'autofill_server_proto', - ], - - 'conditions': [ - ['OS=="ios"', { - 'sources': [ - 'autofill/core/browser/keyboard_accessory_metrics_logger.h', - 'autofill/core/browser/keyboard_accessory_metrics_logger.mm', - ], - }], - ['OS=="android"', { - 'sources': [ - 'autofill/core/browser/autofill_assistant.cc', - 'autofill/core/browser/autofill_assistant.h', - 'autofill/core/browser/autofill_credit_card_filling_infobar_delegate_mobile.cc', - 'autofill/core/browser/autofill_credit_card_filling_infobar_delegate_mobile.h', - ], - }], - ['OS=="ios" or OS=="android"', { - 'sources': [ - 'autofill/core/browser/autofill_save_card_infobar_delegate_mobile.cc', - 'autofill/core/browser/autofill_save_card_infobar_delegate_mobile.h', - 'autofill/core/browser/autofill_save_card_infobar_mobile.h', - ], - }], - ['OS!="ios"', { - 'dependencies': [ - '../device/geolocation/geolocation.gyp:device_geolocation', - ] - }], - ], - - }, - - { - # Protobuf compiler / generate rule for Autofill's server proto. - # GN version: //components/autofill/core/browser/proto - 'target_name': 'autofill_server_proto', - 'type': 'static_library', - 'sources': [ - 'autofill/core/browser/proto/server.proto', - ], - 'variables': { - 'proto_in_dir': 'autofill/core/browser/proto', - 'proto_out_dir': 'components/autofill/core/browser/proto', - }, - 'includes': [ '../build/protoc.gypi' ] - }, - - { - # GN version: //components/autofill/core/browser:test_support - 'target_name': 'autofill_core_test_support', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../base/base.gyp:test_support_base', - '../skia/skia.gyp:skia', - '../testing/gtest.gyp:gtest', - 'autofill_core_common', - 'autofill_core_browser', - 'infobars', - 'os_crypt', - 'pref_registry', - 'prefs/prefs.gyp:prefs', - 'rappor', - 'signin_core_browser_test_support', - ], - 'sources': [ - 'autofill/core/browser/autofill_test_utils.cc', - 'autofill/core/browser/autofill_test_utils.h', - 'autofill/core/browser/data_driven_test.cc', - 'autofill/core/browser/data_driven_test.h', - 'autofill/core/browser/suggestion_test_helpers.h', - 'autofill/core/browser/test_autofill_client.cc', - 'autofill/core/browser/test_autofill_client.h', - 'autofill/core/browser/test_autofill_driver.cc', - 'autofill/core/browser/test_autofill_driver.h', - 'autofill/core/browser/test_autofill_external_delegate.cc', - 'autofill/core/browser/test_autofill_external_delegate.h', - 'autofill/core/browser/test_personal_data_manager.cc', - 'autofill/core/browser/test_personal_data_manager.h', - ], - }, - ], - 'conditions': [ - ['OS != "ios"', { - 'targets': [ - { - # GN version: //components/autofill/content/public/interfaces:types - 'target_name': 'autofill_content_types_mojo_bindings_mojom', - 'type': 'none', - 'variables': { - 'mojom_files': [ - 'autofill/content/public/interfaces/autofill_types.mojom', - ], - 'mojom_typemaps': [ - 'autofill/content/public/cpp/autofill_types.typemap', - '<(DEPTH)/mojo/common/common_custom_types.typemap', - '<(DEPTH)/url/mojo/gurl.typemap', - '<(DEPTH)/url/mojo/origin.typemap', - ], - }, - 'includes': [ '../mojo/mojom_bindings_generator_explicit.gypi' ], - 'dependencies': [ - '../mojo/mojo_public.gyp:mojo_cpp_bindings', - ], - }, - { - # GN version: //components/autofill/content/public/interfaces:types - 'target_name': 'autofill_content_types_mojo_bindings', - 'type': 'static_library', - 'sources': [ - 'autofill/content/public/cpp/autofill_types_struct_traits.cc' - ], - 'export_dependent_settings': [ - '../mojo/mojo_base.gyp:mojo_common_custom_types_mojom', - '../url/url.gyp:url_mojom', - ], - 'dependencies': [ - '../mojo/mojo_base.gyp:mojo_common_custom_types_mojom', - '../mojo/mojo_public.gyp:mojo_cpp_bindings', - '../url/url.gyp:url_mojom', - 'autofill_content_types_mojo_bindings_mojom', - ], - }, - { - # GN version: //components/autofill/content/public/interfaces:test_types - 'target_name': 'autofill_content_test_types_mojo_bindings', - 'type': 'static_library', - 'variables': { - 'mojom_typemaps': [ - 'autofill/content/public/cpp/autofill_types.typemap', - '<(DEPTH)/mojo/common/common_custom_types.typemap', - '<(DEPTH)/url/mojo/gurl.typemap', - '<(DEPTH)/url/mojo/origin.typemap', - ], - }, - 'sources': [ - 'autofill/content/public/interfaces/test_autofill_types.mojom', - ], - 'export_dependent_settings': [ - '../mojo/mojo_base.gyp:mojo_common_custom_types_mojom', - '../url/url.gyp:url_mojom', - 'autofill_content_types_mojo_bindings', - ], - 'dependencies': [ - '../mojo/mojo_base.gyp:mojo_common_custom_types_mojom', - '../mojo/mojo_public.gyp:mojo_cpp_bindings', - '../url/url.gyp:url_mojom', - 'autofill_content_types_mojo_bindings', - ], - 'includes': [ '../mojo/mojom_bindings_generator.gypi' ], - }, - { - # GN version: //components/autofill/content/public/interfaces - 'target_name': 'autofill_content_mojo_bindings_mojom', - 'type': 'none', - 'variables': { - 'mojom_files': [ - 'autofill/content/public/interfaces/autofill_agent.mojom', - 'autofill/content/public/interfaces/autofill_driver.mojom', - ], - 'mojom_typemaps': [ - 'autofill/content/public/cpp/autofill_types.typemap', - '<(DEPTH)/mojo/common/common_custom_types.typemap', - '<(DEPTH)/ui/gfx/geometry/mojo/geometry.typemap', - '<(DEPTH)/url/mojo/gurl.typemap', - ], - }, - 'include_dirs': [ - '..', - ], - 'includes': [ - '../mojo/mojom_bindings_generator_explicit.gypi', - ], - }, - { - # GN version: //components/autofill/content/public/interfaces - 'target_name': 'autofill_content_mojo_bindings', - 'type': 'static_library', - 'export_dependent_settings': [ - '../mojo/mojo_public.gyp:mojo_cpp_bindings', - '../ui/gfx/gfx.gyp:mojo_geometry_bindings', - '../url/url.gyp:url_mojom', - 'autofill_content_types_mojo_bindings', - ], - 'dependencies': [ - '../mojo/mojo_public.gyp:mojo_cpp_bindings', - '../ui/gfx/gfx.gyp:mojo_geometry_bindings', - '../url/url.gyp:url_mojom', - 'autofill_content_mojo_bindings_mojom', - 'autofill_content_types_mojo_bindings', - ], - }, - { - # GN version: //content/autofill/content/common - 'target_name': 'autofill_content_common', - 'type': 'static_library', - 'dependencies': [ - 'autofill_core_common', - '../base/base.gyp:base', - '../content/content.gyp:content_common', - '../ipc/ipc.gyp:ipc', - '../third_party/WebKit/public/blink.gyp:blink_minimal', - '../ui/gfx/gfx.gyp:gfx', - '../ui/gfx/ipc/geometry/gfx_ipc_geometry.gyp:gfx_ipc_geometry', - '../ui/gfx/ipc/gfx_ipc.gyp:gfx_ipc', - '../ui/gfx/ipc/skia/gfx_ipc_skia.gyp:gfx_ipc_skia', - '../url/url.gyp:url_lib', - '../url/ipc/url_ipc.gyp:url_ipc', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'autofill/content/common/autofill_message_generator.cc', - 'autofill/content/common/autofill_message_generator.h', - 'autofill/content/common/autofill_messages.h', - 'autofill/content/common/autofill_param_traits_macros.h', - ], - }, - - { - # Protobuf compiler / generate rule for Autofill's risk integration. - # GN version: //components/autofill/content/browser:risk_proto - 'target_name': 'autofill_content_risk_proto', - 'type': 'static_library', - 'sources': [ - 'autofill/content/browser/risk/proto/fingerprint.proto', - ], - 'variables': { - 'proto_in_dir': 'autofill/content/browser/risk/proto', - 'proto_out_dir': 'components/autofill/content/browser/risk/proto', - }, - 'includes': [ '../build/protoc.gypi' ] - }, - { - # GN version: //components/autofill/content/renderer:test_support - 'target_name': 'autofill_content_test_support', - 'type': 'static_library', - 'dependencies': [ - 'autofill_content_browser', - 'autofill_content_renderer', - '../base/base.gyp:base', - '../ipc/ipc.gyp:ipc', - '../skia/skia.gyp:skia', - '../testing/gmock.gyp:gmock', - ], - 'sources': [ - 'autofill/content/renderer/test_password_autofill_agent.cc', - 'autofill/content/renderer/test_password_autofill_agent.h', - 'autofill/content/renderer/test_password_generation_agent.cc', - 'autofill/content/renderer/test_password_generation_agent.h', - ], - 'include_dirs': [ '..' ], - }, - { - # GN version: //components/autofill/content/browser - 'target_name': 'autofill_content_browser', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../base/base.gyp:base_i18n', - '../content/content.gyp:content_browser', - '../content/content.gyp:content_common', - '../google_apis/google_apis.gyp:google_apis', - '../ipc/ipc.gyp:ipc', - '../mojo/mojo_base.gyp:mojo_common_lib', - '../net/net.gyp:net', - '../skia/skia.gyp:skia', - '../sql/sql.gyp:sql', - '../third_party/icu/icu.gyp:icui18n', - '../third_party/icu/icu.gyp:icuuc', - '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', - '../ui/base/ui_base.gyp:ui_base', - '../ui/display/display.gyp:display', - '../ui/gfx/gfx.gyp:gfx', - '../ui/gfx/gfx.gyp:gfx_geometry', - '../url/url.gyp:url_lib', - 'autofill_content_common', - 'autofill_content_mojo_bindings', - 'autofill_content_risk_proto', - 'autofill_core_browser', - 'autofill_core_common', - 'autofill_server_proto', - 'components_resources.gyp:components_resources', - 'components_strings.gyp:components_strings', - 'os_crypt', - 'prefs/prefs.gyp:prefs', - 'user_prefs', - 'webdata_common', - ], - 'sources': [ - 'autofill/content/browser/content_autofill_driver.cc', - 'autofill/content/browser/content_autofill_driver.h', - 'autofill/content/browser/content_autofill_driver_factory.cc', - 'autofill/content/browser/content_autofill_driver_factory.h', - 'autofill/content/browser/risk/fingerprint.cc', - 'autofill/content/browser/risk/fingerprint.h', - ], - - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [4267, ], - # This is needed because GYP's handling of transitive dependencies is - # not great. See https://goo.gl/QGtlae for details. - 'export_dependent_settings': [ - 'autofill_server_proto', - ], - }, - - { - # GN version: //components/autofill/content/renderer - 'target_name': 'autofill_content_renderer', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_common', - '../content/content.gyp:content_renderer', - '../google_apis/google_apis.gyp:google_apis', - '../ipc/ipc.gyp:ipc', - '../mojo/mojo_base.gyp:mojo_common_lib', - '../net/net.gyp:net', - '../skia/skia.gyp:skia', - '../third_party/re2/re2.gyp:re2', - '../third_party/WebKit/public/blink.gyp:blink', - '../ui/base/ui_base.gyp:ui_base', - 'autofill_content_common', - 'autofill_content_mojo_bindings', - 'autofill_core_common', - 'components_strings.gyp:components_strings', - ], - 'sources': [ - 'autofill/content/renderer/autofill_agent.cc', - 'autofill/content/renderer/autofill_agent.h', - 'autofill/content/renderer/form_autofill_util.cc', - 'autofill/content/renderer/form_autofill_util.h', - 'autofill/content/renderer/form_cache.cc', - 'autofill/content/renderer/form_cache.h', - 'autofill/content/renderer/form_classifier.cc', - 'autofill/content/renderer/form_classifier.h', - 'autofill/content/renderer/page_click_listener.h', - 'autofill/content/renderer/page_click_tracker.cc', - 'autofill/content/renderer/page_click_tracker.h', - 'autofill/content/renderer/password_autofill_agent.cc', - 'autofill/content/renderer/password_autofill_agent.h', - 'autofill/content/renderer/password_form_conversion_utils.cc', - 'autofill/content/renderer/password_form_conversion_utils.h', - 'autofill/content/renderer/password_generation_agent.cc', - 'autofill/content/renderer/password_generation_agent.h', - 'autofill/content/renderer/renderer_save_password_progress_logger.cc', - 'autofill/content/renderer/renderer_save_password_progress_logger.h', - ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [4267, ], - }, - ], - }], - ['OS == "ios"', { - 'targets': [ - { - # GN version: //components/autofill/ios/browser - 'target_name': 'autofill_ios_browser', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - 'autofill_core_browser', - 'autofill_core_common', - 'autofill_ios_injected_js', - 'autofill_server_proto', - '../ios/provider/ios_provider_web.gyp:ios_provider_web', - '../ios/web/ios_web.gyp:ios_web', - ], - 'sources': [ - 'autofill/ios/browser/autofill_client_ios_bridge.h', - 'autofill/ios/browser/autofill_driver_ios.h', - 'autofill/ios/browser/autofill_driver_ios.mm', - 'autofill/ios/browser/autofill_driver_ios_bridge.h', - 'autofill/ios/browser/credit_card_util.h', - 'autofill/ios/browser/credit_card_util.mm', - 'autofill/ios/browser/form_suggestion.h', - 'autofill/ios/browser/form_suggestion.mm', - 'autofill/ios/browser/js_autofill_manager.h', - 'autofill/ios/browser/js_autofill_manager.mm', - 'autofill/ios/browser/js_suggestion_manager.h', - 'autofill/ios/browser/js_suggestion_manager.mm', - 'autofill/ios/browser/personal_data_manager_observer_bridge.h', - 'autofill/ios/browser/personal_data_manager_observer_bridge.mm', - ], - # This is needed because GYP's handling of transitive dependencies is - # not great. See https://goo.gl/QGtlae for details. - 'export_dependent_settings': [ - 'autofill_server_proto', - ], - }, - { - # GN version: //components/autofill/ios/browser:injected_js - 'target_name': 'autofill_ios_injected_js', - 'type': 'none', - 'sources': [ - 'autofill/ios/browser/resources/autofill_controller.js', - 'autofill/ios/browser/resources/suggestion_controller.js', - ], - 'link_settings': { - 'mac_bundle_resources': [ - '<(SHARED_INTERMEDIATE_DIR)/autofill_controller.js', - '<(SHARED_INTERMEDIATE_DIR)/suggestion_controller.js', - ], - }, - 'includes': [ - '../ios/web/js_compile_checked.gypi', - ], - }, - ], - }], - ], -}
diff --git a/components/base32.gypi b/components/base32.gypi deleted file mode 100644 index 1e26737..0000000 --- a/components/base32.gypi +++ /dev/null
@@ -1,23 +0,0 @@ -# Copyright 2016 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. - -{ - 'targets': [ - { - # GN version: //components/base32 - 'target_name': 'base32', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - ], - 'sources': [ - 'base32/base32.h', - 'base32/base32.cc', - ], - } - ], -}
diff --git a/components/bookmarks.gypi b/components/bookmarks.gypi deleted file mode 100644 index d098118..0000000 --- a/components/bookmarks.gypi +++ /dev/null
@@ -1,203 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/bookmarks/browser - 'target_name': 'bookmarks_browser', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../base/base.gyp:base_i18n', - '../net/net.gyp:net', - '../third_party/icu/icu.gyp:icui18n', - '../third_party/icu/icu.gyp:icuuc', - '../ui/base/ui_base.gyp:ui_base', - '../ui/gfx/gfx.gyp:gfx', - '../url/url.gyp:url_lib', - 'bookmarks_common', - 'components_strings.gyp:components_strings', - 'favicon_base', - 'keyed_service_core', - 'pref_registry', - 'query_parser', - 'url_formatter/url_formatter.gyp:url_formatter', - ], - 'sources': [ - 'bookmarks/browser/base_bookmark_model_observer.cc', - 'bookmarks/browser/base_bookmark_model_observer.h', - 'bookmarks/browser/bookmark_client.cc', - 'bookmarks/browser/bookmark_client.h', - 'bookmarks/browser/bookmark_codec.cc', - 'bookmarks/browser/bookmark_codec.h', - 'bookmarks/browser/bookmark_expanded_state_tracker.cc', - 'bookmarks/browser/bookmark_expanded_state_tracker.h', - 'bookmarks/browser/bookmark_index.cc', - 'bookmarks/browser/bookmark_index.h', - 'bookmarks/browser/bookmark_match.cc', - 'bookmarks/browser/bookmark_match.h', - 'bookmarks/browser/bookmark_model.cc', - 'bookmarks/browser/bookmark_model.h', - 'bookmarks/browser/bookmark_model_observer.h', - 'bookmarks/browser/bookmark_node.cc', - 'bookmarks/browser/bookmark_node.h', - 'bookmarks/browser/bookmark_node_data.cc', - 'bookmarks/browser/bookmark_node_data.h', - 'bookmarks/browser/bookmark_node_data_ios.cc', - 'bookmarks/browser/bookmark_node_data_mac.cc', - 'bookmarks/browser/bookmark_node_data_views.cc', - 'bookmarks/browser/bookmark_pasteboard_helper_mac.h', - 'bookmarks/browser/bookmark_pasteboard_helper_mac.mm', - 'bookmarks/browser/bookmark_storage.cc', - 'bookmarks/browser/bookmark_storage.h', - 'bookmarks/browser/bookmark_undo_delegate.h', - 'bookmarks/browser/bookmark_undo_provider.h', - 'bookmarks/browser/bookmark_utils.cc', - 'bookmarks/browser/bookmark_utils.h', - 'bookmarks/browser/scoped_group_bookmark_actions.cc', - 'bookmarks/browser/scoped_group_bookmark_actions.h', - 'bookmarks/browser/startup_task_runner_service.cc', - 'bookmarks/browser/startup_task_runner_service.h', - ], - 'conditions': [ - ['OS == "android"', { - # In GN, this android-specific stuff is its own target at - # //components/bookmarks/common/android - # TODO(cjhopman): This should be its own target in Gyp, too. - 'dependencies': [ - 'bookmarks_jni_headers', - ], - 'sources' : [ - 'bookmarks/common/android/bookmark_id.cc', - 'bookmarks/common/android/bookmark_id.h', - 'bookmarks/common/android/bookmark_type_list.h', - ], - }], - ['toolkit_views==1', { - 'dependencies': [ - '<(DEPTH)/ui/views/views.gyp:views', - ], - }], - ['use_x11==1', { - 'dependencies': [ - '../ui/events/platform/x11/x11_events_platform.gyp:x11_events_platform', - '../ui/gfx/x/gfx_x11.gyp:gfx_x11', - ], - }], - ], - }, - { - # GN version: //components/bookmarks/common - 'target_name': 'bookmarks_common', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - ], - 'sources': [ - 'bookmarks/common/bookmark_constants.cc', - 'bookmarks/common/bookmark_constants.h', - 'bookmarks/common/bookmark_pref_names.cc', - 'bookmarks/common/bookmark_pref_names.h', - ], - }, - { - # GN version: //components/bookmarks/managed - 'target_name': 'bookmarks_managed', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - 'bookmarks_browser', - 'components_strings.gyp:components_strings', - 'keyed_service_core', - ], - 'sources': [ - 'bookmarks/managed/managed_bookmark_service.cc', - 'bookmarks/managed/managed_bookmark_service.h', - 'bookmarks/managed/managed_bookmark_util.cc', - 'bookmarks/managed/managed_bookmark_util.h', - 'bookmarks/managed/managed_bookmarks_tracker.cc', - 'bookmarks/managed/managed_bookmarks_tracker.h', - ], - }, - { - # GN version: //components/bookmarks/test - 'target_name': 'bookmarks_test_support', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../testing/gmock.gyp:gmock', - '../ui/events/platform/events_platform.gyp:events_platform', - '../url/url.gyp:url_lib', - 'bookmarks_browser', - ], - 'sources': [ - 'bookmarks/test/bookmark_test_helpers.cc', - 'bookmarks/test/bookmark_test_helpers.h', - 'bookmarks/test/mock_bookmark_model_observer.cc', - 'bookmarks/test/mock_bookmark_model_observer.h', - 'bookmarks/test/test_bookmark_client.cc', - 'bookmarks/test/test_bookmark_client.h', - ], - 'conditions': [ - ['use_x11==1', { - 'dependencies': [ - '../ui/events/platform/x11/x11_events_platform.gyp:x11_events_platform', - ], - }], - ], - }, - ], - 'conditions' : [ - ['OS=="android"', { - 'targets': [ - { - # GN: //components/bookmarks/common/android:bookmarks_java - 'target_name': 'bookmarks_java', - 'type': 'none', - 'dependencies': [ - '../base/base.gyp:base_java', - 'bookmark_type_java', - ], - 'variables': { - 'java_in_dir': 'bookmarks/common/android/java', - }, - 'includes': [ '../build/java.gypi' ], - }, - { - # GN: //components/bookmarks/common/android:bookmarks_jni_headers - 'target_name': 'bookmarks_jni_headers', - 'type': 'none', - 'sources': [ - 'bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkId.java', - ], - 'variables': { - 'jni_gen_package': 'components/bookmarks', - }, - 'includes': [ '../build/jni_generator.gypi' ], - }, - { - # GN: //components/bookmarks/common/android:bookmarks_type_javagen - 'target_name': 'bookmark_type_java', - 'type': 'none', - 'variables': { - 'source_file': 'bookmarks/common/android/bookmark_type.h', - }, - 'includes': [ '../build/android/java_cpp_enum.gypi' ], - }, - ], - }] - ], -}
diff --git a/components/browser_sync.gypi b/components/browser_sync.gypi deleted file mode 100644 index 98e76ee..0000000 --- a/components/browser_sync.gypi +++ /dev/null
@@ -1,106 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/browser_sync_browser - 'target_name': 'browser_sync_browser', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../google_apis/google_apis.gyp:google_apis', - '../net/net.gyp:net', - '../components/sync.gyp:sync', - '../ui/base/ui_base.gyp:ui_base', - 'autofill_core_browser', - 'autofill_core_common', - 'browser_sync_common', - 'components_strings.gyp:components_strings', - 'dom_distiller_core', - 'generate_version_info', - 'history_core_browser', - 'invalidation_impl', - 'invalidation_public', - 'keyed_service_core', - 'password_manager_core_browser', - 'password_manager_sync_browser', - 'pref_registry', - 'signin_core_browser', - 'syncable_prefs', - 'sync_bookmarks', - 'sync_sessions', - 'variations', - 'version_info', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: file list duplicated in GN build. - 'browser_sync/browser/profile_sync_components_factory_impl.cc', - 'browser_sync/browser/profile_sync_components_factory_impl.h', - 'browser_sync/browser/profile_sync_service.cc', - 'browser_sync/browser/profile_sync_service.h', - 'browser_sync/browser/signin_confirmation_helper.cc', - 'browser_sync/browser/signin_confirmation_helper.h', - ], - }, - { - # GN version: //components/browser_sync_common - 'target_name': 'browser_sync_common', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: file list duplicated in GN build. - 'browser_sync/common/browser_sync_switches.cc', - 'browser_sync/common/browser_sync_switches.h', - ], - }, - { - # GN version: //components/browser_sync/browser:test_support - 'target_name': 'browser_sync_browser_test_support', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../base/base.gyp:test_support_base', - '../google_apis/google_apis.gyp:google_apis', - '../components/sync.gyp:sync', - '../components/sync.gyp:test_support_sync_driver', - '../testing/gmock.gyp:gmock', - 'bookmarks_browser', - 'browser_sync_browser', - 'history_core_browser', - 'invalidation_impl', - 'invalidation_test_support', - 'pref_registry', - 'signin_core_browser', - 'signin_core_browser_test_support', - 'sync_sessions_test_support', - 'syncable_prefs_test_support', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: file list duplicated in GN build. - 'browser_sync/browser/abstract_profile_sync_service_test.cc', - 'browser_sync/browser/abstract_profile_sync_service_test.h', - 'browser_sync/browser/profile_sync_service_mock.cc', - 'browser_sync/browser/profile_sync_service_mock.h', - 'browser_sync/browser/profile_sync_test_util.cc', - 'browser_sync/browser/profile_sync_test_util.h', - 'browser_sync/browser/test_http_bridge_factory.cc', - 'browser_sync/browser/test_http_bridge_factory.h', - 'browser_sync/browser/test_profile_sync_service.cc', - 'browser_sync/browser/test_profile_sync_service.h', - ], - } - ], -}
diff --git a/components/browser_watcher.gypi b/components/browser_watcher.gypi deleted file mode 100644 index b65d463..0000000 --- a/components/browser_watcher.gypi +++ /dev/null
@@ -1,46 +0,0 @@ -# Copyright (c) 2014 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. - -{ - 'conditions': [ - ['OS=="win"', { - 'targets': [ - { - # This is a separate lib to minimize the dependencies for its - # hosting binary "chrome_watcher.dll". - 'target_name': 'browser_watcher', - 'type': 'static_library', - 'sources': [ - 'browser_watcher/endsession_watcher_window_win.cc', - 'browser_watcher/endsession_watcher_window_win.h', - 'browser_watcher/exit_code_watcher_win.cc', - 'browser_watcher/exit_code_watcher_win.h', - 'browser_watcher/exit_funnel_win.cc', - 'browser_watcher/exit_funnel_win.h', - 'browser_watcher/window_hang_monitor_win.cc', - 'browser_watcher/window_hang_monitor_win.h', - ], - 'dependencies': [ - '../base/base.gyp:base', - ], - }, - { - # Users of the watcher link this target. - 'target_name': 'browser_watcher_client', - 'type': 'static_library', - 'sources': [ - 'browser_watcher/watcher_client_win.cc', - 'browser_watcher/watcher_client_win.h', - 'browser_watcher/watcher_metrics_provider_win.cc', - 'browser_watcher/watcher_metrics_provider_win.h', - ], - 'dependencies': [ - '../base/base.gyp:base', - ], - }, - ], - } - ], - ], -} \ No newline at end of file
diff --git a/components/browsing_data.gypi b/components/browsing_data.gypi deleted file mode 100644 index 7e9ea7d..0000000 --- a/components/browsing_data.gypi +++ /dev/null
@@ -1,79 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/browsing_data/core - 'target_name': 'browsing_data_core', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - 'components.gyp:autofill_core_browser', - 'components.gyp:history_core_browser', - 'components.gyp:password_manager_core_browser', - 'sync.gyp:sync', - 'components.gyp:webdata_common', - 'prefs/prefs.gyp:prefs', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'browsing_data/core/browsing_data_utils.cc', - 'browsing_data/core/browsing_data_utils.h', - 'browsing_data/core/pref_names.cc', - 'browsing_data/core/pref_names.h', - 'browsing_data/core/counters/autofill_counter.cc', - 'browsing_data/core/counters/autofill_counter.h', - 'browsing_data/core/counters/browsing_data_counter.cc', - 'browsing_data/core/counters/browsing_data_counter.h', - 'browsing_data/core/counters/history_counter.cc', - 'browsing_data/core/counters/history_counter.h', - 'browsing_data/core/counters/passwords_counter.cc', - 'browsing_data/core/counters/passwords_counter.h', - ], - }, - ], - 'conditions': [ - ['OS == "android"', { - 'targets': [ - { - # GN: //components/browsing_data/core:browsing_data_utils_java - 'target_name': 'browsing_data_utils_java', - 'type': 'none', - 'variables': { - 'source_file': 'components/browsing_data/core/browsing_data_utils.h', - }, - 'includes': [ '../build/android/java_cpp_enum.gypi' ], - }, - ], - }], - ['OS != "ios"', { - 'targets': [ - { - #GN version: //components/browsing_data/content - 'target_name': 'browsing_data_content', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_browser', - '../net/net.gyp:net', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'browsing_data/content/conditional_cache_deletion_helper.cc', - 'browsing_data/content/conditional_cache_deletion_helper.h', - 'browsing_data/content/storage_partition_http_cache_data_remover.cc', - 'browsing_data/content/storage_partition_http_cache_data_remover.h', - ], - }, - ], - }], - ], -}
diff --git a/components/browsing_data_ui.gypi b/components/browsing_data_ui.gypi deleted file mode 100644 index 85365c29..0000000 --- a/components/browsing_data_ui.gypi +++ /dev/null
@@ -1,27 +0,0 @@ -# Copyright 2016 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. - -{ - 'targets': [ - { - # GN version: //components/browsing_data_ui - 'target_name': 'browsing_data_ui', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - 'history_core_browser', - 'sync.gyp:sync', - 'version_info', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'browsing_data_ui/history_notice_utils.cc', - 'browsing_data_ui/history_notice_utils.h', - ], - }, - ], -}
diff --git a/components/bubble.gypi b/components/bubble.gypi deleted file mode 100644 index 76cf9370..0000000 --- a/components/bubble.gypi +++ /dev/null
@@ -1,43 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/bubble - 'target_name': 'bubble', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'bubble/bubble_close_reason.h', - 'bubble/bubble_controller.cc', - 'bubble/bubble_controller.h', - 'bubble/bubble_delegate.cc', - 'bubble/bubble_delegate.h', - 'bubble/bubble_manager.cc', - 'bubble/bubble_manager.h', - 'bubble/bubble_reference.h', - 'bubble/bubble_ui.h', - ], - }, - { - 'target_name': 'bubble_test_support', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../testing/gmock.gyp:gmock', - 'bubble', - ], - 'sources': [ - 'bubble/bubble_manager_mocks.cc', - 'bubble/bubble_manager_mocks.h', - ], - }, - ], -}
diff --git a/components/captive_portal.gypi b/components/captive_portal.gypi deleted file mode 100644 index 5525bb0..0000000 --- a/components/captive_portal.gypi +++ /dev/null
@@ -1,48 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/captive_portal - 'target_name': 'captive_portal', - 'type': '<(component)', - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - '../url/url.gyp:url_lib', - ], - 'include_dirs': [ - '..', - ], - 'defines': [ - 'CAPTIVE_PORTAL_IMPLEMENTATION', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'captive_portal/captive_portal_detector.cc', - 'captive_portal/captive_portal_detector.h', - 'captive_portal/captive_portal_export.h', - 'captive_portal/captive_portal_types.cc', - 'captive_portal/captive_portal_types.h', - ], - }, - { - # GN version: //components/captive_portal:test_support - 'target_name': 'captive_portal_test_support', - 'type': 'static_library', - 'dependencies': [ - 'captive_portal', - '../base/base.gyp:base', - '../net/net.gyp:net', - '../url/url.gyp:url_lib', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'captive_portal/captive_portal_testing_utils.cc', - 'captive_portal/captive_portal_testing_utils.h', - ], - }, - ], -}
diff --git a/components/cast_certificate.gypi b/components/cast_certificate.gypi deleted file mode 100644 index fb4f26ea..0000000 --- a/components/cast_certificate.gypi +++ /dev/null
@@ -1,73 +0,0 @@ -# Copyright 2016 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. - -{ - 'targets': [ - { - 'target_name': 'cast_certificate', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - 'cast_certificate_proto', - ], - 'sources': [ - 'cast_certificate/cast_cert_validator.cc', - 'cast_certificate/cast_cert_validator.h', - 'cast_certificate/cast_crl.cc', - 'cast_certificate/cast_crl.h', - 'cast_certificate/cast_root_ca_cert_der-inc.h', - 'cast_certificate/eureka_root_ca_der-inc.h', - ], - }, - { - 'target_name': 'cast_certificate_proto', - 'type': 'static_library', - 'sources': [ - 'cast_certificate/proto/revocation.proto', - ], - 'includes': [ - '../build/protoc.gypi' - ], - 'variables': { - 'proto_in_dir': 'cast_certificate/proto', - 'proto_out_dir': 'components/cast_certificate/proto', - }, - }, - { - 'target_name': 'cast_certificate_test_proto', - 'type': 'static_library', - 'sources': [ - 'cast_certificate/proto/test_suite.proto', - ], - 'includes': [ - '../build/protoc.gypi' - ], - 'variables': { - 'proto_in_dir': 'cast_certificate/proto', - 'proto_out_dir': 'components/cast_certificate/proto', - }, - }, - { - 'target_name': 'cast_certificate_test_support', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - '../testing/gtest.gyp:gtest', - 'cast_certificate', - ], - 'sources': [ - 'cast_certificate/cast_cert_validator_test_helpers.cc', - 'cast_certificate/cast_cert_validator_test_helpers.h', - ], - }, - ], -}
diff --git a/components/cdm.gypi b/components/cdm.gypi deleted file mode 100644 index 3698f34..0000000 --- a/components/cdm.gypi +++ /dev/null
@@ -1,80 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN verison: //components/cdm/common - 'target_name': 'cdm_common', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_common', - '../ipc/ipc.gyp:ipc', - ], - 'sources': [ - 'cdm/common/cdm_message_generator.cc', - 'cdm/common/cdm_message_generator.h', - 'cdm/common/cdm_messages_android.h', - ], - 'conditions': [ - ['OS == "android"', { - 'sources': [ - 'cdm/common/widevine_drm_delegate_android.cc', - 'cdm/common/widevine_drm_delegate_android.h', - ], - }], - ], - }, - { - # GN version: //components/cdm/renderer - 'target_name': 'cdm_renderer', - 'type': 'static_library', - 'dependencies': [ - 'cdm_common', - '../base/base.gyp:base', - '../content/content.gyp:content_renderer', - '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', - ], - 'include_dirs': [ - # Needed by widevine_key_system_properties.cc. - '<(SHARED_INTERMEDIATE_DIR)', - ], - 'sources': [ - 'cdm/renderer/widevine_key_system_properties.cc', - 'cdm/renderer/widevine_key_system_properties.h', - ], - 'conditions': [ - ['OS == "android"', { - 'sources': [ - 'cdm/renderer/android_key_systems.cc', - 'cdm/renderer/android_key_systems.h', - ], - }], - ], - }, - ], - 'conditions': [ - ['OS == "android"', { - 'targets': [ - { - # GN version: //components/cdm/browser - 'target_name': 'cdm_browser', - 'type': 'static_library', - 'dependencies': [ - 'cdm_common', - '../base/base.gyp:base', - '../content/content.gyp:content_browser', - '../content/content.gyp:content_common', - '../media/media.gyp:media', - ], - 'sources': [ - 'cdm/browser/cdm_message_filter_android.cc', - 'cdm/browser/cdm_message_filter_android.h', - ], - }, - ], - }], - ], -}
diff --git a/components/certificate_reporting.gypi b/components/certificate_reporting.gypi deleted file mode 100644 index 87f9f50..0000000 --- a/components/certificate_reporting.gypi +++ /dev/null
@@ -1,57 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/certificate_reporting - 'target_name': 'certificate_reporting', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../crypto/crypto.gyp:crypto', - '../net/net.gyp:net', - '../url/url.gyp:url_lib', - 'cert_logger_proto', - 'encrypted_cert_logger_proto', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - "certificate_reporting/error_report.cc", - "certificate_reporting/error_report.h", - "certificate_reporting/error_reporter.cc", - "certificate_reporting/error_reporter.h", - ] - }, - { - # Protobuf compiler / generator for the certificate error reporting - # protocol buffer. - # GN version: //components/certificate_reporting:cert_logger_proto - 'target_name': 'cert_logger_proto', - 'type': 'static_library', - 'sources': [ 'certificate_reporting/cert_logger.proto', ], - 'variables': { - 'proto_in_dir': 'certificate_reporting/', - 'proto_out_dir': 'components/certificate_reporting/', - }, - 'includes': [ '../build/protoc.gypi', ], - }, - { - # Protobuf compiler / generator for the encrypted certificate - # reports protocol buffer. - # GN version: //components/certificate_reporting:encrypted_cert_logger_proto - 'target_name': 'encrypted_cert_logger_proto', - 'type': 'static_library', - 'sources': [ 'certificate_reporting/encrypted_cert_logger.proto', ], - 'variables': { - 'proto_in_dir': 'certificate_reporting/', - 'proto_out_dir': 'components/certificate_reporting/', - }, - 'includes': [ '../build/protoc.gypi', ], - }, - ] -}
diff --git a/components/certificate_transparency.gypi b/components/certificate_transparency.gypi deleted file mode 100644 index 8d1c7b4..0000000 --- a/components/certificate_transparency.gypi +++ /dev/null
@@ -1,40 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/certificate_transparency - 'target_name': 'certificate_transparency', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../components/components.gyp:base32', - '../components/components.gyp:safe_json', - '../components/components.gyp:url_matcher', - '../components/prefs/prefs.gyp:prefs', - '../components/url_formatter/url_formatter.gyp:url_formatter', - '../net/net.gyp:net', - '../url/url.gyp:url_lib', - ], - 'sources': [ - 'certificate_transparency/ct_policy_manager.cc', - 'certificate_transparency/ct_policy_manager.h', - 'certificate_transparency/log_dns_client.h', - 'certificate_transparency/log_dns_client.cc', - 'certificate_transparency/log_proof_fetcher.h', - 'certificate_transparency/log_proof_fetcher.cc', - 'certificate_transparency/pref_names.cc', - 'certificate_transparency/pref_names.h', - 'certificate_transparency/single_tree_tracker.cc', - 'certificate_transparency/single_tree_tracker.h', - 'certificate_transparency/tree_state_tracker.h', - 'certificate_transparency/tree_state_tracker.cc', - ], - }, - ], -}
diff --git a/components/chrome_apps.gypi b/components/chrome_apps.gypi deleted file mode 100644 index 4d01ece3..0000000 --- a/components/chrome_apps.gypi +++ /dev/null
@@ -1,51 +0,0 @@ -# Copyright 2015 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. -{ - 'variables': { - 'chromium_code': 1, - 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/components/chrome_apps', - }, - 'targets': [ - { - 'target_name': 'chrome_apps_resources', - 'type': 'none', - 'actions': [ - { - 'action_name': 'chrome_apps_resources', - 'variables': { - 'grit_grd_file': 'chrome_apps/chrome_apps_resources.grd', - }, - 'includes': [ '../build/grit_action.gypi' ], - }, - ], - 'includes': [ '../build/grit_target.gypi' ], - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)', - 'files': [ - '<(SHARED_INTERMEDIATE_DIR)/components/chrome_apps/chrome_apps_resources.pak', - ], - }, - ], - }, - { - 'target_name': 'chrome_apps', - 'type': '<(component)', - 'dependencies': [ - '../base/base.gyp:base', - 'chrome_apps_resources', - ], - 'defines': [ - 'CHROME_APPS_IMPLEMENTATION', - ], - 'sources': [ - '<(grit_out_dir)/grit/chrome_apps_resources_map.cc', - '<(grit_out_dir)/grit/chrome_apps_resources_map.h', - 'chrome_apps/chrome_apps_export.h', - 'chrome_apps/chrome_apps_resource_util.cc', - 'chrome_apps/chrome_apps_resource_util.h', - ] - } - ] -}
diff --git a/components/client_update_protocol.gypi b/components/client_update_protocol.gypi deleted file mode 100644 index ba395d06..0000000 --- a/components/client_update_protocol.gypi +++ /dev/null
@@ -1,41 +0,0 @@ -# Copyright 2016 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. - -{ - 'targets': [ - { - # GN version: //components/client_update_protocol - 'target_name': 'client_update_protocol', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../crypto/crypto.gyp:crypto', - ], - - 'include_dirs': [ - '..', - ], - 'sources': [ - 'client_update_protocol/ecdsa.h', - 'client_update_protocol/ecdsa.cc', - ], - }, - { - # GN version: //components/client_update_protocol:test_support - 'target_name': 'client_update_protocol_test_support', - 'type': 'static_library', - 'dependencies': [ - 'update_client', - '../testing/gtest.gyp:gtest', - ], - - 'include_dirs': [ - '..', - ], - 'sources': [ - 'client_update_protocol/ecdsa_unittest.cc', - ], - }, - ], -}
diff --git a/components/cloud_devices.gypi b/components/cloud_devices.gypi deleted file mode 100644 index 8edf24d17..0000000 --- a/components/cloud_devices.gypi +++ /dev/null
@@ -1,35 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - 'target_name': 'cloud_devices_common', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../google_apis/google_apis.gyp:google_apis', - '../net/net.gyp:net', - '../url/url.gyp:url_lib', - ], - 'sources': [ - 'cloud_devices/common/cloud_device_description.cc', - 'cloud_devices/common/cloud_device_description.h', - 'cloud_devices/common/cloud_device_description_consts.cc', - 'cloud_devices/common/cloud_device_description_consts.h', - 'cloud_devices/common/cloud_devices_switches.cc', - 'cloud_devices/common/cloud_devices_switches.h', - 'cloud_devices/common/cloud_devices_urls.cc', - 'cloud_devices/common/cloud_devices_urls.h', - 'cloud_devices/common/description_items.h', - 'cloud_devices/common/description_items_inl.h', - 'cloud_devices/common/printer_description.cc', - 'cloud_devices/common/printer_description.h', - ], - }, - ], -}
diff --git a/components/component_updater.gypi b/components/component_updater.gypi deleted file mode 100644 index 1a3d2112..0000000 --- a/components/component_updater.gypi +++ /dev/null
@@ -1,61 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/component_updater - 'target_name': 'component_updater', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../ui/base/ui_base.gyp:ui_base', - '../url/url.gyp:url_lib', - 'update_client', - 'version_info', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'component_updater/component_updater_paths.cc', - 'component_updater/component_updater_paths.h', - 'component_updater/component_updater_service.cc', - 'component_updater/component_updater_service.h', - 'component_updater/component_updater_service_internal.h', - 'component_updater/component_updater_switches.cc', - 'component_updater/component_updater_switches.h', - 'component_updater/component_updater_url_constants.cc', - 'component_updater/component_updater_url_constants.h', - 'component_updater/configurator_impl.cc', - 'component_updater/configurator_impl.h', - 'component_updater/default_component_installer.cc', - 'component_updater/default_component_installer.h', - 'component_updater/pref_names.cc', - 'component_updater/pref_names.h', - 'component_updater/timer.cc', - 'component_updater/timer.h', - 'component_updater/updater_state_win.cc', - 'component_updater/updater_state_win.h', - ], - }, - { - # GN version: //components/component_updater:test_support - 'target_name': 'component_updater_test_support', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../testing/gmock.gyp:gmock', - 'component_updater', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'component_updater/mock_component_updater_service.cc', - 'component_updater/mock_component_updater_service.h', - ], - }, - ], -}
diff --git a/components/components.gyp b/components/components.gyp deleted file mode 100644 index d670750..0000000 --- a/components/components.gyp +++ /dev/null
@@ -1,211 +0,0 @@ -# Copyright (c) 2013 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. - -{ - 'variables': { - # This turns on e.g. the filename-based detection of which - # platforms to include source files on (e.g. files ending in - # _mac.h or _mac.cc are only compiled on MacOSX). - 'chromium_code': 1, - }, - 'includes': [ - 'about_handler.gypi', - 'auto_login_parser.gypi', - 'autofill.gypi', - 'base32.gypi', - 'bookmarks.gypi', - 'browser_sync.gypi', - 'browsing_data.gypi', - 'browsing_data_ui.gypi', - 'bubble.gypi', - 'captive_portal.gypi', - 'cast_certificate.gypi', - 'certificate_reporting.gypi', - 'client_update_protocol.gypi', - 'cloud_devices.gypi', - 'component_updater.gypi', - 'content_settings.gypi', - 'cookie_config.gypi', - 'crash.gypi', - 'cronet.gypi', - 'crx_file.gypi', - 'data_reduction_proxy.gypi', - 'data_usage.gypi', - 'data_use_measurement.gypi', - 'device_event_log.gypi', - 'dom_distiller.gypi', - 'error_page.gypi', - 'favicon.gypi', - 'favicon_base.gypi', - 'flags_ui.gypi', - 'gcm_driver.gypi', - 'google.gypi', - 'guest_view.gypi', - 'handoff.gypi', - 'history.gypi', - 'image_fetcher.gypi', - 'infobars.gypi', - 'invalidation.gypi', - 'json_schema.gypi', - 'keyed_service.gypi', - 'language_usage_metrics.gypi', - 'leveldb_proto.gypi', - 'login.gypi', - 'memory_pressure.gypi', - 'metrics.gypi', - 'metrics_services_manager.gypi', - 'navigation_metrics.gypi', - 'net_log.gypi', - 'network_session_configurator.gypi', - 'network_time.gypi', - 'ntp_snippets.gypi', - 'ntp_tiles.gypi', - 'offline_pages.gypi', - 'omnibox.gypi', - 'onc.gypi', - 'open_from_clipboard.gypi', - 'os_crypt.gypi', - 'ownership.gypi', - 'password_manager.gypi', - 'physical_web.gypi', - 'plugins.gypi', - 'policy.gypi', - 'precache.gypi', - 'pref_registry.gypi', - 'previews.gypi', - 'profile_metrics.gypi', - 'proxy_config.gypi', - 'query_parser.gypi', - 'rappor.gypi', - 'search.gypi', - 'search_engines.gypi', - 'search_provider_logos.gypi', - 'security_interstitials.gypi', - 'security_state.gypi', - 'sessions.gypi', - 'signin.gypi', - 'spellcheck.gypi', - 'ssl_config.gypi', - 'ssl_errors.gypi', - 'subresource_filter.gypi', - 'suggestions.gypi', - 'supervised_user_error_page.gypi', - 'sync_bookmarks.gypi', - 'sync_sessions.gypi', - 'syncable_prefs.gypi', - 'toolbar.gypi', - 'translate.gypi', - 'undo.gypi', - 'update_client.gypi', - 'upload_list.gypi', - 'url_matcher.gypi', - 'user_prefs.gypi', - 'variations.gypi', - 'version_info.gypi', - 'version_ui.gypi', - 'web_resource.gypi', - 'web_restrictions.gypi', - 'webdata.gypi', - 'webdata_services.gypi', - ], - 'conditions': [ - ['OS == "android"', { - 'includes': [ - 'external_video_surface.gypi', - ], - }], - ['OS != "ios"', { - 'includes': [ - 'app_modal.gypi', - 'cdm.gypi', - 'certificate_transparency.gypi', - 'contextual_search.gypi', - 'devtools_discovery.gypi', - 'devtools_http_handler.gypi', - 'display_compositor.gypi', - 'domain_reliability.gypi', - 'drive.gypi', - 'memory_coordinator.gypi', - 'navigation_interception.gypi', - 'network_hints.gypi', - 'packed_ct_ev_whitelist.gypi', - 'power.gypi', - 'renderer_context_menu.gypi', - 'safe_browsing_db.gypi', - 'safe_json.gypi', - 'startup_metric_utils.gypi', - 'visitedlink.gypi', - 'wallpaper.gypi', - 'web_cache.gypi', - 'web_contents_delegate_android.gypi', - 'web_modal.gypi', - 'zoom.gypi', - ], - }], - ['OS != "ios" and OS != "android"', { - 'includes': [ - 'feedback.gypi', - 'proximity_auth.gypi', - 'storage_monitor.gypi', - ] - }], - ['chromeos == 1', { - 'includes': [ - 'arc.gypi', - 'pairing.gypi', - 'quirks.gypi', - 'timers.gypi', - 'wifi_sync.gypi', - ], - }], - ['OS == "win" or OS == "mac"', { - 'includes': [ - 'wifi.gypi', - ], - }], - ['OS == "win"', { - 'includes': [ - 'browser_watcher.gypi', - ], - }], - ['chromeos == 1 or use_aura == 1', { - 'includes': [ - 'session_manager.gypi', - 'user_manager.gypi', - ], - }], - ['toolkit_views==1', { - 'includes': [ - 'constrained_window.gypi', - ], - }], - ['enable_basic_printing==1 or enable_print_preview==1', { - 'includes': [ - 'printing.gypi', - ], - }], - ['enable_plugins==1', { - 'includes': [ - 'pdf.gypi', - ], - }], - # TODO(tbarzic): Remove chromeos condition when there are non-chromeos apps - # in components/apps. - ['enable_extensions == 1 and chromeos == 1', { - 'includes': [ - 'chrome_apps.gypi', - ], - }], - ['enable_rlz_support==1', { - 'includes': [ - 'rlz.gypi', - ], - }], - ['use_ash==1', { - 'includes': [ - 'exo.gypi', - ], - }], - ], -}
diff --git a/components/components_resources.gyp b/components/components_resources.gyp deleted file mode 100644 index 9e092c2..0000000 --- a/components/components_resources.gyp +++ /dev/null
@@ -1,93 +0,0 @@ -# Copyright 2014 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. - -{ - 'variables': { - 'about_credits_file': '<(SHARED_INTERMEDIATE_DIR)/about_credits.html', - 'about_credits_file_bro': '<(SHARED_INTERMEDIATE_DIR)/about_credits.bro', - }, - 'targets': [ - { - # GN version: //components/resources - 'target_name': 'components_resources', - 'type': 'none', - 'dependencies': [ - 'compressed_about_credits', - ], - 'hard_dependency': 1, - 'variables': { - 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/components', - }, - 'actions': [ - { - # GN version: //components/resources:components_resources - 'action_name': 'generate_components_resources', - 'variables': { - 'grit_grd_file': 'resources/components_resources.grd', - 'grit_additional_defines': [ - '-E', 'about_credits_file=<(about_credits_file_bro)', - ], - }, - 'includes': [ '../build/grit_action.gypi' ], - }, - { - # GN version: //components/resources:components_scaled_resources - 'action_name': 'generate_components_scaled_resources', - 'variables': { - 'grit_grd_file': 'resources/components_scaled_resources.grd', - }, - 'includes': [ '../build/grit_action.gypi' ], - }, - ], - 'includes': [ '../build/grit_target.gypi' ], - }, - { - 'target_name': 'compressed_about_credits', - 'type': 'none', - 'actions': [ - { - 'variables': { - 'input_file': '<(about_credits_file)', - 'output_file': '<(about_credits_file_bro)', - }, - 'includes': ['../third_party/brotli/bro.gypi'], - } - ], - 'dependencies': [ - 'about_credits' - ], - }, - { - # GN version: //components/resources:about_credits - 'target_name': 'about_credits', - 'type': 'none', - 'hard_dependency': 1, - 'actions': [ - { - 'variables': { - 'generator_path': '../tools/licenses.py', - }, - 'action_name': 'generate_about_credits', - 'inputs': [ - # TODO(phajdan.jr): make licenses.py print license input files so - # about:credits gets rebuilt when one changes. - '<(generator_path)', - 'about_ui/resources/about_credits.tmpl', - 'about_ui/resources/about_credits_entry.tmpl', - ], - 'outputs': [ - '<(about_credits_file)', - ], - 'action': ['python', - '<(generator_path)', - '--target-os=<(OS)', - 'credits', - '<(about_credits_file)', - ], - 'message': 'Generating about:credits', - }, - ], - }, - ], -}
diff --git a/components/components_strings.gyp b/components/components_strings.gyp deleted file mode 100644 index e73a24b..0000000 --- a/components/components_strings.gyp +++ /dev/null
@@ -1,51 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - 'target_name': 'components_strings', - 'type': 'none', - 'hard_dependency': 1, - 'variables': { - 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/components/strings', - }, - 'actions': [ - { - # GN version: //components/strings:components_strings - 'action_name': 'generate_components_strings', - 'variables': { - 'grit_grd_file': 'components_strings.grd', - }, - 'includes': [ '../build/grit_action.gypi' ], - }, - { - # GN version: //components/strings:components_chromium_strings - 'action_name': 'generate_components_chromium_strings', - 'variables': { - 'grit_grd_file': 'components_chromium_strings.grd', - }, - 'includes': [ '../build/grit_action.gypi' ], - }, - { - # GN version: //components/strings:components_google_chrome_strings - 'action_name': 'generate_components_google_chrome_strings', - 'variables': { - 'grit_grd_file': 'components_google_chrome_strings.grd', - }, - 'includes': [ '../build/grit_action.gypi' ], - }, - { - # GN version: //components/strings:components_locale_settings - 'action_name': 'generate_components_locale_settings', - 'variables': { - 'grit_grd_file': 'components_locale_settings.grd', - }, - 'includes': [ '../build/grit_action.gypi' ], - }, - ], - 'includes': [ '../build/grit_target.gypi' ], - }, - ], -}
diff --git a/components/components_tests.gyp b/components/components_tests.gyp deleted file mode 100644 index 5b95afc..0000000 --- a/components/components_tests.gyp +++ /dev/null
@@ -1,2147 +0,0 @@ -# Copyright 2014 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. - -{ - 'variables': { - # This turns on e.g. the filename-based detection of which - # platforms to include source files on (e.g. files ending in - # _mac.h or _mac.cc are only compiled on MacOSX). - 'chromium_code': 1, - - # Note: sources list duplicated in GN build. In the GN build, - # each component has its own unit tests target defined in its - # directory that are then linked into the final components_unittests. - 'auto_login_parser_unittest_sources': [ - 'auto_login_parser/auto_login_parser_unittest.cc', - ], - 'autofill_unittest_sources': [ - 'autofill/content/browser/content_autofill_driver_unittest.cc', - 'autofill/content/browser/payments/payments_client_unittest.cc', - 'autofill/content/public/cpp/autofill_types_struct_traits_unittest.cc', - 'autofill/content/renderer/renderer_save_password_progress_logger_unittest.cc', - 'autofill/core/browser/address_field_unittest.cc', - 'autofill/core/browser/address_i18n_unittest.cc', - 'autofill/core/browser/address_unittest.cc', - 'autofill/core/browser/address_rewriter_unittest.cc', - 'autofill/core/browser/autocomplete_history_manager_unittest.cc', - 'autofill/core/browser/autofill_country_unittest.cc', - 'autofill/core/browser/autofill_data_model_unittest.cc', - 'autofill/core/browser/autofill_data_util_unittest.cc', - 'autofill/core/browser/autofill_download_manager_unittest.cc', - 'autofill/core/browser/autofill_external_delegate_unittest.cc', - 'autofill/core/browser/autofill_field_unittest.cc', - 'autofill/core/browser/autofill_ie_toolbar_import_win_unittest.cc', - 'autofill/core/browser/autofill_manager_unittest.cc', - 'autofill/core/browser/autofill_merge_unittest.cc', - 'autofill/core/browser/autofill_metrics_unittest.cc', - 'autofill/core/browser/autofill_profile_comparator_unittest.cc', - 'autofill/core/browser/autofill_profile_unittest.cc', - 'autofill/core/browser/autofill_type_unittest.cc', - 'autofill/core/browser/contact_info_unittest.cc', - 'autofill/core/browser/country_names_unittest.cc', - 'autofill/core/browser/credit_card_field_unittest.cc', - 'autofill/core/browser/credit_card_unittest.cc', - 'autofill/core/browser/field_candidates_unittest.cc', - 'autofill/core/browser/form_field_unittest.cc', - 'autofill/core/browser/form_structure_unittest.cc', - 'autofill/core/browser/legal_message_line_unittest.cc', - 'autofill/core/browser/name_field_unittest.cc', - 'autofill/core/browser/password_generator_unittest.cc', - 'autofill/core/browser/payments/full_card_request_unittest.cc', - 'autofill/core/browser/payments/payments_service_url_unittest.cc', - 'autofill/core/browser/personal_data_manager_unittest.cc', - 'autofill/core/browser/phone_field_unittest.cc', - 'autofill/core/browser/phone_number_i18n_unittest.cc', - 'autofill/core/browser/phone_number_unittest.cc', - 'autofill/core/browser/ui/card_unmask_prompt_controller_impl_unittest.cc', - 'autofill/core/browser/validation_unittest.cc', - 'autofill/core/browser/webdata/autofill_data_type_controller_unittest.cc', - 'autofill/core/browser/webdata/autofill_profile_syncable_service_unittest.cc', - 'autofill/core/browser/webdata/autofill_table_unittest.cc', - 'autofill/core/browser/webdata/autofill_wallet_metadata_syncable_service_unittest.cc', - 'autofill/core/browser/webdata/web_data_service_unittest.cc', - 'autofill/core/common/autofill_l10n_util_unittest.cc', - 'autofill/core/common/autofill_regexes_unittest.cc', - 'autofill/core/common/autofill_util_unittest.cc', - 'autofill/core/common/form_data_unittest.cc', - 'autofill/core/common/form_field_data_unittest.cc', - 'autofill/core/common/password_form_fill_data_unittest.cc', - 'autofill/core/common/save_password_progress_logger_unittest.cc', - ], - 'base32_unittest_sources': [ - 'base32/base32_unittest.cc', - ], - 'bookmarks_unittest_sources': [ - 'bookmarks/browser/bookmark_codec_unittest.cc', - 'bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc', - 'bookmarks/browser/bookmark_index_unittest.cc', - 'bookmarks/browser/bookmark_model_unittest.cc', - 'bookmarks/browser/bookmark_utils_unittest.cc', - 'bookmarks/managed/managed_bookmarks_tracker_unittest.cc', - ], - 'browser_sync_unittest_sources': [ - 'browser_sync/browser/profile_sync_service_autofill_unittest.cc', - 'browser_sync/browser/profile_sync_service_bookmark_unittest.cc', - 'browser_sync/browser/profile_sync_service_startup_unittest.cc', - 'browser_sync/browser/profile_sync_service_typed_url_unittest.cc', - 'browser_sync/browser/profile_sync_service_unittest.cc', - ], - 'browser_watcher_unittest_sources': [ - 'browser_watcher/endsession_watcher_window_win_unittest.cc', - 'browser_watcher/exit_code_watcher_win_unittest.cc', - 'browser_watcher/exit_funnel_win_unittest.cc', - 'browser_watcher/watcher_client_win_unittest.cc', - 'browser_watcher/watcher_metrics_provider_win_unittest.cc', - 'browser_watcher/window_hang_monitor_win_unittest.cc', - ], - 'browsing_data_ui_unittest_sources': [ - 'browsing_data_ui/history_notice_utils_unittest.cc' - ], - 'bubble_unittest_sources': [ - 'bubble/bubble_manager_mocks.cc', - 'bubble/bubble_manager_mocks.h', - 'bubble/bubble_manager_unittest.cc', - ], - 'captive_portal_unittest_sources': [ - 'captive_portal/captive_portal_detector_unittest.cc', - ], - 'cast_certificate_unittest_sources': [ - 'cast_certificate/cast_cert_validator_unittest.cc', - 'cast_certificate/cast_crl_unittest.cc', - ], - 'certificate_reporting_unittest_sources': [ - 'certificate_reporting/error_report_unittest.cc', - 'certificate_reporting/error_reporter_unittest.cc', - ], - 'certificate_transparency_unittest_sources': [ - 'certificate_transparency/ct_policy_manager_unittest.cc', - 'certificate_transparency/log_dns_client_unittest.cc', - 'certificate_transparency/log_proof_fetcher_unittest.cc', - 'certificate_transparency/mock_log_dns_traffic.cc', - 'certificate_transparency/mock_log_dns_traffic.h', - 'certificate_transparency/single_tree_tracker_unittest.cc', - ], - 'child_trace_message_filter_unittest_sources': [ - 'tracing/child/child_trace_message_filter_unittest.cc', - ], - 'client_update_protocol_unittest_sources': [ - 'client_update_protocol/ecdsa_unittest.cc', - ], - 'cloud_devices_unittest_sources': [ - 'cloud_devices/common/cloud_devices_urls_unittest.cc', - 'cloud_devices/common/printer_description_unittest.cc', - ], - 'component_updater_unittest_sources': [ - 'component_updater/component_updater_service_unittest.cc', - 'component_updater/configurator_impl_unittest.cc', - 'component_updater/default_component_installer_unittest.cc', - 'component_updater/timer_unittest.cc', - 'component_updater/updater_state_unittest_win.cc', - ], - 'content_settings_unittest_sources': [ - 'content_settings/core/browser/content_settings_mock_provider.cc', - 'content_settings/core/browser/content_settings_mock_provider.h', - 'content_settings/core/browser/content_settings_registry_unittest.cc', - 'content_settings/core/browser/content_settings_rule_unittest.cc', - 'content_settings/core/browser/content_settings_utils_unittest.cc', - 'content_settings/core/browser/cookie_settings_unittest.cc', - 'content_settings/core/browser/website_settings_registry_unittest.cc', - 'content_settings/core/common/content_settings_pattern_parser_unittest.cc', - 'content_settings/core/common/content_settings_pattern_unittest.cc', - ], - 'crash_unittest_sources': [ - 'crash/content/app/crash_keys_win_unittest.cc', - 'crash/core/common/crash_keys_unittest.cc', - 'crash/core/common/objc_zombie_unittest.mm', - ], - 'crx_file_unittest_sources': [ - 'crx_file/id_util_unittest.cc', - ], - 'data_reduction_proxy_unittest_sources': [ - 'data_reduction_proxy/content/browser/content_lofi_decider_unittest.cc', - 'data_reduction_proxy/content/browser/content_lofi_ui_service_unittest.cc', - 'data_reduction_proxy/content/browser/data_reduction_proxy_message_filter_unittest.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol_unittest.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_bypass_stats_unittest.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats_unittest.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client_unittest.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_configurator_unittest.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_data_unittest.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_delegate_unittest.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_interceptor_unittest.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_io_data_unittest.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_metrics_unittest.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_mutable_config_values_unittest.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate_unittest.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_pingback_client_unittest.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_prefs_unittest.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_request_options_unittest.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_settings_unittest.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_tamper_detection_unittest.cc', - 'data_reduction_proxy/core/browser/data_usage_store_unittest.cc', - 'data_reduction_proxy/core/common/data_reduction_proxy_event_store_unittest.cc', - 'data_reduction_proxy/core/common/data_reduction_proxy_headers_unittest.cc', - 'data_reduction_proxy/core/common/data_reduction_proxy_params_unittest.cc', - 'data_reduction_proxy/core/common/data_reduction_proxy_util_unittest.cc', - ], - 'data_usage_unittest_sources': [ - 'data_usage/core/data_use_aggregator_unittest.cc', - ], - 'device_event_log_unittest_sources': [ - 'device_event_log/device_event_log_impl_unittest.cc', - ], - 'devtools_http_handler_unittest_sources': [ - 'devtools_http_handler/devtools_http_handler_unittest.cc', - ], - 'display_compositor_unittest_sources': [ - 'display_compositor/buffer_queue_unittest.cc', - ], - 'dom_distiller_unittest_sources': [ - 'dom_distiller/content/browser/dom_distiller_viewer_source_unittest.cc', - 'dom_distiller/content/browser/web_contents_main_frame_observer_unittest.cc', - 'dom_distiller/core/article_entry_unittest.cc', - 'dom_distiller/core/distillable_page_detector_unittest.cc', - 'dom_distiller/core/distilled_content_store_unittest.cc', - 'dom_distiller/core/distilled_page_prefs_unittests.cc', - 'dom_distiller/core/distiller_unittest.cc', - 'dom_distiller/core/distiller_url_fetcher_unittest.cc', - 'dom_distiller/core/dom_distiller_model_unittest.cc', - 'dom_distiller/core/dom_distiller_request_view_base_unittest.cc', - 'dom_distiller/core/dom_distiller_service_unittest.cc', - 'dom_distiller/core/dom_distiller_store_unittest.cc', - 'dom_distiller/core/page_features_unittest.cc', - 'dom_distiller/core/task_tracker_unittest.cc', - 'dom_distiller/core/url_utils_unittest.cc', - 'dom_distiller/core/viewer_unittest.cc', - ], - 'domain_reliability_unittest_sources': [ - 'domain_reliability/config_unittest.cc', - 'domain_reliability/context_unittest.cc', - 'domain_reliability/dispatcher_unittest.cc', - 'domain_reliability/google_configs_unittest.cc', - 'domain_reliability/header_unittest.cc', - 'domain_reliability/monitor_unittest.cc', - 'domain_reliability/scheduler_unittest.cc', - 'domain_reliability/test_util.cc', - 'domain_reliability/test_util.h', - 'domain_reliability/uploader_unittest.cc', - 'domain_reliability/util_unittest.cc', - ], - 'favicon_base_unittest_sources': [ - 'favicon_base/fallback_icon_url_parser_unittest.cc', - 'favicon_base/favicon_url_parser_unittest.cc', - 'favicon_base/large_icon_url_parser_unittest.cc', - 'favicon_base/select_favicon_frames_unittest.cc', - ], - 'favicon_unittest_sources': [ - 'favicon/content/content_favicon_driver_unittest.cc', - 'favicon/core/fallback_url_util_unittest.cc', - 'favicon/core/favicon_handler_unittest.cc', - 'favicon/core/large_icon_service_unittest.cc', - ], - 'flags_ui_unittest_sources': [ - 'flags_ui/flags_state_unittest.cc', - ], - 'undo_unittest_sources': [ - 'undo/bookmark_undo_service_test.cc', - 'undo/undo_manager_test.cc', - ], - 'data_use_measurement_unittest_sources': [ - 'data_use_measurement/content/data_use_measurement_unittest.cc', - ], - 'error_page_unittest_sources': [ - 'error_page/renderer/net_error_helper_core_unittest.cc', - ], - 'feedback_unittest_sources': [ - 'feedback/anonymizer_tool_unittest.cc', - 'feedback/feedback_common_unittest.cc', - 'feedback/feedback_data_unittest.cc', - 'feedback/feedback_uploader_chrome_unittest.cc', - 'feedback/feedback_uploader_unittest.cc', - ], - 'gcm_driver_unittest_sources': [ - 'gcm_driver/gcm_account_mapper_unittest.cc', - 'gcm_driver/gcm_account_tracker_unittest.cc', - 'gcm_driver/gcm_channel_status_request_unittest.cc', - 'gcm_driver/gcm_client_impl_unittest.cc', - 'gcm_driver/gcm_delayed_task_controller_unittest.cc', - 'gcm_driver/gcm_driver_desktop_unittest.cc', - 'gcm_driver/gcm_stats_recorder_android_unittest.cc', - 'gcm_driver/gcm_stats_recorder_impl_unittest.cc', - ], - 'gcm_driver_crypto_unittest_sources': [ - 'gcm_driver/crypto/encryption_header_parsers_unittest.cc', - 'gcm_driver/crypto/gcm_encryption_provider_unittest.cc', - 'gcm_driver/crypto/gcm_key_store_unittest.cc', - 'gcm_driver/crypto/gcm_message_cryptographer_unittest.cc', - 'gcm_driver/crypto/p256_key_util_unittest.cc', - ], - 'google_unittest_sources': [ - 'google/core/browser/google_url_tracker_unittest.cc', - 'google/core/browser/google_util_unittest.cc', - ], - 'guest_view_unittest_sources': [ - 'guest_view/browser/guest_view_manager_unittest.cc' - ], - 'history_unittest_sources': [ - 'history/content/browser/content_history_backend_db_unittest.cc', - 'history/core/browser/android/android_history_types_unittest.cc', - 'history/core/browser/expire_history_backend_unittest.cc', - 'history/core/browser/history_backend_db_unittest.cc', - 'history/core/browser/history_backend_unittest.cc', - 'history/core/browser/history_database_unittest.cc', - 'history/core/browser/history_querying_unittest.cc', - 'history/core/browser/history_service_unittest.cc', - 'history/core/browser/history_types_unittest.cc', - 'history/core/browser/thumbnail_database_unittest.cc', - 'history/core/browser/top_sites_cache_unittest.cc', - 'history/core/browser/top_sites_database_unittest.cc', - 'history/core/browser/top_sites_impl_unittest.cc', - 'history/core/browser/typed_url_syncable_service_unittest.cc', - 'history/core/browser/url_database_unittest.cc', - 'history/core/browser/url_utils_unittest.cc', - 'history/core/browser/visit_database_unittest.cc', - 'history/core/browser/visit_tracker_unittest.cc', - 'history/core/browser/web_history_service_unittest.cc', - 'history/core/common/thumbnail_score_unittest.cc', - ], - 'image_fetcher_unittest_sources': [ - 'image_fetcher/image_data_fetcher_unittest.cc', - ], - 'instance_id_unittest_sources': [ - 'gcm_driver/instance_id/instance_id_driver_unittest.cc', - ], - 'invalidation_unittest_sources': [ - 'invalidation/impl/fake_invalidator_unittest.cc', - 'invalidation/impl/gcm_invalidation_bridge_unittest.cc', - 'invalidation/impl/gcm_network_channel_unittest.cc', - 'invalidation/impl/invalidation_logger_unittest.cc', - 'invalidation/impl/invalidation_notifier_unittest.cc', - 'invalidation/impl/invalidator_registrar_unittest.cc', - 'invalidation/impl/invalidator_storage_unittest.cc', - 'invalidation/impl/non_blocking_invalidator_unittest.cc', - 'invalidation/impl/object_id_invalidation_map_unittest.cc', - 'invalidation/impl/p2p_invalidator_unittest.cc', - 'invalidation/impl/push_client_channel_unittest.cc', - 'invalidation/impl/registration_manager_unittest.cc', - 'invalidation/impl/single_object_invalidation_set_unittest.cc', - 'invalidation/impl/sync_invalidation_listener_unittest.cc', - 'invalidation/impl/sync_system_resources_unittest.cc', - 'invalidation/impl/ticl_invalidation_service_unittest.cc', - 'invalidation/impl/ticl_profile_settings_provider_unittest.cc', - 'invalidation/impl/unacked_invalidation_set_unittest.cc', - ], - 'json_schema_unittest_sources': [ - 'json_schema/json_schema_validator_unittest.cc', - 'json_schema/json_schema_validator_unittest_base.cc', - 'json_schema/json_schema_validator_unittest_base.h', - ], - 'keyed_service_unittest_sources': [ - 'keyed_service/content/browser_context_dependency_manager_unittest.cc', - 'keyed_service/core/dependency_graph_unittest.cc', - ], - 'language_usage_metrics_unittest_sources': [ - 'language_usage_metrics/language_usage_metrics_unittest.cc', - ], - 'leveldb_proto_unittest_sources': [ - 'leveldb_proto/proto_database_impl_unittest.cc', - ], - 'link_header_util_unittest_sources': [ - 'link_header_util/link_header_util_unittest.cc', - ], - 'login_unittest_sources': [ - 'login/screens/screen_context_unittest.cc', - ], - 'memory_coordinator_unittest_sources': [ - 'memory_coordinator/browser/memory_coordinator_unittest.cc', - 'memory_coordinator/child/child_memory_coordinator_impl_unittest.cc', - ], - 'memory_pressure_unittest_sources': [ - 'memory_pressure/direct_memory_pressure_calculator_linux_unittest.cc', - 'memory_pressure/direct_memory_pressure_calculator_win_unittest.cc', - 'memory_pressure/filtered_memory_pressure_calculator_unittest.cc', - 'memory_pressure/memory_pressure_monitor_unittest.cc', - 'memory_pressure/memory_pressure_stats_collector_unittest.cc', - 'memory_pressure/test_memory_pressure_calculator.cc', - 'memory_pressure/test_memory_pressure_calculator.h', - ], - 'metrics_unittest_sources': [ - 'metrics/call_stack_profile_metrics_provider_unittest.cc', - 'metrics/cloned_install_detector_unittest.cc', - 'metrics/daily_event_unittest.cc', - 'metrics/data_use_tracker_unittest.cc', - 'metrics/drive_metrics_provider_unittest.cc', - 'metrics/file_metrics_provider_unittest.cc', - 'metrics/histogram_encoder_unittest.cc', - 'metrics/machine_id_provider_win_unittest.cc', - 'metrics/metrics_log_manager_unittest.cc', - 'metrics/metrics_log_unittest.cc', - 'metrics/metrics_reporting_scheduler_unittest.cc', - 'metrics/metrics_service_unittest.cc', - 'metrics/metrics_state_manager_unittest.cc', - 'metrics/net/net_metrics_log_uploader_unittest.cc', - 'metrics/persisted_logs_unittest.cc', - 'metrics/profiler/profiler_metrics_provider_unittest.cc', - 'metrics/profiler/tracking_synchronizer_unittest.cc', - 'metrics/stability_metrics_helper_unittest.cc', - 'metrics/ui/screen_info_metrics_provider_unittest.cc', - ], - 'metrics_leak_detector_unittest_sources': [ - 'metrics/leak_detector/call_stack_manager_unittest.cc', - 'metrics/leak_detector/call_stack_table_unittest.cc', - 'metrics/leak_detector/leak_analyzer_unittest.cc', - 'metrics/leak_detector/leak_detector_impl_unittest.cc', - 'metrics/leak_detector/leak_detector_unittest.cc', - 'metrics/leak_detector/protobuf_to_mojo_converter_unittest.cc', - 'metrics/leak_detector/ranked_set_unittest.cc', - ], - 'mime_util_unittest_sources': [ - 'mime_util/mime_util_unittest.cc', - ], - 'nacl_unittest_sources': [ - 'nacl/browser/nacl_file_host_unittest.cc', - 'nacl/browser/nacl_process_host_unittest.cc', - 'nacl/browser/nacl_validation_cache_unittest.cc', - 'nacl/browser/pnacl_host_unittest.cc', - 'nacl/browser/pnacl_translation_cache_unittest.cc', - 'nacl/browser/test_nacl_browser_delegate.cc', - 'nacl/zygote/nacl_fork_delegate_linux_unittest.cc', - ], - 'navigation_interception_unittest_sources': [ - 'navigation_interception/intercept_navigation_throttle_unittest.cc', - ], - 'network_hints_unittest_sources': [ - 'network_hints/renderer/dns_prefetch_queue_unittest.cc', - 'network_hints/renderer/renderer_dns_prefetch_unittest.cc', - ], - 'network_session_configurator_unittest_sources': [ - 'network_session_configurator/network_session_configurator_unittest.cc', - ], - 'network_time_unittest_sources': [ - 'network_time/network_time_tracker_unittest.cc', - ], - 'ntp_snippets_unittest_sources': [ - 'ntp_snippets/content_suggestions_service_unittest.cc', - 'ntp_snippets/ntp_snippet_unittest.cc', - 'ntp_snippets/ntp_snippets_database_unittest.cc', - 'ntp_snippets/ntp_snippets_fetcher_unittest.cc', - 'ntp_snippets/ntp_snippets_service_unittest.cc', - 'ntp_snippets/ntp_snippets_status_service_unittest.cc', - 'ntp_snippets/ntp_snippets_test_utils.cc', - 'ntp_snippets/ntp_snippets_test_utils.h', - ], - 'ntp_tiles_unittest_sources': [ - 'ntp_tiles/most_visited_sites_unittest.cc', - ], - 'offline_pages_background_unittest_sources': [ - 'offline_pages/background/request_coordinator_event_logger_unittest.cc', - 'offline_pages/background/request_coordinator_unittest.cc', - 'offline_pages/background/request_picker_unittest.cc', - 'offline_pages/background/request_queue_store_unittest.cc', - 'offline_pages/background/request_queue_unittest.cc', - 'offline_pages/background/save_page_request_unittest.cc', - ], - 'offline_pages_downloads_unittest_sources': [ - 'offline_pages/downloads/download_ui_adapter_unittest.cc', - ], - 'offline_pages_unittest_sources': [ - 'offline_pages/archive_manager_unittest.cc', - 'offline_pages/client_policy_controller_unittest.cc', - 'offline_pages/offline_page_metadata_store_impl_unittest.cc', - 'offline_pages/offline_page_model_event_logger_unittest.cc', - 'offline_pages/offline_page_model_impl_unittest.cc', - 'offline_pages/offline_page_storage_manager_unittest.cc', - 'offline_pages/snapshot_controller_unittest.cc', - ], - 'omnibox_unittest_sources': [ - 'omnibox/browser/answers_cache_unittest.cc', - 'omnibox/browser/autocomplete_input_unittest.cc', - 'omnibox/browser/autocomplete_match_unittest.cc', - 'omnibox/browser/autocomplete_provider_unittest.cc', - 'omnibox/browser/autocomplete_result_unittest.cc', - 'omnibox/browser/base_search_provider_unittest.cc', - 'omnibox/browser/bookmark_provider_unittest.cc', - 'omnibox/browser/builtin_provider_unittest.cc', - 'omnibox/browser/clipboard_url_provider_unittest.cc', - 'omnibox/browser/history_quick_provider_unittest.cc', - 'omnibox/browser/history_url_provider_unittest.cc', - 'omnibox/browser/in_memory_url_index_types_unittest.cc', - 'omnibox/browser/in_memory_url_index_unittest.cc', - 'omnibox/browser/keyword_provider_unittest.cc', - 'omnibox/browser/omnibox_edit_unittest.cc', - 'omnibox/browser/omnibox_field_trial_unittest.cc', - 'omnibox/browser/omnibox_popup_model_unittest.cc', - 'omnibox/browser/omnibox_view_unittest.cc', - 'omnibox/browser/scored_history_match_unittest.cc', - 'omnibox/browser/shortcuts_backend_unittest.cc', - 'omnibox/browser/shortcuts_database_unittest.cc', - 'omnibox/browser/shortcuts_provider_unittest.cc', - 'omnibox/browser/suggestion_answer_unittest.cc', - 'omnibox/browser/url_prefix_unittest.cc', - 'omnibox/browser/zero_suggest_provider_unittest.cc', - ], - 'open_from_clipboard_unittest_sources': [ - 'open_from_clipboard/clipboard_recent_content_ios_unittest.mm', - ], - 'os_crypt_unittest_sources': [ - 'os_crypt/ie7_password_win_unittest.cc', - 'os_crypt/keychain_password_mac_unittest.mm', - 'os_crypt/os_crypt_unittest.cc', - ], - 'ownership_unittest_sources': [ - 'ownership/owner_key_util_impl_unittest.cc', - ], - 'packed_ct_ev_whitelist_unittest_sources': [ - 'packed_ct_ev_whitelist/bit_stream_reader_unittest.cc', - 'packed_ct_ev_whitelist/packed_ct_ev_whitelist_unittest.cc', - ], - 'password_manager_unittest_sources': [ - 'password_manager/content/browser/content_password_manager_driver_unittest.cc', - 'password_manager/content/browser/credential_manager_impl_unittest.cc', - 'password_manager/core/browser/affiliated_match_helper_unittest.cc', - 'password_manager/core/browser/affiliation_backend_unittest.cc', - 'password_manager/core/browser/affiliation_database_unittest.cc', - 'password_manager/core/browser/affiliation_fetch_throttler_unittest.cc', - 'password_manager/core/browser/affiliation_fetcher_unittest.cc', - 'password_manager/core/browser/affiliation_service_unittest.cc', - 'password_manager/core/browser/affiliation_utils_unittest.cc', - 'password_manager/core/browser/browser_save_password_progress_logger_unittest.cc', - 'password_manager/core/browser/export/csv_writer_unittest.cc', - 'password_manager/core/browser/export/password_csv_writer_unittest.cc', - 'password_manager/core/browser/export/password_exporter_unittest.cc', - 'password_manager/core/browser/facet_manager_unittest.cc', - 'password_manager/core/browser/form_fetcher_impl_unittest.cc', - 'password_manager/core/browser/form_saver_impl_unittest.cc', - 'password_manager/core/browser/import/csv_reader_unittest.cc', - 'password_manager/core/browser/import/password_csv_reader_unittest.cc', - 'password_manager/core/browser/import/password_importer_unittest.cc', - 'password_manager/core/browser/log_manager_unittest.cc', - 'password_manager/core/browser/log_router_unittest.cc', - 'password_manager/core/browser/login_database_ios_unittest.cc', - 'password_manager/core/browser/login_database_unittest.cc', - 'password_manager/core/browser/login_model_unittest.cc', - 'password_manager/core/browser/mock_affiliated_match_helper.cc', - 'password_manager/core/browser/mock_affiliated_match_helper.h', - 'password_manager/core/browser/password_autofill_manager_unittest.cc', - 'password_manager/core/browser/password_bubble_experiment_unittest.cc', - 'password_manager/core/browser/password_form_manager_unittest.cc', - 'password_manager/core/browser/password_generation_manager_unittest.cc', - 'password_manager/core/browser/password_manager_settings_migration_experiment_unittest.cc', - 'password_manager/core/browser/password_manager_unittest.cc', - 'password_manager/core/browser/password_manager_util_unittest.cc', - 'password_manager/core/browser/password_store_default_unittest.cc', - 'password_manager/core/browser/password_store_origin_unittest.h', - 'password_manager/core/browser/password_store_unittest.cc', - 'password_manager/core/browser/password_syncable_service_unittest.cc', - 'password_manager/core/browser/password_ui_utils_unittest.cc', - 'password_manager/core/browser/psl_matching_helper_unittest.cc', - 'password_manager/core/browser/sql_table_builder_unittest.cc', - 'password_manager/core/browser/statistics_table_unittest.cc', - 'password_manager/core/common/credential_manager_types_unittest.cc', - 'password_manager/sync/browser/password_manager_setting_migrator_service_unittest.cc', - 'password_manager/sync/browser/password_sync_util_unittest.cc', - 'password_manager/sync/browser/sync_credentials_filter_unittest.cc', - 'password_manager/sync/browser/sync_username_test_base.cc', - 'password_manager/sync/browser/sync_username_test_base.h', - ], - 'policy_unittest_sources': [ - 'policy/core/browser/android/android_combined_policy_provider_unittest.cc', - 'policy/core/browser/android/policy_converter_unittest.cc', - 'policy/core/browser/autofill_policy_handler_unittest.cc', - 'policy/core/browser/browser_policy_connector_unittest.cc', - 'policy/core/browser/configuration_policy_handler_unittest.cc', - 'policy/core/browser/configuration_policy_pref_store_unittest.cc', - 'policy/core/browser/proxy_policy_handler_unittest.cc', - 'policy/core/browser/url_blacklist_manager_unittest.cc', - 'policy/core/browser/url_blacklist_policy_handler_unittest.cc', - 'policy/core/common/async_policy_provider_unittest.cc', - 'policy/core/common/cloud/cloud_policy_client_unittest.cc', - 'policy/core/common/cloud/cloud_policy_core_unittest.cc', - 'policy/core/common/cloud/cloud_policy_manager_unittest.cc', - 'policy/core/common/cloud/cloud_policy_refresh_scheduler_unittest.cc', - 'policy/core/common/cloud/cloud_policy_service_unittest.cc', - 'policy/core/common/cloud/cloud_policy_validator_unittest.cc', - 'policy/core/common/cloud/component_cloud_policy_service_unittest.cc', - 'policy/core/common/cloud/component_cloud_policy_store_unittest.cc', - 'policy/core/common/cloud/component_cloud_policy_updater_unittest.cc', - 'policy/core/common/cloud/device_management_service_unittest.cc', - 'policy/core/common/cloud/external_policy_data_fetcher_unittest.cc', - 'policy/core/common/cloud/external_policy_data_updater_unittest.cc', - 'policy/core/common/cloud/policy_header_io_helper_unittest.cc', - 'policy/core/common/cloud/policy_header_service_unittest.cc', - 'policy/core/common/cloud/resource_cache_unittest.cc', - 'policy/core/common/cloud/user_cloud_policy_manager_unittest.cc', - 'policy/core/common/cloud/user_cloud_policy_store_unittest.cc', - 'policy/core/common/cloud/user_info_fetcher_unittest.cc', - 'policy/core/common/config_dir_policy_loader_unittest.cc', - 'policy/core/common/generate_policy_source_unittest.cc', - 'policy/core/common/policy_bundle_unittest.cc', - 'policy/core/common/policy_loader_ios_unittest.mm', - 'policy/core/common/policy_loader_mac_unittest.cc', - 'policy/core/common/policy_loader_win_unittest.cc', - 'policy/core/common/policy_map_unittest.cc', - 'policy/core/common/policy_service_impl_unittest.cc', - 'policy/core/common/policy_statistics_collector_unittest.cc', - 'policy/core/common/preg_parser_win_unittest.cc', - 'policy/core/common/registry_dict_win_unittest.cc', - 'policy/core/common/remote_commands/remote_commands_queue_unittest.cc', - 'policy/core/common/remote_commands/remote_commands_service_unittest.cc', - 'policy/core/common/schema_map_unittest.cc', - 'policy/core/common/schema_registry_tracking_policy_provider_unittest.cc', - 'policy/core/common/schema_registry_unittest.cc', - 'policy/core/common/schema_unittest.cc', - ], - 'power_unittest_sources': [ - 'power/origin_power_map_unittest.cc', - ], - 'precache_unittest_sources': [ - 'precache/content/precache_manager_unittest.cc', - 'precache/core/fetcher_pool_unittest.cc', - 'precache/core/precache_database_unittest.cc', - 'precache/core/precache_fetcher_unittest.cc', - 'precache/core/precache_referrer_host_table_unittest.cc', - 'precache/core/precache_session_table_unittest.cc', - 'precache/core/precache_url_table_unittest.cc', - ], - 'user_prefs_unittest_sources': [ - 'user_prefs/tracked/device_id_unittest.cc', - 'user_prefs/tracked/pref_hash_calculator_unittest.cc', - 'user_prefs/tracked/pref_hash_filter_unittest.cc', - 'user_prefs/tracked/pref_hash_store_impl_unittest.cc', - 'user_prefs/tracked/registry_hash_store_contents_win_unittest.cc', - 'user_prefs/tracked/segregated_pref_store_unittest.cc', - 'user_prefs/tracked/tracked_preferences_migration_unittest.cc', - ], - 'proximity_auth_unittest_sources': [ - 'proximity_auth/ble/bluetooth_low_energy_characteristics_finder_unittest.cc', - 'proximity_auth/ble/bluetooth_low_energy_connection_finder_unittest.cc', - 'proximity_auth/ble/bluetooth_low_energy_connection_unittest.cc', - 'proximity_auth/ble/bluetooth_low_energy_device_whitelist_unittest.cc', - 'proximity_auth/ble/bluetooth_low_energy_weave_client_connection_unittest.cc', - 'proximity_auth/ble/bluetooth_low_energy_weave_packet_generator_unittest.cc', - 'proximity_auth/ble/bluetooth_low_energy_weave_packet_receiver_unittest.cc', - 'proximity_auth/bluetooth_connection_finder_unittest.cc', - 'proximity_auth/bluetooth_connection_unittest.cc', - 'proximity_auth/bluetooth_throttler_impl_unittest.cc', - 'proximity_auth/connection_unittest.cc', - 'proximity_auth/cryptauth/cryptauth_access_token_fetcher_impl_unittest.cc', - 'proximity_auth/cryptauth/cryptauth_api_call_flow_unittest.cc', - 'proximity_auth/cryptauth/cryptauth_client_impl_unittest.cc', - 'proximity_auth/cryptauth/cryptauth_device_manager_unittest.cc', - 'proximity_auth/cryptauth/cryptauth_enroller_impl_unittest.cc', - 'proximity_auth/cryptauth/cryptauth_enrollment_manager_unittest.cc', - 'proximity_auth/cryptauth/cryptauth_gcm_manager_impl_unittest.cc', - 'proximity_auth/cryptauth/fake_secure_message_delegate_unittest.cc', - 'proximity_auth/cryptauth/sync_scheduler_impl_unittest.cc', - 'proximity_auth/device_to_device_authenticator_unittest.cc', - 'proximity_auth/device_to_device_operations_unittest.cc', - 'proximity_auth/device_to_device_operations_unittest.cc', - 'proximity_auth/device_to_device_secure_context_unittest.cc', - 'proximity_auth/logging/logging_unittest.cc', - 'proximity_auth/messenger_impl_unittest.cc', - 'proximity_auth/proximity_auth_pref_manager_unittest.cc', - 'proximity_auth/proximity_auth_system_unittest.cc', - 'proximity_auth/proximity_monitor_impl_unittest.cc', - 'proximity_auth/remote_device_life_cycle_impl_unittest.cc', - 'proximity_auth/remote_device_loader_unittest.cc', - 'proximity_auth/remote_status_update_unittest.cc', - 'proximity_auth/throttled_bluetooth_connection_finder_unittest.cc', - 'proximity_auth/unlock_manager_unittest.cc', - 'proximity_auth/wire_message_unittest.cc', - ], - 'proxy_config_unittest_sources': [ - 'proxy_config/pref_proxy_config_tracker_impl_unittest.cc', - 'proxy_config/proxy_config_dictionary_unittest.cc', - 'proxy_config/proxy_prefs_unittest.cc', - ], - 'prefs_unittest_sources': [ - 'prefs/default_pref_store_unittest.cc', - 'prefs/in_memory_pref_store_unittest.cc', - 'prefs/json_pref_store_unittest.cc', - 'prefs/overlay_user_pref_store_unittest.cc', - 'prefs/pref_change_registrar_unittest.cc', - 'prefs/pref_member_unittest.cc', - 'prefs/pref_notifier_impl_unittest.cc', - 'prefs/pref_service_unittest.cc', - 'prefs/pref_value_map_unittest.cc', - 'prefs/pref_value_store_unittest.cc', - 'prefs/scoped_user_pref_update_unittest.cc', - ], - 'previews_unittest_sources': [ - 'previews/previews_experiments_unittest.cc', - ], - 'query_parser_unittest_sources': [ - 'query_parser/query_parser_unittest.cc', - 'query_parser/snippet_unittest.cc', - ], - 'rappor_unittest_sources': [ - 'rappor/bloom_filter_unittest.cc', - 'rappor/byte_vector_utils_unittest.cc', - 'rappor/log_uploader_unittest.cc', - 'rappor/rappor_metric_unittest.cc', - 'rappor/rappor_prefs_unittest.cc', - 'rappor/rappor_service_unittest.cc', - 'rappor/rappor_utils_unittest.cc', - 'rappor/reports_unittest.cc', - 'rappor/sampler_unittest.cc', - ], - 'rlz_unittest_sources': [ - 'rlz/rlz_tracker_unittest.cc', - ], - 'safe_browsing_db_mobile_unittest_sources': [ - 'safe_browsing_db/remote_database_manager_unittest.cc', - 'safe_browsing_db/safe_browsing_api_handler_unittest.cc', - ], - 'safe_browsing_db_unittest_sources': [ - 'safe_browsing_db/database_manager_unittest.cc', - 'safe_browsing_db/prefix_set_unittest.cc', - 'safe_browsing_db/testing_util.h', - 'safe_browsing_db/util_unittest.cc', - 'safe_browsing_db/v4_database_unittest.cc', - 'safe_browsing_db/v4_get_hash_protocol_manager_unittest.cc', - 'safe_browsing_db/v4_protocol_manager_util_unittest.cc', - 'safe_browsing_db/v4_rice_unittest.cc', - 'safe_browsing_db/v4_store_unittest.cc', - 'safe_browsing_db/v4_update_protocol_manager_unittest.cc', - ], - 'safe_json_unittest_sources': [ - 'safe_json/json_sanitizer_unittest.cc', - 'safe_json/testing_json_parser_unittest.cc', - ], - 'search_unittest_sources': [ - 'search/search_android_unittest.cc', - 'search/search_unittest.cc', - ], - 'search_engines_unittest_sources': [ - 'search_engines/default_search_manager_unittest.cc', - 'search_engines/default_search_policy_handler_unittest.cc', - 'search_engines/default_search_pref_migration_unittest.cc', - 'search_engines/keyword_table_unittest.cc', - 'search_engines/search_engine_data_type_controller_unittest.cc', - 'search_engines/search_host_to_urls_map_unittest.cc', - 'search_engines/template_url_prepopulate_data_unittest.cc', - 'search_engines/template_url_service_util_unittest.cc', - 'search_engines/template_url_unittest.cc', - ], - 'search_provider_logos_unittest_sources': [ - 'search_provider_logos/logo_cache_unittest.cc', - 'search_provider_logos/logo_tracker_unittest.cc', - ], - 'security_state_unittest_sources': [ - 'security_state/security_state_model_unittest.cc', - ], - 'sessions_unittest_sources': [ - 'sessions/content/content_serialized_navigation_builder_unittest.cc', - 'sessions/content/content_serialized_navigation_driver_unittest.cc', - 'sessions/core/serialized_navigation_entry_unittest.cc', - 'sessions/core/session_backend_unittest.cc', - 'sessions/core/session_types_unittest.cc', - 'sessions/core/tab_restore_service_unittest.cc', - 'sessions/ios/ios_serialized_navigation_builder_unittest.mm', - 'sessions/ios/ios_serialized_navigation_driver_unittest.cc', - ], - 'signin_unittest_sources': [ - 'signin/core/browser/account_info_unittest.cc', - 'signin/core/browser/account_investigator_unittest.cc', - 'signin/core/browser/account_tracker_service_unittest.cc', - 'signin/core/browser/gaia_cookie_manager_service_unittest.cc', - 'signin/core/browser/refresh_token_annotation_request_unittest.cc', - 'signin/core/browser/signin_error_controller_unittest.cc', - 'signin/core/browser/signin_investigator_unittest.cc', - 'signin/core/browser/signin_status_metrics_provider_unittest.cc', - 'signin/core/browser/webdata/token_service_table_unittest.cc', - 'signin/ios/browser/account_consistency_service_unittest.mm', - 'signin/ios/browser/profile_oauth2_token_service_ios_delegate_unittest.mm', - ], - 'spellcheck_unittest_sources': [ - 'spellcheck/renderer/custom_dictionary_engine_unittest.cc', - 'spellcheck/renderer/spellcheck_multilingual_unittest.cc', - 'spellcheck/renderer/spellcheck_provider_hunspell_unittest.cc', - 'spellcheck/renderer/spellcheck_provider_mac_unittest.cc', - 'spellcheck/renderer/spellcheck_provider_test.cc', - 'spellcheck/renderer/spellcheck_provider_test.h', - 'spellcheck/renderer/spellcheck_unittest.cc', - 'spellcheck/renderer/spellcheck_worditerator_unittest.cc', - ], - 'ssl_config_unittest_sources': [ - 'ssl_config/ssl_config_service_manager_pref_unittest.cc', - ], - 'ssl_errors_unittest_sources': [ - 'ssl_errors/error_classification_unittest.cc' - ], - 'storage_monitor_unittest_sources': [ - 'storage_monitor/image_capture_device_manager_unittest.mm', - 'storage_monitor/media_storage_util_unittest.cc', - 'storage_monitor/media_transfer_protocol_device_observer_linux_unittest.cc', - 'storage_monitor/storage_info_unittest.cc', - 'storage_monitor/storage_monitor_chromeos_unittest.cc', - 'storage_monitor/storage_monitor_linux_unittest.cc', - 'storage_monitor/storage_monitor_mac_unittest.mm', - 'storage_monitor/storage_monitor_unittest.cc', - 'storage_monitor/storage_monitor_win_unittest.cc', - ], - 'subresource_filter_content_browser_unittest_sources': [ - 'subresource_filter/content/browser/content_ruleset_distributor_unittest.cc', - 'subresource_filter/content/browser/content_subresource_filter_driver_factory_unittest.cc', - 'subresource_filter/content/browser/subresource_filter_navigation_throttle_unittests.cc', - ], - 'subresource_filter_content_renderer_unittest_sources': [ - 'subresource_filter/content/renderer/document_subresource_filter_unittest.cc', - 'subresource_filter/content/renderer/subresource_filter_agent_unittest.cc', - ], - 'subresource_filter_core_browser_unittest_sources': [ - 'subresource_filter/core/browser/ruleset_service_unittest.cc', - 'subresource_filter/core/browser/subresource_filter_features_unittest.cc', - ], - 'subresource_filter_core_common_unittest_sources': [ - 'subresource_filter/core/common/closed_hash_map_unittest.cc', - 'subresource_filter/core/common/fuzzy_pattern_matching_unittest.cc', - 'subresource_filter/core/common/indexed_ruleset_unittest.cc', - 'subresource_filter/core/common/knuth_morris_pratt_unittest.cc', - 'subresource_filter/core/common/ngram_extractor_unittest.cc', - 'subresource_filter/core/common/string_splitter_unittest.cc', - 'subresource_filter/core/common/unindexed_ruleset_unittest.cc', - 'subresource_filter/core/common/url_pattern_matching_unittest.cc', - ], - 'suggestions_unittest_sources': [ - 'suggestions/blacklist_store_unittest.cc', - 'suggestions/image_manager_unittest.cc', - 'suggestions/suggestions_service_unittest.cc', - 'suggestions/suggestions_store_unittest.cc', - ], - 'supervised_user_error_page_unittest_sources': [ - 'supervised_user_error_page/supervised_user_error_page_unittest.cc', - ], - 'sync_unittest_sources': [ - 'sync/api/attachments/attachment_id_unittest.cc', - 'sync/api/attachments/attachment_metadata_unittest.cc', - 'sync/api/attachments/attachment_unittest.cc', - 'sync/api/entity_data_unittest.cc', - 'sync/api/model_type_service_unittest.cc', - 'sync/api/sync_change_unittest.cc', - 'sync/api/sync_data_unittest.cc', - 'sync/api/sync_error_unittest.cc', - 'sync/api/sync_merge_result_unittest.cc', - 'sync/driver/about_sync_util_unittest.cc', - 'sync/driver/backend_migrator_unittest.cc', - 'sync/driver/data_type_manager_impl_unittest.cc', - 'sync/driver/device_count_metrics_provider_unittest.cc', - 'sync/driver/device_info_data_type_controller_unittest.cc', - 'sync/driver/device_info_service_unittest.cc', - 'sync/driver/device_info_sync_service_unittest.cc', - 'sync/driver/device_info_util_unittest.cc', - 'sync/driver/frontend_data_type_controller_unittest.cc', - 'sync/driver/generic_change_processor_unittest.cc', - 'sync/driver/glue/browser_thread_model_worker_unittest.cc', - 'sync/driver/glue/sync_backend_host_impl_unittest.cc', - 'sync/driver/glue/sync_backend_registrar_unittest.cc', - 'sync/driver/glue/ui_model_worker_unittest.cc', - 'sync/driver/local_device_info_provider_unittest.cc', - 'sync/driver/model_association_manager_unittest.cc', - 'sync/driver/non_blocking_data_type_controller_unittest.cc', - 'sync/driver/non_ui_data_type_controller_unittest.cc', - 'sync/driver/non_ui_model_type_controller_unittest.cc', - 'sync/driver/profile_sync_auth_provider_unittest.cc', - 'sync/driver/shared_change_processor_unittest.cc', - 'sync/driver/startup_controller_unittest.cc', - 'sync/driver/sync_prefs_unittest.cc', - 'sync/driver/sync_stopped_reporter_unittest.cc', - 'sync/driver/sync_util_unittest.cc', - 'sync/driver/system_encryptor_unittest.cc', - 'sync/driver/ui_data_type_controller_unittest.cc', - 'sync/driver/ui_model_type_controller_unittest.cc', - 'sync/engine_impl/apply_control_data_updates_unittest.cc', - 'sync/engine_impl/backoff_delay_provider_unittest.cc', - 'sync/engine_impl/directory_commit_contribution_unittest.cc', - 'sync/engine_impl/directory_update_handler_unittest.cc', - 'sync/engine_impl/get_updates_processor_unittest.cc', - 'sync/engine_impl/model_type_worker_unittest.cc', - 'sync/engine_impl/sync_scheduler_unittest.cc', - 'sync/engine_impl/syncer_proto_util_unittest.cc', - 'sync/engine_impl/syncer_unittest.cc', - 'sync/engine_impl/syncer_util_unittest.cc', - 'sync/engine_impl/worker_entity_tracker_unittest.cc', - 'sync/core_impl/attachments/attachment_downloader_impl_unittest.cc', - 'sync/core_impl/attachments/attachment_service_impl_unittest.cc', - 'sync/core_impl/attachments/attachment_service_proxy_unittest.cc', - 'sync/core_impl/attachments/attachment_store_frontend_unittest.cc', - 'sync/core_impl/attachments/attachment_store_test_template.h', - 'sync/core_impl/attachments/attachment_uploader_impl_unittest.cc', - 'sync/core_impl/attachments/fake_attachment_downloader_unittest.cc', - 'sync/core_impl/attachments/fake_attachment_uploader_unittest.cc', - 'sync/core_impl/attachments/in_memory_attachment_store_unittest.cc', - 'sync/core_impl/attachments/on_disk_attachment_store_unittest.cc', - 'sync/core_impl/attachments/task_queue_unittest.cc', - 'sync/core_impl/debug_info_event_listener_unittest.cc', - 'sync/core/http_bridge_unittest.cc', - 'sync/core_impl/js_mutation_event_observer_unittest.cc', - 'sync/core_impl/js_sync_encryption_handler_observer_unittest.cc', - 'sync/core_impl/js_sync_manager_observer_unittest.cc', - 'sync/core_impl/model_type_connector_proxy_unittest.cc', - 'sync/core/model_type_store_backend_unittest.cc', - 'sync/core/model_type_store_impl_unittest.cc', - 'sync/core/processor_entity_tracker_unittest.cc', - 'sync/core_impl/protocol_event_buffer_unittest.cc', - 'sync/base/attachment_id_proto_unittest.cc', - 'sync/base/cancelation_signal_unittest.cc', - 'sync/base/enum_set_unittest.cc', - 'sync/base/node_ordinal_unittest.cc', - 'sync/base/ordinal_unittest.cc', - 'sync/base/unique_position_unittest.cc', - 'sync/core/change_record_unittest.cc', - 'sync/core/data_batch_impl_unittest.cc', - 'sync/engine/model_safe_worker_unittest.cc', - 'sync/sessions/sync_session_snapshot_unittest.cc', - 'sync/core/simple_metadata_change_list_unittest.cc', - 'sync/base/immutable_unittest.cc', - 'sync/base/proto_value_ptr_unittest.cc', - 'sync/base/weak_handle_unittest.cc', - 'sync/core/shared_model_type_processor_unittest.cc', - 'sync/core_impl/sync_encryption_handler_impl_unittest.cc', - 'sync/core_impl/sync_manager_impl_unittest.cc', - 'sync/core_impl/syncapi_server_connection_manager_unittest.cc', - 'sync/js/js_event_details_unittest.cc', - 'sync/js/sync_js_controller_unittest.cc', - 'sync/protocol/proto_enum_conversions_unittest.cc', - 'sync/protocol/proto_value_conversions_unittest.cc', - 'sync/sessions_impl/model_type_registry_unittest.cc', - 'sync/sessions_impl/nudge_tracker_unittest.cc', - 'sync/sessions_impl/status_controller_unittest.cc', - 'sync/syncable/directory_backing_store_unittest.cc', - 'sync/syncable/directory_unittest.cc', - 'sync/syncable/directory_unittest.h', - 'sync/syncable/entry_kernel_unittest.cc', - 'sync/syncable/model_type_unittest.cc', - 'sync/syncable/nigori_util_unittest.cc', - 'sync/syncable/parent_child_index_unittest.cc', - 'sync/syncable/syncable_enum_conversions_unittest.cc', - 'sync/syncable/syncable_id_unittest.cc', - 'sync/syncable/syncable_unittest.cc', - 'sync/syncable/syncable_util_unittest.cc', - 'sync/base/cryptographer_unittest.cc', - 'sync/base/data_type_histogram_unittest.cc', - 'sync/base/get_session_name_unittest.cc', - 'sync/base/nigori_unittest.cc', - 'sync/base/protobuf_unittest.cc', - ], - 'sync_bookmarks_unittest_sources': [ - 'sync_bookmarks/bookmark_data_type_controller_unittest.cc', - ], - 'sync_sessions_unittest_sources': [ - 'sync_sessions/favicon_cache_unittest.cc', - 'sync_sessions/revisit/bookmarks_page_revisit_observer_unittest.cc', - 'sync_sessions/revisit/current_tab_matcher_unittest.cc', - 'sync_sessions/revisit/offset_tab_matcher_unittest.cc', - 'sync_sessions/revisit/page_revisit_broadcaster_unittest.cc', - 'sync_sessions/revisit/sessions_page_revisit_observer_unittest.cc', - 'sync_sessions/revisit/typed_url_page_revisit_task_unittest.cc', - 'sync_sessions/session_data_type_controller_unittest.cc', - 'sync_sessions/sync_sessions_metrics_unittest.cc', - 'sync_sessions/synced_session_tracker_unittest.cc', - 'sync_sessions/tab_node_pool_unittest.cc', - ], - 'syncable_prefs_unittest_sources': [ - 'syncable_prefs/pref_model_associator_unittest.cc', - 'syncable_prefs/pref_service_syncable_unittest.cc', - ], - 'tracing_unittest_sources': [ - 'tracing/browser/trace_config_file_unittest.cc', - 'tracing/common/graphics_memory_dump_provider_android_unittest.cc', - 'tracing/common/process_metrics_memory_dump_provider_unittest.cc', - 'tracing/core/proto_utils_unittest.cc', - 'tracing/core/proto_zero_message_unittest.cc', - 'tracing/core/trace_buffer_writer_unittest.cc', - 'tracing/core/trace_ring_buffer_unittest.cc', - 'tracing/core/scattered_stream_writer_unittest.cc', - 'tracing/test/fake_scattered_buffer.cc', - 'tracing/test/proto_zero_generation_unittest.cc', - ], - 'translate_unittest_sources': [ - 'translate/core/browser/language_state_unittest.cc', - 'translate/core/browser/mock_translate_driver.cc', - 'translate/core/browser/translate_browser_metrics_unittest.cc', - 'translate/core/browser/translate_language_list_unittest.cc', - 'translate/core/browser/translate_manager_unittest.cc', - 'translate/core/browser/translate_prefs_unittest.cc', - 'translate/core/browser/translate_script_unittest.cc', - 'translate/core/browser/translate_ui_delegate_unittest.cc', - 'translate/core/common/translate_metrics_unittest.cc', - 'translate/core/common/translate_util_unittest.cc', - 'translate/core/language_detection/language_detection_util_unittest.cc', - 'translate/ios/browser/js_translate_manager_unittest.mm', - 'translate/ios/browser/language_detection_controller_unittest.mm', - 'translate/ios/browser/translate_controller_unittest.mm', - ], - 'zoom_unittest_sources': [ - 'zoom/page_zoom_unittests.cc', - ], - 'update_client_unittest_sources': [ - 'update_client/component_patcher_unittest.cc', - 'update_client/crx_downloader_unittest.cc', - 'update_client/persisted_data_unittest.cc', - 'update_client/ping_manager_unittest.cc', - 'update_client/request_sender_unittest.cc', - 'update_client/update_checker_unittest.cc', - 'update_client/update_client_unittest.cc', - 'update_client/update_query_params_unittest.cc', - 'update_client/update_response_unittest.cc', - 'update_client/utils_unittest.cc', - ], - 'upload_list_unittest_sources': [ - 'upload_list/upload_list_unittest.cc', - ], - 'url_formatter_unittest_sources': [ - 'url_formatter/elide_url_unittest.cc', - 'url_formatter/url_fixer_unittest.cc', - 'url_formatter/url_formatter_unittest.cc', - ], - 'url_matcher_unittest_sources': [ - 'url_matcher/regex_set_matcher_unittest.cc', - 'url_matcher/string_pattern_unittest.cc', - 'url_matcher/substring_set_matcher_unittest.cc', - 'url_matcher/url_matcher_factory_unittest.cc', - 'url_matcher/url_matcher_unittest.cc', - ], - 'user_manager_unittest_sources': [ - 'user_manager/user_unittest.cc', - ], - 'variations_unittest_sources': [ - 'variations/active_field_trials_unittest.cc', - 'variations/caching_permuted_entropy_provider_unittest.cc', - 'variations/entropy_provider_unittest.cc', - 'variations/experiment_labels_unittest.cc', - 'variations/metrics_util_unittest.cc', - 'variations/net/variations_http_headers_unittest.cc', - 'variations/service/ui_string_overrider_unittest.cc', - 'variations/service/variations_service_unittest.cc', - 'variations/study_filtering_unittest.cc', - 'variations/variations_associated_data_unittest.cc', - 'variations/variations_http_header_provider_unittest.cc', - 'variations/variations_request_scheduler_mobile_unittest.cc', - 'variations/variations_request_scheduler_unittest.cc', - 'variations/variations_seed_processor_unittest.cc', - 'variations/variations_seed_simulator_unittest.cc', - 'variations/variations_seed_store_unittest.cc', - ], - 'visitedlink_unittest_sources': [ - 'visitedlink/test/visitedlink_unittest.cc', - ], - 'wallpaper_unittest_sources': [ - 'wallpaper/wallpaper_resizer_unittest.cc', - ], - 'web_cache_unittest_sources': [ - 'web_cache/browser/web_cache_manager_unittest.cc', - ], - 'web_modal_unittest_sources': [ - 'web_modal/web_contents_modal_dialog_manager_unittest.cc', - ], - 'web_resource_unittest_sources': [ - 'web_resource/eula_accepted_notifier_unittest.cc', - 'web_resource/resource_request_allowed_notifier_unittest.cc', - ], - 'web_restrictions_unittest_sources' : [ - 'web_restrictions/browser/web_restrictions_client_unittest.cc', - 'web_restrictions/browser/web_restrictions_resource_throttle_unittest.cc', - ], - 'webcrypto_unittest_sources': [ - 'webcrypto/algorithms/aes_cbc_unittest.cc', - 'webcrypto/algorithms/aes_ctr_unittest.cc', - 'webcrypto/algorithms/aes_gcm_unittest.cc', - 'webcrypto/algorithms/aes_kw_unittest.cc', - 'webcrypto/algorithms/ecdh_unittest.cc', - 'webcrypto/algorithms/ecdsa_unittest.cc', - 'webcrypto/algorithms/hmac_unittest.cc', - 'webcrypto/algorithms/rsa_oaep_unittest.cc', - 'webcrypto/algorithms/rsa_pss_unittest.cc', - 'webcrypto/algorithms/rsa_ssa_unittest.cc', - 'webcrypto/algorithms/sha_unittest.cc', - 'webcrypto/algorithms/test_helpers.cc', - 'webcrypto/algorithms/test_helpers.h', - 'webcrypto/status_unittest.cc', - ], - 'webdata_unittest_sources': [ - 'webdata/common/web_database_migration_unittest.cc', - ], - }, - 'targets': [ - { - # GN version: //components:components_tests_pak - 'target_name': 'components_tests_pak', - 'type': 'none', - 'dependencies': [ - 'components_resources.gyp:components_resources', - 'components_strings.gyp:components_strings', - ], - 'actions': [ - { - 'action_name': 'repack_components_tests_pak', - 'variables': { - 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/components/components_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/components/strings/components_strings_en-US.pak', - ], - 'pak_output': '<(PRODUCT_DIR)/components_tests_resources.pak', - }, - 'includes': [ '../build/repack_action.gypi' ], - }, - ], - 'direct_dependent_settings': { - 'mac_bundle_resources': [ - '<(PRODUCT_DIR)/components_tests_resources.pak', - ], - }, - }, - { - # GN version: //components:components_unittests - 'target_name': 'components_unittests', - 'type': '<(gtest_target_type)', - 'sources': [ - 'test/run_all_unittests.cc', - - '<@(auto_login_parser_unittest_sources)', - '<@(autofill_unittest_sources)', - '<@(base32_unittest_sources)', - '<@(bookmarks_unittest_sources)', - '<@(browser_sync_unittest_sources)', - '<@(browser_watcher_unittest_sources)', - '<@(browsing_data_ui_unittest_sources)', - '<@(bubble_unittest_sources)', - '<@(captive_portal_unittest_sources)', - '<@(cast_certificate_unittest_sources)', - '<@(client_update_protocol_unittest_sources)', - '<@(cloud_devices_unittest_sources)', - '<@(component_updater_unittest_sources)', - '<@(content_settings_unittest_sources)', - '<@(crash_unittest_sources)', - '<@(crx_file_unittest_sources)', - '<@(data_reduction_proxy_unittest_sources)', - '<@(data_usage_unittest_sources)', - '<@(data_use_measurement_unittest_sources)', - '<@(device_event_log_unittest_sources)', - '<@(dom_distiller_unittest_sources)', - '<@(favicon_base_unittest_sources)', - '<@(favicon_unittest_sources)', - '<@(flags_ui_unittest_sources)', - '<@(gcm_driver_crypto_unittest_sources)', - '<@(gcm_driver_unittest_sources)', - '<@(google_unittest_sources)', - '<@(history_unittest_sources)', - '<@(image_fetcher_unittest_sources)', - '<@(instance_id_unittest_sources)', - '<@(json_schema_unittest_sources)', - '<@(keyed_service_unittest_sources)', - '<@(language_usage_metrics_unittest_sources)', - '<@(leveldb_proto_unittest_sources)', - '<@(link_header_util_unittest_sources)', - '<@(login_unittest_sources)', - '<@(memory_pressure_unittest_sources)', - '<@(metrics_unittest_sources)', - '<@(mime_util_unittest_sources)', - '<@(network_session_configurator_unittest_sources)', - '<@(network_time_unittest_sources)', - '<@(ntp_snippets_unittest_sources)', - '<@(ntp_tiles_unittest_sources)', - '<@(offline_pages_background_unittest_sources)', - '<@(offline_pages_unittest_sources)', - '<@(omnibox_unittest_sources)', - '<@(open_from_clipboard_unittest_sources)', - '<@(os_crypt_unittest_sources)', - '<@(password_manager_unittest_sources)', - '<@(precache_unittest_sources)', - '<@(proxy_config_unittest_sources)', - '<@(prefs_unittest_sources)', - '<@(previews_unittest_sources)', - '<@(query_parser_unittest_sources)', - '<@(rappor_unittest_sources)', - '<@(search_engines_unittest_sources)', - '<@(search_provider_logos_unittest_sources)', - '<@(search_unittest_sources)', - '<@(security_state_unittest_sources)', - '<@(sessions_unittest_sources)', - '<@(signin_unittest_sources)', - '<@(ssl_config_unittest_sources)', - '<@(ssl_errors_unittest_sources)', - '<@(subresource_filter_core_browser_unittest_sources)', - '<@(subresource_filter_core_common_unittest_sources)', - '<@(suggestions_unittest_sources)', - '<@(supervised_user_error_page_unittest_sources)', - '<@(sync_unittest_sources)', - '<@(sync_bookmarks_unittest_sources)', - '<@(sync_sessions_unittest_sources)', - '<@(syncable_prefs_unittest_sources)', - '<@(translate_unittest_sources)', - '<@(undo_unittest_sources)', - '<@(update_client_unittest_sources)', - '<@(upload_list_unittest_sources)', - '<@(url_formatter_unittest_sources)', - '<@(url_matcher_unittest_sources)', - '<@(user_prefs_unittest_sources)', - '<@(variations_unittest_sources)', - '<@(web_resource_unittest_sources)', - '<@(webdata_unittest_sources)', - 'net_log/net_log_file_writer_unittest.cc', - ], - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../base/base.gyp:test_support_base', - '../google_apis/google_apis.gyp:google_apis_test_support', - '../jingle/jingle.gyp:notifier_test_util', - '../net/net.gyp:net_test_support', - '../sql/sql.gyp:test_support_sql', - '../testing/gmock.gyp:gmock', - '../testing/gtest.gyp:gtest', - '../third_party/icu/icu.gyp:icui18n', - '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', - '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_util', - '../third_party/libjingle/libjingle.gyp:libjingle', - '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', - '../third_party/protobuf/protobuf.gyp:protobuf_lite', - '../third_party/re2/re2.gyp:re2', - '../ui/base/ui_base.gyp:ui_base', - '../ui/gfx/gfx.gyp:gfx', - '../ui/gfx/gfx.gyp:gfx_test_support', - '../ui/resources/ui_resources.gyp:ui_resources', - '../ui/resources/ui_resources.gyp:ui_test_pak', - '../ui/strings/ui_strings.gyp:ui_strings', - '../url/url.gyp:url_lib', - 'components.gyp:auto_login_parser', - 'components.gyp:autofill_core_browser', - 'components.gyp:autofill_core_common', - 'components.gyp:autofill_core_test_support', - 'components.gyp:base32', - 'components.gyp:bookmarks_browser', - 'components.gyp:bookmarks_managed', - 'components.gyp:bookmarks_test_support', - 'components.gyp:browser_sync_browser', - 'components.gyp:browser_sync_browser_test_support', - 'components.gyp:browsing_data_ui', - 'components.gyp:bubble', - 'components.gyp:captive_portal_test_support', - 'components.gyp:cast_certificate', - 'components.gyp:cast_certificate_test_proto', - 'components.gyp:cast_certificate_test_support', - 'components.gyp:certificate_reporting', - 'components.gyp:cloud_devices_common', - 'components.gyp:component_updater', - 'components.gyp:component_updater_test_support', - 'components.gyp:content_settings_core_browser', - 'components.gyp:content_settings_core_common', - 'components.gyp:content_settings_core_test_support', - 'components.gyp:crash_core_common', - 'components.gyp:crx_file', - 'components.gyp:data_reduction_proxy_core_browser', - 'components.gyp:data_reduction_proxy_core_common', - 'components.gyp:data_reduction_proxy_test_support', - 'components.gyp:data_usage_core', - 'components.gyp:data_use_measurement_core', - 'components.gyp:device_event_log_component', - 'components.gyp:dom_distiller_core', - 'components.gyp:dom_distiller_protos', - 'components.gyp:dom_distiller_test_support', - 'components.gyp:favicon_base', - 'components.gyp:favicon_core', - 'components.gyp:flags_ui', - 'components.gyp:gcm_driver', - 'components.gyp:gcm_driver_test_support', - 'components.gyp:google_core_browser', - 'components.gyp:history_core_browser', - 'components.gyp:history_core_common', - 'components.gyp:history_core_test_support', - 'components.gyp:image_fetcher', - 'components.gyp:instance_id_test_support', - 'components.gyp:invalidation_impl', - 'components.gyp:invalidation_test_support', - 'components.gyp:json_schema', - 'components.gyp:keyed_service_core', - 'components.gyp:language_usage_metrics', - 'components.gyp:leveldb_proto', - 'components.gyp:leveldb_proto_test_support', - 'components.gyp:login', - 'components.gyp:memory_pressure', - 'components.gyp:metrics', - 'components.gyp:metrics_net', - 'components.gyp:metrics_profiler', - 'components.gyp:metrics_test_support', - 'components.gyp:metrics_ui', - 'components.gyp:net_log', - 'components.gyp:network_session_configurator', - 'components.gyp:network_time', - 'components.gyp:ntp_snippets', - 'components.gyp:ntp_tiles', - 'components.gyp:offline_pages', - 'components.gyp:offline_pages_background_offliner', - 'components.gyp:offline_pages_test_support', - 'components.gyp:omnibox_browser', - 'components.gyp:omnibox_test_support', - 'components.gyp:open_from_clipboard', - 'components.gyp:open_from_clipboard_test_support', - 'components.gyp:os_crypt', - 'components.gyp:os_crypt_test_support', - 'components.gyp:password_manager_core_browser', - 'components.gyp:password_manager_core_browser_test_support', - 'components.gyp:password_manager_sync_browser', - 'components.gyp:precache_core', - 'components.gyp:pref_registry_test_support', - 'components.gyp:previews', - 'components.gyp:proxy_config', - 'components.gyp:query_parser', - 'components.gyp:rappor', - 'components.gyp:rappor_test_support', - 'components.gyp:search', - 'components.gyp:search_engines', - 'components.gyp:search_engines_test_support', - 'components.gyp:search_provider_logos', - 'components.gyp:security_state', - 'components.gyp:sessions_test_support', - 'components.gyp:signin_core_browser', - 'components.gyp:signin_core_browser_test_support', - 'components.gyp:spellcheck_renderer', - 'components.gyp:ssl_config', - 'components.gyp:ssl_errors', - 'components.gyp:subresource_filter_core_browser_test_support', - 'components.gyp:subresource_filter_core_browser', - 'components.gyp:subresource_filter_core_common', - 'components.gyp:subresource_filter_core_common_test_support', - 'components.gyp:suggestions', - 'components.gyp:supervised_user_error_page', - 'components.gyp:sync_bookmarks', - 'components.gyp:sync_sessions', - 'components.gyp:sync_sessions_test_support', - 'components.gyp:syncable_prefs_test_support', - 'components.gyp:toolbar_test_support', - 'components.gyp:translate_core_browser', - 'components.gyp:translate_core_common', - 'components.gyp:translate_core_language_detection', - 'components.gyp:undo_component', - 'components.gyp:update_client', - 'components.gyp:update_client_test_support', - 'components.gyp:upload_list', - 'components.gyp:url_matcher', - 'components.gyp:user_prefs_tracked', - 'components.gyp:user_prefs_tracked_test_support', - 'components.gyp:variations', - 'components.gyp:variations_net', - 'components.gyp:variations_service', - 'components.gyp:version_info', - 'components.gyp:webdata_services_test_support', - 'components.gyp:web_resource', - 'components.gyp:web_resource_test_support', - 'components_resources.gyp:components_resources', - 'components_strings.gyp:components_strings', - 'components_tests_pak', - 'link_header_util/link_header_util.gyp:link_header_util', - 'mime_util/mime_util.gyp:mime_util', - 'prefs/prefs.gyp:prefs', - 'prefs/prefs.gyp:prefs_test_support', - 'sync.gyp:sync', - 'sync.gyp:test_support_sync_api', - 'sync.gyp:test_support_sync_core', - 'sync.gyp:test_support_sync_core_impl', - 'sync.gyp:test_support_sync_driver', - 'url_formatter/url_formatter.gyp:url_formatter', - ], - 'conditions': [ - ['OS!="mac" and OS!="ios"', { - 'sources!': [ - 'crash/core/common/objc_zombie_unittest.mm', - ], - }], - ['enable_rlz_support==1', { - 'sources': [ - '<@(rlz_unittest_sources)', - ], - 'dependencies': [ - '../net/net.gyp:net_test_support', - '../rlz/rlz.gyp:test_support_rlz', - 'components.gyp:rlz', - ], - 'conditions': [ - ['OS == "ios"', { - 'dependencies': [ - '../ui/base/ui_base.gyp:ui_base', - ], - }], - ], - }], - ['toolkit_views == 1', { - 'sources': [ - 'bookmarks/browser/bookmark_node_data_unittest.cc', - 'constrained_window/constrained_window_views_unittest.cc', - ], - 'dependencies': [ - '<(DEPTH)/ui/views/views.gyp:views', - '<(DEPTH)/ui/views/views.gyp:views_test_support', - 'components.gyp:constrained_window', - ] - }], - ['enable_spellcheck==1', { - 'sources': [ '<@(spellcheck_unittest_sources)' ], - 'conditions': [ - ['OS=="android"', { - 'sources!': [ - 'spellcheck/renderer/spellcheck_multilingual_unittest.cc', - 'spellcheck/renderer/spellcheck_provider_hunspell_unittest.cc', - 'spellcheck/renderer/spellcheck_unittest.cc', - ], - }], - ['OS=="mac"', { - 'sources!': [ - 'spellcheck/renderer/spellcheck_multilingual_unittest.cc', - 'spellcheck/renderer/spellcheck_provider_hunspell_unittest.cc', - ], - }], - ], - }], - ['OS=="win"', { - 'dependencies': [ - 'components.gyp:browser_watcher', - 'components.gyp:browser_watcher_client', - ] - }], - ['OS != "ios"', { - 'sources': [ - '<@(certificate_reporting_unittest_sources)', - '<@(certificate_transparency_unittest_sources)', - '<@(child_trace_message_filter_unittest_sources)', - '<@(devtools_http_handler_unittest_sources)', - '<@(display_compositor_unittest_sources)', - '<@(domain_reliability_unittest_sources)', - '<@(error_page_unittest_sources)', - '<@(guest_view_unittest_sources)', - '<@(memory_coordinator_unittest_sources)', - '<@(navigation_interception_unittest_sources)', - '<@(network_hints_unittest_sources)', - '<@(packed_ct_ev_whitelist_unittest_sources)', - '<@(power_unittest_sources)', - '<@(safe_browsing_db_unittest_sources)', - '<@(safe_json_unittest_sources)', - '<@(storage_monitor_unittest_sources)', - '<@(subresource_filter_content_browser_unittest_sources)', - '<@(subresource_filter_content_renderer_unittest_sources)', - '<@(tracing_unittest_sources)', - '<@(visitedlink_unittest_sources)', - '<@(wallpaper_unittest_sources)', - '<@(web_cache_unittest_sources)', - '<@(webcrypto_unittest_sources)', - '<@(web_modal_unittest_sources)', - '<@(zoom_unittest_sources)', - ], - 'dependencies': [ - '../content/content_shell_and_tests.gyp:test_support_content', - '../mojo/mojo_base.gyp:mojo_common_lib', - '../skia/skia.gyp:skia', - 'components.gyp:autofill_content_browser', - 'components.gyp:autofill_content_renderer', - 'components.gyp:autofill_content_test_support', - 'components.gyp:autofill_content_test_types_mojo_bindings', - 'components.gyp:certificate_transparency', - 'components.gyp:crash_test_support', - 'components.gyp:data_reduction_proxy_content_browser', - 'components.gyp:data_use_measurement_content', - 'components.gyp:devtools_http_handler', - 'components.gyp:display_compositor', - 'components.gyp:dom_distiller_content_browser', - 'components.gyp:dom_distiller_content_renderer', - 'components.gyp:domain_reliability', - 'components.gyp:error_page_renderer', - 'components.gyp:favicon_content', - 'components.gyp:guest_view_browser', - 'components.gyp:guest_view_common', - 'components.gyp:guest_view_test_support', - 'components.gyp:history_content_browser', - 'components.gyp:keyed_service_content', - 'components.gyp:memory_coordinator_browser', - 'components.gyp:memory_coordinator_child', - 'components.gyp:metrics_gpu', - 'components.gyp:navigation_interception', - 'components.gyp:network_hints_renderer', - 'components.gyp:packed_ct_ev_whitelist', - 'components.gyp:password_manager_content_browser', - 'components.gyp:power', - 'components.gyp:precache_content', - 'components.gyp:safe_browsing_db', - 'components.gyp:safe_json', - 'components.gyp:safe_json_test_support', - 'components.gyp:sessions_content', - 'components.gyp:storage_monitor', - 'components.gyp:storage_monitor_test_support', - 'components.gyp:subresource_filter_content_browser', - 'components.gyp:subresource_filter_content_common', - 'components.gyp:subresource_filter_content_renderer', - 'components.gyp:subresource_filter_core_browser', - 'components.gyp:test_database_manager', - 'components.gyp:url_matcher', - 'components.gyp:visitedlink_browser', - 'components.gyp:visitedlink_renderer', - 'components.gyp:wallpaper', - 'components.gyp:web_cache_browser', - 'components.gyp:web_modal', - 'components.gyp:web_modal_test_support', - 'components.gyp:zoom', - 'test_runner/test_runner.gyp:test_runner', - 'tracing.gyp:golden_protos_for_tests', - 'tracing.gyp:proto_zero_testing_messages', - 'tracing.gyp:tracing', - 'webcrypto/webcrypto.gyp:webcrypto', - '../third_party/boringssl/boringssl.gyp:boringssl', - '../third_party/re2/re2.gyp:re2', - ], - 'conditions': [ - ['OS=="android"', { - 'sources' : [ - '<@(web_restrictions_unittest_sources)', - ], - 'dependencies': [ - 'components.gyp:web_restrictions_browser', - 'components.gyp:web_restrictions_test_support', - '../build/android/ndk.gyp:cpu_features', - ], - }], - ['OS=="android" and configuration_policy == 1', { - 'dependencies': [ - 'components.gyp:policy_java', - ], - }], - ['safe_browsing == 2 and OS != "ios"', { - 'dependencies': [ - 'components.gyp:safe_browsing_db_mobile', - ], - 'sources': [ - '<@(safe_browsing_db_mobile_unittest_sources)', - ], - }], - ['OS != "mac" and use_aura == 0', { - 'sources!': [ - 'display_compositor/buffer_queue_unittest.cc', - ], - }], - ], - }, { # 'OS == "ios"' - 'sources/': [ - # Exclude all tests that depends on //content (based on layered- - # component directory structure). - ['exclude', '^[^/]*/content/'], - ], - 'sources!': [ - 'core/http_bridge_unittest.cc', - ], - 'mac_bundle_resources': [ - '<(PRODUCT_DIR)/ui_test.pak', - ], - 'dependencies': [ - '../ios/web/ios_web.gyp:ios_web_test_support', - '../third_party/ocmock/ocmock.gyp:ocmock', - 'components.gyp:autofill_ios_browser', - 'components.gyp:sessions_ios', - 'components.gyp:signin_ios_browser', - 'components.gyp:signin_ios_browser_test_support', - 'components.gyp:translate_ios_browser', - ], - 'actions': [ - { - 'action_name': 'copy_test_data', - 'variables': { - 'test_data_files': [ - '../net/data/ssl/certificates', - 'test/data', - ], - 'test_data_prefix': 'components', - }, - 'includes': [ '../build/copy_test_data_ios.gypi' ], - }, - ], - 'conditions': [ - ['configuration_policy==1', { - 'sources/': [ - ['include', '^policy/'], - ], - }], - ], - }], - ['disable_nacl==0', { - 'sources': [ - '<@(nacl_unittest_sources)', - ], - 'dependencies': [ - 'nacl.gyp:nacl_browser', - 'nacl.gyp:nacl_common', - ], - }], - ['OS == "mac"', { - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/AddressBook.framework', - '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', - '$(SDKROOT)/System/Library/Frameworks/ImageCaptureCore.framework', - ], - }, - 'sources!': [ - 'password_manager/core/browser/password_store_default_unittest.cc', - ], - }], - ['OS == "android"', { - 'sources': [ - 'autofill/core/browser/autofill_assistant_unittest.cc', - 'data_usage/android/traffic_stats_amortizer_unittest.cc', - 'invalidation/impl/invalidation_logger_unittest.cc', - 'invalidation/impl/invalidation_service_android_unittest.cc', - ], - 'sources!': [ - 'gcm_driver/gcm_account_mapper_unittest.cc', - 'gcm_driver/gcm_channel_status_request_unittest.cc', - 'gcm_driver/gcm_client_impl_unittest.cc', - 'gcm_driver/gcm_driver_desktop_unittest.cc', - 'gcm_driver/gcm_stats_recorder_impl_unittest.cc', - 'sessions/core/session_backend_unittest.cc', - 'storage_monitor/media_storage_util_unittest.cc', - 'storage_monitor/storage_info_unittest.cc', - 'storage_monitor/storage_monitor_unittest.cc', - 'web_modal/web_contents_modal_dialog_manager_unittest.cc', - ], - 'dependencies': [ - 'components.gyp:data_usage_android', - 'components.gyp:safe_json_java', - 'components.gyp:variations_java', - '../content/content.gyp:content_java', - '../testing/android/native_test.gyp:native_test_native_code', - ], - 'dependencies!': [ - 'components.gyp:storage_monitor', - 'components.gyp:storage_monitor_test_support', - 'components.gyp:web_modal', - 'components.gyp:web_modal_test_support', - ], - }, { - 'sources': [ - '<@(invalidation_unittest_sources)', - ], - }], - ['OS != "ios" and OS != "android"', { - 'sources': [ - '<@(feedback_unittest_sources)', - '<@(proximity_auth_unittest_sources)', - ], - 'sources!': [ - 'variations/variations_request_scheduler_mobile_unittest.cc', - 'web_resource/promo_resource_service_mobile_ntp_unittest.cc', - ], - 'dependencies': [ - '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks', - '../device/core/core.gyp:device_core', - '../device/core/core.gyp:device_core_mocks', - '../device/hid/hid.gyp:device_hid_mocks', - '../device/usb/usb.gyp:device_usb', - '../device/usb/usb.gyp:device_usb_mocks', - '../google_apis/google_apis.gyp:google_apis_test_support', - '../third_party/protobuf/protobuf.gyp:protobuf_lite', - 'components.gyp:cryptauth', - 'components.gyp:cryptauth_proto', - 'components.gyp:cryptauth_test_support', - 'components.gyp:feedback_component', - 'components.gyp:pref_registry_test_support', - 'components.gyp:proximity_auth', - 'components.gyp:proximity_auth_test_support', - ], - }], - ['chromeos==1', { - 'sources': [ - 'arc/arc_bridge_service_unittest.cc', - 'arc/ime/arc_ime_service_unittest.cc', - 'arc/intent_helper/activity_icon_loader_unittest.cc', - 'arc/intent_helper/arc_intent_helper_bridge_unittest.cc', - 'arc/intent_helper/font_size_util_unittest.cc', - 'arc/intent_helper/intent_filter_unittest.cc', - 'arc/intent_helper/link_handler_model_impl_unittest.cc', - 'pairing/message_buffer_unittest.cc', - 'timers/alarm_timer_unittest.cc', - 'wifi_sync/wifi_config_delegate_chromeos_unittest.cc', - 'wifi_sync/wifi_credential_syncable_service_unittest.cc', - 'wifi_sync/wifi_credential_unittest.cc', - 'wifi_sync/wifi_security_class_chromeos_unittest.cc', - 'wifi_sync/wifi_security_class_unittest.cc', - '<@(metrics_leak_detector_unittest_sources)', - '<@(ownership_unittest_sources)', - '<@(user_manager_unittest_sources)', - ], - 'sources!': [ - 'signin/core/browser/account_investigator_unittest.cc', - 'signin/core/browser/signin_status_metrics_provider_unittest.cc', - 'storage_monitor/storage_monitor_linux_unittest.cc', - ], - 'dependencies': [ - '../chromeos/chromeos.gyp:chromeos_test_support', - 'components.gyp:arc', - 'components.gyp:arc_test_support', - 'components.gyp:metrics_leak_detector', - 'components.gyp:metrics_mojo_bindings', - 'components.gyp:ownership', - 'components.gyp:pairing', - 'components.gyp:user_manager_test_support', - 'components.gyp:wifi_sync', - ], - }], - ['OS=="linux"', { - 'sources': [ - 'metrics/serialization/serialization_utils_unittest.cc', - ], - 'dependencies': [ - 'components.gyp:metrics_serialization', - '../dbus/dbus.gyp:dbus', - '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol', - ], - }], - ['OS=="linux" and chromeos!=1', { - 'sources': [ - 'os_crypt/key_storage_kwallet_unittest.cc', - 'os_crypt/kwallet_dbus_unittest.cc', - 'os_crypt/os_crypt_linux_unittest.cc', - 'os_crypt/os_crypt_util_linux_unittest.cc', - ], - 'defines': [ - 'USE_KWALLET', - 'USE_LIBSECRET', - ], - 'include_dirs': [ - '../third_party/libsecret' - ], - 'dependencies' : [ - '../build/linux/system.gyp:dbus', - '../dbus/dbus.gyp:dbus', - '../dbus/dbus.gyp:dbus_test_support', - ] - }], - ['OS=="linux" and use_udev==0', { - 'dependencies!': [ - 'components.gyp:storage_monitor', - 'components.gyp:storage_monitor_test_support', - ], - 'sources/': [ - ['exclude', '^storage_monitor/'], - ], - }], - ['configuration_policy==1', { - 'dependencies': [ - 'components.gyp:policy_component', - 'components.gyp:policy_component_test_support', - 'components.gyp:policy_test_support', - ], - 'sources': [ - '<@(policy_unittest_sources)', - 'sync/driver/sync_policy_handler_unittest.cc', - ], - 'conditions': [ - ['OS=="android"', { - 'sources/': [ - ['exclude', '^policy/core/common/async_policy_provider_unittest\\.cc'], - ['exclude', '^tracing/browser/trace_config_file_unittest\\.cc'], - ], - }], - ['OS=="android" or OS=="ios"', { - # Note: 'sources!' is processed before any 'sources/', so the - # ['include', '^policy/'] on iOS above will include all of the - # policy source files again. Using 'source/' here too will get - # these files excluded as expected. - 'sources/': [ - ['exclude', '^policy/core/common/cloud/component_cloud_policy_service_unittest\\.cc'], - ['exclude', '^policy/core/common/cloud/component_cloud_policy_store_unittest\\.cc'], - ['exclude', '^policy/core/common/cloud/component_cloud_policy_updater_unittest\\.cc'], - ['exclude', '^policy/core/common/cloud/external_policy_data_fetcher_unittest\\.cc'], - ['exclude', '^policy/core/common/cloud/external_policy_data_updater_unittest\\.cc'], - ['exclude', '^policy/core/common/cloud/resource_cache_unittest\\.cc'], - ['exclude', '^policy/core/common/config_dir_policy_loader_unittest\\.cc'], - ], - }], - ['chromeos==1', { - 'sources': [ - 'policy/core/common/proxy_policy_provider_unittest.cc', - ], - 'sources!': [ - 'policy/core/common/cloud/user_cloud_policy_manager_unittest.cc', - 'policy/core/common/cloud/user_cloud_policy_store_unittest.cc', - ], - }], - ['OS=="ios" or OS=="mac"', { - 'sources': [ - 'policy/core/common/mac_util_unittest.cc', - ], - }], - ], - }, { # configuration_policy!=1 - 'sources!': [ - 'search_engines/default_search_policy_handler_unittest.cc', - 'sync/driver/sync_policy_handler_unittest.cc', - ], - }], - ['enable_plugins == 1', { - 'sources': [ - 'content_settings/core/browser/content_settings_provider_unittest.cc', - ], - }], - ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [4267, ], - }, - ], - 'conditions': [ - ['OS == "android"', { - 'variables': { - 'components_browsertests_pak_input_resources': [ - '<(PRODUCT_DIR)/components_tests_resources.pak', - '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak', - ], - 'conditions': [ - ['icu_use_data_file_flag==1', { - 'components_browsertests_pak_input_resources': [ - '<(PRODUCT_DIR)/icudtl.dat', - ], - }], - ], - }, - 'includes': ['../build/android/v8_external_startup_data_arch_suffix.gypi'], - 'targets': [ - { - 'target_name': 'components_browsertests_paks_copy', - 'type': 'none', - 'dependencies': [ - 'components_browsertests', - ], - 'variables': { - 'dest_path': '<(PRODUCT_DIR)/components_browsertests_apk_shell/assets', - 'src_files': [ - '<@(components_browsertests_pak_input_resources)', - ], - 'clear': 1, - 'conditions': [ - ['v8_use_external_startup_data==1', { - 'renaming_sources': [ - '<(PRODUCT_DIR)/natives_blob.bin', - '<(PRODUCT_DIR)/snapshot_blob.bin', - ], - 'renaming_destinations': [ - 'natives_blob_<(arch_suffix).bin', - 'snapshot_blob_<(arch_suffix).bin', - ], - }], - ], - }, - 'includes': ['../build/android/copy_ex.gypi'], - }, - { - 'target_name': 'components_browsertests_manifest', - 'type': 'none', - 'variables': { - 'jinja_inputs': ['test/android/browsertests_apk/AndroidManifest.xml.jinja2'], - 'jinja_output': '<(SHARED_INTERMEDIATE_DIR)/components_browsertests_manifest/AndroidManifest.xml', - }, - 'includes': [ '../build/android/jinja_template.gypi' ], - }, - { - # GN: //components:components_browsertests_apk - 'target_name': 'components_browsertests_apk', - 'type': 'none', - 'dependencies': [ - '../content/content.gyp:content_java', - '../content/content_shell_and_tests.gyp:content_java_test_support', - '../content/content_shell_and_tests.gyp:content_shell_browsertests_java', - '../content/content_shell_and_tests.gyp:content_shell_java', - 'components_browsertests_paks_copy', - 'components_browsertests', - ], - 'variables': { - 'test_suite_name': 'components_browsertests', - 'isolate_file': 'components_browsertests.isolate', - 'java_in_dir': 'test/android/browsertests_apk', - 'android_manifest_path': '<(SHARED_INTERMEDIATE_DIR)/components_browsertests_manifest/AndroidManifest.xml', - 'resource_dir': 'test/android/browsertests_apk/res', - 'asset_location': '<(PRODUCT_DIR)/components_browsertests_apk_shell/assets', - 'conditions': [ - ['icu_use_data_file_flag==1', { - 'additional_input_paths': [ - '<(asset_location)/icudtl.dat', - ], - }], - ['v8_use_external_startup_data==1', { - 'additional_input_paths': [ - '<(asset_location)/natives_blob_<(arch_suffix).bin', - '<(asset_location)/snapshot_blob_<(arch_suffix).bin', - ], - }], - ], - }, - 'includes': [ '../build/apk_browsertest.gypi' ], - }, - { - 'target_name': 'components_unittests_apk', - 'isolate_file': 'components_unittests.isolate', - 'type': 'none', - 'dependencies': [ - 'components_unittests', - 'components.gyp:instance_id_driver_java', - 'components.gyp:instance_id_driver_test_support_java', - 'components.gyp:invalidation_java', - 'components.gyp:signin_core_browser_java', - 'components.gyp:web_restrictions_test_support_java', - ], - 'variables': { - 'test_suite_name': 'components_unittests', - }, - 'includes': [ '../build/apk_test.gypi' ], - }, - { - 'target_name': 'components_junit_tests', - 'type': 'none', - 'dependencies': [ - 'components.gyp:invalidation_java', - 'components.gyp:policy_java', - 'components.gyp:policy_java_test_support', - 'components.gyp:web_restrictions_java_browser', - '../base/base.gyp:base_java', - '../base/base.gyp:base_java_test_support', - '../testing/android/junit/junit_test.gyp:junit_test_support', - ], - 'variables': { - 'main_class': 'org.chromium.testing.local.JunitTestMain', - 'src_paths': [ - 'invalidation/impl/android/junit/', - 'policy/android/junit/', - 'web_restrictions/browser/junit/' - ], - 'wrapper_script_name': 'helper/<(_target_name)', - }, - 'includes': [ '../build/host_jar.gypi' ], - }, - ], - 'conditions': [ - ['test_isolation_mode != "noop"', - { - 'targets': [ - { - 'target_name': 'components_browsertests_apk_run', - 'type': 'none', - 'dependencies': [ - 'components_browsertests_apk', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'components_browsertests_apk.isolate', - ], - }, - { - 'target_name': 'components_unittests_apk_run', - 'type': 'none', - 'dependencies': [ - 'components_unittests_apk', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'components_unittests_apk.isolate', - ], - }, - ], - }, - ], - ], - }], - ['OS != "ios"', { - 'targets': [ - { - # GN: //components:components_perftests - 'target_name': 'components_perftests', - 'type': '<(gtest_target_type)', - 'dependencies': [ - '../base/base.gyp:base', - '../base/base.gyp:test_support_perf', - '../content/content_shell_and_tests.gyp:test_support_content', - '../testing/gtest.gyp:gtest', - '../testing/perf/perf_test.gyp:perf_test', - 'components.gyp:visitedlink_browser', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'scheduler/base/task_queue_manager_delegate_for_test.cc', - 'scheduler/base/task_queue_manager_delegate_for_test.h', - 'scheduler/base/task_queue_manager_perftest.cc', - 'scheduler/base/test_task_time_tracker.h', - 'visitedlink/test/visitedlink_perftest.cc', - ], - 'conditions': [ - ['OS == "android"', { - 'dependencies': [ - '../testing/android/native_test.gyp:native_test_native_code', - ], - }], - ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [ 4267, ], - }, - { - 'target_name': 'components_browsertests', - 'type': '<(gtest_target_type)', - 'defines!': ['CONTENT_IMPLEMENTATION'], - 'dependencies': [ - '../content/content.gyp:content_common', - '../content/content.gyp:content_gpu', - '../content/content.gyp:content_renderer', - '../content/content_shell_and_tests.gyp:content_browser_test_base', - '../content/content_shell_and_tests.gyp:content_browser_test_support', - '../content/content_shell_and_tests.gyp:content_shell_lib', - '../content/content_shell_and_tests.gyp:content_shell_pak', - '../content/content_shell_and_tests.gyp:test_support_content', - '../skia/skia.gyp:skia', - '../testing/gmock.gyp:gmock', - '../testing/gtest.gyp:gtest', - 'components.gyp:autofill_content_browser', - 'components.gyp:autofill_content_renderer', - 'components.gyp:content_settings_core_browser', - 'components.gyp:content_settings_core_common', - 'components.gyp:dom_distiller_content_browser', - 'components.gyp:dom_distiller_content_renderer', - 'components.gyp:dom_distiller_core', - 'components.gyp:password_manager_content_renderer', - 'components.gyp:pref_registry_test_support', - 'components_resources.gyp:components_resources', - 'components_strings.gyp:components_strings', - 'components_tests_pak', - 'tracing.gyp:tracing', - ], - 'include_dirs': [ - '..', - ], - 'defines': [ - 'HAS_OUT_OF_PROC_TEST_RUNNER', - ], - 'sources': [ - # Note: test list duplicated in GN build. - 'autofill/content/browser/risk/fingerprint_browsertest.cc', - 'autofill/content/renderer/password_form_conversion_utils_browsertest.cc', - 'dom_distiller/content/browser/distillable_page_utils_browsertest.cc', - 'dom_distiller/content/browser/distiller_page_web_contents_browsertest.cc', - 'dom_distiller/content/browser/test/dom_distiller_js_browsertest.cc', - 'password_manager/content/renderer/credential_manager_client_browsertest.cc', - 'tracing/child/child_trace_message_filter_browsertest.cc', - ], - 'conditions': [ - ['OS == "android"', { - 'sources' : [ - 'test/android/browsertests_apk/components_browser_tests_jni_onload.cc', - ], - 'sources!': [ - 'autofill/content/browser/risk/fingerprint_browsertest.cc', - ], - 'dependencies': [ - '../testing/android/native_test.gyp:native_test_support', - ], - }], - ['OS == "linux"', { - 'sources': [ - # content_extractor_browsertest is a standalone content extraction tool built as - # a MANUAL component_browsertest. - 'dom_distiller/standalone/content_extractor_browsertest.cc', - ], - }], - ['OS=="win"', { - 'resource_include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/content/app/resources', - ], - 'sources': [ - '../content/shell/app/resource.h', - '../content/shell/app/shell.rc', - ], - 'dependencies': [ - '<(DEPTH)/content/app/resources/content_resources.gyp:content_resources', - '<(DEPTH)/content/app/strings/content_strings.gyp:content_strings', - '<(DEPTH)/net/net.gyp:net_resources', - '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources', - '<(DEPTH)/third_party/iaccessible2/iaccessible2.gyp:iaccessible2', - '<(DEPTH)/third_party/isimpledom/isimpledom.gyp:isimpledom', - ], - 'configurations': { - 'Debug_Base': { - 'msvs_settings': { - 'VCLinkerTool': { - 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', - }, - }, - }, - }, - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [ 4267, ], - }], - ['OS=="mac"', { - 'dependencies': [ - '../content/content_shell_and_tests.gyp:content_shell', # Needed for Content Shell.app's Helper. - ], - }], - ['enable_basic_printing==1 or enable_print_preview==1', { - 'dependencies': [ - 'components.gyp:printing_test_support', - ], - 'sources' : [ - 'printing/test/print_web_view_helper_browsertest.cc', - ], - }] - ], - }, - ], - 'conditions': [ - ['test_isolation_mode != "noop"', { - 'targets': [ - { - 'target_name': 'components_browsertests_run', - 'type': 'none', - 'dependencies': [ 'components_browsertests' ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'components_browsertests.isolate', - ], - 'conditions': [ - ['use_x11==1', { - 'dependencies': [ - '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', - ], - }], - ], - }, - ], - }], - ], - }], - ['test_isolation_mode != "noop"', { - 'targets': [ - { - 'target_name': 'components_unittests_run', - 'type': 'none', - 'dependencies': [ - 'components_unittests', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'components_unittests.isolate', - ], - 'conditions': [ - ['use_x11==1', { - 'dependencies': [ - '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', - ], - }], - ], - }, - ], - }], - ], -}
diff --git a/components/constrained_window.gypi b/components/constrained_window.gypi deleted file mode 100644 index 9abba05d..0000000 --- a/components/constrained_window.gypi +++ /dev/null
@@ -1,24 +0,0 @@ -# Copyright 2014 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. -{ - 'targets': [ - { - 'target_name': 'constrained_window', - 'type': 'static_library', - 'dependencies': [ - '<(DEPTH)/components/components.gyp:web_modal', - '<(DEPTH)/ui/views/views.gyp:views', - '<(DEPTH)/skia/skia.gyp:skia', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'constrained_window/constrained_window_views.cc', - 'constrained_window/constrained_window_views.h', - 'constrained_window/constrained_window_views_client.h', - ], - }, - ], -}
diff --git a/components/content_settings.gypi b/components/content_settings.gypi deleted file mode 100644 index aafc0baa..0000000 --- a/components/content_settings.gypi +++ /dev/null
@@ -1,140 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/content_settings/core/browser - 'target_name': 'content_settings_core_browser', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - '../url/url.gyp:url_lib', - 'content_settings_core_common', - 'pref_registry', - 'prefs/prefs.gyp:prefs', - 'url_formatter/url_formatter.gyp:url_formatter', - ], - 'variables': { 'enable_wexit_time_destructors': 1, }, - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'content_settings/core/browser/content_settings_binary_value_map.cc', - 'content_settings/core/browser/content_settings_binary_value_map.h', - 'content_settings/core/browser/content_settings_client.h', - 'content_settings/core/browser/content_settings_default_provider.cc', - 'content_settings/core/browser/content_settings_default_provider.h', - 'content_settings/core/browser/content_settings_details.cc', - 'content_settings/core/browser/content_settings_details.h', - 'content_settings/core/browser/content_settings_info.cc', - 'content_settings/core/browser/content_settings_info.h', - 'content_settings/core/browser/content_settings_observable_provider.cc', - 'content_settings/core/browser/content_settings_observable_provider.h', - 'content_settings/core/browser/content_settings_observer.h', - 'content_settings/core/browser/content_settings_origin_identifier_value_map.cc', - 'content_settings/core/browser/content_settings_origin_identifier_value_map.h', - 'content_settings/core/browser/content_settings_policy_provider.cc', - 'content_settings/core/browser/content_settings_policy_provider.h', - 'content_settings/core/browser/content_settings_pref.cc', - 'content_settings/core/browser/content_settings_pref.h', - 'content_settings/core/browser/content_settings_pref_provider.cc', - 'content_settings/core/browser/content_settings_pref_provider.h', - 'content_settings/core/browser/content_settings_provider.h', - 'content_settings/core/browser/content_settings_registry.cc', - 'content_settings/core/browser/content_settings_registry.h', - 'content_settings/core/browser/content_settings_rule.cc', - 'content_settings/core/browser/content_settings_rule.h', - 'content_settings/core/browser/content_settings_usages_state.cc', - 'content_settings/core/browser/content_settings_usages_state.h', - 'content_settings/core/browser/content_settings_utils.cc', - 'content_settings/core/browser/content_settings_utils.h', - 'content_settings/core/browser/cookie_settings.cc', - 'content_settings/core/browser/cookie_settings.h', - 'content_settings/core/browser/host_content_settings_map.cc', - 'content_settings/core/browser/host_content_settings_map.h', - 'content_settings/core/browser/local_shared_objects_counter.h', - 'content_settings/core/browser/website_settings_info.cc', - 'content_settings/core/browser/website_settings_info.h', - 'content_settings/core/browser/website_settings_registry.cc', - 'content_settings/core/browser/website_settings_registry.h', - ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [4267, ], - }, - { - # GN version: //components/content_settings/core/common - 'target_name': 'content_settings_core_common', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - '../url/url.gyp:url_lib', - ], - 'variables': { 'enable_wexit_time_destructors': 1, }, - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'content_settings/core/common/content_settings.cc', - 'content_settings/core/common/content_settings.h', - 'content_settings/core/common/content_settings_pattern.cc', - 'content_settings/core/common/content_settings_pattern.h', - 'content_settings/core/common/content_settings_pattern_parser.cc', - 'content_settings/core/common/content_settings_pattern_parser.h', - 'content_settings/core/common/content_settings_types.h', - 'content_settings/core/common/pref_names.cc', - 'content_settings/core/common/pref_names.h', - ], - }, - { - # GN version: //components/content_settings/core/test:test_support - 'target_name': 'content_settings_core_test_support', - 'type': 'static_library', - 'dependencies': [ - 'content_settings_core_browser', - 'content_settings_core_common', - '../base/base.gyp:base', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'content_settings/core/test/content_settings_test_utils.cc', - 'content_settings/core/test/content_settings_test_utils.h', - ], - }, - ], - 'conditions': [ - ['OS!="ios"', { - 'targets': [ - { - # GN version: //components/content_settings/content/common - 'target_name': 'content_settings_content_common', - 'type': 'static_library', - 'dependencies': [ - 'content_settings_core_common', - '../base/base.gyp:base', - '../ipc/ipc.gyp:ipc', - '../url/url.gyp:url_lib', - '../url/ipc/url_ipc.gyp:url_ipc', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'content_settings/content/common/content_settings_message_generator.cc', - 'content_settings/content/common/content_settings_message_generator.h', - 'content_settings/content/common/content_settings_messages.h', - ], - }, - ], - }] - ], -}
diff --git a/components/contextual_search.gypi b/components/contextual_search.gypi deleted file mode 100644 index a7fb847..0000000 --- a/components/contextual_search.gypi +++ /dev/null
@@ -1,62 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN: //components/contextual_search:browser - 'target_name': 'contextual_search_browser', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - 'contextual_search_mojo_bindings', - '../base/base.gyp:base', - ], - 'sources': [ - 'contextual_search/browser/contextual_search_js_api_service_impl.cc', - 'contextual_search/browser/contextual_search_js_api_service_impl.h', - ], - }, - { - # GN: //components/contextual_search:renderer - 'target_name': 'contextual_search_renderer', - 'type': 'static_library', - 'include_dirs': [ - '..', - '../third_party/WebKit', - ], - 'dependencies': [ - 'contextual_search_mojo_bindings', - '../base/base.gyp:base', - '../content/content.gyp:content_common', - '../third_party/WebKit/public/blink.gyp:blink', - ], - 'sources': [ - 'contextual_search/renderer/contextual_search_wrapper.cc', - 'contextual_search/renderer/contextual_search_wrapper.h', - 'contextual_search/renderer/overlay_js_render_frame_observer.cc', - 'contextual_search/renderer/overlay_js_render_frame_observer.h', - 'contextual_search/renderer/overlay_page_notifier_service_impl.cc', - 'contextual_search/renderer/overlay_page_notifier_service_impl.h', - ], - }, - { - # GN version: //components/contextual_search:mojo_bindings - 'target_name': 'contextual_search_mojo_bindings', - 'type': 'static_library', - 'sources': [ - 'contextual_search/common/contextual_search_js_api_service.mojom', - 'contextual_search/common/overlay_page_notifier_service.mojom', - ], - 'variables': { - 'use_new_wrapper_types': 'false', - }, - 'includes': [ - '../mojo/mojom_bindings_generator.gypi', - ], - }, - ], -}
diff --git a/components/cookie_config.gypi b/components/cookie_config.gypi deleted file mode 100644 index 4c3e8f7..0000000 --- a/components/cookie_config.gypi +++ /dev/null
@@ -1,26 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/cookie_config - 'target_name': 'cookie_config', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - 'os_crypt', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'cookie_config/cookie_store_util.cc', - 'cookie_config/cookie_store_util.h', - ], - }, - ], -} -
diff --git a/components/crash.gypi b/components/crash.gypi deleted file mode 100644 index 8ad81ac..0000000 --- a/components/crash.gypi +++ /dev/null
@@ -1,487 +0,0 @@ -# Copyright 2013 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. - -{ - 'targets': [ - { - # GN version: //components/crash/core/browser - 'target_name': 'crash_core_browser', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - 'upload_list', - '../base/base.gyp:base', - '../components/components_strings.gyp:components_strings', - ], - 'sources': [ - 'crash/core/browser/crashes_ui_util.cc', - 'crash/core/browser/crashes_ui_util.h', - ], - }, - { - # GN version: //components/crash/core/common - 'target_name': 'crash_core_common', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - # List of dependencies is intentionally very minimal. Please avoid - # adding extra dependencies without first checking with OWNERS. - '../base/base.gyp:base', - ], - 'sources': [ - 'crash/core/common/crash_keys.cc', - 'crash/core/common/crash_keys.h', - ], - 'conditions': [ - ['OS=="mac" or OS=="ios"', { - 'sources': [ - 'crash/core/common/objc_zombie.h', - 'crash/core/common/objc_zombie.mm', - ], - }], - ], - }, - ], - 'conditions': [ - ['OS=="win" and target_arch=="ia32"', { - 'targets': [ - { - 'target_name': 'crash_core_common_win64', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - # List of dependencies is intentionally very minimal. Please avoid - # adding extra dependencies without first checking with OWNERS. - '../base/base.gyp:base_win64', - ], - 'sources': [ - 'crash/core/common/crash_keys.cc', - 'crash/core/common/crash_keys.h', - ], - 'configurations': { - 'Common_Base': { - 'msvs_target_platform': 'x64', - }, - }, - }, - ], - }], - ['OS!="ios"', { - 'targets': [ - { - 'target_name': 'crash_component_lib', - 'type': 'static_library', - 'sources': [ - 'crash/content/app/crash_keys_win.cc', - 'crash/content/app/crash_keys_win.h', - 'crash/content/app/crash_reporter_client.cc', - 'crash/content/app/crash_reporter_client.h', - ], - 'include_dirs': [ - '..', - '../breakpad/src', - ], - }, - { - # TODO(mark): https://crbug.com/466890: merge this target with - # crash_component. - # - # This is a temporary base target that is depended on by both - # crash_component and crash_component_breakpad_to_be_deleted. It - # provides everything common to both of those targets. For a short - # period, there are two Mac and Windows crash component - # implementations. The new one uses a Crashpad implementation and is - # used by Chrome. The old one uses a Breakpad implementation and is - # used by content_shell. Consumers should depend on the desired - # target. All three targets behave identically on non-Mac/-Windows. - # When content_shell and any other consumers are migrated to the - # Crashpad implementation on Mac/Windows, crash_component will merge - # back into this target, crash_component_non_mac_win, which will be - # renamed crash_component. crash_component_breakpad_to_be_deleted will - # be deleted. - # - # While this situation exists: - # - # Do not depend on this target directly! Depend on - # crash_component_breakpad_to_be_deleted for old Breakpad behavior on - # all platforms, or preferably, depend on crash_component to get Breakpad - # everywhere except for Mac and Windows, where you will get Crashpad. - # - # GN version: //components/crash/content/app:app_non_mac - 'target_name': 'crash_component_non_mac_win', - 'variables': { - 'conditions': [ - ['OS == "ios" or OS == "mac"', { - # On IOS there are no files compiled into the library, and we - # can't have libraries with zero objects. - # For now, the same applies to Mac OS X, until this target - # merges with crash_component. - 'crash_component_target_type%': 'none', - }, { - 'crash_component_target_type%': 'static_library', - }], - ], - }, - 'type': '<(crash_component_target_type)', - 'sources': [ - 'crash/content/app/breakpad_linux.cc', - 'crash/content/app/breakpad_linux.h', - 'crash/content/app/breakpad_linux_impl.h', - 'crash/content/app/hard_error_handler_win.cc', - 'crash/content/app/hard_error_handler_win.h', - ], - 'dependencies': [ - 'crash_component_lib', - 'crash_core_common', - '../base/base.gyp:base', - ], - 'defines': ['CRASH_IMPLEMENTATION'], - 'conditions': [ - ['OS=="win"', { - 'dependencies': [ - '../breakpad/breakpad.gyp:breakpad_handler', - '../breakpad/breakpad.gyp:breakpad_sender', - '../sandbox/sandbox.gyp:sandbox', - ], - }], - ['os_posix == 1 and OS != "mac" and OS != "ios"', { - 'dependencies': [ - '../breakpad/breakpad.gyp:breakpad_client', - ], - 'include_dirs': [ - '../breakpad/src', - ], - }], - ['clang==1 and target_arch=="ia32"', { - 'cflags!': [ - # Clang's -mstackrealign doesn't work well with - # linux_syscall_support.h hand written asm syscalls. - # See https://crbug.com/556393 - '-mstackrealign', - ], - }], - ], - 'target_conditions': [ - # Need 'target_conditions' to override default filename_rules to include - # the files on Android. - ['OS=="android"', { - 'sources/': [ - ['include', '^crash/content/app/breakpad_linux\\.cc$'], - ], - }], - ], - }, - { - # Note: if you depend on this target, you need to either link in - # content.gyp:content_common, or add - # content/public/common/content_switches.cc to your sources. - # - # GN version: //components/crash/content/app - - # TODO(mark): https://crbug.com/466890: merge this target with - # crash_component_non_mac_win. - # - # Most of this target is actually in its dependency, - # crash_component_non_mac_win. See the comment in that target for an - # explanation for the split. The split is temporary and the two targets - # will be unified again soon. - 'target_name': 'crash_component', - 'variables': { - 'conditions': [ - ['OS != "mac" and OS != "win"', { - # There are no source files except on Mac OS X and Windows. - 'crash_component_target_type%': 'none', - }, { - 'crash_component_target_type%': 'static_library', - }], - ], - }, - 'type': '<(crash_component_target_type)', - 'sources': [ - 'crash/content/app/crash_switches.cc', - 'crash/content/app/crash_switches.h', - 'crash/content/app/crashpad.cc', - 'crash/content/app/crashpad.h', - 'crash/content/app/crashpad_mac.mm', - 'crash/content/app/crashpad_win.cc', - 'crash/content/app/run_as_crashpad_handler_win.cc', - 'crash/content/app/run_as_crashpad_handler_win.h', - ], - 'dependencies': [ - 'crash_component_non_mac_win', - 'crash_component_lib', - '../base/base.gyp:base', - '../third_party/kasko/kasko.gyp:kasko', - ], - 'export_dependent_settings': [ - '../third_party/kasko/kasko.gyp:kasko', - ], - 'conditions': [ - ['OS=="mac" or OS=="win"', { - 'dependencies': [ - '../third_party/crashpad/crashpad/client/client.gyp:crashpad_client', - '../third_party/crashpad/crashpad/snapshot/snapshot.gyp:crashpad_snapshot_api', - ], - }], - ['OS=="win"', { - 'dependencies': [ - '../third_party/crashpad/crashpad/handler/handler.gyp:crashpad_handler_lib', - ], - }], - ], - 'defines': ['CRASH_IMPLEMENTATION'], - }, - { - # TODO(mark): https://crbug.com/466890: remove this target. - # - # This is a temporary target provided for Mac and Windows Breakpad - # users that have not yet migrated to Crashpad (namely content_shell). - # This target will be removed shortly and all consumers will be - # expected to use Crashpad as the Mac and Windows crash-reporting - # client. See the comment in the crash_component_non_mac_win target - # for more details. - # - # GN version: //components/crash/content/app:app_breakpad_mac_to_be_deleted - 'target_name': 'crash_component_breakpad_to_be_deleted', - 'variables': { - 'conditions': [ - ['OS != "mac" and OS != "win"', { - # There are no source files on any platform but Mac OS X and - # Windows. - 'crash_component_target_type%': 'none', - }, { - 'crash_component_target_type%': 'static_library', - }], - ], - }, - 'type': '<(crash_component_target_type)', - 'sources': [ - 'crash/content/app/breakpad_mac.h', - 'crash/content/app/breakpad_mac.mm', - 'crash/content/app/breakpad_win.cc', - 'crash/content/app/breakpad_win.h', - ], - 'dependencies': [ - 'crash_component_non_mac_win', - 'crash_component_lib', - ], - 'defines': ['CRASH_IMPLEMENTATION'], - 'conditions': [ - ['OS=="mac"', { - 'dependencies': [ - '../breakpad/breakpad.gyp:breakpad', - ], - 'include_dirs': [ - '..', - '../breakpad/src', - ], - }], - ['OS=="win"', { - 'dependencies': [ - '../breakpad/breakpad.gyp:breakpad_handler', - ], - 'include_dirs': [ - '..', - '../breakpad/src', - ], - 'all_dependent_settings': { - 'msvs_settings': { - 'VCLinkerTool': { - 'AdditionalDependencies': [ - 'userenv.lib', - ], - }, - }, - }, - 'msvs_settings': { - 'VCLinkerTool': { - 'AdditionalDependencies': [ - 'userenv.lib', - ], - }, - }, - }], - ], - }, - { - # GN version: //components/crash/content/app:test_support - 'target_name': 'crash_test_support', - 'type': 'none', - 'dependencies': [ - 'crash_component_lib', - ], - 'direct_dependent_settings': { - 'include_dirs' : [ - '../breakpad/src', - ], - } - }, - ], - 'conditions': [ - ['OS=="win"', { - 'targets': [ - { - # GN version: //components/crash/content/tools:crash_service - 'target_name': 'breakpad_crash_service', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../breakpad/breakpad.gyp:breakpad_handler', - '../breakpad/breakpad.gyp:breakpad_sender', - ], - 'sources': [ - 'crash/content/tools/crash_service.cc', - 'crash/content/tools/crash_service.h', - ], - }, - ], - }], - ['OS=="win" and target_arch=="ia32"', { - 'targets': [ - { - # Note: if you depend on this target, you need to either link in - # content.gyp:content_common, or add - # content/public/common/content_switches.cc to your sources. - 'target_name': 'breakpad_win64', - 'type': 'static_library', - 'sources': [ - 'crash/content/app/breakpad_linux.cc', - 'crash/content/app/breakpad_linux.h', - 'crash/content/app/breakpad_linux_impl.h', - 'crash/content/app/breakpad_mac.h', - 'crash/content/app/breakpad_mac.mm', - 'crash/content/app/breakpad_win.cc', - 'crash/content/app/breakpad_win.h', - # TODO(siggi): test the x64 version too. - 'crash/content/app/crash_keys_win.cc', - 'crash/content/app/crash_keys_win.h', - 'crash/content/app/crash_reporter_client.cc', - 'crash/content/app/crash_reporter_client.h', - 'crash/content/app/hard_error_handler_win.cc', - 'crash/content/app/hard_error_handler_win.h', - ], - 'defines': [ - 'COMPILE_CONTENT_STATICALLY', - 'CRASH_IMPLEMENTATION', - ], - 'dependencies': [ - '../base/base.gyp:base_win64', - '../breakpad/breakpad.gyp:breakpad_handler_win64', - '../breakpad/breakpad.gyp:breakpad_sender_win64', - '../sandbox/sandbox.gyp:sandbox_win64', - ], - 'configurations': { - 'Common_Base': { - 'msvs_target_platform': 'x64', - }, - }, - 'conditions': [ - ['OS=="win"', { - 'all_dependent_settings': { - 'msvs_settings': { - 'VCLinkerTool': { - 'AdditionalDependencies': [ - 'userenv.lib', - ], - }, - }, - }, - 'msvs_settings': { - 'VCLinkerTool': { - 'AdditionalDependencies': [ - 'userenv.lib', - ], - }, - }, - }], - ], - }, - { - # GN version: //components/crash/content/tools:crash_service - 'target_name': 'breakpad_crash_service_win64', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base_win64', - '../breakpad/breakpad.gyp:breakpad_handler_win64', - '../breakpad/breakpad.gyp:breakpad_sender_win64', - ], - 'sources': [ - 'crash/content/tools/crash_service.cc', - 'crash/content/tools/crash_service.h', - ], - 'configurations': { - 'Common_Base': { - 'msvs_target_platform': 'x64', - }, - }, - }, - ], - }], - ['OS=="mac"', { - 'targets': [ - { - # GN version: //components/crash/content/app:breakpad_stubs - 'target_name': 'breakpad_stubs', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - ], - 'sources': [ - 'crash/content/app/breakpad_mac.h', - 'crash/content/app/breakpad_mac_stubs.mm', - 'crash/content/app/crash_reporter_client.cc', - 'crash/content/app/crash_reporter_client.h', - ], - }, - ], - }], - ['os_posix == 1 and OS != "mac"', { - 'targets': [ - { - # GN version: //components/crash/content/browser - 'target_name': 'breakpad_host', - 'type': 'static_library', - 'dependencies': [ - 'crash_component', - '../base/base.gyp:base', - '../breakpad/breakpad.gyp:breakpad_client', - '../content/content.gyp:content_browser', - '../content/content.gyp:content_common', - ], - 'sources': [ - 'crash/content/browser/crash_dump_manager_android.cc', - 'crash/content/browser/crash_dump_manager_android.h', - 'crash/content/browser/crash_handler_host_linux.cc', - 'crash/content/browser/crash_handler_host_linux.h', - ], - 'include_dirs': [ - '../breakpad/src', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../breakpad/src', - ], - }, - 'target_conditions': [ - # Need 'target_conditions' to override default filename_rules to include - # the files on Android. - ['OS=="android"', { - 'sources/': [ - ['include', '^crash/content/browser/crash_handler_host_linux\\.cc$'], - ], - }], - ], - }, - ], - }], - ], - }], - ], -}
diff --git a/components/cronet.gypi b/components/cronet.gypi deleted file mode 100644 index 0bb1305f..0000000 --- a/components/cronet.gypi +++ /dev/null
@@ -1,1013 +0,0 @@ -# Copyright 2014 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. - -{ - 'conditions': [ - ['OS=="android"', { - 'targets': [ - { - 'target_name': 'cronet_jni_headers', - 'type': 'none', - 'sources': [ - 'cronet/android/java/src/org/chromium/net/impl/CronetBidirectionalStream.java', - 'cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java', - 'cronet/android/java/src/org/chromium/net/impl/CronetUploadDataStream.java', - 'cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java', - 'cronet/android/java/src/org/chromium/net/impl/CronetUrlRequestContext.java', - 'cronet/android/java/src/org/chromium/net/impl/ChromiumUrlRequest.java', - 'cronet/android/java/src/org/chromium/net/impl/ChromiumUrlRequestContext.java', - ], - 'variables': { - 'jni_gen_package': 'cronet', - }, - 'includes': [ '../build/jni_generator.gypi' ], - }, - { - 'target_name': 'chromium_url_request_java', - 'type': 'none', - 'variables': { - 'source_file': 'cronet/android/chromium_url_request.h', - }, - 'includes': [ '../build/android/java_cpp_enum.gypi' ], - }, - { - 'target_name': 'net_request_priority_java', - 'type': 'none', - 'variables': { - 'source_file': '../net/base/request_priority.h', - }, - 'includes': [ '../build/android/java_cpp_enum.gypi' ], - }, - { - 'target_name': 'network_quality_observation_source_java', - 'type': 'none', - 'variables': { - 'source_file': '../net/nqe/network_quality_observation_source.h', - }, - 'includes': [ '../build/android/java_cpp_enum.gypi' ], - }, - { - 'target_name': 'url_request_error_java', - 'type': 'none', - 'variables': { - 'source_file': 'cronet/android/url_request_error.h', - }, - 'includes': [ '../build/android/java_cpp_enum.gypi' ], - }, - { - # This target is a jar file containing classes that Cronet's javadocs - # may reference but are not included in the javadocs themselves. - 'target_name': 'cronet_javadoc_classpath', - 'type': 'none', - 'variables': { - # Work around GYP requirement that java targets specify java_in_dir - # variable that contains at least one java file. - 'java_in_dir': 'cronet/android/api', - 'java_in_dir_suffix': '/src_dummy', - 'never_lint': 1, - }, - 'dependencies': [ - 'url_request_error_java', - ], - 'includes': [ '../build/java.gypi' ], - }, - { - 'target_name': 'http_cache_type_java', - 'type': 'none', - 'variables': { - 'source_file': 'cronet/url_request_context_config.h', - }, - 'includes': [ '../build/android/java_cpp_enum.gypi' ], - }, - { - 'target_name': 'load_states_list', - 'type': 'none', - 'sources': [ - 'cronet/android/java/src/org/chromium/net/LoadState.template', - ], - 'variables': { - 'package_name': 'org/chromium/cronet', - 'template_deps': ['../net/base/load_states_list.h'], - }, - 'includes': [ '../build/android/java_cpp_template.gypi' ], - }, - { - 'target_name': 'cronet_api_version', - 'type': 'none', - 'variables': { - 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE', - 'version_py_path': '<(DEPTH)/build/util/version.py', - 'version_path': '<(DEPTH)/chrome/VERSION', - 'template_input_path': 'cronet/android/api/src/org/chromium/net/ApiVersion.template', - 'output_path': '<(SHARED_INTERMEDIATE_DIR)/templates/<(_target_name)/org/chromium/net/ApiVersion.java', - }, - 'direct_dependent_settings': { - 'variables': { - # Ensure that the output directory is used in the class path - # when building targets that depend on this one. - 'generated_src_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/templates/<(_target_name)', - ], - # Ensure dependents are rebuilt when the generated Java file changes. - 'additional_input_paths': [ - '<(output_path)', - ], - }, - }, - 'actions': [ - { - 'action_name': 'cronet_api_version', - 'inputs': [ - '<(template_input_path)', - '<(version_path)', - '<(lastchange_path)', - ], - 'outputs': [ - '<(output_path)', - ], - 'action': [ - 'python', - '<(version_py_path)', - '-f', '<(version_path)', - '-f', '<(lastchange_path)', - '<(template_input_path)', - '<(output_path)', - ], - 'message': 'Generating API version information', - }, - ], - }, - { - 'target_name': 'cronet_impl_version', - 'type': 'none', - 'variables': { - 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE', - 'version_py_path': '<(DEPTH)/build/util/version.py', - 'version_path': '<(DEPTH)/chrome/VERSION', - 'template_input_path': 'cronet/android/java/src/org/chromium/net/impl/ImplVersion.template', - 'output_path': '<(SHARED_INTERMEDIATE_DIR)/templates/<(_target_name)/org/chromium/net/impl/ImplVersion.java', - }, - 'direct_dependent_settings': { - 'variables': { - # Ensure that the output directory is used in the class path - # when building targets that depend on this one. - 'generated_src_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/templates/<(_target_name)', - ], - # Ensure dependents are rebuilt when the generated Java file changes. - 'additional_input_paths': [ - '<(output_path)', - ], - }, - }, - 'actions': [ - { - 'action_name': 'cronet_impl_version', - 'inputs': [ - '<(template_input_path)', - '<(version_path)', - '<(lastchange_path)', - ], - 'outputs': [ - '<(output_path)', - ], - 'action': [ - 'python', - '<(version_py_path)', - '-f', '<(version_path)', - '-f', '<(lastchange_path)', - '<(template_input_path)', - '<(output_path)', - ], - 'message': 'Generating impl version information', - }, - ], - }, - { - 'target_name': 'cronet_version_header', - 'type': 'none', - # Need to set hard_depency flag because cronet_version generates a - # header. - 'hard_dependency': 1, - 'direct_dependent_settings': { - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/', - ], - }, - 'actions': [ - { - 'action_name': 'version_header', - 'message': 'Generating version header file: <@(_outputs)', - 'inputs': [ - '<(version_path)', - 'cronet/version.h.in', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/components/cronet/version.h', - ], - 'action': [ - 'python', - '<(version_py_path)', - '-e', 'VERSION_FULL="<(version_full)"', - 'cronet/version.h.in', - '<@(_outputs)', - ], - 'includes': [ - '../build/util/version.gypi', - ], - }, - ], - }, - { - # Protobuf compiler / generator for certificate verifcation protocol - # buffer. - # GN version: //cronet:cronet_android_cert_proto - 'target_name': 'cronet_android_cert_proto', - 'type': 'static_library', - 'sources': [ - 'cronet/android/cert/proto/cert_verification.proto', - ], - 'variables': { - 'enable_wexit_time_destructors': 1, - 'proto_in_dir': 'cronet/android/cert/proto', - 'proto_out_dir': 'cronet/android/cert/proto', - }, - 'includes': [ - '../build/protoc.gypi', - ], - }, - { - 'target_name': 'cronet_static', - 'type': 'static_library', - 'dependencies': [ - '../net/net.gyp:net', - '../url/url.gyp:url_lib', - ], - 'conditions': [ - ['enable_data_reduction_proxy_support==1', - { - 'dependencies': [ - '../components/components.gyp:data_reduction_proxy_core_browser_small', - ], - }, - ], - ['use_platform_icu_alternatives!=1', - { - 'dependencies': [ - '../base/base.gyp:base_i18n', - ], - }, - ], - ], - 'includes': [ 'cronet/cronet_static.gypi' ], - }, - { - 'target_name': 'libcronet', - 'type': 'shared_library', - 'sources': [ - 'cronet/android/cronet_jni.cc', - ], - 'dependencies': [ - 'cronet_static', - '../base/base.gyp:base', - '../net/net.gyp:net', - ], - 'ldflags': [ - '-Wl,--version-script=<!(cd <(DEPTH) && pwd -P)/components/cronet/android/only_jni_exports.lst', - ], - 'variables': { - # libcronet doesn't really use native JNI exports, but it does use - # its own linker version script. The ARM64 linker appears to not - # work with multiple version scripts with anonymous version tags, - # so enable use_native_jni_exports which avoids adding another - # version sript (android_no_jni_exports.lst) so we don't run afoul - # of this ARM64 linker limitation. - 'use_native_jni_exports': 1, - }, - }, - { # cronet_api.jar defines Cronet API and provides implementation of - # legacy api using HttpUrlConnection (not the Chromium stack). - 'target_name': 'cronet_api', - 'type': 'none', - 'dependencies': [ - 'http_cache_type_java', - 'url_request_error_java', - 'cronet_api_version', - 'load_states_list', - 'network_quality_observation_source_java', - '../third_party/android_tools/android_tools.gyp:android_support_v13_java', - ], - 'variables': { - 'java_in_dir': 'cronet/android/api', - 'run_findbugs': 1, - }, - 'includes': [ '../build/java.gypi' ], - }, - { # cronet.jar implements HttpUrlRequest interface using Chromium stack - # in native libcronet.so library. - 'target_name': 'cronet_java', - 'type': 'none', - 'dependencies': [ - '../base/base.gyp:base', - 'cronet_api', - 'cronet_impl_version', - 'chromium_url_request_java', - 'libcronet', - 'net_request_priority_java', - 'network_quality_observation_source_java', - '../third_party/android_tools/android_tools.gyp:android_support_v13_java', - ], - 'variables': { - 'java_in_dir': 'cronet/android/java', - 'javac_includes': [ - '**/ChromiumUrlRequest.java', - '**/ChromiumUrlRequestContext.java', - '**/ChromiumUrlRequestError.java', - '**/ChromiumUrlRequestFactory.java', - '**/ChromiumUrlRequestPriority.java', - '**/CronetBidirectionalStream.java', - '**/CronetLibraryLoader.java', - '**/CronetUploadDataStream.java', - '**/CronetUrlRequest.java', - '**/CronetUrlRequestContext.java', - '**/ImplVersion.java', - '**/RequestPriority.java', - '**/urlconnection/CronetBufferedOutputStream.java', - '**/urlconnection/CronetChunkedOutputStream.java', - '**/urlconnection/CronetFixedModeOutputStream.java', - '**/urlconnection/CronetInputStream.java', - '**/urlconnection/CronetHttpURLConnection.java', - '**/urlconnection/CronetHttpURLStreamHandler.java', - '**/urlconnection/CronetOutputStream.java', - '**/urlconnection/CronetURLStreamHandlerFactory.java', - '**/urlconnection/MessageLoop.java', - ], - 'run_findbugs': 1, - }, - 'includes': [ '../build/java.gypi' ], - }, - { - 'target_name': 'cronet_sample_apk', - 'type': 'none', - 'dependencies': [ - 'cronet_java', - 'cronet_api', - ], - 'variables': { - 'apk_name': 'CronetSample', - 'java_in_dir': 'cronet/android/sample', - 'resource_dir': 'cronet/android/sample/res', - 'native_lib_target': 'libcronet', - 'proguard_enabled': 'true', - 'proguard_flags_paths': [ - 'cronet/android/proguard.cfg', - 'cronet/android/sample/javatests/proguard.cfg', - ], - 'run_findbugs': 1, - }, - 'includes': [ '../build/java_apk.gypi' ], - }, - { - # cronet_sample_apk creates a .jar as a side effect. Any java targets - # that need that .jar in their classpath should depend on this target, - # cronet_sample_apk_java. Dependents of cronet_sample_apk receive its - # jar path in the variable 'apk_output_jar_path'. This target should - # only be used by targets which instrument cronet_sample_apk. - 'target_name': 'cronet_sample_apk_java', - 'type': 'none', - 'dependencies': [ - 'cronet_sample_apk', - ], - 'includes': [ '../build/apk_fake_jar.gypi' ], - }, - { - 'target_name': 'cronet_sample_test_apk', - 'type': 'none', - 'dependencies': [ - 'cronet_java', - 'cronet_sample_apk_java', - 'cronet_api', - '../base/base.gyp:base_java_test_support', - '../net/net.gyp:net_java_test_support', - '../net/net.gyp:require_net_test_support_apk', - ], - 'variables': { - 'apk_name': 'CronetSampleTest', - 'java_in_dir': 'cronet/android/sample/javatests', - 'is_test_apk': 1, - 'run_findbugs': 1, - 'test_type': 'instrumentation', - 'additional_apks': [ - '<(PRODUCT_DIR)/apks/ChromiumNetTestSupport.apk', - ], - }, - 'includes': [ - '../build/java_apk.gypi', - '../build/android/test_runner.gypi', - ], - }, - { - 'target_name': 'cronet_tests_jni_headers', - 'type': 'none', - 'sources': [ - 'cronet/android/test/src/org/chromium/net/CronetTestUtil.java', - 'cronet/android/test/src/org/chromium/net/MockUrlRequestJobFactory.java', - 'cronet/android/test/src/org/chromium/net/MockCertVerifier.java', - 'cronet/android/test/src/org/chromium/net/NativeTestServer.java', - 'cronet/android/test/src/org/chromium/net/NetworkChangeNotifierUtil.java', - 'cronet/android/test/src/org/chromium/net/QuicTestServer.java', - 'cronet/android/test/src/org/chromium/net/SdchObserver.java', - 'cronet/android/test/src/org/chromium/net/TestUploadDataStreamHandler.java', - 'cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java', - ], - 'variables': { - 'jni_gen_package': 'cronet_tests', - }, - 'includes': [ '../build/jni_generator.gypi' ], - }, - { - 'target_name': 'libcronet_tests', - 'type': 'shared_library', - 'sources': [ - 'cronet/android/test/cronet_test_jni.cc', - 'cronet/android/test/mock_cert_verifier.cc', - 'cronet/android/test/mock_cert_verifier.h', - 'cronet/android/test/mock_url_request_job_factory.cc', - 'cronet/android/test/mock_url_request_job_factory.h', - 'cronet/android/test/native_test_server.cc', - 'cronet/android/test/native_test_server.h', - 'cronet/android/test/quic_test_server.cc', - 'cronet/android/test/quic_test_server.h', - 'cronet/android/test/sdch_test_util.cc', - 'cronet/android/test/sdch_test_util.h', - 'cronet/android/test/test_upload_data_stream_handler.cc', - 'cronet/android/test/test_upload_data_stream_handler.h', - 'cronet/android/test/network_change_notifier_util.cc', - 'cronet/android/test/network_change_notifier_util.h', - 'cronet/android/test/cronet_url_request_context_config_test.cc', - 'cronet/android/test/cronet_url_request_context_config_test.h', - 'cronet/android/test/cronet_test_util.cc', - 'cronet/android/test/cronet_test_util.h', - ], - 'dependencies': [ - 'cronet_tests_jni_headers', - '../base/base.gyp:base', - '../net/net.gyp:net', - '../net/net.gyp:net_quic_proto', - '../net/net.gyp:net_test_support', - '../net/net.gyp:simple_quic_tools', - '../base/base.gyp:base_i18n', - '../third_party/icu/icu.gyp:icui18n', - '../third_party/icu/icu.gyp:icuuc', - ], - 'ldflags': [ - '-Wl,--version-script=<!(cd <(DEPTH) && pwd -P)/components/cronet/android/only_jni_exports.lst', - ], - 'variables': { - # libcronet doesn't really use native JNI exports, but it does use - # its own linker version script. The ARM64 linker appears to not - # work with multiple version scripts with anonymous version tags, - # so enable use_native_jni_exports which avoids adding another - # version sript (android_no_jni_exports.lst) so we don't run afoul - # of this ARM64 linker limitation. - 'use_native_jni_exports': 1, - }, - 'conditions': [ - ['enable_data_reduction_proxy_support==1', - { - 'dependencies': [ - '../components/components.gyp:data_reduction_proxy_core_browser_small', - ], - }, - ], - ], - 'includes': [ 'cronet/cronet_static.gypi' ], - }, - { - 'target_name': 'cronet_test_support', - 'type': 'none', - 'dependencies': [ - 'cronet_java', - '../net/net.gyp:net_java_test_support', - '../third_party/netty-tcnative/netty-tcnative.gyp:netty-tcnative', - '../third_party/netty4/netty.gyp:netty_all', - ], - 'variables': { - 'java_in_dir': 'cronet/android/test', - 'additional_src_dirs': [ 'cronet/android/test/javatests/src' ], - 'run_findbugs': 1, - }, - 'includes': [ '../build/java.gypi' ], - }, - { - 'target_name': 'cronet_test_apk', - 'type': 'none', - 'dependencies': [ - 'cronet_java', - 'cronet_test_support', - '../net/net.gyp:net_java_test_support', - '../third_party/netty-tcnative/netty-tcnative.gyp:netty-tcnative', - '../third_party/netty4/netty.gyp:netty_all', - ], - 'variables': { - 'apk_name': 'CronetTest', - # There isn't an easy way to have a java_apk target without any Java - # so we'll borrow the trick from the net_test_support_apk target of - # pointing it at placeholder Java via java_in_dir_suffix. - 'java_in_dir': 'cronet/android/test', - 'java_in_dir_suffix': '/src_dummy', - 'resource_dir': 'cronet/android/test/res', - 'asset_location': 'cronet/android/test/assets', - 'native_lib_target': 'libcronet_tests', - 'never_lint': 1, - 'additional_bundled_libs': [ - '>(netty_tcnative_so_file_location)', - ], - }, - 'includes': [ '../build/java_apk.gypi' ], - }, - { - # cronet_test_apk creates a .jar as a side effect. Any java targets - # that need that .jar in their classpath should depend on this target, - # cronet_test_apk_java. Dependents of cronet_test_apk receive its - # jar path in the variable 'apk_output_jar_path'. This target should - # only be used by targets which instrument cronet_test_apk. - 'target_name': 'cronet_test_apk_java', - 'type': 'none', - 'dependencies': [ - 'cronet_test_apk', - ], - 'includes': [ '../build/apk_fake_jar.gypi' ], - }, - { - 'target_name': 'cronet_test_instrumentation_apk', - 'type': 'none', - 'dependencies': [ - 'cronet_test_apk_java', - '../base/base.gyp:base_java_test_support', - '../net/net.gyp:net_java_test_support', - '../net/net.gyp:require_net_test_support_apk', - ], - 'variables': { - 'apk_name': 'CronetTestInstrumentation', - 'java_in_dir': 'cronet/android/test/javatests', - 'resource_dir': 'cronet/android/test/res', - 'is_test_apk': 1, - 'run_findbugs': 1, - 'test_type': 'instrumentation', - 'isolate_file': 'cronet/android/cronet_test_instrumentation_apk.isolate', - 'additional_apks': [ - '<(PRODUCT_DIR)/apks/ChromiumNetTestSupport.apk', - ], - }, - 'includes': [ - '../build/java_apk.gypi', - '../build/android/test_runner.gypi', - ], - }, - { - 'target_name': 'cronet_perf_test_apk', - 'type': 'none', - 'dependencies': [ - 'cronet_java', - 'cronet_api', - 'cronet_test_support', - ], - 'variables': { - 'apk_name': 'CronetPerfTest', - 'java_in_dir': 'cronet/android/test/javaperftests', - 'native_lib_target': 'libcronet_tests', - 'proguard_enabled': 'true', - 'proguard_flags_paths': [ - 'cronet/android/proguard.cfg', - 'cronet/android/test/javaperftests/proguard.cfg', - ], - 'run_findbugs': 1, - }, - 'includes': [ '../build/java_apk.gypi' ], - }, - { - 'target_name': 'cronet_unittests', - 'type': '<(gtest_target_type)', - 'dependencies': [ - 'cronet_android_cert_proto', - 'cronet_static', - 'metrics', - '../base/base.gyp:base', - '../base/base.gyp:test_support_base', - '../net/net.gyp:net_test_support', - '../testing/gtest.gyp:gtest', - '../testing/android/native_test.gyp:native_test_native_code', - ], - 'sources': [ - 'cronet/android/cert/cert_verifier_cache_serializer_unittest.cc', - 'cronet/histogram_manager_unittest.cc', - 'cronet/run_all_unittests.cc', - 'cronet/stale_host_resolver_unittest.cc', - 'cronet/url_request_context_config_unittest.cc', - ], - }, - { - 'target_name': 'cronet_unittests_apk', - 'type': 'none', - 'dependencies': [ - 'cronet_unittests', - ], - 'variables': { - 'test_suite_name': 'cronet_unittests', - 'shard_timeout': 180, - }, - 'includes': [ - '../build/apk_test.gypi', - ], - }, - { - 'target_name': 'cronet_package', - 'type': 'none', - 'dependencies': [ - 'libcronet', - 'cronet_java', - 'cronet_api', - 'cronet_javadoc_classpath', - '../net/net.gyp:net_unittests_apk', - ], - 'variables': { - 'native_lib': 'libcronet.>(android_product_extension)', - 'java_lib': 'cronet.jar', - 'java_api_lib': 'cronet_api.jar', - 'java_api_src_lib': 'cronet_api-src.jar', - 'java_src_lib': 'cronet-src.jar', - 'java_sample_src_lib': 'cronet-sample-src.jar', - 'lib_java_dir': '<(PRODUCT_DIR)/lib.java', - 'package_dir': '<(PRODUCT_DIR)/cronet', - 'intermediate_dir': '<(SHARED_INTERMEDIATE_DIR)/cronet', - 'jar_extract_dir': '<(intermediate_dir)/cronet_jar_extract', - 'jar_extract_stamp': '<(intermediate_dir)/jar_extract.stamp', - 'cronet_jar_stamp': '<(intermediate_dir)/cronet_jar.stamp', - }, - 'actions': [ - { - 'action_name': 'strip libcronet', - 'inputs': ['<(SHARED_LIB_DIR)/<(native_lib)'], - 'outputs': ['<(package_dir)/libs/<(android_app_abi)/<(native_lib)'], - 'action': [ - '<(android_strip)', - '--strip-unneeded', - '<@(_inputs)', - '-o', - '<@(_outputs)', - ], - }, - { - 'action_name': 'extracting from jars', - 'inputs': [ - '<(lib_java_dir)/cronet_java.jar', - '<(lib_java_dir)/base_java.jar', - '<(lib_java_dir)/net_java.jar', - '<(lib_java_dir)/url_java.jar', - ], - 'outputs': ['<(jar_extract_stamp)', '<(jar_extract_dir)'], - 'action': [ - 'python', - 'cronet/tools/extract_from_jars.py', - '--classes-dir=<(jar_extract_dir)', - '--jars=<@(_inputs)', - '--stamp=<(jar_extract_stamp)', - ], - }, - { - 'action_name': 'jar_<(_target_name)', - 'message': 'Creating <(_target_name) jar', - 'inputs': [ - '<(DEPTH)/build/android/gyp/util/build_utils.py', - '<(DEPTH)/build/android/gyp/util/md5_check.py', - '<(DEPTH)/build/android/gyp/jar.py', - '<(jar_extract_stamp)', - ], - 'outputs': [ - '<(package_dir)/<(java_lib)', - '<(cronet_jar_stamp)', - ], - 'action': [ - 'python', '<(DEPTH)/build/android/gyp/jar.py', - '--classes-dir=<(jar_extract_dir)', - '--jar-path=<(package_dir)/<(java_lib)', - '--stamp=<(cronet_jar_stamp)', - ] - }, - { - 'action_name': 'jar_api_src_<(_target_name)', - 'inputs': ['cronet/tools/jar_src.py'] , - 'outputs': ['<(package_dir)/<(java_api_src_lib)'], - 'action': [ - 'python', - '<@(_inputs)', - '--src-dir=cronet/android/api/src', - '--jar-path=<(package_dir)/<(java_api_src_lib)', - ], - }, - { - 'action_name': 'jar_src_<(_target_name)', - 'inputs': ['cronet/tools/jar_src.py'] , - 'outputs': ['<(package_dir)/<(java_src_lib)'], - 'action': [ - 'python', - '<@(_inputs)', - '--src-dir=../base/android/java/src', - '--src-dir=../net/android/java/src', - '--src-dir=../url/android/java/src', - '--src-dir=cronet/android/java/src', - '--jar-path=<(package_dir)/<(java_src_lib)', - ], - }, - { - 'action_name': 'jar_sample_src_<(_target_name)', - 'inputs': ['cronet/tools/jar_src.py'] , - 'outputs': ['<(package_dir)/<(java_sample_src_lib)'], - 'action': [ - 'python', - '<@(_inputs)', - '--src-dir=cronet/android/sample', - '--jar-path=<(package_dir)/<(java_sample_src_lib)', - ], - }, - { - 'action_name': 'generate licenses', - 'inputs': ['cronet/tools/cronet_licenses.py'] , - 'outputs': ['<(package_dir)/LICENSE'], - 'action': [ - 'python', - '<@(_inputs)', - 'license', - '<@(_outputs)', - ], - }, - { - 'action_name': 'generate javadoc', - 'inputs': ['cronet/tools/generate_javadoc.py'] , - 'outputs': ['<(package_dir)/javadoc'], - 'action': [ - 'python', - '<@(_inputs)', - '--output-dir=<(package_dir)', - '--input-dir=cronet/', - '--overview-file=<(package_dir)/README.md.html', - '--readme-file=cronet/README.md', - '--lib-java-dir=<(lib_java_dir)', - ], - 'message': 'Generating Javadoc', - }, - ], - 'copies': [ - { - 'destination': '<(package_dir)', - 'files': [ - '../AUTHORS', - '../chrome/VERSION', - 'cronet/android/proguard.cfg', - '<(lib_java_dir)/<(java_api_lib)' - ], - }, - { - 'destination': '<(package_dir)/symbols/<(android_app_abi)', - 'files': [ - '<(SHARED_LIB_DIR)/<(native_lib)', - ], - }, - ], - }, - ], - 'variables': { - 'enable_data_reduction_proxy_support%': 0, - }, - }], # OS=="android" - ['OS=="ios"', { - 'targets': [ - { # TODO(mef): Dedup this with copy in OS=="android" section. - 'target_name': 'cronet_version_header', - 'type': 'none', - # Need to set hard_depency flag because cronet_version generates a - # header. - 'hard_dependency': 1, - 'direct_dependent_settings': { - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/', - ], - }, - 'actions': [ - { - 'action_name': 'version_header', - 'message': 'Generating version header file: <@(_outputs)', - 'inputs': [ - '<(version_path)', - 'cronet/version.h.in', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/components/cronet/ios/version.h', - ], - 'action': [ - 'python', - '<(version_py_path)', - '-e', 'VERSION_FULL="<(version_full)"', - 'cronet/version.h.in', - '<@(_outputs)', - ], - 'includes': [ - '../build/util/version.gypi', - ], - }, - ], - }, - { - 'target_name': 'cronet_static', - 'type': 'static_library', - 'sources': [ - 'cronet/ios/Cronet.h', - 'cronet/ios/Cronet.mm', - 'cronet/ios/cronet_bidirectional_stream.h', - 'cronet/ios/cronet_bidirectional_stream.cc', - 'cronet/ios/cronet_c_for_grpc.h', - 'cronet/ios/cronet_c_for_grpc.cc', - 'cronet/ios/cronet_environment.cc', - 'cronet/ios/cronet_environment.h', - 'cronet/stale_host_resolver.cc', - 'cronet/stale_host_resolver.h', - 'cronet/url_request_context_config.cc', - 'cronet/url_request_context_config.h', - ], - 'dependencies': [ - 'cronet_version_header', - '../base/base.gyp:base', - '../net/net.gyp:net', - ], - 'cflags': [ - '-fdata-sections', - '-ffunction-sections', - '-fno-rtti', - '-fvisibility=hidden' - '-fvisibility-inlines-hidden', - '-Wno-sign-promo', - '-Wno-missing-field-initializers', - ], - 'ldflags': [ - '-llog', - '-Wl,--gc-sections', - '-Wl,--exclude-libs,ALL' - ], - }, - { - 'target_name': 'libcronet_shared', - 'type': 'shared_library', - 'sources': [ - 'cronet/ios/Cronet.h', - 'cronet/ios/Cronet.mm', - ], - 'dependencies': [ - 'cronet_static', - '../base/base.gyp:base', - ], - }, - { - 'target_name': 'cronet_framework', - 'product_name': 'Cronet', - 'type': 'shared_library', - 'mac_bundle': 1, - 'sources': [ - 'cronet/ios/Cronet.h', - 'cronet/ios/cronet_c_for_grpc.h', - 'cronet/ios/empty.cc', - ], - 'mac_framework_headers': [ - 'cronet/ios/Cronet.h', - 'cronet/ios/cronet_c_for_grpc.h', - ], - 'link_settings': { - 'libraries': [ - 'Foundation.framework', - ], - }, - 'xcode_settings': { - 'DEBUGGING_SYMBOLS': 'YES', - 'INFOPLIST_FILE': 'cronet/ios/Info.plist', - 'LD_DYLIB_INSTALL_NAME': '@loader_path/Frameworks/Cronet.framework/Cronet', - }, - 'dependencies': [ - 'cronet_static', - '../base/base.gyp:base', - ], - 'configurations': { - 'Debug_Base': { - 'xcode_settings': { - 'DEPLOYMENT_POSTPROCESSING': 'NO', - 'DEBUG_INFORMATION_FORMAT': 'dwarf', - 'STRIP_INSTALLED_PRODUCT': 'NO', - } - }, - 'Release_Base': { - 'xcode_settings': { - 'DEPLOYMENT_POSTPROCESSING': 'YES', - 'DEBUG_INFORMATION_FORMAT': 'dwarf-with-dsym', - 'STRIP_INSTALLED_PRODUCT': 'YES', - 'STRIP_STYLE': 'non-global', - } - }, - }, - }, - { - 'target_name': 'cronet_test', - 'type': 'executable', - 'dependencies': [ - 'cronet_static', - '../net/net.gyp:net_quic_proto', - '../net/net.gyp:net_test_support', - '../net/net.gyp:simple_quic_tools', - '../testing/gtest.gyp:gtest', - ], - 'sources': [ - 'cronet/ios/test/cronet_bidirectional_stream_test.mm', - 'cronet/ios/test/cronet_test_runner.mm', - 'cronet/ios/test/quic_test_server.cc', - 'cronet/ios/test/quic_test_server.h', - ], - 'mac_bundle_resources': [ - '../net/data/ssl/certificates/quic_test.example.com.crt', - '../net/data/ssl/certificates/quic_test.example.com.key', - '../net/data/ssl/certificates/quic_test.example.com.key.pkcs8', - '../net/data/ssl/certificates/quic_test.example.com.key.sct', - ], - 'include_dirs': [ - '..', - ], - }, - { - # Build this target to package a standalone Cronet in a single - # .a file. - 'target_name': 'cronet_package', - 'type': 'none', - 'variables' : { - 'package_dir': '<(PRODUCT_DIR)/cronet', - }, - 'dependencies': [ - # Depend on the dummy target so that all of CrNet's dependencies - # are built before packaging. - 'libcronet_shared', - ], - 'actions': [ - { - 'action_name': 'Package Cronet', - 'variables': { - 'tool_path': - 'cronet/tools/link_dependencies.py', - }, - # Actions need an inputs list, even if it's empty. - 'inputs': [ - '<(tool_path)', - '<(PRODUCT_DIR)/libcronet_shared.dylib', - ], - # Only specify one output, since this will be libtool's output. - 'outputs': [ '<(package_dir)/libcronet_standalone_with_symbols.a' ], - 'action': ['<(tool_path)', - '<(PRODUCT_DIR)', - 'libcronet_shared.dylib', - '<@(_outputs)', - ], - }, - { - 'action_name': 'Stripping standalone library', - # Actions need an inputs list, even if it's empty. - 'inputs': [ - '<(package_dir)/libcronet_standalone_with_symbols.a', - ], - # Only specify one output, since this will be libtool's output. - 'outputs': [ '<(package_dir)/libcronet_standalone.a' ], - 'action': ['strip', - '-S', - '<@(_inputs)', - '-o', - '<@(_outputs)', - ], - }, - ], - 'copies': [ - { - 'destination': '<(package_dir)', - 'files': [ - '../chrome/VERSION', - 'cronet/ios/Cronet.h', - 'cronet/ios/cronet_c_for_grpc.h', - ], - }, - { - 'destination': '<(package_dir)/test', - 'files': [ - 'cronet/ios/test/cronet_bidirectional_stream_test.mm', - 'cronet/ios/test/cronet_test_runner.mm', - ], - }, - ], - }, - ], - }], # OS=="ios" - ], -}
diff --git a/components/cronet/cronet_static.gypi b/components/cronet/cronet_static.gypi deleted file mode 100644 index 9cf19c5a..0000000 --- a/components/cronet/cronet_static.gypi +++ /dev/null
@@ -1,90 +0,0 @@ -# Copyright 2014 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. - -{ - # Included in 'cronet_static'. - 'dependencies': [ - '../base/base.gyp:base', - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '../url/url.gyp:url_url_features', - 'chromium_url_request_java', - 'cronet_android_cert_proto', - 'cronet_jni_headers', - 'cronet_api_version', - 'cronet_impl_version', - 'cronet_version_header', - 'metrics', - 'url_request_error_java', - ], - 'sources': [ - 'android/cert/cert_verifier_cache_serializer.cc', - 'android/cert/cert_verifier_cache_serializer.h', - 'android/chromium_url_request.cc', - 'android/chromium_url_request.h', - 'android/chromium_url_request_context.cc', - 'android/chromium_url_request_context.h', - 'android/cronet_bidirectional_stream_adapter.cc', - 'android/cronet_bidirectional_stream_adapter.h', - 'android/cronet_in_memory_pref_store.cc', - 'android/cronet_in_memory_pref_store.h', - 'android/cronet_library_loader.cc', - 'android/cronet_library_loader.h', - 'android/cronet_upload_data_stream.cc', - 'android/cronet_upload_data_stream.h', - 'android/cronet_upload_data_stream_adapter.cc', - 'android/cronet_upload_data_stream_adapter.h', - 'android/cronet_url_request_adapter.cc', - 'android/cronet_url_request_adapter.h', - 'android/cronet_url_request_context_adapter.cc', - 'android/cronet_url_request_context_adapter.h', - 'android/io_buffer_with_byte_buffer.cc', - 'android/io_buffer_with_byte_buffer.h', - 'android/url_request_adapter.cc', - 'android/url_request_adapter.h', - 'android/url_request_context_adapter.cc', - 'android/url_request_context_adapter.h', - 'android/url_request_error.cc', - 'android/url_request_error.h', - 'android/wrapped_channel_upload_element_reader.cc', - 'android/wrapped_channel_upload_element_reader.h', - 'histogram_manager.cc', - 'histogram_manager.h', - 'stale_host_resolver.cc', - 'stale_host_resolver.h', - 'url_request_context_config.cc', - 'url_request_context_config.h', - ], - 'cflags': [ - '-DLOGGING=1', - '-fdata-sections', - '-ffunction-sections', - '-fno-rtti', - '-fvisibility=hidden', - '-fvisibility-inlines-hidden', - '-Wno-sign-promo', - '-Wno-missing-field-initializers', - ], - 'ldflags': [ - '-llog', - '-landroid', - '-Wl,--gc-sections', - '-Wl,--exclude-libs,ALL' - ], - 'conditions': [ - # If Data Reduction Proxy support is enabled, add the following - # defines and sources. Dependencies are target-specific and are - # not included here. - ['enable_data_reduction_proxy_support==1', - { - 'defines' : [ - 'DATA_REDUCTION_PROXY_SUPPORT' - ], - 'sources': [ - 'android/cronet_data_reduction_proxy.cc', - 'android/cronet_data_reduction_proxy.h', - ], - } - ], - ], -}
diff --git a/components/crx_file.gypi b/components/crx_file.gypi deleted file mode 100644 index 3c81095..0000000 --- a/components/crx_file.gypi +++ /dev/null
@@ -1,25 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - 'target_name': 'crx_file', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../crypto/crypto.gyp:crypto', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'crx_file/crx_file.cc', - 'crx_file/crx_file.h', - 'crx_file/id_util.cc', - 'crx_file/id_util.h', - ], - }, - ], -}
diff --git a/components/data_reduction_proxy.gypi b/components/data_reduction_proxy.gypi deleted file mode 100644 index f97bbde..0000000 --- a/components/data_reduction_proxy.gypi +++ /dev/null
@@ -1,304 +0,0 @@ -# Copyright 2014 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. - - -{ - 'variables' : - { - 'data_reduction_proxy_core_browser_sources' : [ - # Note: sources list duplicated in GN build. - 'data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol.h', - 'data_reduction_proxy/core/browser/data_reduction_proxy_bypass_stats.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_bypass_stats.h', - 'data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h', - 'data_reduction_proxy/core/browser/data_reduction_proxy_config.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_config.h', - 'data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client.h', - 'data_reduction_proxy/core/browser/data_reduction_proxy_configurator.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_configurator.h', - 'data_reduction_proxy/core/browser/data_reduction_proxy_data.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_data.h', - 'data_reduction_proxy/core/browser/data_reduction_proxy_debug_ui_service.h', - 'data_reduction_proxy/core/browser/data_reduction_proxy_delegate.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_delegate.h', - 'data_reduction_proxy/core/browser/data_reduction_proxy_interceptor.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_interceptor.h', - 'data_reduction_proxy/core/browser/data_reduction_proxy_io_data.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h', - 'data_reduction_proxy/core/browser/data_reduction_proxy_metrics.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_metrics.h', - 'data_reduction_proxy/core/browser/data_reduction_proxy_mutable_config_values.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_mutable_config_values.h', - 'data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.h', - 'data_reduction_proxy/core/browser/data_reduction_proxy_pingback_client.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_pingback_client.h', - 'data_reduction_proxy/core/browser/data_reduction_proxy_prefs.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_prefs.h', - 'data_reduction_proxy/core/browser/data_reduction_proxy_request_options.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_request_options.h', - 'data_reduction_proxy/core/browser/data_reduction_proxy_service.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_service.h', - 'data_reduction_proxy/core/browser/data_reduction_proxy_service_observer.h', - 'data_reduction_proxy/core/browser/data_reduction_proxy_settings.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_settings.h', - 'data_reduction_proxy/core/browser/data_reduction_proxy_tamper_detection.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_tamper_detection.h', - 'data_reduction_proxy/core/browser/data_store.cc', - 'data_reduction_proxy/core/browser/data_store.h', - 'data_reduction_proxy/core/browser/data_use_group.h', - 'data_reduction_proxy/core/browser/data_use_group_provider.h', - 'data_reduction_proxy/core/browser/data_usage_store.cc', - 'data_reduction_proxy/core/browser/data_usage_store.h', - 'data_reduction_proxy/core/browser/db_data_owner.cc', - 'data_reduction_proxy/core/browser/db_data_owner.h', - ], - 'data_reduction_proxy_core_browser_deps' : [ - 'data_reduction_proxy_version_header', - '../base/base.gyp:base', - '../crypto/crypto.gyp:crypto', - 'pref_registry', - ], - 'data_reduction_proxy_core_common_sources' : [ - # Note: sources list duplicated in GN build. - 'data_reduction_proxy/core/common/data_reduction_proxy_bypass_action_list.h', - 'data_reduction_proxy/core/common/data_reduction_proxy_bypass_type_list.h', - 'data_reduction_proxy/core/common/data_reduction_proxy_config_values.h', - 'data_reduction_proxy/core/common/data_reduction_proxy_event_creator.cc', - 'data_reduction_proxy/core/common/data_reduction_proxy_event_creator.h', - 'data_reduction_proxy/core/common/data_reduction_proxy_event_storage_delegate.h', - 'data_reduction_proxy/core/common/data_reduction_proxy_event_store.cc', - 'data_reduction_proxy/core/common/data_reduction_proxy_event_store.h', - 'data_reduction_proxy/core/common/data_reduction_proxy_headers.cc', - 'data_reduction_proxy/core/common/data_reduction_proxy_headers.h', - 'data_reduction_proxy/core/common/data_reduction_proxy_page_load_timing.cc', - 'data_reduction_proxy/core/common/data_reduction_proxy_page_load_timing.h', - 'data_reduction_proxy/core/common/data_reduction_proxy_params.cc', - 'data_reduction_proxy/core/common/data_reduction_proxy_params.h', - 'data_reduction_proxy/core/common/data_reduction_proxy_pref_names.cc', - 'data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h', - 'data_reduction_proxy/core/common/data_reduction_proxy_switches.cc', - 'data_reduction_proxy/core/common/data_reduction_proxy_switches.h', - 'data_reduction_proxy/core/common/data_reduction_proxy_util.cc', - 'data_reduction_proxy/core/common/data_reduction_proxy_util.h', - 'data_reduction_proxy/core/common/lofi_decider.h', - 'data_reduction_proxy/core/common/lofi_ui_service.h', - ], - }, - 'conditions': [ - # Small versions of libraries for Cronet. - ['OS=="android"', { - 'targets' : [ - { - # GN version: //components/data_reduction_proxy/core/browser:browser_small - 'target_name': 'data_reduction_proxy_core_browser_small', - 'type': 'static_library', - 'dependencies': [ - '<@(data_reduction_proxy_core_browser_deps)', - '../net/net.gyp:net', - '../url/url.gyp:url_lib', - 'data_reduction_proxy_core_common', - 'data_reduction_proxy_proto', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - '<@(data_reduction_proxy_core_browser_sources)' - ], - }, - ], - }], - ['OS!="ios"', { - 'targets' : [ - { - # GN version: //components/data_reduction_proxy/content/common - 'target_name': 'data_reduction_proxy_content_common', - 'type': 'static_library', - 'dependencies': [ - '../content/content.gyp:content_common', - '../ipc/ipc.gyp:ipc', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'data_reduction_proxy/content/common/data_reduction_proxy_messages.cc', - 'data_reduction_proxy/content/common/data_reduction_proxy_messages.h', - ], - }, - { - # GN version: //components/data_reduction_proxy/content/browser - 'target_name': 'data_reduction_proxy_content_browser', - 'type': 'static_library', - 'dependencies': [ - '../content/content.gyp:content_common', - '../ipc/ipc.gyp:ipc', - '../skia/skia.gyp:skia', - 'data_reduction_proxy_content_common', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'data_reduction_proxy/content/browser/content_lofi_ui_service.cc', - 'data_reduction_proxy/content/browser/content_lofi_ui_service.h', - 'data_reduction_proxy/content/browser/content_lofi_decider.cc', - 'data_reduction_proxy/content/browser/content_lofi_decider.h', - 'data_reduction_proxy/content/browser/data_reduction_proxy_message_filter.cc', - 'data_reduction_proxy/content/browser/data_reduction_proxy_message_filter.h', - ], - }, - ], - }], - ], - 'targets': [ - { - # GN version: //components/data_reduction_proxy/core/browser - 'target_name': 'data_reduction_proxy_core_browser', - 'type': 'static_library', - 'conditions': [ - ['OS != "ios"', { - 'defines': [ - 'USE_GOOGLE_API_KEYS_FOR_AUTH_KEY' - ] - }], - ], - 'defines': [ - 'USE_GOOGLE_API_KEYS' - ], - 'dependencies': [ - '<@(data_reduction_proxy_core_browser_deps)', - '../google_apis/google_apis.gyp:google_apis', - '../net/net.gyp:net', - '../url/url.gyp:url_lib', - 'data_reduction_proxy_core_common', - 'data_reduction_proxy_proto', - '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', - ], - 'export_dependent_settings': [ - 'data_reduction_proxy_proto', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - '<@(data_reduction_proxy_core_browser_sources)', - 'data_reduction_proxy/core/browser/data_store_impl.cc', - 'data_reduction_proxy/core/browser/data_store_impl.h', - ], - }, - { - # GN version: //components/data_reduction_proxy/core/common - 'target_name': 'data_reduction_proxy_core_common', - 'type': 'static_library', - 'defines': [ - 'USE_GOOGLE_API_KEYS' - ], - 'dependencies': [ - '../base/base.gyp:base', - '../google_apis/google_apis.gyp:google_apis', - '../url/url.gyp:url_lib', - 'data_reduction_proxy_proto', - 'data_reduction_proxy_version_header', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - '<@(data_reduction_proxy_core_common_sources)' - ], - }, - { - # GN version: //components/data_reduction_proxy/core/browser:test_support - 'target_name': 'data_reduction_proxy_test_support', - 'type': 'static_library', - 'dependencies' : [ - '../base/base.gyp:base', - '../net/net.gyp:net', - '../net/net.gyp:net_test_support', - '../testing/gmock.gyp:gmock', - '../testing/gtest.gyp:gtest', - 'data_reduction_proxy_core_browser', - 'data_reduction_proxy_core_common', - 'data_reduction_proxy_proto', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.h', - 'data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h', - 'data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.cc', - 'data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.h', - 'data_reduction_proxy/core/common/data_reduction_proxy_event_storage_delegate_test_utils.cc', - 'data_reduction_proxy/core/common/data_reduction_proxy_event_storage_delegate_test_utils.h', - 'data_reduction_proxy/core/common/data_reduction_proxy_headers_test_utils.cc', - 'data_reduction_proxy/core/common/data_reduction_proxy_headers_test_utils.h', - 'data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.cc', - 'data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.h', - ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [4267, ], - }, - { - # GN version: //components/data_reduction_proxy/proto - 'target_name': 'data_reduction_proxy_proto', - 'type': 'static_library', - 'dependencies': [ - ], - 'include_dirs': [ - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'data_reduction_proxy/proto/client_config.proto', - 'data_reduction_proxy/proto/data_store.proto', - 'data_reduction_proxy/proto/pageload_metrics.proto', - ], - 'variables': { - 'proto_in_dir': 'data_reduction_proxy/proto', - 'proto_out_dir': 'components/data_reduction_proxy/proto', - }, - 'includes': [ '../build/protoc.gypi' ], - }, - { - 'target_name': 'data_reduction_proxy_version_header', - 'type': 'none', - 'direct_dependent_settings': { - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)', - ], - }, - 'actions': [ - { - 'action_name': 'version_header', - 'message': 'Generating version header file: <@(_outputs)', - 'inputs': [ - '<(version_path)', - 'data_reduction_proxy/core/common/version.h.in', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/components/data_reduction_proxy/core/common/version.h', - ], - 'action': [ - 'python', - '<(version_py_path)', - '-e', 'VERSION_FULL="<(version_full)"', - 'data_reduction_proxy/core/common/version.h.in', - '<@(_outputs)', - ], - 'includes': [ - '../build/util/version.gypi', - ], - }, - ], - }, - ], -}
diff --git a/components/data_usage.gypi b/components/data_usage.gypi deleted file mode 100644 index 6fcef19..0000000 --- a/components/data_usage.gypi +++ /dev/null
@@ -1,44 +0,0 @@ -# Copyright 2015 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. -{ - 'targets': [ - { - 'target_name': 'data_usage_core', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - '../url/url.gyp:url_lib', - ], - 'sources': [ - 'data_usage/core/data_use.cc', - 'data_usage/core/data_use.h', - 'data_usage/core/data_use_aggregator.cc', - 'data_usage/core/data_use_aggregator.h', - 'data_usage/core/data_use_amortizer.h', - 'data_usage/core/data_use_annotator.h', - ] - }, - ], - 'conditions': [ - ['OS=="android"', { - 'targets': [ - { - 'target_name': 'data_usage_android', - 'type': 'static_library', - 'dependencies': [ - ':data_usage_core', - '../base/base.gyp:base', - '../net/net.gyp:net', - '../url/url.gyp:url_lib', - ], - 'sources': [ - 'data_usage/android/traffic_stats_amortizer.cc', - 'data_usage/android/traffic_stats_amortizer.h', - ] - }, - ] - }], # OS=="android" - ], -}
diff --git a/components/data_use_measurement.gypi b/components/data_use_measurement.gypi deleted file mode 100644 index 8b0c490..0000000 --- a/components/data_use_measurement.gypi +++ /dev/null
@@ -1,39 +0,0 @@ -# Copyright 2015 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. -{ - 'targets': [ - { - 'target_name': 'data_use_measurement_core', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - ], - 'sources': [ - 'data_use_measurement/core/data_use_user_data.cc', - 'data_use_measurement/core/data_use_user_data.h', - ] - }, - ], - 'conditions': [ - ['OS!="ios"', { - 'targets': [ - { - 'target_name': 'data_use_measurement_content', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_browser', - '../net/net.gyp:net', - 'data_use_measurement_core', - ], - 'sources': [ - 'data_use_measurement/content/data_use_measurement.cc', - 'data_use_measurement/content/data_use_measurement.h', - ] - }, - ], - }], - ], -}
diff --git a/components/device_event_log.gypi b/components/device_event_log.gypi deleted file mode 100644 index 8e77790..0000000 --- a/components/device_event_log.gypi +++ /dev/null
@@ -1,27 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - 'target_name': 'device_event_log_component', - 'type': '<(component)', - 'dependencies': [ - '../base/base.gyp:base', - ], - 'include_dirs': [ - '..', - ], - 'defines': [ - 'DEVICE_EVENT_LOG_IMPLEMENTATION', - ], - 'sources': [ - 'device_event_log/device_event_log.cc', - 'device_event_log/device_event_log.h', - 'device_event_log/device_event_log_impl.cc', - 'device_event_log/device_event_log_impl.h', - ], - }, - ], -}
diff --git a/components/devtools_discovery.gypi b/components/devtools_discovery.gypi deleted file mode 100644 index 9b8232c..0000000 --- a/components/devtools_discovery.gypi +++ /dev/null
@@ -1,27 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - 'target_name': 'devtools_discovery', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_browser', - '../content/content.gyp:content_common', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'devtools_discovery/basic_target_descriptor.cc', - 'devtools_discovery/basic_target_descriptor.h', - 'devtools_discovery/devtools_discovery_manager.cc', - 'devtools_discovery/devtools_discovery_manager.h', - 'devtools_discovery/devtools_target_descriptor.h', - ], - }, - ], -}
diff --git a/components/devtools_http_handler.gypi b/components/devtools_http_handler.gypi deleted file mode 100644 index 1215e29..0000000 --- a/components/devtools_http_handler.gypi +++ /dev/null
@@ -1,27 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - 'target_name': 'devtools_http_handler', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../components/components.gyp:devtools_discovery', - '../content/content.gyp:content_browser', - '../net/net.gyp:net', - '../net/net.gyp:http_server', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'devtools_http_handler/devtools_http_handler.cc', - 'devtools_http_handler/devtools_http_handler.h', - 'devtools_http_handler/devtools_http_handler_delegate.h', - ], - }, - ], -}
diff --git a/components/display_compositor.gypi b/components/display_compositor.gypi deleted file mode 100644 index 54be47b..0000000 --- a/components/display_compositor.gypi +++ /dev/null
@@ -1,116 +0,0 @@ -# Copyright 2016 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. - -{ - 'targets': [ - { - # GN version: //components/display_compositor:display_compositor - 'target_name': 'display_compositor', - 'type': '<(component)', - 'dependencies': [ - '../base/base.gyp:base', - '../cc/cc.gyp:cc', - '../gpu/gpu.gyp:command_buffer_client', - '../gpu/gpu.gyp:command_buffer_common', - '../skia/skia.gyp:skia', - '../third_party/khronos/khronos.gyp:khronos_headers', - '../ui/gfx/gfx.gyp:gfx', - '../ui/gfx/gfx.gyp:gfx_geometry', - '../ui/gl/gl.gyp:gl', - ], - - 'defines': [ - 'DISPLAY_COMPOSITOR_IMPLEMENTATION', - ], - - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [4267, ], - - 'include_dirs': [ - '..', - ], - - 'sources': [ - 'display_compositor/buffer_queue.cc', - 'display_compositor/buffer_queue.h', - 'display_compositor/compositor_overlay_candidate_validator.h', - 'display_compositor/compositor_overlay_candidate_validator_android.cc', - 'display_compositor/compositor_overlay_candidate_validator_android.h', - 'display_compositor/compositor_overlay_candidate_validator_mac.h', - 'display_compositor/compositor_overlay_candidate_validator_mac.mm', - 'display_compositor/compositor_overlay_candidate_validator_ozone.cc', - 'display_compositor/compositor_overlay_candidate_validator_ozone.h', - 'display_compositor/display_compositor_export.h', - 'display_compositor/gl_helper.cc', - 'display_compositor/gl_helper.h', - 'display_compositor/gl_helper_readback_support.cc', - 'display_compositor/gl_helper_readback_support.h', - 'display_compositor/gl_helper_scaling.cc', - 'display_compositor/gl_helper_scaling.h', - ], - 'conditions': [ - ['use_ozone==1', { - 'dependencies': [ - '../ui/ozone/ozone.gyp:ozone_base', - ], - }], - ], - }, - { - # GN version: //components/display_compositor:display_compositor_gl_tests - 'target_name': 'display_compositor_gl_tests', - 'type': '<(gtest_target_type)', - 'dependencies': [ - 'display_compositor', - '../base/base.gyp:base', - '../base/base.gyp:test_support_base', - '../cc/cc_tests.gyp:cc_test_support', - '../gpu/gpu.gyp:command_buffer_client', - '../media/media.gyp:media', - '../skia/skia.gyp:skia', - '../testing/gmock.gyp:gmock', - '../testing/gtest.gyp:gtest', - '../ui/gl/gl.gyp:gl_test_support', - ], - - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [4267, ], - - 'sources': [ - "display_compositor/display_compositor_test_suite.cc", - "display_compositor/display_compositor_test_suite.h", - "display_compositor/gl_helper_unittest.cc", - "display_compositor/run_all_unittests.cc", - "display_compositor/yuv_readback_unittest.cc", - ] - }, - { - # GN version: //components/display_compositor:display_compositor_benchmark - 'target_name': 'display_compositor_benchmark', - 'type': '<(gtest_target_type)', - 'dependencies': [ - 'display_compositor', - '../base/base.gyp:base', - '../base/base.gyp:test_support_base', - '../cc/cc_tests.gyp:cc_test_support', - '../gpu/gpu.gyp:command_buffer_client', - '../media/media.gyp:media', - '../skia/skia.gyp:skia', - '../testing/gmock.gyp:gmock', - '../testing/gtest.gyp:gtest', - '../ui/gl/gl.gyp:gl_test_support', - ], - - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [4267, ], - - 'sources': [ - "display_compositor/display_compositor_test_suite.cc", - "display_compositor/display_compositor_test_suite.h", - "display_compositor/gl_helper_benchmark.cc", - "display_compositor/run_all_unittests.cc", - ] - }, - ] -}
diff --git a/components/dom_distiller.gypi b/components/dom_distiller.gypi deleted file mode 100644 index 687e2de..0000000 --- a/components/dom_distiller.gypi +++ /dev/null
@@ -1,369 +0,0 @@ -# Copyright 2013 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. - -{ - 'targets': [ - { - # GN version: //components/dom_distiller/core - 'target_name': 'dom_distiller_core', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../skia/skia.gyp:skia', - '../components/sync.gyp:sync', - '../third_party/dom_distiller_js/dom_distiller_js.gyp:dom_distiller_js_proto', - '../third_party/re2/re2.gyp:re2', - 'components.gyp:leveldb_proto', - 'components_resources.gyp:components_resources', - 'components_strings.gyp:components_strings', - 'dom_distiller_protos', - 'prefs/prefs.gyp:prefs', - 'pref_registry', - 'variations', - ], - 'include_dirs': [ - '..', - ], - 'export_dependent_settings': [ - 'dom_distiller_protos', - '../third_party/dom_distiller_js/dom_distiller_js.gyp:dom_distiller_js_proto', - ], - 'sources': [ - 'dom_distiller/android/component_jni_registrar.cc', - 'dom_distiller/android/component_jni_registrar.h', - 'dom_distiller/core/article_attachments_data.cc', - 'dom_distiller/core/article_attachments_data.h', - 'dom_distiller/core/article_distillation_update.cc', - 'dom_distiller/core/article_distillation_update.h', - 'dom_distiller/core/article_entry.cc', - 'dom_distiller/core/article_entry.h', - 'dom_distiller/core/distillable_page_detector.cc', - 'dom_distiller/core/distillable_page_detector.h', - 'dom_distiller/core/distilled_content_store.cc', - 'dom_distiller/core/distilled_content_store.h', - 'dom_distiller/core/distilled_page_prefs.cc', - 'dom_distiller/core/distilled_page_prefs.h', - 'dom_distiller/core/distilled_page_prefs_android.cc', - 'dom_distiller/core/distilled_page_prefs_android.h', - 'dom_distiller/core/distiller.cc', - 'dom_distiller/core/distiller.h', - 'dom_distiller/core/distiller_page.cc', - 'dom_distiller/core/distiller_page.h', - 'dom_distiller/core/distiller_url_fetcher.cc', - 'dom_distiller/core/distiller_url_fetcher.h', - 'dom_distiller/core/dom_distiller_constants.cc', - 'dom_distiller/core/dom_distiller_constants.h', - 'dom_distiller/core/dom_distiller_features.cc', - 'dom_distiller/core/dom_distiller_features.h', - 'dom_distiller/core/dom_distiller_model.cc', - 'dom_distiller/core/dom_distiller_model.h', - 'dom_distiller/core/dom_distiller_observer.h', - 'dom_distiller/core/dom_distiller_request_view_base.cc', - 'dom_distiller/core/dom_distiller_request_view_base.h', - 'dom_distiller/core/dom_distiller_service.cc', - 'dom_distiller/core/dom_distiller_service.h', - 'dom_distiller/core/dom_distiller_service_android.cc', - 'dom_distiller/core/dom_distiller_service_android.h', - 'dom_distiller/core/dom_distiller_store.cc', - 'dom_distiller/core/dom_distiller_store.h', - 'dom_distiller/core/dom_distiller_switches.cc', - 'dom_distiller/core/dom_distiller_switches.h', - 'dom_distiller/core/experiments.cc', - 'dom_distiller/core/experiments.h', - 'dom_distiller/core/feedback_reporter.cc', - 'dom_distiller/core/feedback_reporter.h', - 'dom_distiller/core/font_family_list.h', - 'dom_distiller/core/page_features.cc', - 'dom_distiller/core/page_features.h', - 'dom_distiller/core/task_tracker.cc', - 'dom_distiller/core/task_tracker.h', - 'dom_distiller/core/theme_list.h', - 'dom_distiller/core/url_constants.cc', - 'dom_distiller/core/url_constants.h', - 'dom_distiller/core/url_utils.cc', - 'dom_distiller/core/url_utils.h', - 'dom_distiller/core/url_utils_android.cc', - 'dom_distiller/core/url_utils_android.h', - 'dom_distiller/core/viewer.cc', - 'dom_distiller/core/viewer.h', - ], - 'conditions': [ - ['OS == "android"', { - 'dependencies': [ - 'dom_distiller_core_jni_headers', - ], - }], - ], - }, - { - # GN version: components/dom_distiller/core:test_support - 'target_name': 'dom_distiller_test_support', - 'type': 'static_library', - 'dependencies': [ - 'dom_distiller_core', - 'components.gyp:leveldb_proto_test_support', - '../components/sync.gyp:sync', - '../testing/gmock.gyp:gmock', - '../url/url.gyp:url_lib', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'dom_distiller/core/dom_distiller_test_util.cc', - 'dom_distiller/core/dom_distiller_test_util.h', - 'dom_distiller/core/fake_distiller.cc', - 'dom_distiller/core/fake_distiller.h', - 'dom_distiller/core/fake_distiller_page.cc', - 'dom_distiller/core/fake_distiller_page.h', - 'dom_distiller/core/test_request_view_handle.h', - ], - }, - { - # GN version: //components/dom_distiller/core/proto - 'target_name': 'dom_distiller_protos', - 'type': 'static_library', - 'sources': [ - 'dom_distiller/core/proto/adaboost.proto', - 'dom_distiller/core/proto/distilled_article.proto', - 'dom_distiller/core/proto/distilled_page.proto', - ], - 'variables': { - 'proto_in_dir': 'dom_distiller/core/proto', - 'proto_out_dir': 'components/dom_distiller/core/proto', - }, - 'includes': [ '../build/protoc.gypi' ] - }, - { - # GN version: //components/dom_distiller/content:mojo_bindings - 'target_name': 'dom_distiller_mojo_bindings', - 'type': 'static_library', - 'sources': [ - 'dom_distiller/content/common/distillability_service.mojom', - 'dom_distiller/content/common/distiller_javascript_service.mojom', - 'dom_distiller/content/common/distiller_page_notifier_service.mojom', - ], - 'variables': { - 'use_new_wrapper_types': 'false', - }, - 'includes': [ - '../mojo/mojom_bindings_generator.gypi', - ], - }, - ], - 'conditions': [ - ['OS != "ios"', { - 'targets': [ - { - # GN version: //components/dom_distiller/content/browser - 'target_name': 'dom_distiller_content_browser', - 'type': 'static_library', - 'dependencies': [ - 'dom_distiller_core', - 'dom_distiller_mojo_bindings', - 'dom_distiller_protos', - '../base/base.gyp:base', - '../content/content.gyp:content_browser', - '../mojo/mojo_public.gyp:mojo_cpp_bindings', - '../net/net.gyp:net', - '../skia/skia.gyp:skia', - '../components/sync.gyp:sync', - '../ui/display/display.gyp:display', - '../ui/gfx/gfx.gyp:gfx', - '../url/url.gyp:url_lib', - 'components_resources.gyp:components_resources', - 'components_strings.gyp:components_strings', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'dom_distiller/content/browser/distillability_driver.cc', - 'dom_distiller/content/browser/distillability_driver.h', - 'dom_distiller/content/browser/distillable_page_utils.cc', - 'dom_distiller/content/browser/distillable_page_utils.h', - 'dom_distiller/content/browser/distillable_page_utils_android.cc', - 'dom_distiller/content/browser/distillable_page_utils_android.h', - 'dom_distiller/content/browser/distiller_javascript_service_impl.cc', - 'dom_distiller/content/browser/distiller_javascript_service_impl.h', - 'dom_distiller/content/browser/distiller_javascript_utils.cc', - 'dom_distiller/content/browser/distiller_javascript_utils.h', - 'dom_distiller/content/browser/distiller_page_web_contents.cc', - 'dom_distiller/content/browser/distiller_page_web_contents.h', - 'dom_distiller/content/browser/distiller_ui_handle.h', - 'dom_distiller/content/browser/dom_distiller_viewer_source.cc', - 'dom_distiller/content/browser/dom_distiller_viewer_source.h', - 'dom_distiller/content/browser/web_contents_main_frame_observer.cc', - 'dom_distiller/content/browser/web_contents_main_frame_observer.h', - ], - 'conditions': [ - ['OS == "android"', { - 'dependencies': [ - 'dom_distiller_content_jni_headers', - 'dom_distiller_core_jni_headers', - ], - }], - ], - }, - { - # GN version: //components/dom_distiller/content/renderer - 'target_name': 'dom_distiller_content_renderer', - 'type': 'static_library', - 'dependencies': [ - 'dom_distiller_mojo_bindings', - 'dom_distiller_protos', - '../base/base.gyp:base', - '../content/content.gyp:content_browser', - '../gin/gin.gyp:gin', - '../mojo/mojo_public.gyp:mojo_cpp_bindings', - ], - 'include_dirs': [ - '..', - ], - 'export_dependent_settings': [ - 'dom_distiller_protos', - ], - 'sources': [ - 'dom_distiller/content/renderer/distillability_agent.cc', - 'dom_distiller/content/renderer/distillability_agent.h', - 'dom_distiller/content/renderer/distiller_js_render_frame_observer.cc', - 'dom_distiller/content/renderer/distiller_js_render_frame_observer.h', - 'dom_distiller/content/renderer/distiller_native_javascript.cc', - 'dom_distiller/content/renderer/distiller_native_javascript.h', - 'dom_distiller/content/renderer/distiller_page_notifier_service_impl.cc', - 'dom_distiller/content/renderer/distiller_page_notifier_service_impl.h', - ], - }, - { - # GN version: //components/dom_distiller/webui - 'target_name': 'dom_distiller_webui', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_browser', - '../net/net.gyp:net', - '../skia/skia.gyp:skia', - '../components/sync.gyp:sync', - '../url/url.gyp:url_lib', - 'components_resources.gyp:components_resources', - 'components_strings.gyp:components_strings', - 'dom_distiller_core', - 'dom_distiller_protos', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'dom_distiller/webui/dom_distiller_handler.cc', - 'dom_distiller/webui/dom_distiller_handler.h', - 'dom_distiller/webui/dom_distiller_ui.cc', - 'dom_distiller/webui/dom_distiller_ui.h', - ], - }, - ], - }], - ['OS=="ios"', { - 'targets': [ - { - # GN version: //components/dom_distiller/ios - 'target_name': 'dom_distiller_ios', - 'type': 'static_library', - 'dependencies': [ - '../ios/provider/ios_provider_web.gyp:ios_provider_web', - 'dom_distiller_protos', - 'dom_distiller_core', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'dom_distiller/ios/distiller_page_factory_ios.h', - 'dom_distiller/ios/distiller_page_factory_ios.mm', - 'dom_distiller/ios/distiller_page_ios.h', - 'dom_distiller/ios/distiller_page_ios.mm', - ], - }, - ], - }], - ['OS=="android"', { - 'targets': [ - { - # TODO(cjhopman): remove this when it is rolled downstream. - 'target_name': 'dom_distiller_core_java', - 'type': 'none', - 'dependencies': [ - 'dom_distiller_java', - ], - }, - { - # GN: //components/dom_distiller/android:dom_distiller_java - 'target_name': 'dom_distiller_java', - 'type': 'none', - 'dependencies': [ - 'dom_distiller_core_font_family_java', - 'dom_distiller_core_theme_java', - '../base/base.gyp:base', - '../content/content.gyp:content_java', - ], - 'variables': { - 'java_in_dir': 'dom_distiller/android/java', - }, - 'includes': [ '../build/java.gypi' ], - }, - { - # GN: //components/dom_distiller/android:dom_distiller_core_font_family_javagen - 'target_name': 'dom_distiller_core_font_family_java', - 'type': 'none', - 'sources': [ - 'dom_distiller/android/java/src/org/chromium/components/dom_distiller/core/FontFamily.template', - ], - 'variables': { - 'package_name': 'org/chromium/components/dom_distiller/core', - 'template_deps': ['dom_distiller/core/font_family_list.h'], - }, - 'includes': [ '../build/android/java_cpp_template.gypi' ], - }, - { - # GN: //components/dom_distiller/android:dom_distiller_content_java - 'target_name': 'dom_distiller_content_jni_headers', - 'type': 'none', - 'sources': [ - 'dom_distiller/android/java/src/org/chromium/components/dom_distiller/content/DistillablePageUtils.java', - ], - 'variables': { - 'jni_gen_package': 'dom_distiller_content', - }, - 'includes': [ '../build/jni_generator.gypi' ], - }, - { - # GN: //components/dom_distiller/android:jni_headers - 'target_name': 'dom_distiller_core_jni_headers', - 'type': 'none', - 'sources': [ - 'dom_distiller/android/java/src/org/chromium/components/dom_distiller/core/DistilledPagePrefs.java', - 'dom_distiller/android/java/src/org/chromium/components/dom_distiller/core/DomDistillerService.java', - 'dom_distiller/android/java/src/org/chromium/components/dom_distiller/core/DomDistillerUrlUtils.java', - ], - 'variables': { - 'jni_gen_package': 'dom_distiller_core', - }, - 'includes': [ '../build/jni_generator.gypi' ], - }, - { - # GN: //components/dom_distiller/android:dom_distiller_core_theme_javagen - 'target_name': 'dom_distiller_core_theme_java', - 'type': 'none', - 'sources': [ - 'dom_distiller/android/java/src/org/chromium/components/dom_distiller/core/Theme.template', - ], - 'variables': { - 'package_name': 'org/chromium/components/dom_distiller/core', - 'template_deps': ['dom_distiller/core/theme_list.h'], - }, - 'includes': [ '../build/android/java_cpp_template.gypi' ], - }, - ], - }], - ], -}
diff --git a/components/domain_reliability.gypi b/components/domain_reliability.gypi deleted file mode 100644 index fbd1314..0000000 --- a/components/domain_reliability.gypi +++ /dev/null
@@ -1,92 +0,0 @@ -# Copyright 2014 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. - -{ - 'includes': [ - 'domain_reliability/baked_in_configs.gypi', - ], - 'targets': [ - { - # GN version: //components/domain_reliability - 'target_name': 'domain_reliability', - 'type': '<(component)', - 'dependencies': [ - '../base/base.gyp:base', - '../components/components.gyp:data_use_measurement_core', - '../components/components.gyp:keyed_service_core', - '../components/prefs/prefs.gyp:prefs', - '../content/content.gyp:content_browser', - '../content/content.gyp:content_common', - '../net/net.gyp:net', - '../url/url.gyp:url_lib', - ], - 'include_dirs': [ - '..', - ], - 'defines': [ - 'DOMAIN_RELIABILITY_IMPLEMENTATION', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'domain_reliability/baked_in_configs.h', - 'domain_reliability/beacon.cc', - 'domain_reliability/beacon.h', - 'domain_reliability/clear_mode.h', - 'domain_reliability/config.cc', - 'domain_reliability/config.h', - 'domain_reliability/context.cc', - 'domain_reliability/context.h', - 'domain_reliability/context_manager.cc', - 'domain_reliability/context_manager.h', - 'domain_reliability/dispatcher.cc', - 'domain_reliability/dispatcher.h', - 'domain_reliability/domain_reliability_export.h', - 'domain_reliability/google_configs.cc', - 'domain_reliability/google_configs.h', - 'domain_reliability/header.cc', - 'domain_reliability/header.h', - 'domain_reliability/monitor.cc', - 'domain_reliability/monitor.h', - 'domain_reliability/quic_error_mapping.cc', - 'domain_reliability/quic_error_mapping.h', - 'domain_reliability/scheduler.cc', - 'domain_reliability/scheduler.h', - 'domain_reliability/service.cc', - 'domain_reliability/service.h', - 'domain_reliability/uploader.cc', - 'domain_reliability/uploader.h', - 'domain_reliability/util.cc', - 'domain_reliability/util.h', - ], - 'actions': [ - { - 'action_name': 'bake_in_configs', - 'variables': { - 'bake_in_configs_script': 'domain_reliability/bake_in_configs.py', - 'baked_in_configs_cc': - '<(INTERMEDIATE_DIR)/domain_reliability/baked_in_configs.cc', - }, - 'inputs': [ - '<(bake_in_configs_script)', - '<@(baked_in_configs)', - 'domain_reliability/baked_in_configs.gypi', - ], - 'outputs': [ - '<(baked_in_configs_cc)' - ], - # The actual list of JSON files will overflow the command line length - # limit on Windows, so pass the name of the .gypi file and - # bake_in_configs.py will read the filenames out of it manually. - 'action': ['python', - '<(bake_in_configs_script)', - '--gypi-relative-to=.', - '--gypi-file=domain_reliability/baked_in_configs.gypi', - '--output=<(baked_in_configs_cc)'], - 'process_outputs_as_sources': 1, - 'message': 'Baking in Domain Reliability configs', - }, - ], - }, - ], -}
diff --git a/components/domain_reliability/BUILD.gn b/components/domain_reliability/BUILD.gn index 5834a82..52620af 100644 --- a/components/domain_reliability/BUILD.gn +++ b/components/domain_reliability/BUILD.gn
@@ -2,28 +2,30 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -# Paths to the JSON files are kind of gross. They're stored in the gypi -# relative to //components, since that's the working directory gyp seems -# to use for all of the components. When we depend on them here, we need -# to remove the leading domain_reliability, since *our* working directory -# is one level deeper. When we call bake_in_configs.py, we need to give -# it a properly-rebased path to //components so it can properly join the -# paths relative to that and find the JSON files. - -baked_in_configs_gypi = exec_script("//build/gypi_to_gn.py", - [ rebase_path("baked_in_configs.gypi") ], - "scope", - [ "baked_in_configs.gypi" ]) - -# The config file names in the .gypi are relative to "//components". -baked_in_configs = - rebase_path(baked_in_configs_gypi.baked_in_configs, ".", "//components") - action("bake_in_configs") { visibility = [ ":*" ] script = "bake_in_configs.py" - inputs = baked_in_configs + [ "baked_in_configs.gypi" ] + inputs = [ + "baked_in_configs/c_android_clients_google_com.json", + "baked_in_configs/c_bigcache_googleapis_com.json", + "baked_in_configs/c_doc-0-0-sj_sj_googleusercontent_com.json", + "baked_in_configs/c_docs_google_com.json", + "baked_in_configs/c_drive_google_com.json", + "baked_in_configs/c_googlesyndication_com.json", + "baked_in_configs/c_pack_google_com.json", + "baked_in_configs/c_play_google_com.json", + "baked_in_configs/c_youtube_com.json", + "baked_in_configs/clients2_google_com.json", + "baked_in_configs/docs_google_com.json", + "baked_in_configs/google-analytics_com.json", + "baked_in_configs/googlevideo_com.json", + "baked_in_configs/gvt1_com.json", + "baked_in_configs/gvt2_com.json", + "baked_in_configs/ssl_gstatic_com.json", + "baked_in_configs/www_google_com.json", + ] + output_file = "$target_gen_dir/baked_in_configs.cc" outputs = [ output_file, @@ -31,7 +33,7 @@ # The JSON file list is too long for the command line on Windows, so put # them in a response file. - response_file_contents = rebase_path(baked_in_configs, root_build_dir) + response_file_contents = rebase_path(inputs, root_build_dir) args = [ "--file-list", "{{response_file_name}}",
diff --git a/components/domain_reliability/baked_in_configs.gypi b/components/domain_reliability/baked_in_configs.gypi deleted file mode 100644 index a872ef8..0000000 --- a/components/domain_reliability/baked_in_configs.gypi +++ /dev/null
@@ -1,27 +0,0 @@ -# Copyright 2014 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. - -{ - 'variables': { - 'baked_in_configs': [ - 'domain_reliability/baked_in_configs/c_android_clients_google_com.json', - 'domain_reliability/baked_in_configs/c_bigcache_googleapis_com.json', - 'domain_reliability/baked_in_configs/c_doc-0-0-sj_sj_googleusercontent_com.json', - 'domain_reliability/baked_in_configs/c_docs_google_com.json', - 'domain_reliability/baked_in_configs/c_drive_google_com.json', - 'domain_reliability/baked_in_configs/c_googlesyndication_com.json', - 'domain_reliability/baked_in_configs/c_pack_google_com.json', - 'domain_reliability/baked_in_configs/c_play_google_com.json', - 'domain_reliability/baked_in_configs/c_youtube_com.json', - 'domain_reliability/baked_in_configs/clients2_google_com.json', - 'domain_reliability/baked_in_configs/docs_google_com.json', - 'domain_reliability/baked_in_configs/google-analytics_com.json', - 'domain_reliability/baked_in_configs/googlevideo_com.json', - 'domain_reliability/baked_in_configs/gvt1_com.json', - 'domain_reliability/baked_in_configs/gvt2_com.json', - 'domain_reliability/baked_in_configs/ssl_gstatic_com.json', - 'domain_reliability/baked_in_configs/www_google_com.json', - ], - }, -}
diff --git a/components/drive.gypi b/components/drive.gypi deleted file mode 100644 index 537dc38..0000000 --- a/components/drive.gypi +++ /dev/null
@@ -1,218 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/drive:drive - 'target_name': 'drive', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - 'drive_proto', - '../base/base.gyp:base', - '../components/components.gyp:invalidation_public', - - # TODO(lukasza): Remove this dependency (see DEPS file for more info). - '../content/content.gyp:content_browser', - - '../google_apis/google_apis.gyp:google_apis', - '../net/net.gyp:net', - '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', - '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp', - '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', - '../third_party/re2/re2.gyp:re2', - ], - 'sources': [ - 'drive/drive_api_util.cc', - 'drive/drive_api_util.h', - 'drive/drive_app_registry.cc', - 'drive/drive_app_registry.h', - 'drive/drive_app_registry_observer.h', - 'drive/drive_notification_manager.cc', - 'drive/drive_notification_manager.h', - 'drive/drive_notification_observer.h', - 'drive/drive_pref_names.cc', - 'drive/drive_pref_names.h', - 'drive/drive_uploader.cc', - 'drive/drive_uploader.h', - 'drive/event_logger.cc', - 'drive/event_logger.h', - 'drive/file_change.cc', - 'drive/file_change.h', - 'drive/file_errors.cc', - 'drive/file_errors.h', - 'drive/file_system_core_util.cc', - 'drive/file_system_core_util.h', - 'drive/file_system_metadata.cc', - 'drive/file_system_metadata.h', - 'drive/file_write_watcher.cc', - 'drive/file_write_watcher.h', - 'drive/job_list.cc', - 'drive/job_list.h', - 'drive/job_queue.cc', - 'drive/job_queue.h', - 'drive/job_scheduler.cc', - 'drive/job_scheduler.h', - 'drive/local_file_reader.cc', - 'drive/local_file_reader.h', - 'drive/resource_entry_conversion.cc', - 'drive/resource_entry_conversion.h', - 'drive/resource_metadata_storage.cc', - 'drive/resource_metadata_storage.h', - 'drive/service/drive_api_service.cc', - 'drive/service/drive_api_service.h', - 'drive/service/drive_service_interface.cc', - 'drive/service/drive_service_interface.h', - ], - }, - - { - # GN version: //components/drive:proto - # Protobuf compiler / generator for the Drive protocol buffer. - 'target_name': 'drive_proto', - 'type': 'static_library', - 'sources': [ 'drive/drive.proto' ], - 'variables': { - 'proto_in_dir': 'drive', - 'proto_out_dir': 'components/drive', - }, - 'includes': [ '../build/protoc.gypi' ] - }, - - { - # GN version: //components/drive:test_support - 'target_name': 'drive_test_support', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - 'drive', - 'drive_proto', - '../base/base.gyp:base', - '../content/content_shell_and_tests.gyp:test_support_content', - '../google_apis/google_apis.gyp:google_apis', - '../net/net.gyp:net', - ], - 'sources': [ - "drive/service/dummy_drive_service.cc", - "drive/service/dummy_drive_service.h", - "drive/service/fake_drive_service.cc", - "drive/service/fake_drive_service.h", - "drive/service/test_util.cc", - "drive/service/test_util.h", - ], - }, - - # TODO(lukasza): drive_unittests target. - # Currently tests are built as part of chrome/chrome_tests_unit.gypi. - ], - - 'conditions': [ - ['chromeos==1', { - 'targets': [ - { - # GN version: //components/drive:drive_chromeos - 'target_name': 'drive_chromeos', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - 'drive', - 'drive_proto', - '../base/base.gyp:base', - '../google_apis/google_apis.gyp:google_apis', - '../net/net.gyp:net', - ], - 'sources': [ - 'drive/chromeos/change_list_loader.cc', - 'drive/chromeos/change_list_loader.h', - 'drive/chromeos/change_list_loader_observer.h', - 'drive/chromeos/change_list_processor.cc', - 'drive/chromeos/change_list_processor.h', - 'drive/chromeos/directory_loader.cc', - 'drive/chromeos/directory_loader.h', - 'drive/chromeos/file_cache.cc', - 'drive/chromeos/file_cache.h', - 'drive/chromeos/file_system.cc', - 'drive/chromeos/file_system.h', - 'drive/chromeos/file_system/copy_operation.cc', - 'drive/chromeos/file_system/copy_operation.h', - 'drive/chromeos/file_system/create_directory_operation.cc', - 'drive/chromeos/file_system/create_directory_operation.h', - 'drive/chromeos/file_system/create_file_operation.cc', - 'drive/chromeos/file_system/create_file_operation.h', - 'drive/chromeos/file_system/download_operation.cc', - 'drive/chromeos/file_system/download_operation.h', - 'drive/chromeos/file_system/get_file_for_saving_operation.cc', - 'drive/chromeos/file_system/get_file_for_saving_operation.h', - 'drive/chromeos/file_system/move_operation.cc', - 'drive/chromeos/file_system/move_operation.h', - 'drive/chromeos/file_system/open_file_operation.cc', - 'drive/chromeos/file_system/open_file_operation.h', - 'drive/chromeos/file_system/operation_delegate.cc', - 'drive/chromeos/file_system/operation_delegate.h', - 'drive/chromeos/file_system/remove_operation.cc', - 'drive/chromeos/file_system/remove_operation.h', - 'drive/chromeos/file_system/search_operation.cc', - 'drive/chromeos/file_system/search_operation.h', - 'drive/chromeos/file_system/set_property_operation.cc', - 'drive/chromeos/file_system/set_property_operation.h', - 'drive/chromeos/file_system/touch_operation.cc', - 'drive/chromeos/file_system/touch_operation.h', - 'drive/chromeos/file_system/truncate_operation.cc', - 'drive/chromeos/file_system/truncate_operation.h', - 'drive/chromeos/file_system_interface.cc', - 'drive/chromeos/file_system_interface.h', - 'drive/chromeos/file_system_observer.h', - 'drive/chromeos/remove_stale_cache_files.cc', - 'drive/chromeos/remove_stale_cache_files.h', - 'drive/chromeos/resource_metadata.cc', - 'drive/chromeos/resource_metadata.h', - 'drive/chromeos/search_metadata.cc', - 'drive/chromeos/search_metadata.h', - 'drive/chromeos/sync/entry_revert_performer.cc', - 'drive/chromeos/sync/entry_revert_performer.h', - 'drive/chromeos/sync/entry_update_performer.cc', - 'drive/chromeos/sync/entry_update_performer.h', - 'drive/chromeos/sync/remove_performer.cc', - 'drive/chromeos/sync/remove_performer.h', - 'drive/chromeos/sync_client.cc', - 'drive/chromeos/sync_client.h', - ], - }, - - { - # GN version: //components/drive:test_support_chromeos - 'target_name': 'drive_test_support_chromeos', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - 'drive', - 'drive_chromeos', - 'drive_proto', - '../base/base.gyp:base', - '../content/content_shell_and_tests.gyp:test_support_content', - ], - 'sources': [ - "drive/chromeos/drive_test_util.cc", - "drive/chromeos/drive_test_util.h", - "drive/chromeos/dummy_file_system.cc", - "drive/chromeos/dummy_file_system.h", - "drive/chromeos/fake_file_system.cc", - "drive/chromeos/fake_file_system.h", - "drive/chromeos/fake_free_disk_space_getter.cc", - "drive/chromeos/fake_free_disk_space_getter.h", - ] - } - ] - }] - ] -}
diff --git a/components/error_page.gypi b/components/error_page.gypi deleted file mode 100644 index de8bb3be..0000000 --- a/components/error_page.gypi +++ /dev/null
@@ -1,64 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/error_page/common - 'target_name': 'error_page_common', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../base/base.gyp:base_i18n', - '../net/net.gyp:net', - '../url/url.gyp:url_lib', - '../ui/base/ui_base.gyp:ui_base', - 'components_strings.gyp:components_strings', - 'offline_pages', - 'url_formatter/url_formatter.gyp:url_formatter', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'error_page/common/error_page_params.cc', - 'error_page/common/error_page_params.h', - 'error_page/common/error_page_switches.cc', - 'error_page/common/error_page_switches.h', - 'error_page/common/localized_error.cc', - 'error_page/common/localized_error.h', - 'error_page/common/net_error_info.cc', - 'error_page/common/net_error_info.h', - ], - }, - ], - 'conditions': [ - ['OS != "ios"', { - 'targets': [ - { - # GN version: //components/error_page/renderer - 'target_name': 'error_page_renderer', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../components/components_strings.gyp:components_strings', - '../content/content.gyp:content_common', - '../net/net.gyp:net', - '../third_party/WebKit/public/blink.gyp:blink', - '../ui/base/ui_base.gyp:ui_base', - '../url/url.gyp:url_lib', - 'error_page_common', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'error_page/renderer/net_error_helper_core.cc', - 'error_page/renderer/net_error_helper_core.h', - ], - } - ], - }], - ], -}
diff --git a/components/exo.gypi b/components/exo.gypi deleted file mode 100644 index 82df057a..0000000 --- a/components/exo.gypi +++ /dev/null
@@ -1,125 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/exo - 'target_name': 'exo', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../ash/ash.gyp:ash', - '../base/base.gyp:base', - '../cc/cc.gyp:cc', - '../cc/cc.gyp:cc_surfaces', - '../device/gamepad/gamepad.gyp:device_gamepad', - '../gpu/gpu.gyp:gpu', - '../skia/skia.gyp:skia', - '../ui/aura/aura.gyp:aura', - '../ui/compositor/compositor.gyp:compositor', - '../ui/gfx/gfx.gyp:gfx', - '../ui/gfx/gfx.gyp:gfx_geometry', - '../ui/gl/gl.gyp:gl', - '../ui/views/views.gyp:views', - '../ui/wm/wm.gyp:wm', - ], - 'export_dependent_settings': [ - '../ui/views/views.gyp:views', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'exo/buffer.cc', - 'exo/buffer.h', - 'exo/display.cc', - 'exo/display.h', - 'exo/gamepad.cc', - 'exo/gamepad.h', - 'exo/keyboard.cc', - 'exo/keyboard.h', - 'exo/keyboard_delegate.h', - 'exo/notification_surface.cc', - 'exo/notification_surface.h', - 'exo/notification_surface_manager.h', - 'exo/pointer.cc', - 'exo/pointer.h', - 'exo/pointer_delegate.h', - 'exo/shared_memory.cc', - 'exo/shared_memory.h', - 'exo/shell_surface.cc', - 'exo/shell_surface.h', - 'exo/sub_surface.cc', - 'exo/sub_surface.h', - 'exo/surface.cc', - 'exo/surface.h', - 'exo/surface_property.h', - 'exo/surface_delegate.h', - 'exo/surface_observer.h', - 'exo/touch.cc', - 'exo/touch.h', - 'exo/touch_delegate.h', - ], - }, - ], - 'conditions': [ - [ 'OS=="linux"', { - 'targets': [ - { - # GN version: //components/exo:wayland - 'target_name': 'exo_wayland', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../ipc/ipc.gyp:ipc', - '../skia/skia.gyp:skia', - '../third_party/wayland-protocols/wayland-protocols.gyp:alpha_compositing_protocol', - '../third_party/wayland-protocols/wayland-protocols.gyp:gaming_input_protocol', - '../third_party/wayland-protocols/wayland-protocols.gyp:remote_shell_protocol', - '../third_party/wayland-protocols/wayland-protocols.gyp:secure_output_protocol', - '../third_party/wayland-protocols/wayland-protocols.gyp:stylus_protocol', - '../third_party/wayland-protocols/wayland-protocols.gyp:viewporter_protocol', - '../third_party/wayland-protocols/wayland-protocols.gyp:xdg_shell_protocol', - '../third_party/wayland-protocols/wayland-protocols.gyp:vsync_feedback_protocol', - '../third_party/wayland/wayland.gyp:wayland_server', - '../ui/aura/aura.gyp:aura', - '../ui/events/events.gyp:dom_keycode_converter', - '../ui/display/display.gyp:display', - '../ui/events/events.gyp:events_base', - '../ui/views/views.gyp:views', - 'exo', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'exo/wayland/scoped_wl.cc', - 'exo/wayland/scoped_wl.h', - 'exo/wayland/server.cc', - 'exo/wayland/server.h', - ], - 'conditions': [ - ['use_ozone==1', { - 'dependencies': [ - '../build/linux/system.gyp:libdrm', - '../third_party/mesa/mesa.gyp:wayland_drm_protocol', - '../third_party/wayland-protocols/wayland-protocols.gyp:linux_dmabuf_protocol', - ], - }], - ['use_xkbcommon==1', { - 'dependencies': [ - '../build/linux/system.gyp:xkbcommon', - ], - 'defines': [ - 'USE_XKBCOMMON', - ], - }], - ], - }, - ], - }], - ], -}
diff --git a/components/external_video_surface.gypi b/components/external_video_surface.gypi deleted file mode 100644 index b6abe3dc..0000000 --- a/components/external_video_surface.gypi +++ /dev/null
@@ -1,49 +0,0 @@ -# Copyright 2015 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. - -{ - 'variables': { - 'chromium_code': 1 - }, - 'targets': [ - { - 'target_name': 'external_video_surface', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_browser', - 'external_video_surface_jni_headers', - ], - 'sources': [ - 'external_video_surface/browser/android/external_video_surface_container_impl.cc', - 'external_video_surface/browser/android/external_video_surface_container_impl.h', - 'external_video_surface/component_jni_registrar.cc', - 'external_video_surface/component_jni_registrar.h', - ], - }, - { - 'target_name': 'external_video_surface_java', - 'type': 'none', - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_java', - ], - 'variables': { - 'java_in_dir': 'external_video_surface/android/java', - }, - 'includes': [ '../build/java.gypi' ], - }, - { - 'target_name': 'external_video_surface_jni_headers', - 'type': 'none', - 'sources': [ - 'external_video_surface/android/java/src/org/chromium/components/external_video_surface/ExternalVideoSurfaceContainer.java', - ], - 'variables': { - 'jni_gen_package': 'external_video_surface', - }, - 'includes': [ '../build/jni_generator.gypi' ], - }, - ], -}
diff --git a/components/favicon.gypi b/components/favicon.gypi deleted file mode 100644 index 9d9ffb60..0000000 --- a/components/favicon.gypi +++ /dev/null
@@ -1,112 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/favicon/core - 'target_name': 'favicon_core', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../base/base.gyp:base_i18n', - '../skia/skia.gyp:skia', - '../ui/base/ui_base.gyp:ui_base', - '../ui/gfx/gfx.gyp:gfx', - '../url/url.gyp:url_lib', - 'bookmarks_browser', - 'favicon_base', - 'history_core_browser', - 'keyed_service_core', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'favicon/core/fallback_url_util.cc', - 'favicon/core/fallback_url_util.h', - 'favicon/core/favicon_client.h', - 'favicon/core/favicon_driver.cc', - 'favicon/core/favicon_driver.h', - 'favicon/core/favicon_driver_impl.cc', - 'favicon/core/favicon_driver_impl.h', - 'favicon/core/favicon_driver_observer.h', - 'favicon/core/favicon_handler.cc', - 'favicon/core/favicon_handler.h', - 'favicon/core/favicon_service.cc', - 'favicon/core/favicon_service.h', - 'favicon/core/favicon_url.cc', - 'favicon/core/favicon_url.h', - 'favicon/core/favicon_util.cc', - 'favicon/core/favicon_util.h', - 'favicon/core/large_icon_service.cc', - 'favicon/core/large_icon_service.h', - ], - 'include_dirs': [ - '..', - ], - 'conditions': [ - ['OS!="ios"', { - 'sources': [ - 'favicon/core/fallback_icon_client.h', - 'favicon/core/fallback_icon_service.cc', - 'favicon/core/fallback_icon_service.h', - ], - }], - ], - }, - ], - 'conditions': [ - ['OS!="ios"', { - 'targets': [ - { - # GN version: //components/favicon/content - 'target_name': 'favicon_content', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_browser', - '../content/content.gyp:content_common', - '../ui/gfx/gfx.gyp:gfx', - 'favicon_base', - 'favicon_core', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'favicon/content/content_favicon_driver.cc', - 'favicon/content/content_favicon_driver.h', - 'favicon/content/favicon_url_util.cc', - 'favicon/content/favicon_url_util.h', - ], - 'include_dirs': [ - '..', - ], - }, - ], - }], - ['OS=="ios"', { - 'targets': [ - { - # GN version: //components/favicon/ios - 'target_name': 'favicon_ios', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../ios/web/ios_web.gyp:ios_web', - '../ui/gfx/gfx.gyp:gfx', - 'favicon_base', - 'favicon_core', - ], - 'sources': [ - 'favicon/ios/favicon_url_util.cc', - 'favicon/ios/favicon_url_util.h', - 'favicon/ios/web_favicon_driver.h', - 'favicon/ios/web_favicon_driver.mm', - ], - 'include_dirs': [ - '..', - ], - }, - ], - }], - ], -}
diff --git a/components/favicon_base.gypi b/components/favicon_base.gypi deleted file mode 100644 index b969e54..0000000 --- a/components/favicon_base.gypi +++ /dev/null
@@ -1,45 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/favicon_base - 'target_name': 'favicon_base', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - '../skia/skia.gyp:skia', - '../ui/base/ui_base.gyp:ui_base', - '../ui/base/ui_base.gyp:ui_data_pack', - '../ui/gfx/gfx.gyp:gfx', - '../ui/gfx/gfx.gyp:gfx_geometry', - '../url/url.gyp:url_lib', - ], - 'sources': [ - 'favicon_base/fallback_icon_style.cc', - 'favicon_base/fallback_icon_style.h', - 'favicon_base/fallback_icon_url_parser.cc', - 'favicon_base/fallback_icon_url_parser.h', - 'favicon_base/favicon_callback.h', - 'favicon_base/favicon_types.cc', - 'favicon_base/favicon_types.h', - 'favicon_base/favicon_url_parser.cc', - 'favicon_base/favicon_url_parser.h', - 'favicon_base/favicon_usage_data.cc', - 'favicon_base/favicon_usage_data.h', - 'favicon_base/favicon_util.cc', - 'favicon_base/favicon_util.h', - 'favicon_base/large_icon_url_parser.cc', - 'favicon_base/large_icon_url_parser.h', - 'favicon_base/select_favicon_frames.cc', - 'favicon_base/select_favicon_frames.h', - ], - }, - ], -}
diff --git a/components/feedback.gypi b/components/feedback.gypi deleted file mode 100644 index e92f00d..0000000 --- a/components/feedback.gypi +++ /dev/null
@@ -1,71 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - 'target_name': 'feedback_component', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_common', - '../net/net.gyp:net', - '../third_party/re2/re2.gyp:re2', - '../third_party/zlib/google/zip.gyp:zip', - 'keyed_service_core', - 'feedback_proto', - 'components.gyp:variations_net', - ], - 'include_dirs': [ - '..', - ], - 'defines': [ - ], - 'sources': [ - 'feedback/anonymizer_tool.cc', - 'feedback/anonymizer_tool.h', - 'feedback/feedback_common.cc', - 'feedback/feedback_common.h', - 'feedback/feedback_data.cc', - 'feedback/feedback_data.h', - 'feedback/feedback_report.cc', - 'feedback/feedback_report.h', - 'feedback/feedback_switches.cc', - 'feedback/feedback_switches.h', - 'feedback/feedback_uploader.cc', - 'feedback/feedback_uploader.h', - 'feedback/feedback_uploader_chrome.cc', - 'feedback/feedback_uploader_chrome.h', - 'feedback/feedback_uploader_delegate.cc', - 'feedback/feedback_uploader_delegate.h', - 'feedback/feedback_uploader_factory.cc', - 'feedback/feedback_uploader_factory.h', - 'feedback/feedback_util.cc', - 'feedback/feedback_util.h', - 'feedback/tracing_manager.cc', - 'feedback/tracing_manager.h', - ], - }, - { - # Protobuf compiler / generate rule for feedback - # GN version: //components/feedback/proto - 'target_name': 'feedback_proto', - 'type': 'static_library', - 'sources': [ - 'feedback/proto/annotations.proto', - 'feedback/proto/chrome.proto', - 'feedback/proto/common.proto', - 'feedback/proto/dom.proto', - 'feedback/proto/extension.proto', - 'feedback/proto/math.proto', - 'feedback/proto/web.proto', - ], - 'variables': { - 'proto_in_dir': 'feedback/proto', - 'proto_out_dir': 'components/feedback/proto', - }, - 'includes': [ '../build/protoc.gypi' ] - }, - ], -}
diff --git a/components/filesystem/filesystem.gyp b/components/filesystem/filesystem.gyp deleted file mode 100644 index 87c24b3..0000000 --- a/components/filesystem/filesystem.gyp +++ /dev/null
@@ -1,72 +0,0 @@ -# Copyright 2016 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. - -{ - 'variables': { - # This turns on e.g. the filename-based detection of which - # platforms to include source files on (e.g. files ending in - # _mac.h or _mac.cc are only compiled on MacOSX). - 'chromium_code': 1, - }, - 'targets': [ - { - # GN version: //components/filesystem:lib - 'target_name': 'filesystem_lib', - 'type': 'static_library', - 'include_dirs': [ - '../..', - ], - 'sources': [ - 'directory_impl.cc', - 'directory_impl.h', - 'file_impl.cc', - 'file_impl.h', - 'file_system_impl.cc', - 'file_system_impl.h', - 'lock_table.cc', - 'lock_table.h', - 'shared_temp_dir.cc', - 'shared_temp_dir.h', - 'util.cc', - 'util.h', - ], - 'dependencies': [ - 'filesystem_bindings', - '../../mojo/mojo_edk.gyp:mojo_system_impl', - '../../mojo/mojo_public.gyp:mojo_cpp_bindings', - '../../mojo/mojo_public.gyp:mojo_cpp_system', - '../../services/shell/shell_public.gyp:shell_public', - '../../url/url.gyp:url_lib', - ], - 'export_dependent_settings': [ - 'filesystem_bindings', - ], - }, - { - # GN version: //components/filesystem/public/interfaces - 'target_name': 'filesystem_bindings', - 'type': 'static_library', - 'dependencies': [ - 'filesystem_bindings_mojom', - ], - 'hard_dependency': 1, - }, - { - 'target_name': 'filesystem_bindings_mojom', - 'type': 'none', - 'variables': { - 'mojom_files': [ - 'public/interfaces/directory.mojom', - 'public/interfaces/file.mojom', - 'public/interfaces/file_system.mojom', - 'public/interfaces/types.mojom', - ], - 'use_new_wrapper_types': 'false', - }, - 'includes': [ - '../../mojo/mojom_bindings_generator_explicit.gypi', - ], - } - ], -}
diff --git a/components/flags_ui.gypi b/components/flags_ui.gypi deleted file mode 100644 index 31e3653..0000000 --- a/components/flags_ui.gypi +++ /dev/null
@@ -1,79 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/flags_ui - 'target_name': 'flags_ui', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../components/components_strings.gyp:components_strings', - '../components/prefs/prefs.gyp:prefs', - '../ui/base/ui_base.gyp:ui_base', - 'flags_ui_switches', - 'pref_registry', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'flags_ui/feature_entry.cc', - 'flags_ui/feature_entry.h', - 'flags_ui/feature_entry_macros.h', - 'flags_ui/flags_state.cc', - 'flags_ui/flags_state.h', - 'flags_ui/flags_storage.h', - 'flags_ui/flags_ui_constants.cc', - 'flags_ui/flags_ui_constants.h', - 'flags_ui/flags_ui_pref_names.cc', - 'flags_ui/flags_ui_pref_names.h', - 'flags_ui/pref_service_flags_storage.cc', - 'flags_ui/pref_service_flags_storage.h', - ], - }, - { - # GN version: //components/flags_ui:switches - # This is a separate target so that the dependencies of - # //chrome/common can be kept minimal. - 'target_name': 'flags_ui_switches', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'flags_ui/flags_ui_switches.cc', - 'flags_ui/flags_ui_switches.h', - ], - }, - ], - 'conditions': [ - ['OS=="win" and target_arch=="ia32"', { - 'targets': [ - { - # The flags_ui_switches_win64 target here allows us to use base for - # Win64 targets (the normal build is 32 bits). - 'target_name': 'flags_ui_switches_win64', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'flags_ui/flags_ui_switches.cc', - 'flags_ui/flags_ui_switches.h', - ], - 'configurations': { - 'Common_Base': { - 'msvs_target_platform': 'x64', - }, - }, - }, - ], - }], - ], -}
diff --git a/components/gcm_driver.gypi b/components/gcm_driver.gypi deleted file mode 100644 index 292e777..0000000 --- a/components/gcm_driver.gypi +++ /dev/null
@@ -1,373 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/gcm_driver/common - 'target_name': 'gcm_driver_common', - 'type': '<(component)', - 'include_dirs': [ - '..', - ], - 'defines': [ - 'GCM_DRIVER_IMPLEMENTATION', - ], - 'sources': [ - # Note: file list duplicated in GN build. - 'gcm_driver/common/gcm_driver_export.h', - 'gcm_driver/common/gcm_messages.cc', - 'gcm_driver/common/gcm_messages.h', - ], - }, - { - # GN version: //components/gcm_driver - 'target_name': 'gcm_driver', - 'type': 'static_library', - 'dependencies': [ - 'gcm_driver_common', - 'gcm_driver_crypto', - 'os_crypt', - '../base/base.gyp:base', - '../components/components.gyp:crx_file', - '../components/sync.gyp:sync', - '../google_apis/gcm/gcm.gyp:gcm', - '../net/net.gyp:net', - '../url/url.gyp:url_lib', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: file list duplicated in GN build. - 'gcm_driver/android/component_jni_registrar.cc', - 'gcm_driver/android/component_jni_registrar.h', - 'gcm_driver/default_gcm_app_handler.cc', - 'gcm_driver/default_gcm_app_handler.h', - 'gcm_driver/gcm_account_mapper.cc', - 'gcm_driver/gcm_account_mapper.h', - 'gcm_driver/gcm_account_tracker.cc', - 'gcm_driver/gcm_account_tracker.h', - 'gcm_driver/gcm_activity.cc', - 'gcm_driver/gcm_activity.h', - 'gcm_driver/gcm_app_handler.cc', - 'gcm_driver/gcm_app_handler.h', - 'gcm_driver/gcm_backoff_policy.cc', - 'gcm_driver/gcm_backoff_policy.h', - 'gcm_driver/gcm_channel_status_request.cc', - 'gcm_driver/gcm_channel_status_request.h', - 'gcm_driver/gcm_channel_status_syncer.cc', - 'gcm_driver/gcm_channel_status_syncer.h', - 'gcm_driver/gcm_client.cc', - 'gcm_driver/gcm_client.h', - 'gcm_driver/gcm_client_factory.cc', - 'gcm_driver/gcm_client_factory.h', - 'gcm_driver/gcm_client_impl.cc', - 'gcm_driver/gcm_client_impl.h', - 'gcm_driver/gcm_connection_observer.cc', - 'gcm_driver/gcm_connection_observer.h', - 'gcm_driver/gcm_delayed_task_controller.cc', - 'gcm_driver/gcm_delayed_task_controller.h', - 'gcm_driver/gcm_desktop_utils.cc', - 'gcm_driver/gcm_desktop_utils.h', - 'gcm_driver/gcm_driver.cc', - 'gcm_driver/gcm_driver.h', - 'gcm_driver/gcm_driver_android.cc', - 'gcm_driver/gcm_driver_android.h', - 'gcm_driver/gcm_driver_constants.cc', - 'gcm_driver/gcm_driver_constants.h', - 'gcm_driver/gcm_driver_desktop.cc', - 'gcm_driver/gcm_driver_desktop.h', - 'gcm_driver/gcm_internals_constants.cc', - 'gcm_driver/gcm_internals_constants.h', - 'gcm_driver/gcm_internals_helper.cc', - 'gcm_driver/gcm_internals_helper.h', - 'gcm_driver/gcm_profile_service.cc', - 'gcm_driver/gcm_profile_service.h', - 'gcm_driver/gcm_stats_recorder_android.cc', - 'gcm_driver/gcm_stats_recorder_android.h', - 'gcm_driver/gcm_stats_recorder_impl.cc', - 'gcm_driver/gcm_stats_recorder_impl.h', - 'gcm_driver/registration_info.cc', - 'gcm_driver/registration_info.h', - 'gcm_driver/system_encryptor.cc', - 'gcm_driver/system_encryptor.h', - ], - 'conditions': [ - ['OS == "android"', { - 'dependencies': [ - 'gcm_driver_jni_headers', - ], - 'dependencies!': [ - '../components/components.gyp:crx_file', - '../google_apis/gcm/gcm.gyp:gcm', - ], - 'sources!': [ - 'gcm_driver/gcm_account_mapper.cc', - 'gcm_driver/gcm_account_mapper.h', - 'gcm_driver/gcm_channel_status_request.cc', - 'gcm_driver/gcm_channel_status_request.h', - 'gcm_driver/gcm_channel_status_syncer.cc', - 'gcm_driver/gcm_channel_status_syncer.h', - 'gcm_driver/gcm_client_factory.cc', - 'gcm_driver/gcm_client_factory.h', - 'gcm_driver/gcm_client_impl.cc', - 'gcm_driver/gcm_client_impl.h', - 'gcm_driver/gcm_desktop_utils.cc', - 'gcm_driver/gcm_desktop_utils.h', - 'gcm_driver/gcm_driver_desktop.cc', - 'gcm_driver/gcm_driver_desktop.h', - 'gcm_driver/gcm_stats_recorder_impl.cc', - 'gcm_driver/gcm_stats_recorder_impl.h', - ], - }], - ['chromeos == 1', { - 'dependencies': [ - 'timers', - ], - }], - ], - }, - { - # GN version: //components/gcm_driver:test_support - 'target_name': 'gcm_driver_test_support', - 'type': 'static_library', - 'dependencies': [ - 'gcm_driver', - '../base/base.gyp:base', - '../google_apis/gcm/gcm.gyp:gcm_test_support', - '../testing/gtest.gyp:gtest', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: file list duplicated in GN build. - 'gcm_driver/fake_gcm_app_handler.cc', - 'gcm_driver/fake_gcm_app_handler.h', - 'gcm_driver/fake_gcm_client.cc', - 'gcm_driver/fake_gcm_client.h', - 'gcm_driver/fake_gcm_client_factory.cc', - 'gcm_driver/fake_gcm_client_factory.h', - 'gcm_driver/fake_gcm_driver.cc', - 'gcm_driver/fake_gcm_driver.h', - ], - 'conditions': [ - ['OS == "android"', { - 'dependencies!': [ - '../google_apis/gcm/gcm.gyp:gcm_test_support', - ], - 'sources!': [ - 'gcm_driver/fake_gcm_client.cc', - 'gcm_driver/fake_gcm_client.h', - 'gcm_driver/fake_gcm_client_factory.cc', - 'gcm_driver/fake_gcm_client_factory.h', - ], - }], - ], - }, - { - # GN version: //components/gcm_driver/instance_id - 'target_name': 'instance_id', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: file list duplicated in GN build. - 'gcm_driver/instance_id/android/component_jni_registrar.cc', - 'gcm_driver/instance_id/android/component_jni_registrar.h', - 'gcm_driver/instance_id/instance_id.cc', - 'gcm_driver/instance_id/instance_id.h', - 'gcm_driver/instance_id/instance_id_android.cc', - 'gcm_driver/instance_id/instance_id_android.h', - 'gcm_driver/instance_id/instance_id_driver.cc', - 'gcm_driver/instance_id/instance_id_driver.h', - 'gcm_driver/instance_id/instance_id_impl.cc', - 'gcm_driver/instance_id/instance_id_impl.h', - ], - 'conditions': [ - ['OS == "android"', { - 'dependencies': [ - 'instance_id_driver_jni_headers', - ], - 'sources!': [ - 'gcm_driver/instance_id/instance_id_impl.cc', - 'gcm_driver/instance_id/instance_id_impl.h', - ], - }], - ], - }, - { - # GN version: //components/gcm_driver/instance_id:test_support - 'target_name': 'instance_id_test_support', - 'type': 'static_library', - 'dependencies': [ - 'gcm_driver_test_support', - 'instance_id', - '../testing/gtest.gyp:gtest', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: file list duplicated in GN build. - 'gcm_driver/instance_id/fake_gcm_driver_for_instance_id.cc', - 'gcm_driver/instance_id/fake_gcm_driver_for_instance_id.h', - 'gcm_driver/instance_id/scoped_use_fake_instance_id_android.cc', - 'gcm_driver/instance_id/scoped_use_fake_instance_id_android.h', - ], - 'conditions': [ - ['OS == "android"', { - 'dependencies': [ - 'instance_id_driver_test_support_jni_headers', - ], - }], - ], - }, - { - # GN version: //components/gcm_driver/crypto - 'target_name': 'gcm_driver_crypto', - 'type': 'static_library', - 'dependencies': [ - 'gcm_driver_crypto_proto', - '../base/base.gyp:base', - '../components/components.gyp:leveldb_proto', - '../crypto/crypto.gyp:crypto', - '../net/net.gyp:net', - '../third_party/boringssl/boringssl.gyp:boringssl', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: file list duplicated in GN build. - 'gcm_driver/crypto/encryption_header_parsers.cc', - 'gcm_driver/crypto/encryption_header_parsers.h', - 'gcm_driver/crypto/gcm_encryption_provider.cc', - 'gcm_driver/crypto/gcm_encryption_provider.h', - 'gcm_driver/crypto/gcm_key_store.cc', - 'gcm_driver/crypto/gcm_key_store.h', - 'gcm_driver/crypto/gcm_message_cryptographer.cc', - 'gcm_driver/crypto/gcm_message_cryptographer.h', - 'gcm_driver/crypto/p256_key_util.cc', - 'gcm_driver/crypto/p256_key_util.h', - ], - }, - { - # GN version: //components/gcm_driver/crypto/proto - 'target_name': 'gcm_driver_crypto_proto', - 'type': 'static_library', - 'sources': [ - 'gcm_driver/crypto/proto/gcm_encryption_data.proto', - ], - 'variables': { - 'proto_in_dir': 'gcm_driver/crypto/proto', - 'proto_out_dir': 'components/gcm_driver/crypto/proto', - }, - 'includes': [ '../build/protoc.gypi' ], - }, - { - # GN version: //components/gcm_driver/crypto:test_support - 'target_name': 'gcm_driver_crypto_test_support', - 'type': 'static_library', - 'dependencies': [ - 'gcm_driver_common', - 'gcm_driver_crypto', - '../base/base.gyp:base', - '../crypto/crypto.gyp:crypto', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: file list duplicated in GN build. - 'gcm_driver/crypto/gcm_crypto_test_helpers.cc', - 'gcm_driver/crypto/gcm_crypto_test_helpers.h', - ], - }, - ], - 'conditions': [ - ['OS == "android"', { - 'targets': [ - { - # GN version: //components/gcm_driver/android:gcm_driver_java - 'target_name': 'gcm_driver_java', - 'type': 'none', - 'dependencies': [ - '../base/base.gyp:base_java', - '../content/content.gyp:content_java', - '../components/sync.gyp:sync_java', - ], - 'variables': { - 'java_in_dir': 'gcm_driver/android/java', - }, - 'includes': [ '../build/java.gypi' ], - }, - { - # GN version: //components/gcm_driver/android:jni_headers - 'target_name': 'gcm_driver_jni_headers', - 'type': 'none', - 'sources': [ - 'gcm_driver/android/java/src/org/chromium/components/gcm_driver/GCMDriver.java', - ], - 'variables': { - 'jni_gen_package': 'components/gcm_driver', - }, - 'includes': [ '../build/jni_generator.gypi' ], - }, - { - # GN version: //components/gcm_driver/instance_id/android:instance_id_driver_java - 'target_name': 'instance_id_driver_java', - 'type': 'none', - 'dependencies': [ - '../base/base.gyp:base_java', - '../third_party/android_tools/android_tools.gyp:google_play_services_javalib', - ], - 'variables': { - 'java_in_dir': 'gcm_driver/instance_id/android/java', - }, - 'includes': [ '../build/java.gypi' ], - }, - { - # GN version: //components/gcm_driver/instance_id/android:instance_id_driver_test_support_java - 'target_name': 'instance_id_driver_test_support_java', - 'type': 'none', - 'dependencies': [ - 'instance_id_driver_java', - ], - 'variables': { - 'java_in_dir': 'gcm_driver/instance_id/android/javatests', - }, - 'includes': [ '../build/java.gypi' ], - }, - { - # GN version: //components/gcm_driver/instance_id/android:jni_headers - 'target_name': 'instance_id_driver_jni_headers', - 'type': 'none', - 'sources': [ - 'gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java', - ], - 'variables': { - 'jni_gen_package': 'components/gcm_driver/instance_id', - }, - 'includes': [ '../build/jni_generator.gypi' ], - }, - { - # GN version: //components/gcm_driver/instance_id/android:test_support_jni_headers - 'target_name': 'instance_id_driver_test_support_jni_headers', - 'type': 'none', - 'sources': [ - 'gcm_driver/instance_id/android/javatests/src/org/chromium/components/gcm_driver/instance_id/FakeInstanceIDWithSubtype.java', - ], - 'variables': { - 'jni_gen_package': 'components/gcm_driver/instance_id', - }, - 'includes': [ '../build/jni_generator.gypi' ], - }, - ], - }, - ], - ], -}
diff --git a/components/google.gypi b/components/google.gypi deleted file mode 100644 index 5bc0a74..0000000 --- a/components/google.gypi +++ /dev/null
@@ -1,39 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/google/core/browser - 'target_name': 'google_core_browser', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - '../url/url.gyp:url_lib', - 'components_strings.gyp:components_strings', - 'data_use_measurement_core', - 'keyed_service_core', - 'pref_registry', - 'url_formatter/url_formatter.gyp:url_formatter', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources duplicated in GN build. - 'google/core/browser/google_pref_names.cc', - 'google/core/browser/google_pref_names.h', - 'google/core/browser/google_switches.cc', - 'google/core/browser/google_switches.h', - 'google/core/browser/google_url_tracker.cc', - 'google/core/browser/google_url_tracker.h', - 'google/core/browser/google_url_tracker_client.cc', - 'google/core/browser/google_url_tracker_client.h', - 'google/core/browser/google_util.cc', - 'google/core/browser/google_util.h', - ], - }, - ], -}
diff --git a/components/guest_view.gypi b/components/guest_view.gypi deleted file mode 100644 index 39e13ca..0000000 --- a/components/guest_view.gypi +++ /dev/null
@@ -1,99 +0,0 @@ -# Copyright 2015 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. -{ - 'conditions': [ - ['OS != "ios"', { - 'targets': [ - { - 'target_name': 'guest_view_browser', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_browser', - '../content/content.gyp:content_common', - 'guest_view_common' - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'guest_view/browser/guest_view.h', - 'guest_view/browser/guest_view_base.cc', - 'guest_view/browser/guest_view_base.h', - 'guest_view/browser/guest_view_event.cc', - 'guest_view/browser/guest_view_event.h', - 'guest_view/browser/guest_view_manager.cc', - 'guest_view/browser/guest_view_manager.h', - 'guest_view/browser/guest_view_manager_delegate.cc', - 'guest_view/browser/guest_view_manager_delegate.h', - 'guest_view/browser/guest_view_manager_factory.h', - 'guest_view/browser/guest_view_message_filter.cc', - 'guest_view/browser/guest_view_message_filter.h', - ], - }, - { - 'target_name': 'guest_view_common', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../ipc/ipc.gyp:ipc', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'guest_view/common/guest_view_constants.cc', - 'guest_view/common/guest_view_constants.h', - 'guest_view/common/guest_view_message_generator.cc', - 'guest_view/common/guest_view_message_generator.h', - 'guest_view/common/guest_view_messages.h', - ] - }, - { - 'target_name': 'guest_view_renderer', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_common', - '../content/content.gyp:content_renderer', - '../third_party/WebKit/public/blink.gyp:blink', - '../v8/src/v8.gyp:v8', - 'guest_view_common' - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'guest_view/renderer/guest_view_container_dispatcher.cc', - 'guest_view/renderer/guest_view_container_dispatcher.h', - 'guest_view/renderer/guest_view_container.cc', - 'guest_view/renderer/guest_view_container.h', - 'guest_view/renderer/guest_view_request.cc', - 'guest_view/renderer/guest_view_request.h', - 'guest_view/renderer/iframe_guest_view_container.cc', - 'guest_view/renderer/iframe_guest_view_container.h', - 'guest_view/renderer/iframe_guest_view_request.cc', - 'guest_view/renderer/iframe_guest_view_request.h', - ], - }, - { - 'target_name': 'guest_view_test_support', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../content/content_shell_and_tests.gyp:test_support_content', - 'guest_view_browser', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'guest_view/browser/test_guest_view_manager.h', - 'guest_view/browser/test_guest_view_manager.cc', - ], - } - ], - }] - ] -}
diff --git a/components/handoff.gypi b/components/handoff.gypi deleted file mode 100644 index 264e03197..0000000 --- a/components/handoff.gypi +++ /dev/null
@@ -1,33 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/handoff - 'target_name': 'handoff', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'conditions': [ - ['OS=="mac" or OS=="ios"', { - 'sources': [ - 'handoff/handoff_utility.h', - 'handoff/handoff_utility.mm', - ], - }], - ['OS=="mac"', { - 'sources': [ - 'handoff/handoff_manager.h', - 'handoff/handoff_manager.mm', - ], - 'dependencies': [ - '../base/base.gyp:base', - ], - }], - ], - }, - ], -}
diff --git a/components/history.gypi b/components/history.gypi deleted file mode 100644 index 52aac08..0000000 --- a/components/history.gypi +++ /dev/null
@@ -1,267 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/history/core/browser - 'target_name': 'history_core_browser', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../base/base.gyp:base_i18n', - '../google_apis/google_apis.gyp:google_apis', - '../net/net.gyp:net', - '../skia/skia.gyp:skia', - '../sql/sql.gyp:sql', - '../components/sync.gyp:sync', - '../third_party/sqlite/sqlite.gyp:sqlite', - '../ui/base/ui_base.gyp:ui_base', - '../ui/gfx/gfx.gyp:gfx', - '../url/url.gyp:url_lib', - 'favicon_base', - 'history_core_common', - 'keyed_service_core', - 'prefs/prefs.gyp:prefs', - 'query_parser', - 'signin_core_browser', - 'url_formatter/url_formatter.gyp:url_formatter', - 'version_info', - ], - 'export_dependent_settings': [ - '../skia/skia.gyp:skia', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'history/core/browser/delete_directive_handler.cc', - 'history/core/browser/delete_directive_handler.h', - 'history/core/browser/download_constants.h', - 'history/core/browser/download_database.cc', - 'history/core/browser/download_database.h', - 'history/core/browser/download_row.cc', - 'history/core/browser/download_row.h', - 'history/core/browser/download_types.cc', - 'history/core/browser/download_types.h', - 'history/core/browser/expire_history_backend.cc', - 'history/core/browser/expire_history_backend.h', - 'history/core/browser/history_backend.cc', - 'history/core/browser/history_backend.h', - 'history/core/browser/history_backend_client.h', - 'history/core/browser/history_backend_notifier.h', - 'history/core/browser/history_backend_observer.h', - 'history/core/browser/history_client.h', - 'history/core/browser/history_constants.cc', - 'history/core/browser/history_constants.h', - 'history/core/browser/history_context.h', - 'history/core/browser/history_database.cc', - 'history/core/browser/history_database.h', - 'history/core/browser/history_database_params.cc', - 'history/core/browser/history_database_params.h', - 'history/core/browser/history_db_task.h', - 'history/core/browser/history_delete_directives_data_type_controller.cc', - 'history/core/browser/history_delete_directives_data_type_controller.h', - 'history/core/browser/history_match.cc', - 'history/core/browser/history_match.h', - 'history/core/browser/history_model_worker.cc', - 'history/core/browser/history_model_worker.h', - 'history/core/browser/history_service.cc', - 'history/core/browser/history_service.h', - 'history/core/browser/history_service_observer.h', - 'history/core/browser/history_types.cc', - 'history/core/browser/history_types.h', - 'history/core/browser/in_memory_database.cc', - 'history/core/browser/in_memory_database.h', - 'history/core/browser/in_memory_history_backend.cc', - 'history/core/browser/in_memory_history_backend.h', - 'history/core/browser/keyword_id.h', - 'history/core/browser/keyword_search_term.cc', - 'history/core/browser/keyword_search_term.h', - 'history/core/browser/page_usage_data.cc', - 'history/core/browser/page_usage_data.h', - 'history/core/browser/thumbnail_database.cc', - 'history/core/browser/thumbnail_database.h', - 'history/core/browser/top_sites.cc', - 'history/core/browser/top_sites.h', - 'history/core/browser/top_sites_backend.cc', - 'history/core/browser/top_sites_backend.h', - 'history/core/browser/top_sites_cache.cc', - 'history/core/browser/top_sites_cache.h', - 'history/core/browser/top_sites_database.cc', - 'history/core/browser/top_sites_database.h', - 'history/core/browser/top_sites_impl.cc', - 'history/core/browser/top_sites_impl.h', - 'history/core/browser/top_sites_observer.h', - 'history/core/browser/typed_url_data_type_controller.cc', - 'history/core/browser/typed_url_data_type_controller.h', - 'history/core/browser/typed_url_syncable_service.cc', - 'history/core/browser/typed_url_syncable_service.h', - 'history/core/browser/url_database.cc', - 'history/core/browser/url_database.h', - 'history/core/browser/url_row.cc', - 'history/core/browser/url_row.h', - 'history/core/browser/url_utils.cc', - 'history/core/browser/url_utils.h', - 'history/core/browser/visit_database.cc', - 'history/core/browser/visit_database.h', - 'history/core/browser/visit_delegate.cc', - 'history/core/browser/visit_delegate.h', - 'history/core/browser/visit_tracker.cc', - 'history/core/browser/visit_tracker.h', - 'history/core/browser/visitsegment_database.cc', - 'history/core/browser/visitsegment_database.h', - 'history/core/browser/web_history_service.cc', - 'history/core/browser/web_history_service.h', - ], - 'conditions': [ - ['OS=="android"', { - 'sources': [ - 'history/core/browser/android/android_cache_database.cc', - 'history/core/browser/android/android_cache_database.h', - 'history/core/browser/android/android_history_types.cc', - 'history/core/browser/android/android_history_types.h', - 'history/core/browser/android/android_time.h', - 'history/core/browser/android/android_urls_database.cc', - 'history/core/browser/android/android_urls_database.h', - 'history/core/browser/android/android_urls_sql_handler.cc', - 'history/core/browser/android/android_urls_sql_handler.h', - 'history/core/browser/android/favicon_sql_handler.cc', - 'history/core/browser/android/favicon_sql_handler.h', - 'history/core/browser/android/sql_handler.cc', - 'history/core/browser/android/sql_handler.h', - 'history/core/browser/android/urls_sql_handler.cc', - 'history/core/browser/android/urls_sql_handler.h', - 'history/core/browser/android/visit_sql_handler.cc', - 'history/core/browser/android/visit_sql_handler.h', - ], - }], - ], - }, - { - # GN version: //components/history/core/common - 'target_name': 'history_core_common', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'history/core/common/thumbnail_score.cc', - 'history/core/common/thumbnail_score.h', - ], - }, - { - # GN version: //components/history/core/test - 'target_name': 'history_core_test_support', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - '../skia/skia.gyp:skia', - '../sql/sql.gyp:sql', - '../sql/sql.gyp:test_support_sql', - '../components/sync.gyp:sync', - '../testing/gtest.gyp:gtest', - '../ui/gfx/gfx.gyp:gfx', - '../url/url.gyp:url_lib', - 'history_core_browser', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'history/core/test/database_test_utils.cc', - 'history/core/test/database_test_utils.h', - 'history/core/test/fake_web_history_service.cc', - 'history/core/test/fake_web_history_service.h', - 'history/core/test/history_backend_db_base_test.cc', - 'history/core/test/history_backend_db_base_test.h', - 'history/core/test/history_client_fake_bookmarks.cc', - 'history/core/test/history_client_fake_bookmarks.h', - 'history/core/test/history_unittest_base.cc', - 'history/core/test/history_service_test_util.cc', - 'history/core/test/history_service_test_util.h', - 'history/core/test/history_unittest_base.h', - 'history/core/test/test_history_database.cc', - 'history/core/test/test_history_database.h', - 'history/core/test/thumbnail-inl.h', - 'history/core/test/thumbnail.cc', - 'history/core/test/thumbnail.h', - 'history/core/test/thumbnail_ios.mm', - 'history/core/test/wait_top_sites_loaded_observer.cc', - 'history/core/test/wait_top_sites_loaded_observer.h', - ], - 'conditions': [ - ['OS=="ios"', { - 'sources!': [ - 'history/core/test/thumbnail.cc', - ], - }], - ], - }, - ], - 'conditions': [ - ['OS!="ios"', { - 'targets': [ - { - # GN version: //components/history/content/browser - 'target_name': 'history_content_browser', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_browser', - '../url/url.gyp:url_lib', - 'history_core_browser', - 'visitedlink_browser', - ], - 'sources': [ - 'history/content/browser/content_visit_delegate.cc', - 'history/content/browser/content_visit_delegate.h', - 'history/content/browser/download_constants_utils.cc', - 'history/content/browser/download_constants_utils.h', - 'history/content/browser/history_context_helper.cc', - 'history/content/browser/history_context_helper.h', - 'history/content/browser/history_database_helper.cc', - 'history/content/browser/history_database_helper.h', - 'history/content/browser/web_contents_top_sites_observer.cc', - 'history/content/browser/web_contents_top_sites_observer.h', - ], - } - ], - }], - ['OS=="ios"', { - 'targets': [ - { - # GN version: //components/history/ios/browser - 'target_name': 'history_ios_browser', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../ios/web/ios_web.gyp:ios_web', - '../url/url.gyp:url_lib', - 'history_core_browser', - ], - 'sources': [ - 'history/ios/browser/history_database_helper.cc', - 'history/ios/browser/history_database_helper.h', - 'history/ios/browser/web_state_top_sites_observer.h', - 'history/ios/browser/web_state_top_sites_observer.mm', - ], - }, - ], - }], - ], -}
diff --git a/components/history/core/browser/history_backend.cc b/components/history/core/browser/history_backend.cc index 210032aa..f9e2b57d 100644 --- a/components/history/core/browser/history_backend.cc +++ b/components/history/core/browser/history_backend.cc
@@ -2257,7 +2257,7 @@ scheduled_commit_ = new CommitLaterTask(this); task_runner_->PostDelayedTask( FROM_HERE, - base::Bind(&CommitLaterTask::RunCommit, scheduled_commit_.get()), + base::Bind(&CommitLaterTask::RunCommit, scheduled_commit_), base::TimeDelta::FromSeconds(kCommitIntervalSeconds)); }
diff --git a/components/history/core/browser/history_service.cc b/components/history/core/browser/history_service.cc index 284d3ea..fd3a29e 100644 --- a/components/history/core/browser/history_service.cc +++ b/components/history/core/browser/history_service.cc
@@ -226,7 +226,7 @@ DCHECK(thread_checker_.CalledOnValidThread()); ScheduleTask(PRIORITY_NORMAL, base::Bind(&HistoryBackend::ClearCachedDataForContextID, - history_backend_.get(), context_id)); + history_backend_, context_id)); } URLDatabase* HistoryService::InMemoryDatabase() { @@ -250,7 +250,7 @@ DCHECK(thread_checker_.CalledOnValidThread()); ScheduleTask(PRIORITY_UI, base::Bind(&HistoryBackend::SetKeywordSearchTermsForURL, - history_backend_.get(), url, keyword_id, term)); + history_backend_, url, keyword_id, term)); } void HistoryService::DeleteAllSearchTermsForKeyword(KeywordID keyword_id) { @@ -262,7 +262,7 @@ ScheduleTask(PRIORITY_UI, base::Bind(&HistoryBackend::DeleteAllSearchTermsForKeyword, - history_backend_.get(), keyword_id)); + history_backend_, keyword_id)); } void HistoryService::DeleteKeywordSearchTermForURL(const GURL& url) { @@ -270,7 +270,7 @@ DCHECK(thread_checker_.CalledOnValidThread()); ScheduleTask(PRIORITY_UI, base::Bind(&HistoryBackend::DeleteKeywordSearchTermForURL, - history_backend_.get(), url)); + history_backend_, url)); } void HistoryService::DeleteMatchingURLsForKeyword(KeywordID keyword_id, @@ -279,7 +279,7 @@ DCHECK(thread_checker_.CalledOnValidThread()); ScheduleTask(PRIORITY_UI, base::Bind(&HistoryBackend::DeleteMatchingURLsForKeyword, - history_backend_.get(), keyword_id, term)); + history_backend_, keyword_id, term)); } void HistoryService::URLsNoLongerBookmarked(const std::set<GURL>& urls) { @@ -287,7 +287,7 @@ DCHECK(thread_checker_.CalledOnValidThread()); ScheduleTask(PRIORITY_NORMAL, base::Bind(&HistoryBackend::URLsNoLongerBookmarked, - history_backend_.get(), urls)); + history_backend_, urls)); } void HistoryService::AddObserver(HistoryServiceObserver* observer) { @@ -313,7 +313,7 @@ // HistoryDBTask::DoneRunOnMainThread() in the correct thread. thread_->task_runner()->PostTask( FROM_HERE, base::Bind(&HistoryBackend::ProcessDBTask, - history_backend_.get(), base::Passed(&task), + history_backend_, base::Passed(&task), base::ThreadTaskRunnerHandle::Get(), is_canceled)); return task_id; } @@ -329,7 +329,7 @@ ScheduleTask( PRIORITY_NORMAL, base::Bind(&HistoryBackend::SetOnBackendDestroyTask, - history_backend_.get(), base::MessageLoop::current(), task)); + history_backend_, base::MessageLoop::current(), task)); } void HistoryService::TopHosts(size_t num_hosts, @@ -338,7 +338,7 @@ DCHECK(thread_checker_.CalledOnValidThread()); PostTaskAndReplyWithResult( thread_->task_runner().get(), FROM_HERE, - base::Bind(&HistoryBackend::TopHosts, history_backend_.get(), num_hosts), + base::Bind(&HistoryBackend::TopHosts, history_backend_, num_hosts), callback); } @@ -350,7 +350,7 @@ PostTaskAndReplyWithResult( thread_->task_runner().get(), FROM_HERE, base::Bind(&HistoryBackend::GetCountsAndLastVisitForOrigins, - history_backend_.get(), origins), + history_backend_, origins), callback); } @@ -361,7 +361,7 @@ DCHECK(thread_checker_.CalledOnValidThread()); PostTaskAndReplyWithResult(thread_->task_runner().get(), FROM_HERE, base::Bind(&HistoryBackend::HostRankIfAvailable, - history_backend_.get(), url), + history_backend_, url), callback); } @@ -414,7 +414,7 @@ } ScheduleTask(PRIORITY_NORMAL, - base::Bind(&HistoryBackend::AddPage, history_backend_.get(), + base::Bind(&HistoryBackend::AddPage, history_backend_, add_page_args)); } @@ -427,7 +427,7 @@ ScheduleTask(PRIORITY_NORMAL, base::Bind(&HistoryBackend::AddPageNoVisitForBookmark, - history_backend_.get(), url, title)); + history_backend_, url, title)); } void HistoryService::SetPageTitle(const GURL& url, @@ -435,7 +435,7 @@ DCHECK(thread_) << "History service being called after cleanup"; DCHECK(thread_checker_.CalledOnValidThread()); ScheduleTask(PRIORITY_NORMAL, base::Bind(&HistoryBackend::SetPageTitle, - history_backend_.get(), url, title)); + history_backend_, url, title)); } void HistoryService::UpdateWithPageEndTime(ContextID context_id, @@ -446,7 +446,7 @@ DCHECK(thread_checker_.CalledOnValidThread()); ScheduleTask( PRIORITY_NORMAL, - base::Bind(&HistoryBackend::UpdateWithPageEndTime, history_backend_.get(), + base::Bind(&HistoryBackend::UpdateWithPageEndTime, history_backend_, context_id, nav_entry_id, url, end_ts)); } @@ -479,7 +479,7 @@ ScheduleTask(PRIORITY_NORMAL, base::Bind(&HistoryBackend::AddPagesWithDetails, - history_backend_.get(), rows, visit_source)); + history_backend_, rows, visit_source)); } void HistoryService::AddPagesWithDetails(const URLRows& info, @@ -498,7 +498,7 @@ ScheduleTask(PRIORITY_NORMAL, base::Bind(&HistoryBackend::AddPagesWithDetails, - history_backend_.get(), info, visit_source)); + history_backend_, info, visit_source)); } base::CancelableTaskTracker::TaskId HistoryService::GetFavicons( @@ -513,7 +513,7 @@ new std::vector<favicon_base::FaviconRawBitmapResult>(); return tracker->PostTaskAndReply( thread_->task_runner().get(), FROM_HERE, - base::Bind(&HistoryBackend::GetFavicons, history_backend_.get(), + base::Bind(&HistoryBackend::GetFavicons, history_backend_, icon_urls, icon_types, desired_sizes, results), base::Bind(&RunWithFaviconResults, callback, base::Owned(results))); } @@ -530,7 +530,7 @@ new std::vector<favicon_base::FaviconRawBitmapResult>(); return tracker->PostTaskAndReply( thread_->task_runner().get(), FROM_HERE, - base::Bind(&HistoryBackend::GetFaviconsForURL, history_backend_.get(), + base::Bind(&HistoryBackend::GetFaviconsForURL, history_backend_, page_url, icon_types, desired_sizes, results), base::Bind(&RunWithFaviconResults, callback, base::Owned(results))); } @@ -548,7 +548,7 @@ return tracker->PostTaskAndReply( thread_->task_runner().get(), FROM_HERE, base::Bind(&HistoryBackend::GetLargestFaviconForURL, - history_backend_.get(), page_url, icon_types, + history_backend_, page_url, icon_types, minimum_size_in_pixels, result), base::Bind(&RunWithFaviconResult, callback, base::Owned(result))); } @@ -564,7 +564,7 @@ new std::vector<favicon_base::FaviconRawBitmapResult>(); return tracker->PostTaskAndReply( thread_->task_runner().get(), FROM_HERE, - base::Bind(&HistoryBackend::GetFaviconForID, history_backend_.get(), + base::Bind(&HistoryBackend::GetFaviconForID, history_backend_, favicon_id, desired_size, results), base::Bind(&RunWithFaviconResults, callback, base::Owned(results))); } @@ -584,7 +584,7 @@ return tracker->PostTaskAndReply( thread_->task_runner().get(), FROM_HERE, base::Bind(&HistoryBackend::UpdateFaviconMappingsAndFetch, - history_backend_.get(), page_url, icon_urls, icon_types, + history_backend_, page_url, icon_urls, icon_types, desired_sizes, results), base::Bind(&RunWithFaviconResults, callback, base::Owned(results))); } @@ -602,7 +602,7 @@ ScheduleTask( PRIORITY_NORMAL, - base::Bind(&HistoryBackend::MergeFavicon, history_backend_.get(), + base::Bind(&HistoryBackend::MergeFavicon, history_backend_, page_url, icon_url, icon_type, bitmap_data, pixel_size)); } @@ -616,7 +616,7 @@ return; ScheduleTask(PRIORITY_NORMAL, - base::Bind(&HistoryBackend::SetFavicons, history_backend_.get(), + base::Bind(&HistoryBackend::SetFavicons, history_backend_, page_url, icon_type, icon_url, bitmaps)); } @@ -625,7 +625,7 @@ DCHECK(thread_checker_.CalledOnValidThread()); ScheduleTask(PRIORITY_NORMAL, base::Bind(&HistoryBackend::SetFaviconsOutOfDateForPage, - history_backend_.get(), page_url)); + history_backend_, page_url)); } void HistoryService::SetImportedFavicons( @@ -634,7 +634,7 @@ DCHECK(thread_checker_.CalledOnValidThread()); ScheduleTask(PRIORITY_NORMAL, base::Bind(&HistoryBackend::SetImportedFavicons, - history_backend_.get(), favicon_usage)); + history_backend_, favicon_usage)); } base::CancelableTaskTracker::TaskId HistoryService::QueryURL( @@ -647,7 +647,7 @@ QueryURLResult* query_url_result = new QueryURLResult(); return tracker->PostTaskAndReply( thread_->task_runner().get(), FROM_HERE, - base::Bind(&HistoryBackend::QueryURL, history_backend_.get(), url, + base::Bind(&HistoryBackend::QueryURL, history_backend_, url, want_visits, base::Unretained(query_url_result)), base::Bind(&RunWithQueryURLResult, callback, base::Owned(query_url_result))); @@ -666,7 +666,7 @@ return tracker->PostTaskAndReplyWithResult( thread_->task_runner().get(), FROM_HERE, base::Bind(&HistoryBackend::GetHistoryCount, - history_backend_.get(), + history_backend_, begin_time, end_time), callback); @@ -683,7 +683,7 @@ DCHECK(thread_checker_.CalledOnValidThread()); PostTaskAndReplyWithResult(thread_->task_runner().get(), FROM_HERE, base::Bind(&HistoryBackend::CreateDownload, - history_backend_.get(), create_info), + history_backend_, create_info), callback); } @@ -692,7 +692,7 @@ DCHECK(thread_checker_.CalledOnValidThread()); PostTaskAndReplyWithResult( thread_->task_runner().get(), FROM_HERE, - base::Bind(&HistoryBackend::GetNextDownloadId, history_backend_.get()), + base::Bind(&HistoryBackend::GetNextDownloadId, history_backend_), callback); } @@ -709,7 +709,7 @@ // Bind's arguments. thread_->task_runner()->PostTaskAndReply( FROM_HERE, - base::Bind(&HistoryBackend::QueryDownloads, history_backend_.get(), rows), + base::Bind(&HistoryBackend::QueryDownloads, history_backend_, rows), base::Bind(callback, base::Passed(&scoped_rows))); } @@ -719,14 +719,14 @@ DCHECK(thread_) << "History service being called after cleanup"; DCHECK(thread_checker_.CalledOnValidThread()); ScheduleTask(PRIORITY_NORMAL, base::Bind(&HistoryBackend::UpdateDownload, - history_backend_.get(), data)); + history_backend_, data)); } void HistoryService::RemoveDownloads(const std::set<uint32_t>& ids) { DCHECK(thread_) << "History service being called after cleanup"; DCHECK(thread_checker_.CalledOnValidThread()); ScheduleTask(PRIORITY_NORMAL, base::Bind(&HistoryBackend::RemoveDownloads, - history_backend_.get(), ids)); + history_backend_, ids)); } base::CancelableTaskTracker::TaskId HistoryService::QueryHistory( @@ -739,7 +739,7 @@ QueryResults* query_results = new QueryResults(); return tracker->PostTaskAndReply( thread_->task_runner().get(), FROM_HERE, - base::Bind(&HistoryBackend::QueryHistory, history_backend_.get(), + base::Bind(&HistoryBackend::QueryHistory, history_backend_, text_query, options, base::Unretained(query_results)), base::Bind(callback, base::Owned(query_results))); } @@ -753,7 +753,7 @@ RedirectList* result = new RedirectList(); return tracker->PostTaskAndReply( thread_->task_runner().get(), FROM_HERE, - base::Bind(&HistoryBackend::QueryRedirectsFrom, history_backend_.get(), + base::Bind(&HistoryBackend::QueryRedirectsFrom, history_backend_, from_url, base::Unretained(result)), base::Bind(callback, base::Owned(result))); } @@ -767,7 +767,7 @@ RedirectList* result = new RedirectList(); return tracker->PostTaskAndReply( thread_->task_runner().get(), FROM_HERE, - base::Bind(&HistoryBackend::QueryRedirectsTo, history_backend_.get(), + base::Bind(&HistoryBackend::QueryRedirectsTo, history_backend_, to_url, base::Unretained(result)), base::Bind(callback, base::Owned(result))); } @@ -782,7 +782,7 @@ return tracker->PostTaskAndReply( thread_->task_runner().get(), FROM_HERE, base::Bind(&HistoryBackend::GetVisibleVisitCountToHost, - history_backend_.get(), url, base::Unretained(result)), + history_backend_, url, base::Unretained(result)), base::Bind(&RunWithVisibleVisitCountToHostResult, callback, base::Owned(result))); } @@ -797,7 +797,7 @@ MostVisitedURLList* result = new MostVisitedURLList(); return tracker->PostTaskAndReply( thread_->task_runner().get(), FROM_HERE, - base::Bind(&HistoryBackend::QueryMostVisitedURLs, history_backend_.get(), + base::Bind(&HistoryBackend::QueryMostVisitedURLs, history_backend_, result_count, days_back, base::Unretained(result)), base::Bind(callback, base::Owned(result))); } @@ -844,7 +844,7 @@ // See http://crbug.com/99767. history_backend_->AddRef(); base::Closure closing_task = - base::Bind(&HistoryBackend::Closing, history_backend_.get()); + base::Bind(&HistoryBackend::Closing, history_backend_); ScheduleTask(PRIORITY_NORMAL, closing_task); closing_task.Reset(); HistoryBackend* raw_ptr = history_backend_.get(); @@ -884,7 +884,7 @@ history_backend_.swap(backend); ScheduleTask(PRIORITY_UI, - base::Bind(&HistoryBackend::Init, history_backend_.get(), + base::Bind(&HistoryBackend::Init, history_backend_, no_db, history_database_params)); if (visit_delegate_ && !visit_delegate_->Init(this)) @@ -900,7 +900,7 @@ const base::Callback<void(HistoryBackend*, URLDatabase*)>& callback) { DCHECK(thread_checker_.CalledOnValidThread()); ScheduleTask(PRIORITY_UI, base::Bind(&HistoryBackend::ScheduleAutocomplete, - history_backend_.get(), callback)); + history_backend_, callback)); } void HistoryService::ScheduleTask(SchedulePriority priority, @@ -979,7 +979,7 @@ DCHECK(thread_checker_.CalledOnValidThread()); // We will update the visited links when we observe the delete notifications. ScheduleTask(PRIORITY_NORMAL, base::Bind(&HistoryBackend::DeleteURL, - history_backend_.get(), url)); + history_backend_, url)); } void HistoryService::DeleteURLsForTest(const std::vector<GURL>& urls) { @@ -988,7 +988,7 @@ // We will update the visited links when we observe the delete // notifications. ScheduleTask(PRIORITY_NORMAL, base::Bind(&HistoryBackend::DeleteURLs, - history_backend_.get(), urls)); + history_backend_, urls)); } void HistoryService::ExpireHistoryBetween(
diff --git a/components/image_fetcher.gypi b/components/image_fetcher.gypi deleted file mode 100644 index 8596aa5..0000000 --- a/components/image_fetcher.gypi +++ /dev/null
@@ -1,31 +0,0 @@ -# Copyright 2016 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. - -{ - 'targets': [ - { - # GN version: //components/image_fetcher - 'target_name': 'image_fetcher', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - '../url/url.gyp:url_lib', - 'data_use_measurement_core', - ], - 'sources': [ - 'image_fetcher/image_data_fetcher.cc', - 'image_fetcher/image_data_fetcher.h', - 'image_fetcher/image_decoder.h', - 'image_fetcher/image_fetcher.h', - 'image_fetcher/image_fetcher_delegate.h', - 'image_fetcher/image_fetcher_impl.cc', - 'image_fetcher/image_fetcher_impl.h', - ] - }, - ], -}
diff --git a/components/infobars.gypi b/components/infobars.gypi deleted file mode 100644 index a0e36a0..0000000 --- a/components/infobars.gypi +++ /dev/null
@@ -1,65 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/infobars/core - 'target_name': 'infobars_core', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../skia/skia.gyp:skia', - '../ui/base/ui_base.gyp:ui_base', - '../ui/gfx/gfx.gyp:gfx', - '../ui/strings/ui_strings.gyp:ui_strings', - ], - 'export_dependent_settings': [ - '../skia/skia.gyp:skia', - ], - 'sources': [ - # Note: sources duplicated in GN build. - 'infobars/core/confirm_infobar_delegate.cc', - 'infobars/core/confirm_infobar_delegate.h', - 'infobars/core/infobar.cc', - 'infobars/core/infobar.h', - 'infobars/core/infobar_container.cc', - 'infobars/core/infobar_container.h', - 'infobars/core/infobar_delegate.cc', - 'infobars/core/infobar_delegate.h', - 'infobars/core/infobar_manager.cc', - 'infobars/core/infobar_manager.h', - 'infobars/core/infobars_switches.cc', - 'infobars/core/infobars_switches.h', - 'infobars/core/simple_alert_infobar_delegate.cc', - 'infobars/core/simple_alert_infobar_delegate.h', - ], - 'conditions': [ - ['OS != "ios" and OS != "android"', { - 'dependencies': [ - '../ui/gfx/gfx.gyp:gfx_vector_icons', - '../ui/native_theme/native_theme.gyp:native_theme', - ], - }], - ], - }, - ], - 'conditions': [ - ['OS == "android"', { - 'targets': [ - { - 'target_name': 'infobar_delegate_java', - 'type': 'none', - 'variables': { - 'source_file': 'infobars/core/infobar_delegate.h', - }, - 'includes': [ '../build/android/java_cpp_enum.gypi' ], - }, - ], - }], - ], -}
diff --git a/components/invalidation.gypi b/components/invalidation.gypi deleted file mode 100644 index f1997731..0000000 --- a/components/invalidation.gypi +++ /dev/null
@@ -1,269 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/invalidation/public - 'target_name': 'invalidation_public', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', - # TODO(akalin): Remove this (http://crbug.com/133352). - '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp', - ], - 'export_dependent_settings': [ - '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'invalidation/public/ack_handle.cc', - 'invalidation/public/ack_handle.h', - 'invalidation/public/ack_handler.cc', - 'invalidation/public/ack_handler.h', - 'invalidation/public/invalidation.cc', - 'invalidation/public/invalidation.h', - 'invalidation/public/invalidation_export.h', - 'invalidation/public/invalidation_handler.cc', - 'invalidation/public/invalidation_handler.h', - 'invalidation/public/invalidation_service.h', - 'invalidation/public/invalidation_util.cc', - 'invalidation/public/invalidation_util.h', - 'invalidation/public/invalidator_state.cc', - 'invalidation/public/invalidator_state.h', - 'invalidation/public/object_id_invalidation_map.cc', - 'invalidation/public/object_id_invalidation_map.h', - 'invalidation/public/single_object_invalidation_set.cc', - 'invalidation/public/single_object_invalidation_set.h', - ], - }, - { - # GN version: //components/invalidation/impl - 'target_name': 'invalidation_impl', - 'type': 'static_library', - 'dependencies': [ - 'invalidation_public', - '../base/base.gyp:base', - '../base/base.gyp:base_i18n', - '../google_apis/google_apis.gyp:google_apis', - '../jingle/jingle.gyp:notifier', - '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp', - 'data_use_measurement_core', - 'gcm_driver', - 'keyed_service_core', - 'pref_registry', - 'prefs/prefs.gyp:prefs', - 'signin_core_browser', - ], - 'export_dependent_settings': [ - 'invalidation_public', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'invalidation/impl/invalidation_logger.cc', - 'invalidation/impl/invalidation_logger.h', - 'invalidation/impl/invalidation_logger_observer.h', - 'invalidation/impl/invalidation_prefs.cc', - 'invalidation/impl/invalidation_prefs.h', - 'invalidation/impl/invalidation_service_util.cc', - 'invalidation/impl/invalidation_service_util.h', - 'invalidation/impl/invalidation_state_tracker.cc', - 'invalidation/impl/invalidation_state_tracker.h', - 'invalidation/impl/invalidation_switches.cc', - 'invalidation/impl/invalidation_switches.h', - 'invalidation/impl/invalidator.cc', - 'invalidation/impl/invalidator.h', - 'invalidation/impl/invalidator_registrar.cc', - 'invalidation/impl/invalidator_registrar.h', - 'invalidation/impl/invalidator_storage.cc', - 'invalidation/impl/invalidator_storage.h', - 'invalidation/impl/mock_ack_handler.cc', - 'invalidation/impl/mock_ack_handler.h', - 'invalidation/impl/profile_invalidation_provider.cc', - 'invalidation/impl/profile_invalidation_provider.h', - 'invalidation/impl/unacked_invalidation_set.cc', - 'invalidation/impl/unacked_invalidation_set.h', - ], - 'conditions': [ - ['OS != "android"', { - 'sources': [ - # Note: sources list duplicated in GN build. - 'invalidation/impl/gcm_invalidation_bridge.cc', - 'invalidation/impl/gcm_invalidation_bridge.h', - 'invalidation/impl/gcm_network_channel.cc', - 'invalidation/impl/gcm_network_channel.h', - 'invalidation/impl/gcm_network_channel_delegate.h', - 'invalidation/impl/invalidation_notifier.cc', - 'invalidation/impl/invalidation_notifier.h', - 'invalidation/impl/non_blocking_invalidator.cc', - 'invalidation/impl/non_blocking_invalidator.h', - 'invalidation/impl/notifier_reason_util.cc', - 'invalidation/impl/notifier_reason_util.h', - 'invalidation/impl/p2p_invalidator.cc', - 'invalidation/impl/p2p_invalidator.h', - 'invalidation/impl/push_client_channel.cc', - 'invalidation/impl/push_client_channel.h', - 'invalidation/impl/registration_manager.cc', - 'invalidation/impl/registration_manager.h', - 'invalidation/impl/state_writer.h', - 'invalidation/impl/sync_invalidation_listener.cc', - 'invalidation/impl/sync_invalidation_listener.h', - 'invalidation/impl/sync_system_resources.cc', - 'invalidation/impl/sync_system_resources.h', - 'invalidation/impl/ticl_invalidation_service.cc', - 'invalidation/impl/ticl_invalidation_service.h', - 'invalidation/impl/ticl_profile_settings_provider.cc', - 'invalidation/impl/ticl_profile_settings_provider.h', - 'invalidation/impl/ticl_settings_provider.cc', - 'invalidation/impl/ticl_settings_provider.h', - ], - }], - ['OS == "android"', { - 'dependencies': [ - 'invalidation_jni_headers', - ], - 'sources': [ - 'invalidation/impl/android/component_jni_registrar.cc', - 'invalidation/impl/android/component_jni_registrar.h', - 'invalidation/impl/invalidation_service_android.cc', - 'invalidation/impl/invalidation_service_android.h', - ], - }], - ], - }, - { - # GN version: //components/invalidation:test_support - 'target_name': 'invalidation_test_support', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../google_apis/google_apis.gyp:google_apis', - '../jingle/jingle.gyp:notifier', - '../jingle/jingle.gyp:notifier_test_util', - '../net/net.gyp:net', - '../testing/gmock.gyp:gmock', - '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', - '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp', - 'gcm_driver_test_support', - 'keyed_service_core', - ], - 'export_dependent_settings': [ - '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'invalidation/impl/fake_invalidation_handler.cc', - 'invalidation/impl/fake_invalidation_handler.h', - 'invalidation/impl/fake_invalidation_service.cc', - 'invalidation/impl/fake_invalidation_service.h', - 'invalidation/impl/fake_invalidation_state_tracker.cc', - 'invalidation/impl/fake_invalidation_state_tracker.h', - 'invalidation/impl/fake_invalidator.cc', - 'invalidation/impl/fake_invalidator.h', - 'invalidation/impl/invalidation_service_test_template.cc', - 'invalidation/impl/invalidation_service_test_template.h', - 'invalidation/impl/invalidation_test_util.cc', - 'invalidation/impl/invalidation_test_util.h', - 'invalidation/impl/invalidator_test_template.cc', - 'invalidation/impl/invalidator_test_template.h', - 'invalidation/impl/object_id_invalidation_map_test_util.cc', - 'invalidation/impl/object_id_invalidation_map_test_util.h', - 'invalidation/impl/unacked_invalidation_set_test_util.cc', - 'invalidation/impl/unacked_invalidation_set_test_util.h', - ], - 'conditions': [ - ['OS != "android"', { - 'sources': [ - # Note: sources list duplicated in GN build. - 'invalidation/impl/p2p_invalidation_service.cc', - 'invalidation/impl/p2p_invalidation_service.h', - ], - }], - ['OS == "android"', { - 'dependencies': [ - 'invalidation_jni_headers', - ], - }], - ], - }, - ], - 'conditions': [ - ['OS == "android"', { - 'targets': [ - { - 'target_name': 'invalidation_java', - 'type': 'none', - 'dependencies': [ - 'invalidation_proto_java', - '../base/base.gyp:base', - '../components/sync.gyp:sync_java', - '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_javalib', - ], - 'variables': { - 'java_in_dir': 'invalidation/impl/android/java', - }, - 'includes': [ '../build/java.gypi' ], - }, - { - 'target_name': 'invalidation_proto_java', - 'type': 'none', - 'sources': [ - 'invalidation/impl/android/proto/serialized_invalidation.proto', - ], - 'includes': [ '../build/protoc_java.gypi' ], - }, - { - 'target_name': 'invalidation_javatests', - 'type': 'none', - 'dependencies': [ - 'invalidation_java', - '../base/base.gyp:base_java_test_support', - '../content/content_shell_and_tests.gyp:content_java_test_support', - ], - 'variables': { - 'java_in_dir': 'invalidation/impl/android/javatests', - }, - 'includes': [ '../build/java.gypi' ], - }, - { - 'target_name': 'invalidation_jni_headers', - 'type': 'none', - 'sources': [ - 'invalidation/impl/android/java/src/org/chromium/components/invalidation/InvalidationService.java', - ], - 'variables': { - 'jni_gen_package': 'components/invalidation', - }, - 'includes': [ '../build/jni_generator.gypi' ], - }, - { - 'target_name': 'components_invalidation_impl_junit_tests', - 'type': 'none', - 'dependencies': [ - '../testing/android/junit/junit_test.gyp:junit_test_support', - ], - 'variables': { - 'main_class': 'org.chromium.testing.local.JunitTestMain', - 'src_paths': [ - '../testing/android/junit/DummyTest.java', - ], - 'wrapper_script_name': 'helper/<(_target_name)', - }, - 'includes': [ '../build/host_jar.gypi' ], - }, - ], - }, - ], - ], -}
diff --git a/components/invalidation/impl/non_blocking_invalidator.cc b/components/invalidation/impl/non_blocking_invalidator.cc index 667175aa6..0a5bca0 100644 --- a/components/invalidation/impl/non_blocking_invalidator.cc +++ b/components/invalidation/impl/non_blocking_invalidator.cc
@@ -249,7 +249,7 @@ FROM_HERE, base::Bind( &NonBlockingInvalidator::Core::Initialize, - core_.get(), + core_, initialize_options))) { NOTREACHED(); } @@ -260,7 +260,7 @@ if (!network_task_runner_->PostTask( FROM_HERE, base::Bind(&NonBlockingInvalidator::Core::Teardown, - core_.get()))) { + core_))) { DVLOG(1) << "Network thread stopped before invalidator is destroyed."; } } @@ -279,7 +279,7 @@ FROM_HERE, base::Bind( &NonBlockingInvalidator::Core::UpdateRegisteredIds, - core_.get(), + core_, registrar_.GetAllRegisteredIds()))) { NOTREACHED(); } @@ -302,7 +302,7 @@ if (!network_task_runner_->PostTask( FROM_HERE, base::Bind(&NonBlockingInvalidator::Core::UpdateCredentials, - core_.get(), email, token))) { + core_, email, token))) { NOTREACHED(); } } @@ -315,7 +315,7 @@ if (!network_task_runner_->PostTask( FROM_HERE, base::Bind(&NonBlockingInvalidator::Core::RequestDetailedStatus, - core_.get(), + core_, proxy_callback))) { NOTREACHED(); }
diff --git a/components/json_schema.gypi b/components/json_schema.gypi deleted file mode 100644 index fdafc98..0000000 --- a/components/json_schema.gypi +++ /dev/null
@@ -1,25 +0,0 @@ -# Copyright 2013 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. - -{ - 'targets': [ - { - 'target_name': 'json_schema', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../third_party/re2/re2.gyp:re2' - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'json_schema/json_schema_constants.cc', - 'json_schema/json_schema_constants.h', - 'json_schema/json_schema_validator.cc', - 'json_schema/json_schema_validator.h', - ], - }, - ], -}
diff --git a/components/keyed_service.gypi b/components/keyed_service.gypi deleted file mode 100644 index 5bfef70..0000000 --- a/components/keyed_service.gypi +++ /dev/null
@@ -1,111 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/keyed_service/core:core - 'target_name': 'keyed_service_core', - 'type': '<(component)', - 'defines': [ - 'KEYED_SERVICE_IMPLEMENTATION', - ], - 'include_dirs': [ - '..', - ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [ 4267, ], - 'dependencies': [ - '../base/base.gyp:base', - 'prefs/prefs.gyp:prefs', - 'user_prefs', - ], - 'sources': [ - 'keyed_service/core/dependency_graph.cc', - 'keyed_service/core/dependency_graph.h', - 'keyed_service/core/dependency_manager.cc', - 'keyed_service/core/dependency_manager.h', - 'keyed_service/core/dependency_node.h', - 'keyed_service/core/keyed_service.cc', - 'keyed_service/core/keyed_service.h', - 'keyed_service/core/keyed_service_base_factory.cc', - 'keyed_service/core/keyed_service_base_factory.h', - 'keyed_service/core/keyed_service_export.h', - 'keyed_service/core/keyed_service_factory.cc', - 'keyed_service/core/keyed_service_factory.h', - 'keyed_service/core/keyed_service_shutdown_notifier.cc', - 'keyed_service/core/keyed_service_shutdown_notifier.h', - 'keyed_service/core/refcounted_keyed_service.cc', - 'keyed_service/core/refcounted_keyed_service.h', - 'keyed_service/core/refcounted_keyed_service_factory.cc', - 'keyed_service/core/refcounted_keyed_service_factory.h', - 'keyed_service/core/service_access_type.h', - ], - }, - ], - 'conditions': [ - ['OS != "ios"', { - 'targets': [ - { - # GN version: //components/keyed_service/content:content - 'target_name': 'keyed_service_content', - 'type': '<(component)', - 'defines': [ - 'KEYED_SERVICE_IMPLEMENTATION', - ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [ 4267, ], - 'dependencies': [ - '../base/base.gyp:base', - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '../content/content.gyp:content_common', - 'keyed_service_core', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'keyed_service/content/browser_context_dependency_manager.cc', - 'keyed_service/content/browser_context_dependency_manager.h', - 'keyed_service/content/browser_context_keyed_base_factory.cc', - 'keyed_service/content/browser_context_keyed_base_factory.h', - 'keyed_service/content/browser_context_keyed_service_factory.cc', - 'keyed_service/content/browser_context_keyed_service_factory.h', - 'keyed_service/content/browser_context_keyed_service_shutdown_notifier_factory.cc', - 'keyed_service/content/browser_context_keyed_service_shutdown_notifier_factory.h', - 'keyed_service/content/refcounted_browser_context_keyed_service_factory.cc', - 'keyed_service/content/refcounted_browser_context_keyed_service_factory.h', - ], - }], - }], - ['OS == "ios"', { - 'targets': [ - { - # GN version: //components/keyed_service/ios - 'target_name': 'keyed_service_ios', - 'type': '<(component)', - 'defines': [ - 'KEYED_SERVICE_IMPLEMENTATION', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '../ios/web/ios_web.gyp:ios_web', - 'keyed_service_core', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'keyed_service/ios/browser_state_dependency_manager.cc', - 'keyed_service/ios/browser_state_dependency_manager.h', - 'keyed_service/ios/browser_state_keyed_service_factory.cc', - 'keyed_service/ios/browser_state_keyed_service_factory.h', - 'keyed_service/ios/refcounted_browser_state_keyed_service_factory.cc', - 'keyed_service/ios/refcounted_browser_state_keyed_service_factory.h', - ], - }], - }], - ], -}
diff --git a/components/language_usage_metrics.gypi b/components/language_usage_metrics.gypi deleted file mode 100644 index e150a1bb..0000000 --- a/components/language_usage_metrics.gypi +++ /dev/null
@@ -1,22 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - 'target_name': 'language_usage_metrics', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'language_usage_metrics/language_usage_metrics.cc', - 'language_usage_metrics/language_usage_metrics.h', - ], - }, - ], -}
diff --git a/components/leveldb/BUILD.gn b/components/leveldb/BUILD.gn index 43cf1ae..082ab78 100644 --- a/components/leveldb/BUILD.gn +++ b/components/leveldb/BUILD.gn
@@ -18,10 +18,13 @@ "leveldb_service_impl.h", ] - deps = [ + public_deps = [ "//components/filesystem/public/interfaces", "//components/leveldb/public/cpp", "//components/leveldb/public/interfaces", + ] + + deps = [ "//mojo/common", "//mojo/public/cpp/system", "//services/shell/public/cpp",
diff --git a/components/leveldb/leveldb.gyp b/components/leveldb/leveldb.gyp deleted file mode 100644 index 925fa5b..0000000 --- a/components/leveldb/leveldb.gyp +++ /dev/null
@@ -1,81 +0,0 @@ -# Copyright 2016 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. - -{ - 'variables': { - # This turns on e.g. the filename-based detection of which - # platforms to include source files on (e.g. files ending in - # _mac.h or _mac.cc are only compiled on MacOSX). - 'chromium_code': 1, - }, - 'targets': [ - { - # GN version: //components/leveldb:lib - 'target_name': 'leveldb_lib', - 'type': 'static_library', - 'include_dirs': [ - '../..', - ], - 'sources': [ - 'env_mojo.cc', - 'env_mojo.h', - 'leveldb_database_impl.cc', - 'leveldb_database_impl.h', - 'leveldb_mojo_proxy.cc', - 'leveldb_mojo_proxy.h', - 'leveldb_service_impl.cc', - 'leveldb_service_impl.h', - ], - 'dependencies': [ - 'leveldb_public_lib', - '../../components/filesystem/filesystem.gyp:filesystem_lib', - '../../mojo/mojo_public.gyp:mojo_cpp_bindings', - '../../services/shell/shell_public.gyp:shell_public', - '../../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', - ] - }, - { - # GN version: //components/leveldb/public/cpp:cpp - 'target_name': 'leveldb_public_lib', - 'type': 'static_library', - 'sources': [ - 'public/cpp/remote_iterator.cc', - 'public/cpp/remote_iterator.h', - 'public/cpp/util.cc', - 'public/cpp/util.h', - ], - 'dependencies': [ - 'leveldb_bindings_mojom', - '../../mojo/mojo_edk.gyp:mojo_system_impl', - '../../mojo/mojo_public.gyp:mojo_cpp_bindings', - '../../services/shell/shell_public.gyp:shell_public', - '../../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', - ] - }, - { - # GN version: //components/leveldb/public/interfaces - 'target_name': 'leveldb_bindings', - 'type': 'static_library', - 'dependencies': [ - 'leveldb_bindings_mojom', - ], - }, - { - 'target_name': 'leveldb_bindings_mojom', - 'type': 'none', - 'variables': { - 'mojom_files': [ - 'public/interfaces/leveldb.mojom', - ], - 'use_new_wrapper_types': 'false', - }, - 'dependencies': [ - '../../components/filesystem/filesystem.gyp:filesystem_bindings_mojom', - ], - 'includes': [ - '../../mojo/mojom_bindings_generator_explicit.gypi', - ], - } - ], -}
diff --git a/components/leveldb/leveldb_database_impl.cc b/components/leveldb/leveldb_database_impl.cc index f5d618c..82b1773 100644 --- a/components/leveldb/leveldb_database_impl.cc +++ b/components/leveldb/leveldb_database_impl.cc
@@ -7,10 +7,10 @@ #include <map> #include <string> +#include "base/optional.h" #include "base/rand_util.h" #include "components/leveldb/env_mojo.h" #include "components/leveldb/public/cpp/util.h" -#include "mojo/common/common_type_converters.h" #include "third_party/leveldatabase/src/include/leveldb/db.h" #include "third_party/leveldatabase/src/include/leveldb/write_batch.h" @@ -60,15 +60,15 @@ db_->ReleaseSnapshot(p.second); } -void LevelDBDatabaseImpl::Put(mojo::Array<uint8_t> key, - mojo::Array<uint8_t> value, +void LevelDBDatabaseImpl::Put(const std::vector<uint8_t>& key, + const std::vector<uint8_t>& value, const PutCallback& callback) { leveldb::Status status = db_->Put(leveldb::WriteOptions(), GetSliceFor(key), GetSliceFor(value)); callback.Run(LeveldbStatusToError(status)); } -void LevelDBDatabaseImpl::Delete(mojo::Array<uint8_t> key, +void LevelDBDatabaseImpl::Delete(const std::vector<uint8_t>& key, const DeleteCallback& callback) { leveldb::Status status = db_->Delete(leveldb::WriteOptions(), GetSliceFor(key)); @@ -76,7 +76,7 @@ } void LevelDBDatabaseImpl::DeletePrefixed( - mojo::Array<uint8_t> key_prefix, + const std::vector<uint8_t>& key_prefix, const DeletePrefixedCallback& callback) { leveldb::WriteBatch batch; leveldb::Status status = DeletePrefixedHelper( @@ -87,15 +87,19 @@ } void LevelDBDatabaseImpl::Write( - mojo::Array<mojom::BatchedOperationPtr> operations, + std::vector<mojom::BatchedOperationPtr> operations, const WriteCallback& callback) { leveldb::WriteBatch batch; for (size_t i = 0; i < operations.size(); ++i) { switch (operations[i]->type) { case mojom::BatchOperationType::PUT_KEY: { - batch.Put(GetSliceFor(operations[i]->key), - GetSliceFor(operations[i]->value)); + if (operations[i]->value) { + batch.Put(GetSliceFor(operations[i]->key), + GetSliceFor(*(operations[i]->value))); + } else { + batch.Put(GetSliceFor(operations[i]->key), leveldb::Slice()); + } break; } case mojom::BatchOperationType::DELETE_KEY: { @@ -113,23 +117,23 @@ callback.Run(LeveldbStatusToError(status)); } -void LevelDBDatabaseImpl::Get(mojo::Array<uint8_t> key, +void LevelDBDatabaseImpl::Get(const std::vector<uint8_t>& key, const GetCallback& callback) { std::string value; leveldb::Status status = db_->Get(leveldb::ReadOptions(), GetSliceFor(key), &value); - callback.Run(LeveldbStatusToError(status), mojo::Array<uint8_t>::From(value)); + callback.Run(LeveldbStatusToError(status), StdStringToUint8Vector(value)); } -void LevelDBDatabaseImpl::GetPrefixed(mojo::Array<uint8_t> key_prefix, +void LevelDBDatabaseImpl::GetPrefixed(const std::vector<uint8_t>& key_prefix, const GetPrefixedCallback& callback) { - mojo::Array<mojom::KeyValuePtr> data; + std::vector<mojom::KeyValuePtr> data; leveldb::Status status = ForEachWithPrefix( db_.get(), GetSliceFor(key_prefix), [&data](const leveldb::Slice& key, const leveldb::Slice& value) { mojom::KeyValuePtr kv = mojom::KeyValue::New(); - kv->key = GetArrayFor(key); - kv->value = GetArrayFor(value); + kv->key = GetVectorFor(key); + kv->value = GetVectorFor(value); data.push_back(std::move(kv)); }); callback.Run(LeveldbStatusToError(status), std::move(data)); @@ -151,13 +155,13 @@ } void LevelDBDatabaseImpl::GetFromSnapshot(uint64_t snapshot_id, - mojo::Array<uint8_t> key, + const std::vector<uint8_t>& key, const GetCallback& callback) { // If the snapshot id is invalid, send back invalid argument auto it = snapshot_map_.find(snapshot_id); if (it == snapshot_map_.end()) { callback.Run(mojom::DatabaseError::INVALID_ARGUMENT, - mojo::Array<uint8_t>()); + std::vector<uint8_t>()); return; } @@ -165,7 +169,7 @@ leveldb::ReadOptions options; options.snapshot = it->second; leveldb::Status status = db_->Get(options, GetSliceFor(key), &value); - callback.Run(LeveldbStatusToError(status), mojo::Array<uint8_t>::From(value)); + callback.Run(LeveldbStatusToError(status), StdStringToUint8Vector(value)); } void LevelDBDatabaseImpl::NewIterator(const NewIteratorCallback& callback) { @@ -207,8 +211,8 @@ const IteratorSeekToFirstCallback& callback) { auto it = iterator_map_.find(iterator_id); if (it == iterator_map_.end()) { - callback.Run(false, mojom::DatabaseError::INVALID_ARGUMENT, nullptr, - nullptr); + callback.Run(false, mojom::DatabaseError::INVALID_ARGUMENT, base::nullopt, + base::nullopt); return; } @@ -222,8 +226,8 @@ const IteratorSeekToLastCallback& callback) { auto it = iterator_map_.find(iterator_id); if (it == iterator_map_.end()) { - callback.Run(false, mojom::DatabaseError::INVALID_ARGUMENT, nullptr, - nullptr); + callback.Run(false, mojom::DatabaseError::INVALID_ARGUMENT, base::nullopt, + base::nullopt); return; } @@ -234,12 +238,12 @@ void LevelDBDatabaseImpl::IteratorSeek( uint64_t iterator_id, - mojo::Array<uint8_t> target, + const std::vector<uint8_t>& target, const IteratorSeekToLastCallback& callback) { auto it = iterator_map_.find(iterator_id); if (it == iterator_map_.end()) { - callback.Run(false, mojom::DatabaseError::INVALID_ARGUMENT, nullptr, - nullptr); + callback.Run(false, mojom::DatabaseError::INVALID_ARGUMENT, base::nullopt, + base::nullopt); return; } @@ -252,8 +256,8 @@ const IteratorNextCallback& callback) { auto it = iterator_map_.find(iterator_id); if (it == iterator_map_.end()) { - callback.Run(false, mojom::DatabaseError::INVALID_ARGUMENT, nullptr, - nullptr); + callback.Run(false, mojom::DatabaseError::INVALID_ARGUMENT, base::nullopt, + base::nullopt); return; } @@ -266,8 +270,8 @@ const IteratorPrevCallback& callback) { auto it = iterator_map_.find(iterator_id); if (it == iterator_map_.end()) { - callback.Run(false, mojom::DatabaseError::INVALID_ARGUMENT, nullptr, - nullptr); + callback.Run(false, mojom::DatabaseError::INVALID_ARGUMENT, base::nullopt, + base::nullopt); return; } @@ -280,12 +284,13 @@ leveldb::Iterator* it, const IteratorSeekToFirstCallback& callback) { if (!it->Valid()) { - callback.Run(false, LeveldbStatusToError(it->status()), nullptr, nullptr); + callback.Run(false, LeveldbStatusToError(it->status()), base::nullopt, + base::nullopt); return; } - callback.Run(true, LeveldbStatusToError(it->status()), GetArrayFor(it->key()), - GetArrayFor(it->value())); + callback.Run(true, LeveldbStatusToError(it->status()), + GetVectorFor(it->key()), GetVectorFor(it->value())); } leveldb::Status LevelDBDatabaseImpl::DeletePrefixedHelper(
diff --git a/components/leveldb/leveldb_database_impl.h b/components/leveldb/leveldb_database_impl.h index e16b4bf..87dba6cd 100644 --- a/components/leveldb/leveldb_database_impl.h +++ b/components/leveldb/leveldb_database_impl.h
@@ -25,22 +25,23 @@ ~LevelDBDatabaseImpl() override; // Overridden from LevelDBDatabase: - void Put(mojo::Array<uint8_t> key, - mojo::Array<uint8_t> value, + void Put(const std::vector<uint8_t>& key, + const std::vector<uint8_t>& value, const PutCallback& callback) override; - void Delete(mojo::Array<uint8_t> key, + void Delete(const std::vector<uint8_t>& key, const DeleteCallback& callback) override; - void DeletePrefixed(mojo::Array<uint8_t> key_prefix, + void DeletePrefixed(const std::vector<uint8_t>& key_prefix, const DeletePrefixedCallback& callback) override; - void Write(mojo::Array<mojom::BatchedOperationPtr> operations, + void Write(std::vector<mojom::BatchedOperationPtr> operations, const WriteCallback& callback) override; - void Get(mojo::Array<uint8_t> key, const GetCallback& callback) override; - void GetPrefixed(mojo::Array<uint8_t> key_prefix, + void Get(const std::vector<uint8_t>& key, + const GetCallback& callback) override; + void GetPrefixed(const std::vector<uint8_t>& key_prefix, const GetPrefixedCallback& callback) override; void GetSnapshot(const GetSnapshotCallback& callback) override; void ReleaseSnapshot(uint64_t snapshot_id) override; void GetFromSnapshot(uint64_t snapshot_id, - mojo::Array<uint8_t> key, + const std::vector<uint8_t>& key, const GetCallback& callback) override; void NewIterator(const NewIteratorCallback& callback) override; void NewIteratorFromSnapshot(uint64_t snapshot_id, @@ -52,7 +53,7 @@ void IteratorSeekToLast(uint64_t iterator_id, const IteratorSeekToLastCallback& callback) override; void IteratorSeek(uint64_t iterator_id, - mojo::Array<uint8_t> target, + const std::vector<uint8_t>& target, const IteratorSeekToLastCallback& callback) override; void IteratorNext(uint64_t iterator_id, const IteratorNextCallback& callback) override;
diff --git a/components/leveldb/leveldb_service_impl.cc b/components/leveldb/leveldb_service_impl.cc index a362813..587a78ed 100644 --- a/components/leveldb/leveldb_service_impl.cc +++ b/components/leveldb/leveldb_service_impl.cc
@@ -26,7 +26,7 @@ LevelDBServiceImpl::~LevelDBServiceImpl() {} void LevelDBServiceImpl::Open(filesystem::mojom::DirectoryPtr directory, - const mojo::String& dbname, + const std::string& dbname, leveldb::mojom::LevelDBDatabaseRequest database, const OpenCallback& callback) { OpenWithOptions(leveldb::mojom::OpenOptions::New(), std::move(directory), @@ -36,7 +36,7 @@ void LevelDBServiceImpl::OpenWithOptions( leveldb::mojom::OpenOptionsPtr open_options, filesystem::mojom::DirectoryPtr directory, - const mojo::String& dbname, + const std::string& dbname, leveldb::mojom::LevelDBDatabaseRequest database, const OpenCallback& callback) { leveldb::Options options; @@ -57,7 +57,7 @@ options.env = env_mojo.get(); leveldb::DB* db = nullptr; - leveldb::Status s = leveldb::DB::Open(options, dbname.To<std::string>(), &db); + leveldb::Status s = leveldb::DB::Open(options, dbname, &db); if (s.ok()) { new LevelDBDatabaseImpl(std::move(database), std::move(env_mojo),
diff --git a/components/leveldb/leveldb_service_impl.h b/components/leveldb/leveldb_service_impl.h index b380f6a..bf413dbf 100644 --- a/components/leveldb/leveldb_service_impl.h +++ b/components/leveldb/leveldb_service_impl.h
@@ -20,12 +20,12 @@ // Overridden from LevelDBService: void Open(filesystem::mojom::DirectoryPtr directory, - const mojo::String& dbname, + const std::string& dbname, leveldb::mojom::LevelDBDatabaseRequest database, const OpenCallback& callback) override; void OpenWithOptions(leveldb::mojom::OpenOptionsPtr open_options, filesystem::mojom::DirectoryPtr directory, - const mojo::String& dbname, + const std::string& dbname, leveldb::mojom::LevelDBDatabaseRequest database, const OpenCallback& callback) override; void OpenInMemory(leveldb::mojom::LevelDBDatabaseRequest database,
diff --git a/components/leveldb/leveldb_service_unittest.cc b/components/leveldb/leveldb_service_unittest.cc index 598f488..2a5be69 100644 --- a/components/leveldb/leveldb_service_unittest.cc +++ b/components/leveldb/leveldb_service_unittest.cc
@@ -8,8 +8,8 @@ #include "components/filesystem/public/interfaces/directory.mojom.h" #include "components/filesystem/public/interfaces/file_system.mojom.h" #include "components/filesystem/public/interfaces/types.mojom.h" +#include "components/leveldb/public/cpp/util.h" #include "components/leveldb/public/interfaces/leveldb.mojom.h" -#include "mojo/common/common_type_converters.h" #include "mojo/public/cpp/bindings/binding_set.h" #include "services/shell/public/cpp/service_context.h" #include "services/shell/public/cpp/service_test.h" @@ -22,7 +22,7 @@ template <typename... Args> void IgnoreAllArgs(Args&&...) {} template <typename... Args> -void DoCaptures(Args*... out_args, +void DoCaptures(typename std::decay<Args>::type*... out_args, const base::Closure& quit_closure, Args... in_args) { IgnoreAllArgs((*out_args = std::move(in_args))...); @@ -41,42 +41,48 @@ return base::Bind(&DoCaptures<T1, T2>, t1, t2, quit_closure); } +template <typename T1, typename T2> +base::Callback<void(T1, const T2&)> +CaptureConstRef(T1* t1, T2* t2, const base::Closure& quit_closure) { + return base::Bind(&DoCaptures<T1, const T2&>, t1, t2, quit_closure); +} + void DatabaseSyncPut(mojom::LevelDBDatabase* database, - mojo::Array<uint8_t> key, - mojo::Array<uint8_t> value, + const std::string& key, + const std::string& value, mojom::DatabaseError* out_error) { base::RunLoop run_loop; - database->Put(std::move(key), std::move(value), + database->Put(StdStringToUint8Vector(key), StdStringToUint8Vector(value), Capture(out_error, run_loop.QuitClosure())); run_loop.Run(); } void DatabaseSyncGet(mojom::LevelDBDatabase* database, - mojo::Array<uint8_t> key, + const std::string& key, mojom::DatabaseError* out_error, - mojo::Array<uint8_t>* out_value) { + std::vector<uint8_t>* out_value) { base::RunLoop run_loop; - database->Get(std::move(key), - Capture(out_error, out_value, run_loop.QuitClosure())); + database->Get(StdStringToUint8Vector(key), + CaptureConstRef(out_error, out_value, run_loop.QuitClosure())); run_loop.Run(); } void DatabaseSyncGetPrefixed(mojom::LevelDBDatabase* database, - mojo::Array<uint8_t> key_prefix, + const std::string& key_prefix, mojom::DatabaseError* out_error, - mojo::Array<mojom::KeyValuePtr>* out_key_values) { + std::vector<mojom::KeyValuePtr>* out_key_values) { base::RunLoop run_loop; database->GetPrefixed( - std::move(key_prefix), + StdStringToUint8Vector(key_prefix), Capture(out_error, out_key_values, run_loop.QuitClosure())); run_loop.Run(); } void DatabaseSyncDeletePrefixed(mojom::LevelDBDatabase* database, - mojo::Array<uint8_t> key_prefix, + const std::string& key_prefix, mojom::DatabaseError* out_error) { base::RunLoop run_loop; - database->DeletePrefixed(std::move(key_prefix), + database->DeletePrefixed(StdStringToUint8Vector(key_prefix), Capture(out_error, run_loop.QuitClosure())); run_loop.Run(); } @@ -136,36 +142,30 @@ // Write a key to the database. error = mojom::DatabaseError::INVALID_ARGUMENT; - DatabaseSyncPut(database.get(), - mojo::Array<uint8_t>::From(std::string("key")), - mojo::Array<uint8_t>::From(std::string("value")), &error); + DatabaseSyncPut(database.get(), "key", "value", &error); EXPECT_EQ(mojom::DatabaseError::OK, error); // Read the key back from the database. error = mojom::DatabaseError::INVALID_ARGUMENT; - mojo::Array<uint8_t> value; - DatabaseSyncGet(database.get(), - mojo::Array<uint8_t>::From(std::string("key")), &error, - &value); + std::vector<uint8_t> value; + DatabaseSyncGet(database.get(), "key", &error, &value); EXPECT_EQ(mojom::DatabaseError::OK, error); - EXPECT_EQ("value", value.To<std::string>()); + EXPECT_EQ("value", Uint8VectorToStdString(value)); // Delete the key from the database. error = mojom::DatabaseError::INVALID_ARGUMENT; base::RunLoop run_loop; - database->Delete(mojo::Array<uint8_t>::From(std::string("key")), + database->Delete(StdStringToUint8Vector("key"), Capture(&error, run_loop.QuitClosure())); run_loop.Run(); EXPECT_EQ(mojom::DatabaseError::OK, error); // Read the key back from the database. error = mojom::DatabaseError::INVALID_ARGUMENT; - value.SetToEmpty(); - DatabaseSyncGet(database.get(), - mojo::Array<uint8_t>::From(std::string("key")), &error, - &value); + value.clear(); + DatabaseSyncGet(database.get(), "key", &error, &value); EXPECT_EQ(mojom::DatabaseError::NOT_FOUND, error); - EXPECT_EQ("", value.To<std::string>()); + EXPECT_EQ("", Uint8VectorToStdString(value)); } TEST_F(LevelDBServiceTest, WriteBatch) { @@ -175,22 +175,20 @@ EXPECT_EQ(mojom::DatabaseError::OK, error); // Write a key to the database. - DatabaseSyncPut(database.get(), - mojo::Array<uint8_t>::From(std::string("key")), - mojo::Array<uint8_t>::From(std::string("value")), &error); + DatabaseSyncPut(database.get(), "key", "value", &error); EXPECT_EQ(mojom::DatabaseError::OK, error); // Create a batched operation which both deletes "key" and adds another write. - mojo::Array<mojom::BatchedOperationPtr> operations; + std::vector<mojom::BatchedOperationPtr> operations; mojom::BatchedOperationPtr item = mojom::BatchedOperation::New(); item->type = mojom::BatchOperationType::DELETE_KEY; - item->key = mojo::Array<uint8_t>::From(std::string("key")); + item->key = StdStringToUint8Vector("key"); operations.push_back(std::move(item)); item = mojom::BatchedOperation::New(); item->type = mojom::BatchOperationType::PUT_KEY; - item->key = mojo::Array<uint8_t>::From(std::string("other")); - item->value = mojo::Array<uint8_t>::From(std::string("more")); + item->key = StdStringToUint8Vector("other"); + item->value = StdStringToUint8Vector("more"); operations.push_back(std::move(item)); base::RunLoop run_loop; @@ -201,36 +199,28 @@ // Reading "key" should be invalid now. error = mojom::DatabaseError::INVALID_ARGUMENT; - mojo::Array<uint8_t> value; - DatabaseSyncGet(database.get(), - mojo::Array<uint8_t>::From(std::string("key")), &error, - &value); + std::vector<uint8_t> value; + DatabaseSyncGet(database.get(), "key", &error, &value); EXPECT_EQ(mojom::DatabaseError::NOT_FOUND, error); - EXPECT_EQ("", value.To<std::string>()); + EXPECT_EQ("", Uint8VectorToStdString(value)); // Reading "other" should return "more" error = mojom::DatabaseError::INVALID_ARGUMENT; - DatabaseSyncGet(database.get(), - mojo::Array<uint8_t>::From(std::string("other")), &error, - &value); + DatabaseSyncGet(database.get(), "other", &error, &value); EXPECT_EQ(mojom::DatabaseError::OK, error); - EXPECT_EQ("more", value.To<std::string>()); + EXPECT_EQ("more", Uint8VectorToStdString(value)); // Write a some prefixed keys to the database. - DatabaseSyncPut(database.get(), - mojo::Array<uint8_t>::From(std::string("prefix-key1")), - mojo::Array<uint8_t>::From(std::string("value")), &error); + DatabaseSyncPut(database.get(), "prefix-key1", "value", &error); EXPECT_EQ(mojom::DatabaseError::OK, error); - DatabaseSyncPut(database.get(), - mojo::Array<uint8_t>::From(std::string("prefix-key2")), - mojo::Array<uint8_t>::From(std::string("value")), &error); + DatabaseSyncPut(database.get(), "prefix-key2", "value", &error); EXPECT_EQ(mojom::DatabaseError::OK, error); // Create a batched operation to delete them. - operations.SetToEmpty(); + operations.clear(); item = mojom::BatchedOperation::New(); item->type = mojom::BatchOperationType::DELETE_PREFIXED_KEY; - item->key = mojo::Array<uint8_t>::From(std::string("prefix")); + item->key = StdStringToUint8Vector("prefix"); operations.push_back(std::move(item)); base::RunLoop run_loop2; database->Write(std::move(operations), @@ -240,20 +230,16 @@ // Reading all "prefix" keys should be invalid now. error = mojom::DatabaseError::INVALID_ARGUMENT; - value = nullptr; - DatabaseSyncGet(database.get(), - mojo::Array<uint8_t>::From(std::string("prefix-key1")), - &error, &value); + value.clear(); + DatabaseSyncGet(database.get(), "prefix-key1", &error, &value); EXPECT_EQ(mojom::DatabaseError::NOT_FOUND, error); - EXPECT_EQ("", value.To<std::string>()); + EXPECT_EQ("", Uint8VectorToStdString(value)); // Reading "key" should be invalid now. error = mojom::DatabaseError::INVALID_ARGUMENT; - value = nullptr; - DatabaseSyncGet(database.get(), - mojo::Array<uint8_t>::From(std::string("prefix-key2")), - &error, &value); + value.clear(); + DatabaseSyncGet(database.get(), "prefix-key2", &error, &value); EXPECT_EQ(mojom::DatabaseError::NOT_FOUND, error); - EXPECT_EQ("", value.To<std::string>()); + EXPECT_EQ("", Uint8VectorToStdString(value)); } TEST_F(LevelDBServiceTest, Reconnect) { @@ -279,9 +265,7 @@ // Write a key to the database. error = mojom::DatabaseError::INVALID_ARGUMENT; - DatabaseSyncPut(database.get(), - mojo::Array<uint8_t>::From(std::string("key")), - mojo::Array<uint8_t>::From(std::string("value")), &error); + DatabaseSyncPut(database.get(), "key", "value", &error); EXPECT_EQ(mojom::DatabaseError::OK, error); // The database should go out of scope here. @@ -301,12 +285,10 @@ // We should still be able to read the key back from the database. error = mojom::DatabaseError::INVALID_ARGUMENT; - mojo::Array<uint8_t> value; - DatabaseSyncGet(database.get(), - mojo::Array<uint8_t>::From(std::string("key")), &error, - &value); + std::vector<uint8_t> value; + DatabaseSyncGet(database.get(), "key", &error, &value); EXPECT_EQ(mojom::DatabaseError::OK, error); - EXPECT_EQ("value", value.To<std::string>()); + EXPECT_EQ("value", Uint8VectorToStdString(value)); } } @@ -331,9 +313,7 @@ // Write a key to the database. error = mojom::DatabaseError::INVALID_ARGUMENT; - DatabaseSyncPut(database.get(), - mojo::Array<uint8_t>::From(std::string("key")), - mojo::Array<uint8_t>::From(std::string("value")), &error); + DatabaseSyncPut(database.get(), "key", "value", &error); EXPECT_EQ(mojom::DatabaseError::OK, error); // Take a snapshot where key=value. @@ -344,30 +324,26 @@ // Change key to "yek". error = mojom::DatabaseError::INVALID_ARGUMENT; - DatabaseSyncPut(database.get(), - mojo::Array<uint8_t>::From(std::string("key")), - mojo::Array<uint8_t>::From(std::string("yek")), &error); + DatabaseSyncPut(database.get(), "key", "yek", &error); EXPECT_EQ(mojom::DatabaseError::OK, error); // (Ensure this change is live on the database.) error = mojom::DatabaseError::INVALID_ARGUMENT; - mojo::Array<uint8_t> value; - DatabaseSyncGet(database.get(), - mojo::Array<uint8_t>::From(std::string("key")), &error, - &value); + std::vector<uint8_t> value; + DatabaseSyncGet(database.get(), "key", &error, &value); EXPECT_EQ(mojom::DatabaseError::OK, error); - EXPECT_EQ("yek", value.To<std::string>()); + EXPECT_EQ("yek", Uint8VectorToStdString(value)); // But if we were to read from the snapshot, we'd still get value. error = mojom::DatabaseError::INVALID_ARGUMENT; - value.SetToEmpty(); + value.clear(); base::RunLoop run_loop2; - database->GetFromSnapshot(key_value_snapshot, - mojo::Array<uint8_t>::From(std::string("key")), - Capture(&error, &value, run_loop2.QuitClosure())); + database->GetFromSnapshot( + key_value_snapshot, StdStringToUint8Vector("key"), + CaptureConstRef(&error, &value, run_loop2.QuitClosure())); run_loop2.Run(); EXPECT_EQ(mojom::DatabaseError::OK, error); - EXPECT_EQ("value", value.To<std::string>()); + EXPECT_EQ("value", Uint8VectorToStdString(value)); } TEST_F(LevelDBServiceTest, InvalidArgumentOnInvalidSnapshot) { @@ -379,11 +355,11 @@ uint64_t invalid_snapshot = 8; error = mojom::DatabaseError::OK; - mojo::Array<uint8_t> value; + std::vector<uint8_t> value; base::RunLoop run_loop; - database->GetFromSnapshot(invalid_snapshot, - mojo::Array<uint8_t>::From(std::string("key")), - Capture(&error, &value, run_loop.QuitClosure())); + database->GetFromSnapshot( + invalid_snapshot, StdStringToUint8Vector("key"), + CaptureConstRef(&error, &value, run_loop.QuitClosure())); run_loop.Run(); EXPECT_EQ(mojom::DatabaseError::INVALID_ARGUMENT, error); } @@ -396,36 +372,30 @@ // Write a key to the database. error = mojom::DatabaseError::INVALID_ARGUMENT; - DatabaseSyncPut(database.get(), - mojo::Array<uint8_t>::From(std::string("key")), - mojo::Array<uint8_t>::From(std::string("value")), &error); + DatabaseSyncPut(database.get(), "key", "value", &error); EXPECT_EQ(mojom::DatabaseError::OK, error); // Read the key back from the database. error = mojom::DatabaseError::INVALID_ARGUMENT; - mojo::Array<uint8_t> value; - DatabaseSyncGet(database.get(), - mojo::Array<uint8_t>::From(std::string("key")), &error, - &value); + std::vector<uint8_t> value; + DatabaseSyncGet(database.get(), "key", &error, &value); EXPECT_EQ(mojom::DatabaseError::OK, error); - EXPECT_EQ("value", value.To<std::string>()); + EXPECT_EQ("value", Uint8VectorToStdString(value)); // Delete the key from the database. error = mojom::DatabaseError::INVALID_ARGUMENT; base::RunLoop run_loop; - database->Delete(mojo::Array<uint8_t>::From(std::string("key")), + database->Delete(StdStringToUint8Vector("key"), Capture(&error, run_loop.QuitClosure())); run_loop.Run(); EXPECT_EQ(mojom::DatabaseError::OK, error); // Read the key back from the database. error = mojom::DatabaseError::INVALID_ARGUMENT; - value.SetToEmpty(); - DatabaseSyncGet(database.get(), - mojo::Array<uint8_t>::From(std::string("key")), &error, - &value); + value.clear(); + DatabaseSyncGet(database.get(), "key", &error, &value); EXPECT_EQ(mojom::DatabaseError::NOT_FOUND, error); - EXPECT_EQ("", value.To<std::string>()); + EXPECT_EQ("", Uint8VectorToStdString(value)); } TEST_F(LevelDBServiceTest, Prefixed) { @@ -436,110 +406,90 @@ EXPECT_EQ(mojom::DatabaseError::OK, error); const std::string prefix("prefix"); - mojo::Array<mojom::KeyValuePtr> key_values; + std::vector<mojom::KeyValuePtr> key_values; // Completely empty database. error = mojom::DatabaseError::INVALID_ARGUMENT; - DatabaseSyncGetPrefixed(database.get(), mojo::Array<uint8_t>::From(prefix), - &error, &key_values); + DatabaseSyncGetPrefixed(database.get(), prefix, &error, &key_values); EXPECT_EQ(mojom::DatabaseError::OK, error); EXPECT_TRUE(key_values.empty()); // No values with our prefix, but values before and after. error = mojom::DatabaseError::INVALID_ARGUMENT; - DatabaseSyncPut(database.get(), - mojo::Array<uint8_t>::From(std::string("a-before-prefix")), - mojo::Array<uint8_t>::From(std::string("value")), &error); + DatabaseSyncPut(database.get(), "a-before-prefix", "value", &error); EXPECT_EQ(mojom::DatabaseError::OK, error); error = mojom::DatabaseError::INVALID_ARGUMENT; - DatabaseSyncPut(database.get(), - mojo::Array<uint8_t>::From(std::string("z-after-prefix")), - mojo::Array<uint8_t>::From(std::string("value")), &error); + DatabaseSyncPut(database.get(), "z-after-prefix", "value", &error); EXPECT_EQ(mojom::DatabaseError::OK, error); - key_values.SetToEmpty(); + key_values.clear(); error = mojom::DatabaseError::INVALID_ARGUMENT; - DatabaseSyncGetPrefixed(database.get(), mojo::Array<uint8_t>::From(prefix), - &error, &key_values); + DatabaseSyncGetPrefixed(database.get(), prefix, &error, &key_values); EXPECT_EQ(mojom::DatabaseError::OK, error); EXPECT_TRUE(key_values.empty()); // One value with the exact prefix. - DatabaseSyncPut(database.get(), mojo::Array<uint8_t>::From(prefix), - mojo::Array<uint8_t>::From(std::string("value")), &error); + DatabaseSyncPut(database.get(), prefix, "value", &error); EXPECT_EQ(mojom::DatabaseError::OK, error); error = mojom::DatabaseError::INVALID_ARGUMENT; - key_values.SetToEmpty(); - DatabaseSyncGetPrefixed(database.get(), mojo::Array<uint8_t>::From(prefix), - &error, &key_values); + key_values.clear(); + DatabaseSyncGetPrefixed(database.get(), prefix, &error, &key_values); EXPECT_EQ(mojom::DatabaseError::OK, error); EXPECT_EQ(1u, key_values.size()); - EXPECT_EQ("prefix", key_values[0]->key.To<std::string>()); - EXPECT_EQ("value", key_values[0]->value.To<std::string>()); + EXPECT_EQ("prefix", Uint8VectorToStdString(key_values[0]->key)); + EXPECT_EQ("value", Uint8VectorToStdString(key_values[0]->value)); // Multiple values with starting with the prefix. - DatabaseSyncPut(database.get(), mojo::Array<uint8_t>::From(prefix + "2"), - mojo::Array<uint8_t>::From(std::string("value2")), &error); + DatabaseSyncPut(database.get(), (prefix + "2"), "value2", &error); EXPECT_EQ(mojom::DatabaseError::OK, error); error = mojom::DatabaseError::INVALID_ARGUMENT; - key_values.SetToEmpty(); - DatabaseSyncGetPrefixed(database.get(), mojo::Array<uint8_t>::From(prefix), - &error, &key_values); + key_values.clear(); + DatabaseSyncGetPrefixed(database.get(), prefix, &error, &key_values); EXPECT_EQ(mojom::DatabaseError::OK, error); EXPECT_EQ(2u, key_values.size()); - EXPECT_EQ("prefix", key_values[0]->key.To<std::string>()); - EXPECT_EQ("value", key_values[0]->value.To<std::string>()); - EXPECT_EQ("prefix2", key_values[1]->key.To<std::string>()); - EXPECT_EQ("value2", key_values[1]->value.To<std::string>()); + EXPECT_EQ("prefix", Uint8VectorToStdString(key_values[0]->key)); + EXPECT_EQ("value", Uint8VectorToStdString(key_values[0]->value)); + EXPECT_EQ("prefix2", Uint8VectorToStdString(key_values[1]->key)); + EXPECT_EQ("value2", Uint8VectorToStdString(key_values[1]->value)); // Delete the prefixed values. error = mojom::DatabaseError::INVALID_ARGUMENT; - DatabaseSyncDeletePrefixed(database.get(), mojo::Array<uint8_t>::From(prefix), - &error); + DatabaseSyncDeletePrefixed(database.get(), prefix, &error); EXPECT_EQ(mojom::DatabaseError::OK, error); error = mojom::DatabaseError::INVALID_ARGUMENT; - key_values.SetToEmpty(); - DatabaseSyncGetPrefixed(database.get(), mojo::Array<uint8_t>::From(prefix), - &error, &key_values); + key_values.clear(); + DatabaseSyncGetPrefixed(database.get(), prefix, &error, &key_values); EXPECT_EQ(mojom::DatabaseError::OK, error); EXPECT_TRUE(key_values.empty()); // Make sure the others are not deleted. - mojo::Array<uint8_t> value; - DatabaseSyncGet(database.get(), - mojo::Array<uint8_t>::From(std::string("a-before-prefix")), - &error, &value); + std::vector<uint8_t> value; + DatabaseSyncGet(database.get(), "a-before-prefix", &error, &value); EXPECT_EQ(mojom::DatabaseError::OK, error); - EXPECT_EQ("value", value.To<std::string>()); - value.SetToEmpty(); - DatabaseSyncGet(database.get(), - mojo::Array<uint8_t>::From(std::string("z-after-prefix")), - &error, &value); + EXPECT_EQ("value", Uint8VectorToStdString(value)); + value.clear(); + DatabaseSyncGet(database.get(), "z-after-prefix", &error, &value); EXPECT_EQ(mojom::DatabaseError::OK, error); - EXPECT_EQ("value", value.To<std::string>()); + EXPECT_EQ("value", Uint8VectorToStdString(value)); // A key having our prefix, but no key matching it exactly. // Even thought there is no exact matching key, GetPrefixed // and DeletePrefixed still operate on the values. error = mojom::DatabaseError::INVALID_ARGUMENT; - DatabaseSyncPut(database.get(), mojo::Array<uint8_t>::From(prefix + "2"), - mojo::Array<uint8_t>::From(std::string("value2")), &error); + DatabaseSyncPut(database.get(), (prefix + "2"), "value2", &error); EXPECT_EQ(mojom::DatabaseError::OK, error); error = mojom::DatabaseError::INVALID_ARGUMENT; - key_values.SetToEmpty(); - DatabaseSyncGetPrefixed(database.get(), mojo::Array<uint8_t>::From(prefix), - &error, &key_values); + key_values.clear(); + DatabaseSyncGetPrefixed(database.get(), prefix, &error, &key_values); EXPECT_EQ(mojom::DatabaseError::OK, error); EXPECT_EQ(1u, key_values.size()); - EXPECT_EQ("prefix2", key_values[0]->key.To<std::string>()); - EXPECT_EQ("value2", key_values[0]->value.To<std::string>()); + EXPECT_EQ("prefix2", Uint8VectorToStdString(key_values[0]->key)); + EXPECT_EQ("value2", Uint8VectorToStdString(key_values[0]->value)); error = mojom::DatabaseError::INVALID_ARGUMENT; - DatabaseSyncDeletePrefixed(database.get(), mojo::Array<uint8_t>::From(prefix), - &error); + DatabaseSyncDeletePrefixed(database.get(), prefix, &error); EXPECT_EQ(mojom::DatabaseError::OK, error); error = mojom::DatabaseError::INVALID_ARGUMENT; - key_values.SetToEmpty(); - DatabaseSyncGetPrefixed(database.get(), mojo::Array<uint8_t>::From(prefix), - &error, &key_values); + key_values.clear(); + DatabaseSyncGetPrefixed(database.get(), prefix, &error, &key_values); EXPECT_EQ(mojom::DatabaseError::OK, error); EXPECT_TRUE(key_values.empty()); }
diff --git a/components/leveldb/public/cpp/remote_iterator.cc b/components/leveldb/public/cpp/remote_iterator.cc index b1042f70..c7e0c4a 100644 --- a/components/leveldb/public/cpp/remote_iterator.cc +++ b/components/leveldb/public/cpp/remote_iterator.cc
@@ -34,7 +34,7 @@ } void RemoteIterator::Seek(const Slice& target) { - database_->IteratorSeek(iterator_id_, GetArrayFor(target), &valid_, &status_, + database_->IteratorSeek(iterator_id_, GetVectorFor(target), &valid_, &status_, &key_, &value_); } @@ -47,15 +47,19 @@ } Slice RemoteIterator::key() const { - return GetSliceFor(key_); + if (!key_) + return leveldb::Slice(); + return GetSliceFor(*key_); } Slice RemoteIterator::value() const { - return GetSliceFor(value_); + if (!value_) + return leveldb::Slice(); + return GetSliceFor(*value_); } Status RemoteIterator::status() const { - return DatabaseErrorToStatus(status_, GetSliceFor(key_), GetSliceFor(value_)); + return DatabaseErrorToStatus(status_, key(), value()); } } // namespace leveldb
diff --git a/components/leveldb/public/cpp/remote_iterator.h b/components/leveldb/public/cpp/remote_iterator.h index 1d3920b..0a4ae36d 100644 --- a/components/leveldb/public/cpp/remote_iterator.h +++ b/components/leveldb/public/cpp/remote_iterator.h
@@ -6,7 +6,6 @@ #define COMPONENTS_LEVELDB_PUBLIC_CPP_REMOTE_ITERATOR_H_ #include "components/leveldb/public/interfaces/leveldb.mojom.h" -#include "mojo/public/cpp/bindings/array.h" #include "third_party/leveldatabase/src/include/leveldb/iterator.h" namespace leveldb { @@ -37,8 +36,8 @@ bool valid_; mojom::DatabaseError status_; - mojo::Array<uint8_t> key_; - mojo::Array<uint8_t> value_; + base::Optional<std::vector<uint8_t>> key_; + base::Optional<std::vector<uint8_t>> value_; DISALLOW_COPY_AND_ASSIGN(RemoteIterator); };
diff --git a/components/leveldb/public/cpp/util.cc b/components/leveldb/public/cpp/util.cc index 647f12c..d2dd6a60 100644 --- a/components/leveldb/public/cpp/util.cc +++ b/components/leveldb/public/cpp/util.cc
@@ -45,19 +45,28 @@ return leveldb::Status::InvalidArgument(msg, msg2); } -leveldb::Slice GetSliceFor(const mojo::Array<uint8_t>& key) { +leveldb::Slice GetSliceFor(const std::vector<uint8_t>& key) { if (key.size() == 0) return leveldb::Slice(); return leveldb::Slice(reinterpret_cast<const char*>(&key.front()), key.size()); } -mojo::Array<uint8_t> GetArrayFor(const leveldb::Slice& s) { +std::vector<uint8_t> GetVectorFor(const leveldb::Slice& s) { if (s.size() == 0) - return mojo::Array<uint8_t>(); - return mojo::Array<uint8_t>(std::vector<uint8_t>( + return std::vector<uint8_t>(); + return std::vector<uint8_t>( reinterpret_cast<const uint8_t*>(s.data()), - reinterpret_cast<const uint8_t*>(s.data() + s.size()))); + reinterpret_cast<const uint8_t*>(s.data() + s.size())); +} + +std::string Uint8VectorToStdString(const std::vector<uint8_t>& input) { + return std::string(reinterpret_cast<const char*>(input.data()), input.size()); +} + +std::vector<uint8_t> StdStringToUint8Vector(const std::string& input) { + const uint8_t* data = reinterpret_cast<const uint8_t*>(input.data()); + return std::vector<uint8_t>(data, data + input.size()); } } // namespace leveldb
diff --git a/components/leveldb/public/cpp/util.h b/components/leveldb/public/cpp/util.h index 44f733a..23e1e1d 100644 --- a/components/leveldb/public/cpp/util.h +++ b/components/leveldb/public/cpp/util.h
@@ -25,10 +25,14 @@ // Builds a Slice pointing to the data inside |a|. This is not a type-converter // as it is not a copy operation; the returned Slice points into |a| and must // outlive |a|. -leveldb::Slice GetSliceFor(const mojo::Array<uint8_t>& a); +leveldb::Slice GetSliceFor(const std::vector<uint8_t>& a); -// Copies the data that |s| points to into a mojo::Array. -mojo::Array<uint8_t> GetArrayFor(const leveldb::Slice& s); +// Copies the data that |s| points to into a std::vector. +std::vector<uint8_t> GetVectorFor(const leveldb::Slice& s); + +std::string Uint8VectorToStdString(const std::vector<uint8_t>& input); + +std::vector<uint8_t> StdStringToUint8Vector(const std::string& input); } // namespace leveldb
diff --git a/components/leveldb/public/interfaces/BUILD.gn b/components/leveldb/public/interfaces/BUILD.gn index a8b33770..0b95cf4 100644 --- a/components/leveldb/public/interfaces/BUILD.gn +++ b/components/leveldb/public/interfaces/BUILD.gn
@@ -12,6 +12,4 @@ deps = [ "//components/filesystem/public/interfaces", ] - - use_new_wrapper_types = false }
diff --git a/components/leveldb/remote_iterator_unittest.cc b/components/leveldb/remote_iterator_unittest.cc index 4319dc39..56e1c93 100644 --- a/components/leveldb/remote_iterator_unittest.cc +++ b/components/leveldb/remote_iterator_unittest.cc
@@ -8,8 +8,8 @@ #include "base/macros.h" #include "base/run_loop.h" #include "components/leveldb/public/cpp/remote_iterator.h" +#include "components/leveldb/public/cpp/util.h" #include "components/leveldb/public/interfaces/leveldb.mojom.h" -#include "mojo/common/common_type_converters.h" #include "services/shell/public/cpp/service_context.h" #include "services/shell/public/cpp/service_test.h" @@ -55,8 +55,8 @@ // Write a key to the database. error = mojom::DatabaseError::INVALID_ARGUMENT; base::RunLoop run_loop; - database_->Put(mojo::Array<uint8_t>::From(p.first), - mojo::Array<uint8_t>::From(p.second), + database_->Put(StdStringToUint8Vector(p.first), + StdStringToUint8Vector(p.second), Capture(&error, run_loop.QuitClosure())); run_loop.Run(); EXPECT_EQ(mojom::DatabaseError::OK, error);
diff --git a/components/leveldb_proto.gypi b/components/leveldb_proto.gypi deleted file mode 100644 index b90ad90..0000000 --- a/components/leveldb_proto.gypi +++ /dev/null
@@ -1,44 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - 'target_name': 'leveldb_proto', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', - ], - 'sources': [ - 'leveldb_proto/leveldb_database.cc', - 'leveldb_proto/leveldb_database.h', - 'leveldb_proto/proto_database.h', - 'leveldb_proto/proto_database_impl.h', - ] - }, - { - 'target_name': 'leveldb_proto_test_support', - 'type': 'static_library', - 'dependencies': [ - 'leveldb_proto', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'leveldb_proto/testing/fake_db.h', - 'leveldb_proto/testing/proto/test.proto', - ], - 'variables': { - 'proto_in_dir': 'leveldb_proto/testing/proto', - 'proto_out_dir': 'components/leveldb_proto/testing/proto', - }, - 'includes': [ '../build/protoc.gypi' ] - }, - ], -}
diff --git a/components/link_header_util/link_header_util.gyp b/components/link_header_util/link_header_util.gyp deleted file mode 100644 index 4ad5c73..0000000 --- a/components/link_header_util/link_header_util.gyp +++ /dev/null
@@ -1,21 +0,0 @@ -# Copyright 2016 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. - -{ - 'targets': [ - { - # GN version: //components/link_header_util/link_header_util - 'target_name': 'link_header_util', - 'type': 'static_library', - 'dependencies': [ - '../../base/base.gyp:base', - '../../net/net.gyp:net', - ], - 'sources': [ - 'link_header_util.cc', - 'link_header_util.h', - ], - } - ], -}
diff --git a/components/login.gypi b/components/login.gypi deleted file mode 100644 index ac662125..0000000 --- a/components/login.gypi +++ /dev/null
@@ -1,29 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [{ - 'target_name': 'login', - 'type': '<(component)', - 'dependencies': [ - '<(DEPTH)/base/base.gyp:base', - '<(DEPTH)/components/components.gyp:signin_core_account_id', - '<(DEPTH)/ui/base/ui_base.gyp:ui_base', - ], - 'export_dependent_settings': [ - '<(DEPTH)/base/base.gyp:base', - ], - 'defines': [ - 'LOGIN_IMPLEMENTATION', - ], - 'sources': [ - 'login/base_screen_handler_utils.cc', - 'login/base_screen_handler_utils.h', - 'login/localized_values_builder.cc', - 'login/localized_values_builder.h', - 'login/screens/screen_context.cc', - 'login/screens/screen_context.h', - ], - }], -}
diff --git a/components/memory_coordinator.gypi b/components/memory_coordinator.gypi deleted file mode 100644 index e1ac8f0..0000000 --- a/components/memory_coordinator.gypi +++ /dev/null
@@ -1,65 +0,0 @@ -# Copyright (c) 2016 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. - -{ - 'targets': [ - { - # GN version: //components/memory_coordinator/public/interfaces - 'target_name': 'memory_coordinator_mojo_bindings', - 'type': 'static_library', - 'sources': [ - 'memory_coordinator/public/interfaces/child_memory_coordinator.mojom', - 'memory_coordinator/public/interfaces/memory_coordinator.mojom', - ], - 'variables': { - 'use_new_wrapper_types': 'false', - }, - 'includes': [ '../mojo/mojom_bindings_generator.gypi' ], - }, - { - # GN version: //components/memory_coordinator/common - 'target_name': 'memory_coordinator_common', - 'type': 'static_library', - 'dependencies': [ - '<(DEPTH)/base/base.gyp:base', - 'memory_coordinator_mojo_bindings', - ], - 'sources': [ - 'memory_coordinator/common/client_registry.cc', - 'memory_coordinator/common/client_registry.h', - 'memory_coordinator/common/memory_coordinator_client.h', - 'memory_coordinator/common/memory_coordinator_features.cc', - 'memory_coordinator/common/memory_coordinator_features.h', - ], - }, - { - # GN version: //components/memory_coordinator/child - 'target_name': 'memory_coordinator_child', - 'type': 'static_library', - 'dependencies': [ - '<(DEPTH)/base/base.gyp:base', - 'memory_coordinator_common', - 'memory_coordinator_mojo_bindings', - ], - 'sources': [ - 'memory_coordinator/child/child_memory_coordinator_impl.cc', - 'memory_coordinator/child/child_memory_coordinator_impl.h', - ], - }, - { - # GN version: //components/memory_coordinator/browser - 'target_name': 'memory_coordinator_browser', - 'type': 'static_library', - 'dependencies': [ - '<(DEPTH)/base/base.gyp:base', - 'memory_coordinator_common', - 'memory_coordinator_mojo_bindings', - ], - 'sources': [ - 'memory_coordinator/browser/memory_coordinator.cc', - 'memory_coordinator/browser/memory_coordinator.h', - ], - }, - ], -}
diff --git a/components/memory_pressure.gypi b/components/memory_pressure.gypi deleted file mode 100644 index 41d8e0c..0000000 --- a/components/memory_pressure.gypi +++ /dev/null
@@ -1,35 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/memory_pressure - 'target_name': 'memory_pressure', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - ], - 'sources': [ - 'memory_pressure/direct_memory_pressure_calculator.h', - 'memory_pressure/direct_memory_pressure_calculator_linux.cc', - 'memory_pressure/direct_memory_pressure_calculator_linux.h', - 'memory_pressure/direct_memory_pressure_calculator_win.cc', - 'memory_pressure/direct_memory_pressure_calculator_win.h', - 'memory_pressure/filtered_memory_pressure_calculator.cc', - 'memory_pressure/filtered_memory_pressure_calculator.h', - 'memory_pressure/memory_pressure_calculator.h', - 'memory_pressure/memory_pressure_listener.cc', - 'memory_pressure/memory_pressure_listener.h', - 'memory_pressure/memory_pressure_monitor.cc', - 'memory_pressure/memory_pressure_monitor.h', - 'memory_pressure/memory_pressure_stats_collector.cc', - 'memory_pressure/memory_pressure_stats_collector.h', - ], - }, - ], -}
diff --git a/components/metrics.gypi b/components/metrics.gypi deleted file mode 100644 index 688e46c..0000000 --- a/components/metrics.gypi +++ /dev/null
@@ -1,361 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/metrics - 'target_name': 'metrics', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../third_party/zlib/google/zip.gyp:compression_utils', - 'component_metrics_proto', - 'prefs/prefs.gyp:prefs', - 'variations', - ], - 'export_dependent_settings': [ - 'component_metrics_proto', - ], - 'sources': [ - 'metrics/call_stack_profile_metrics_provider.cc', - 'metrics/call_stack_profile_metrics_provider.h', - 'metrics/clean_exit_beacon.cc', - 'metrics/clean_exit_beacon.h', - 'metrics/client_info.cc', - 'metrics/client_info.h', - 'metrics/cloned_install_detector.cc', - 'metrics/cloned_install_detector.h', - 'metrics/daily_event.cc', - 'metrics/daily_event.h', - 'metrics/drive_metrics_provider.cc', - 'metrics/drive_metrics_provider.h', - 'metrics/drive_metrics_provider_android.cc', - 'metrics/drive_metrics_provider_ios.mm', - 'metrics/drive_metrics_provider_linux.cc', - 'metrics/drive_metrics_provider_mac.mm', - 'metrics/drive_metrics_provider_win.cc', - 'metrics/enabled_state_provider.cc', - 'metrics/enabled_state_provider.h', - 'metrics/file_metrics_provider.cc', - 'metrics/file_metrics_provider.h', - 'metrics/histogram_encoder.cc', - 'metrics/histogram_encoder.h', - 'metrics/machine_id_provider.h', - 'metrics/machine_id_provider_stub.cc', - 'metrics/machine_id_provider_win.cc', - 'metrics/data_use_tracker.cc', - 'metrics/data_use_tracker.h', - 'metrics/metrics_log.cc', - 'metrics/metrics_log.h', - 'metrics/metrics_log_manager.cc', - 'metrics/metrics_log_manager.h', - 'metrics/metrics_log_uploader.cc', - 'metrics/metrics_log_uploader.h', - 'metrics/metrics_pref_names.cc', - 'metrics/metrics_pref_names.h', - 'metrics/metrics_provider.cc', - 'metrics/metrics_provider.h', - 'metrics/metrics_reporting_default_state.cc', - 'metrics/metrics_reporting_default_state.h', - 'metrics/metrics_reporting_scheduler.cc', - 'metrics/metrics_reporting_scheduler.h', - 'metrics/metrics_service.cc', - 'metrics/metrics_service.h', - 'metrics/metrics_service_accessor.cc', - 'metrics/metrics_service_accessor.h', - 'metrics/metrics_service_client.cc', - 'metrics/metrics_service_client.h', - 'metrics/metrics_state_manager.cc', - 'metrics/metrics_state_manager.h', - 'metrics/metrics_switches.cc', - 'metrics/metrics_switches.h', - 'metrics/persisted_logs.cc', - 'metrics/persisted_logs.h', - 'metrics/stability_metrics_helper.cc', - 'metrics/stability_metrics_helper.h', - 'metrics/system_memory_stats_recorder.h', - 'metrics/system_memory_stats_recorder_linux.cc', - 'metrics/system_memory_stats_recorder_win.cc', - 'metrics/url_constants.cc', - 'metrics/url_constants.h', - ], - 'conditions': [ - ['chromeos==1', { - 'dependencies': [ - 'metrics_serialization', - ], - }], - ['OS == "mac"', { - 'link_settings': { - 'libraries': [ - # The below are all needed for drive_metrics_provider_mac.mm. - '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework', - '$(SDKROOT)/System/Library/Frameworks/DiskArbitration.framework', - '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', - '$(SDKROOT)/System/Library/Frameworks/IOKit.framework', - ], - }, - }], - ['OS=="win"', { - 'sources!': [ - 'metrics/machine_id_provider_stub.cc', - ], - }], - ], - }, - { - # GN version: //components/metrics:net - 'target_name': 'metrics_net', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - '../url/url.gyp:url_lib', - 'component_metrics_proto', - 'data_use_measurement_core', - 'metrics', - 'version_info', - ], - 'sources': [ - 'metrics/net/cellular_logic_helper.cc', - 'metrics/net/cellular_logic_helper.h', - 'metrics/net/net_metrics_log_uploader.cc', - 'metrics/net/net_metrics_log_uploader.h', - 'metrics/net/network_metrics_provider.cc', - 'metrics/net/network_metrics_provider.h', - 'metrics/net/version_utils.cc', - 'metrics/net/version_utils.h', - 'metrics/net/wifi_access_point_info_provider.cc', - 'metrics/net/wifi_access_point_info_provider.h', - 'metrics/net/wifi_access_point_info_provider_chromeos.cc', - 'metrics/net/wifi_access_point_info_provider_chromeos.h', - ], - }, - { - # GN version: //components/metrics:ui - 'target_name': 'metrics_ui', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../ui/display/display.gyp:display', - '../ui/gfx/gfx.gyp:gfx', - 'metrics', - ], - 'sources': [ - 'metrics/ui/screen_info_metrics_provider.cc', - 'metrics/ui/screen_info_metrics_provider.h', - ], - }, - { - # Protobuf compiler / generator for UMA (User Metrics Analysis). - # - # GN version: //components/metrics/proto:proto - 'target_name': 'component_metrics_proto', - 'type': 'static_library', - 'sources': [ - 'metrics/proto/call_stack_profile.proto', - 'metrics/proto/cast_logs.proto', - 'metrics/proto/chrome_user_metrics_extension.proto', - 'metrics/proto/histogram_event.proto', - 'metrics/proto/memory_leak_report.proto', - 'metrics/proto/omnibox_event.proto', - 'metrics/proto/omnibox_input_type.proto', - 'metrics/proto/perf_data.proto', - 'metrics/proto/perf_stat.proto', - 'metrics/proto/profiler_event.proto', - 'metrics/proto/sampled_profile.proto', - 'metrics/proto/system_profile.proto', - 'metrics/proto/user_action_event.proto', - ], - 'variables': { - 'proto_in_dir': 'metrics/proto', - 'proto_out_dir': 'components/metrics/proto', - }, - 'includes': [ '../build/protoc.gypi' ], - }, - { - # TODO(isherman): Remove all //chrome dependencies on this target, and - # merge the files in this target with components_unittests. - # GN version: //components/metrics:test_support - 'target_name': 'metrics_test_support', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - 'component_metrics_proto', - 'metrics', - ], - 'export_dependent_settings': [ - 'component_metrics_proto', - ], - 'sources': [ - 'metrics/test_enabled_state_provider.cc', - 'metrics/test_enabled_state_provider.h', - 'metrics/test_metrics_provider.cc', - 'metrics/test_metrics_provider.h', - 'metrics/test_metrics_service_client.cc', - 'metrics/test_metrics_service_client.h', - ], - }, - { - # GN version: //components/metrics:profiler - 'target_name': 'metrics_profiler', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - 'component_metrics_proto', - 'metrics', - 'variations', - ], - 'export_dependent_settings': [ - 'component_metrics_proto', - ], - 'sources': [ - 'metrics/profiler/profiler_metrics_provider.cc', - 'metrics/profiler/profiler_metrics_provider.h', - 'metrics/profiler/tracking_synchronizer.cc', - 'metrics/profiler/tracking_synchronizer.h', - 'metrics/profiler/tracking_synchronizer_delegate.h', - 'metrics/profiler/tracking_synchronizer_observer.cc', - 'metrics/profiler/tracking_synchronizer_observer.h', - ], - }, - ], - 'conditions': [ - ['OS=="linux"', { - 'targets': [ - { - 'target_name': 'metrics_serialization', - 'type': 'static_library', - 'sources': [ - 'metrics/serialization/metric_sample.cc', - 'metrics/serialization/metric_sample.h', - 'metrics/serialization/serialization_utils.cc', - 'metrics/serialization/serialization_utils.h', - ], - 'dependencies': [ - '../base/base.gyp:base', - ], - }, - ], - }], - ['chromeos==1', { - 'targets': [ - { - # GN version: //components/metrics:leak_detector - 'target_name': 'metrics_leak_detector', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - 'component_metrics_proto', - ], - 'sources': [ - 'metrics/leak_detector/call_stack_manager.cc', - 'metrics/leak_detector/call_stack_manager.h', - 'metrics/leak_detector/call_stack_table.cc', - 'metrics/leak_detector/call_stack_table.h', - 'metrics/leak_detector/custom_allocator.cc', - 'metrics/leak_detector/custom_allocator.h', - 'metrics/leak_detector/gnu_build_id_reader.cc', - 'metrics/leak_detector/gnu_build_id_reader.h', - 'metrics/leak_detector/leak_analyzer.cc', - 'metrics/leak_detector/leak_analyzer.h', - 'metrics/leak_detector/leak_detector.cc', - 'metrics/leak_detector/leak_detector.h', - 'metrics/leak_detector/leak_detector_impl.cc', - 'metrics/leak_detector/leak_detector_impl.h', - 'metrics/leak_detector/leak_detector_value_type.cc', - 'metrics/leak_detector/leak_detector_value_type.h', - 'metrics/leak_detector/protobuf_to_mojo_converter.cc', - 'metrics/leak_detector/protobuf_to_mojo_converter.h', - 'metrics/leak_detector/ranked_set.cc', - 'metrics/leak_detector/ranked_set.h', - ], - }, - { - 'target_name': 'metrics_mojo_bindings', - 'type': 'static_library', - 'includes': [ - '../mojo/mojom_bindings_generator.gypi', - ], - 'sources': [ - 'metrics/leak_detector/leak_detector.mojom', - ], - }, - ], - }], - ['OS!="ios"', { - 'targets': [ - { - # GN version: //components/metrics:gpu - 'target_name': 'metrics_gpu', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_browser', - 'component_metrics_proto', - 'metrics', - ], - 'sources': [ - 'metrics/gpu/gpu_metrics_provider.cc', - 'metrics/gpu/gpu_metrics_provider.h', - ], - }, - { - # GN version: //components/metrics:profiler_content - 'target_name': 'metrics_profiler_content', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_browser', - '../content/content.gyp:content_common', - 'metrics_profiler', - ], - 'sources': [ - 'metrics/profiler/content/content_tracking_synchronizer_delegate.cc', - 'metrics/profiler/content/content_tracking_synchronizer_delegate.h', - ], - }, - ], - }, { # OS==ios - 'targets': [ - { - # GN version: //components/metrics:profiler_ios - 'target_name': 'metrics_profiler_ios', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - 'metrics_profiler', - ], - 'sources': [ - 'metrics/profiler/ios/ios_tracking_synchronizer_delegate.cc', - 'metrics/profiler/ios/ios_tracking_synchronizer_delegate.h', - ], - }, - ], - }], - ], -}
diff --git a/components/metrics/metrics_log.cc b/components/metrics/metrics_log.cc index 3d8cc18..691a946 100644 --- a/components/metrics/metrics_log.cc +++ b/components/metrics/metrics_log.cc
@@ -203,37 +203,45 @@ metrics_providers[i]->ProvideStabilityMetrics(system_profile); } - // Omit some stats unless this is the initial stability log. - if (log_type() != INITIAL_STABILITY_LOG) - return; + SystemProfileProto::Stability* stability = + system_profile->mutable_stability(); int incomplete_shutdown_count = pref->GetInteger(prefs::kStabilityIncompleteSessionEndCount); - pref->SetInteger(prefs::kStabilityIncompleteSessionEndCount, 0); + if (incomplete_shutdown_count) { + pref->SetInteger(prefs::kStabilityIncompleteSessionEndCount, 0); + stability->set_incomplete_shutdown_count(incomplete_shutdown_count); + } + int breakpad_registration_success_count = pref->GetInteger(prefs::kStabilityBreakpadRegistrationSuccess); - pref->SetInteger(prefs::kStabilityBreakpadRegistrationSuccess, 0); + if (breakpad_registration_success_count) { + pref->SetInteger(prefs::kStabilityBreakpadRegistrationSuccess, 0); + stability->set_breakpad_registration_success_count( + breakpad_registration_success_count); + } + int breakpad_registration_failure_count = pref->GetInteger(prefs::kStabilityBreakpadRegistrationFail); - pref->SetInteger(prefs::kStabilityBreakpadRegistrationFail, 0); + if (breakpad_registration_failure_count) { + pref->SetInteger(prefs::kStabilityBreakpadRegistrationFail, 0); + stability->set_breakpad_registration_failure_count( + breakpad_registration_failure_count); + } + int debugger_present_count = pref->GetInteger(prefs::kStabilityDebuggerPresent); - pref->SetInteger(prefs::kStabilityDebuggerPresent, 0); + if (debugger_present_count) { + pref->SetInteger(prefs::kStabilityDebuggerPresent, 0); + stability->set_debugger_present_count(debugger_present_count); + } + int debugger_not_present_count = pref->GetInteger(prefs::kStabilityDebuggerNotPresent); - pref->SetInteger(prefs::kStabilityDebuggerNotPresent, 0); - - // TODO(jar): The following are all optional, so we *could* optimize them for - // values of zero (and not include them). - SystemProfileProto::Stability* stability = - system_profile->mutable_stability(); - stability->set_incomplete_shutdown_count(incomplete_shutdown_count); - stability->set_breakpad_registration_success_count( - breakpad_registration_success_count); - stability->set_breakpad_registration_failure_count( - breakpad_registration_failure_count); - stability->set_debugger_present_count(debugger_present_count); - stability->set_debugger_not_present_count(debugger_not_present_count); + if (debugger_not_present_count) { + pref->SetInteger(prefs::kStabilityDebuggerNotPresent, 0); + stability->set_debugger_not_present_count(debugger_not_present_count); + } } void MetricsLog::RecordGeneralMetrics( @@ -285,9 +293,11 @@ // protobufs is complete. void MetricsLog::WriteRequiredStabilityAttributes(PrefService* pref) { int launch_count = pref->GetInteger(prefs::kStabilityLaunchCount); - pref->SetInteger(prefs::kStabilityLaunchCount, 0); + if (launch_count) + pref->SetInteger(prefs::kStabilityLaunchCount, 0); int crash_count = pref->GetInteger(prefs::kStabilityCrashCount); - pref->SetInteger(prefs::kStabilityCrashCount, 0); + if (crash_count) + pref->SetInteger(prefs::kStabilityCrashCount, 0); SystemProfileProto::Stability* stability = uma_proto()->mutable_system_profile()->mutable_stability(); @@ -379,15 +389,15 @@ for (size_t i = 0; i < metrics_providers.size(); ++i) metrics_providers[i]->ProvideSystemProfileMetrics(system_profile); - std::string serialied_system_profile; + std::string serialized_system_profile; std::string base64_system_profile; - if (system_profile->SerializeToString(&serialied_system_profile)) { - base::Base64Encode(serialied_system_profile, &base64_system_profile); + if (system_profile->SerializeToString(&serialized_system_profile)) { + base::Base64Encode(serialized_system_profile, &base64_system_profile); PrefService* local_state = local_state_; local_state->SetString(prefs::kStabilitySavedSystemProfile, base64_system_profile); local_state->SetString(prefs::kStabilitySavedSystemProfileHash, - ComputeSHA1(serialied_system_profile)); + ComputeSHA1(serialized_system_profile)); } } @@ -404,10 +414,11 @@ local_state->ClearPref(prefs::kStabilitySavedSystemProfileHash); SystemProfileProto* system_profile = uma_proto()->mutable_system_profile(); - std::string serialied_system_profile; - return base::Base64Decode(base64_system_profile, &serialied_system_profile) && - ComputeSHA1(serialied_system_profile) == system_profile_hash && - system_profile->ParseFromString(serialied_system_profile); + std::string serialized_system_profile; + return base::Base64Decode(base64_system_profile, + &serialized_system_profile) && + ComputeSHA1(serialized_system_profile) == system_profile_hash && + system_profile->ParseFromString(serialized_system_profile); } void MetricsLog::CloseLog() {
diff --git a/components/metrics/metrics_log_unittest.cc b/components/metrics/metrics_log_unittest.cc index fe03ff8..807328c 100644 --- a/components/metrics/metrics_log_unittest.cc +++ b/components/metrics/metrics_log_unittest.cc
@@ -388,12 +388,12 @@ // Required metrics: EXPECT_TRUE(stability.has_launch_count()); EXPECT_TRUE(stability.has_crash_count()); - // Initial log metrics: - EXPECT_TRUE(stability.has_incomplete_shutdown_count()); - EXPECT_TRUE(stability.has_breakpad_registration_success_count()); - EXPECT_TRUE(stability.has_breakpad_registration_failure_count()); - EXPECT_TRUE(stability.has_debugger_present_count()); - EXPECT_TRUE(stability.has_debugger_not_present_count()); + // Initial log metrics: only expected if non-zero. + EXPECT_FALSE(stability.has_incomplete_shutdown_count()); + EXPECT_FALSE(stability.has_breakpad_registration_success_count()); + EXPECT_FALSE(stability.has_breakpad_registration_failure_count()); + EXPECT_FALSE(stability.has_debugger_present_count()); + EXPECT_FALSE(stability.has_debugger_not_present_count()); // The test provider should have been called upon to provide initial // stability and regular stability metrics. @@ -418,7 +418,7 @@ // Required metrics: EXPECT_TRUE(stability.has_launch_count()); EXPECT_TRUE(stability.has_crash_count()); - // Initial log metrics: + // Initial log metrics: only expected if non-zero. EXPECT_FALSE(stability.has_incomplete_shutdown_count()); EXPECT_FALSE(stability.has_breakpad_registration_success_count()); EXPECT_FALSE(stability.has_breakpad_registration_failure_count());
diff --git a/components/metrics/metrics_service.cc b/components/metrics/metrics_service.cc index 2c6b8ef0..df9bd1b 100644 --- a/components/metrics/metrics_service.cc +++ b/components/metrics/metrics_service.cc
@@ -523,7 +523,11 @@ provider->ClearSavedStabilityMetrics(); // Reset the prefs that are managed by MetricsService/MetricsLog directly. + local_state_->SetInteger(prefs::kStabilityBreakpadRegistrationSuccess, 0); + local_state_->SetInteger(prefs::kStabilityBreakpadRegistrationFail, 0); local_state_->SetInteger(prefs::kStabilityCrashCount, 0); + local_state_->SetInteger(prefs::kStabilityDebuggerPresent, 0); + local_state_->SetInteger(prefs::kStabilityDebuggerNotPresent, 0); local_state_->SetInteger(prefs::kStabilityExecutionPhase, UNINITIALIZED_PHASE); local_state_->SetInteger(prefs::kStabilityIncompleteSessionEndCount, 0);
diff --git a/components/metrics/proto/chrome_user_metrics_extension.proto b/components/metrics/proto/chrome_user_metrics_extension.proto index 8b82933a..4b9bf68b 100644 --- a/components/metrics/proto/chrome_user_metrics_extension.proto +++ b/components/metrics/proto/chrome_user_metrics_extension.proto
@@ -31,6 +31,9 @@ // UMA metrics from Android Webview. ANDROID_WEBVIEW = 20; + + // Cast receivers, e.g. Chromecast + CAST = 35; } // The product corresponding to this log. The field type is int32 instead of // Product so that downstream users of the Chromium metrics component can
diff --git a/components/metrics_services_manager.gypi b/components/metrics_services_manager.gypi deleted file mode 100644 index e417180..0000000 --- a/components/metrics_services_manager.gypi +++ /dev/null
@@ -1,28 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/metrics_services_manager - 'target_name': 'metrics_services_manager', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - 'metrics', - 'rappor', - 'variations', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'metrics_services_manager/metrics_services_manager.cc', - 'metrics_services_manager/metrics_services_manager.h', - 'metrics_services_manager/metrics_services_manager_client.h', - ], - }, - ], -}
diff --git a/components/mime_util/mime_util.gyp b/components/mime_util/mime_util.gyp deleted file mode 100644 index c922f98..0000000 --- a/components/mime_util/mime_util.gyp +++ /dev/null
@@ -1,29 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/mime_util/mime_util - 'target_name': 'mime_util', - 'type': 'static_library', - 'dependencies': [ - '../../base/base.gyp:base', - '../../net/net.gyp:net', - ], - 'sources': [ - 'mime_util.cc', - 'mime_util.h', - ], - 'conditions': [ - ['OS!="ios"', { - # iOS doesn't use and must not depend on //media - 'dependencies': [ - '../../media/media.gyp:media', - ], - }], - ], - } - ], -}
diff --git a/components/nacl.gyp b/components/nacl.gyp deleted file mode 100644 index 677fbc4..0000000 --- a/components/nacl.gyp +++ /dev/null
@@ -1,466 +0,0 @@ -# Copyright 2013 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. - -{ - 'variables': { - 'chromium_code': 1, - }, - 'target_defaults': { - 'variables': { - 'nacl_target': 0, - }, - 'target_conditions': [ - # This part is shared between the targets defined below. Only files and - # settings relevant for building the Win64 target should be added here. - ['nacl_target==1', { - 'include_dirs': [ - '<(INTERMEDIATE_DIR)', - ], - 'sources': [ - # .cc, .h, and .mm files under nacl that are used on all - # platforms, including both 32-bit and 64-bit Windows. - # Test files are also not included. - 'nacl/loader/nacl_ipc_adapter.cc', - 'nacl/loader/nacl_ipc_adapter.h', - 'nacl/loader/nacl_listener.cc', - 'nacl/loader/nacl_listener.h', - 'nacl/loader/nacl_main.cc', - 'nacl/loader/nacl_main_platform_delegate.h', - 'nacl/loader/nacl_main_platform_delegate_linux.cc', - 'nacl/loader/nacl_main_platform_delegate_mac.mm', - 'nacl/loader/nacl_main_platform_delegate_win.cc', - 'nacl/loader/nacl_trusted_listener.cc', - 'nacl/loader/nacl_trusted_listener.h', - 'nacl/loader/nacl_validation_db.h', - 'nacl/loader/nacl_validation_query.cc', - 'nacl/loader/nacl_validation_query.h', - ], - # TODO(gregoryd): consider switching NaCl to use Chrome OS defines - 'conditions': [ - ['OS=="win"', { - 'defines': [ - '__STDC_LIMIT_MACROS=1', - ], - 'include_dirs': [ - '<(DEPTH)/third_party/wtl/include', - ], - },], - ['OS=="linux"', { - 'defines': [ - '__STDC_LIMIT_MACROS=1', - ], - 'sources': [ - '../components/nacl/common/nacl_paths.cc', - '../components/nacl/common/nacl_paths.h', - ], - },], - ], - }], - ], - }, - 'conditions': [ - ['disable_nacl!=1', { - 'targets': [ - { - # GN version: //components/nacl/loader - 'target_name': 'nacl', - 'type': 'static_library', - 'variables': { - 'nacl_target': 1, - }, - 'dependencies': [ - '../base/base.gyp:base', - '../base/base.gyp:base_static', - '../crypto/crypto.gyp:crypto', - '../ipc/ipc.gyp:ipc', - '../mojo/mojo_edk.gyp:mojo_system_impl', - '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel_main_chrome', - '../ppapi/ppapi_internal.gyp:ppapi_ipc', - '../ppapi/ppapi_internal.gyp:ppapi_shared', - ], - 'conditions': [ - ['disable_nacl_untrusted==0', { - 'dependencies': [ - '../ppapi/native_client/native_client.gyp:nacl_irt', - '../ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp:pnacl_support_extension', - ], - }], - ], - }, - { - # GN version: //components/nacl/browser - 'target_name': 'nacl_browser', - 'type': 'static_library', - 'sources': [ - 'nacl/browser/bad_message.cc', - 'nacl/browser/bad_message.h', - 'nacl/browser/nacl_broker_host_win.cc', - 'nacl/browser/nacl_broker_host_win.h', - 'nacl/browser/nacl_broker_service_win.cc', - 'nacl/browser/nacl_broker_service_win.h', - 'nacl/browser/nacl_browser.cc', - 'nacl/browser/nacl_browser.h', - 'nacl/browser/nacl_file_host.cc', - 'nacl/browser/nacl_file_host.h', - 'nacl/browser/nacl_host_message_filter.cc', - 'nacl/browser/nacl_host_message_filter.h', - 'nacl/browser/nacl_process_host.cc', - 'nacl/browser/nacl_process_host.h', - 'nacl/browser/nacl_validation_cache.cc', - 'nacl/browser/nacl_validation_cache.h', - 'nacl/browser/pnacl_host.cc', - 'nacl/browser/pnacl_host.h', - 'nacl/browser/pnacl_translation_cache.cc', - 'nacl/browser/pnacl_translation_cache.h', - 'nacl/common/nacl_debug_exception_handler_win.cc', - 'nacl/common/nacl_debug_exception_handler_win.h', - ], - 'include_dirs': [ - '..', - ], - 'dependencies': [ - 'nacl_common', - 'nacl_switches', - 'url_formatter/url_formatter.gyp:url_formatter', - '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel', - '../content/content.gyp:content_browser', - ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [4267, ], - 'conditions': [ - ['OS=="linux"', { - 'sources': [ - '../components/nacl/zygote/nacl_fork_delegate_linux.cc', - '../components/nacl/zygote/nacl_fork_delegate_linux.h', - ], - 'dependencies': [ - # Required by nacl_fork_delegate_linux.cc. - '../sandbox/sandbox.gyp:suid_sandbox_client', - '../sandbox/sandbox.gyp:sandbox_services', - ] - }], - ], - }, - { - # GN version: //components/nacl/renderer - 'target_name': 'nacl_renderer', - 'type': 'static_library', - 'sources': [ - 'nacl/renderer/file_downloader.cc', - 'nacl/renderer/file_downloader.h', - 'nacl/renderer/histogram.cc', - 'nacl/renderer/histogram.h', - 'nacl/renderer/json_manifest.cc', - 'nacl/renderer/json_manifest.h', - 'nacl/renderer/manifest_downloader.cc', - 'nacl/renderer/manifest_downloader.h', - 'nacl/renderer/manifest_service_channel.cc', - 'nacl/renderer/manifest_service_channel.h', - 'nacl/renderer/nacl_helper.cc', - 'nacl/renderer/nacl_helper.h', - 'nacl/renderer/nexe_load_manager.cc', - 'nacl/renderer/nexe_load_manager.h', - 'nacl/renderer/platform_info.cc', - 'nacl/renderer/platform_info.h', - 'nacl/renderer/pnacl_translation_resource_host.cc', - 'nacl/renderer/pnacl_translation_resource_host.h', - 'nacl/renderer/ppb_nacl_private_impl.cc', - 'nacl/renderer/ppb_nacl_private_impl.h', - 'nacl/renderer/progress_event.cc', - 'nacl/renderer/progress_event.h', - 'nacl/renderer/trusted_plugin_channel.cc', - 'nacl/renderer/trusted_plugin_channel.h', - ], - 'include_dirs': [ - '..', - ], - 'dependencies': [ - 'nacl_common', - '../content/content.gyp:content_renderer', - '../components/nacl/renderer/plugin/plugin.gyp:nacl_trusted_plugin', - '../third_party/WebKit/public/blink.gyp:blink', - ], - }, - { - # GN version: //components/nacl/loader:nacl_loader_unittests - 'target_name': 'nacl_loader_unittests', - 'type': '<(gtest_target_type)', - 'sources': [ - 'nacl/loader/nacl_ipc_adapter_unittest.cc', - 'nacl/loader/nacl_validation_query_unittest.cc', - 'nacl/loader/run_all_unittests.cc', - ], - 'dependencies': [ - 'nacl', - '../base/base.gyp:test_support_base', - '../ipc/ipc.gyp:test_support_ipc', - '../testing/gtest.gyp:gtest', - ], - }, - ], - 'conditions': [ - ['OS=="linux"', { - 'targets': [ - { - # GN version: //components/nacl/loader:nacl_helper - 'target_name': 'nacl_helper', - 'type': 'executable', - 'include_dirs': [ - '..', - ], - 'sources': [ - 'nacl/loader/nacl_helper_linux.cc', - 'nacl/loader/nacl_helper_linux.h', - ], - 'dependencies': [ - 'nacl_linux', - ], - 'cflags': ['-fPIE'], - 'ldflags!': [ - # Do not pick the default ASan options from - # build/sanitizers/sanitizer_options.cc to avoid a conflict with - # those in nacl/nacl_helper_linux.cc. - '-Wl,-u_sanitizer_options_link_helper', - ], - 'link_settings': { - 'ldflags': ['-pie'], - }, - }, { - # GN version: //components/nacl/loader/sandbox_linux - 'target_name': 'nacl_linux', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'defines': [ - # Allow .cc files to know if they're being compiled as part - # of nacl_helper. - 'IN_NACL_HELPER=1', - ], - 'sources': [ - 'nacl/loader/sandbox_linux/nacl_bpf_sandbox_linux.cc', - 'nacl/loader/sandbox_linux/nacl_sandbox_linux.cc', - ], - 'dependencies': [ - 'nacl', - 'nacl_common', - 'nacl_switches', - '../crypto/crypto.gyp:crypto', - '../sandbox/sandbox.gyp:sandbox', - ], - 'conditions': [ - ['use_glib == 1', { - 'dependencies': [ - '../build/linux/system.gyp:glib', - ], - }], - ['use_seccomp_bpf == 0', { - 'sources!': [ - '../content/common/sandbox_linux/sandbox_bpf_base_policy_linux.cc', - '../content/common/sandbox_linux/sandbox_init_linux.cc', - ], - }, { - 'defines': ['USE_SECCOMP_BPF'], - }], - ], - 'cflags': ['-fPIE'], - }, - ], - }], - ['OS=="win" and target_arch=="ia32"', { - 'targets': [ - { - 'target_name': 'nacl_win64', - 'type': 'static_library', - 'variables': { - 'nacl_target': 1, - }, - 'dependencies': [ - 'nacl_common_win64', - '../mojo/mojo_edk.gyp:mojo_system_impl_win64', - '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel_main_chrome64', - '../ppapi/ppapi_internal.gyp:ppapi_shared_win64', - '../ppapi/ppapi_internal.gyp:ppapi_ipc_win64', - ], - 'export_dependent_settings': [ - '../ppapi/ppapi_internal.gyp:ppapi_ipc_win64', - ], - 'sources': [ - '../components/nacl/broker/nacl_broker_listener.cc', - '../components/nacl/broker/nacl_broker_listener.h', - '../components/nacl/common/nacl_debug_exception_handler_win.cc', - '../components/nacl/loader/nacl_helper_win_64.cc', - '../components/nacl/loader/nacl_helper_win_64.h', - ], - 'include_dirs': [ - '..', - ], - 'defines': [ - '<@(nacl_win64_defines)', - 'COMPILE_CONTENT_STATICALLY', - ], - 'configurations': { - 'Common_Base': { - 'msvs_target_platform': 'x64', - }, - }, - }, - { - # GN version: //components/nacl/common:switches - 'target_name': 'nacl_switches_win64', - 'type': 'static_library', - 'sources': [ - 'nacl/common/nacl_switches.cc', - 'nacl/common/nacl_switches.h', - ], - 'include_dirs': [ - '..', - ], - 'configurations': { - 'Common_Base': { - 'msvs_target_platform': 'x64', - }, - }, - }, - { - # GN version: //components/nacl/common - 'target_name': 'nacl_common_win64', - 'type': 'static_library', - 'defines': [ - 'COMPILE_CONTENT_STATICALLY', - ], - 'sources': [ - 'nacl/common/nacl_cmd_line.cc', - 'nacl/common/nacl_cmd_line.h', - 'nacl/common/nacl_constants.cc', - 'nacl/common/nacl_constants.h', - 'nacl/common/nacl_messages.cc', - 'nacl/common/nacl_messages.h', - 'nacl/common/nacl_renderer_messages.cc', - 'nacl/common/nacl_renderer_messages.h', - 'nacl/common/nacl_types.cc', - 'nacl/common/nacl_types.h', - 'nacl/common/nacl_types_param_traits.cc', - 'nacl/common/nacl_types_param_traits.h', - ], - 'include_dirs': [ - '..', - ], - 'configurations': { - 'Common_Base': { - 'msvs_target_platform': 'x64', - }, - }, - }, - ], - }], - ], - }, { # else (disable_nacl==1) - 'targets': [ - { - 'target_name': 'nacl', - 'type': 'none', - 'sources': [], - }, - ], - 'conditions': [ - ['OS=="win"', { - 'targets': [ - { - 'target_name': 'nacl_win64', - 'type': 'none', - 'sources': [], - }, - { - 'target_name': 'nacl_switches_win64', - 'type': 'none', - 'sources': [], - }, - ], - }], - ], - }], - ['disable_nacl!=1 and test_isolation_mode!="noop"', { - 'targets': [ - { - 'target_name': 'nacl_loader_unittests_run', - 'type': 'none', - 'dependencies': [ - 'nacl_loader_unittests', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'nacl_loader_unittests.isolate', - ], - }, - ], - }], - ['disable_nacl==0 and disable_nacl_untrusted==0 and enable_nacl_nonsfi_test==1', { - 'targets': [ - { - 'target_name': 'nacl_helper_nonsfi_unittests', - 'type': '<(gtest_target_type)', - 'sources': [ - 'nacl/loader/nonsfi/nacl_helper_nonsfi_unittests.cc', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../base/base.gyp:test_launcher_nacl_nonsfi', - 'nacl_nonsfi.gyp:nacl_helper_nonsfi_unittests_main', - ], - }, - ], - }], - ], - 'targets': [ - { - # GN version: //components/nacl/common:switches - 'target_name': 'nacl_switches', - 'type': 'static_library', - 'sources': [ - 'nacl/common/nacl_switches.cc', - 'nacl/common/nacl_switches.h', - ], - 'include_dirs': [ - '..', - ], - }, - { - # GN version: //components/nacl/common - 'target_name': 'nacl_common', - 'type': 'static_library', - 'sources': [ - 'nacl/common/nacl_cmd_line.cc', - 'nacl/common/nacl_cmd_line.h', - 'nacl/common/nacl_constants.cc', - 'nacl/common/nacl_constants.h', - 'nacl/common/nacl_host_messages.cc', - 'nacl/common/nacl_host_messages.h', - 'nacl/common/nacl_messages.cc', - 'nacl/common/nacl_messages.h', - 'nacl/common/nacl_nonsfi_util.cc', - 'nacl/common/nacl_nonsfi_util.h', - 'nacl/common/nacl_process_type.h', - 'nacl/common/nacl_renderer_messages.cc', - 'nacl/common/nacl_renderer_messages.h', - 'nacl/common/nacl_sandbox_type.h', - 'nacl/common/nacl_types.cc', - 'nacl/common/nacl_types.h', - 'nacl/common/nacl_types_param_traits.cc', - 'nacl/common/nacl_types_param_traits.h', - 'nacl/common/pnacl_types.cc', - 'nacl/common/pnacl_types.h', - ], - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../content/content.gyp:content_common', - '../url/ipc/url_ipc.gyp:url_ipc', - ], - }, - ] -}
diff --git a/components/nacl/renderer/plugin/plugin.gyp b/components/nacl/renderer/plugin/plugin.gyp deleted file mode 100644 index 6fb305d4e..0000000 --- a/components/nacl/renderer/plugin/plugin.gyp +++ /dev/null
@@ -1,33 +0,0 @@ -# -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'variables': { - 'chromium_code': 1, # Use higher warning level. - }, - 'targets': [ - { - 'target_name': 'nacl_trusted_plugin', - 'type': 'static_library', - 'sources': [ - 'module_ppapi.cc', - 'nacl_subprocess.cc', - 'plugin.cc', - 'pnacl_coordinator.cc', - 'pnacl_resources.cc', - 'pnacl_translate_thread.cc', - 'ppapi_entrypoints.cc', - 'service_runtime.cc', - ], - 'dependencies': [ - '<(DEPTH)/media/media.gyp:shared_memory_support', - '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp_objects', - '<(DEPTH)/ppapi/ppapi.gyp:ppapi_internal_module', - ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [4267, ], - }, - ], -}
diff --git a/components/nacl_nonsfi.gyp b/components/nacl_nonsfi.gyp deleted file mode 100644 index 7fdfe1f73..0000000 --- a/components/nacl_nonsfi.gyp +++ /dev/null
@@ -1,303 +0,0 @@ -# Copyright 2014 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. - -{ - 'variables': { - 'chromium_code': 1, - }, - 'includes': [ - '../build/common_untrusted.gypi', - ], - 'conditions': [ - ['disable_nacl==0 and disable_nacl_untrusted==0', { - 'targets': [ - { - # nacl_helper_nonsfi is similar to nacl_helper (built in nacl.gyp) - # but for the NaCl plugin in Non-SFI mode. - # This binary is built using the PNaCl toolchain, but it is native - # linux binary and will run on Linux directly. - # Most library code can be shared with the one for untrusted build - # (i.e. the one for irt.nexe built by the NaCl/PNaCl toolchain), but - # as nacl_helper_nonsfi runs on Linux, there are some differences, - # such as MessageLoopForIO (which is based on libevent in Non-SFI - # mode) or ipc_channel implementation. - # Because of the toolchain, in both builds, OS_NACL macro (derived - # from __native_client__ macro) is defined. Code can test whether - # __native_client_nonsfi__ is #defined in order to determine - # whether it is being compiled for SFI mode or Non-SFI mode. - # - # Currently, nacl_helper_nonsfi is under development and the binary - # does nothing (i.e. it has only empty main(), now). - # TODO(crbug.com/358465): Implement it then switch nacl_helper in - # Non-SFI mode to nacl_helper_nonsfi. - 'target_name': 'nacl_helper_nonsfi', - 'type': 'none', - 'variables': { - 'nacl_untrusted_build': 1, - 'nexe_target': 'nacl_helper_nonsfi', - # Rename the output binary file to nacl_helper_nonsfi and put it - # directly under out/{Debug,Release}/. - 'out_newlib32_nonsfi': '<(PRODUCT_DIR)/nacl_helper_nonsfi', - 'out_newlib_arm_nonsfi': '<(PRODUCT_DIR)/nacl_helper_nonsfi', - - 'build_glibc': 0, - 'build_newlib': 0, - 'build_irt': 0, - 'build_pnacl_newlib': 0, - 'build_nonsfi_helper': 1, - - 'sources': [ - 'nacl/common/nacl_messages.cc', - 'nacl/common/nacl_switches.cc', - 'nacl/common/nacl_types.cc', - 'nacl/common/nacl_types_param_traits.cc', - 'nacl/loader/nacl_helper_linux.cc', - 'nacl/loader/nacl_trusted_listener.cc', - 'nacl/loader/nonsfi/nonsfi_listener.cc', - 'nacl/loader/nonsfi/nonsfi_main.cc', - ], - - 'link_flags': [ - '-lbase_nacl_nonsfi', - '-lcommand_buffer_client_nacl', - '-lcommand_buffer_common_nacl', - '-lcontent_common_nacl_nonsfi', - '-lelf_loader', - '-levent_nacl_nonsfi', - '-lgfx_geometry_nacl', - '-lgfx_ipc_geometry_nacl', - '-lgio', - '-lgles2_cmd_helper_nacl', - '-lgles2_implementation_nacl', - '-lgles2_utils_nacl', - '-lgpu_ipc_nacl', - '-lipc_nacl_nonsfi', - '-lmojo_cpp_bindings_nacl', - '-lmojo_cpp_system_nacl', - '-lmojo_public_system_nacl', - '-lmojo_system_impl_nacl_nonsfi', - '-lnacl_helper_nonsfi_sandbox', - '-lplatform', - '-lppapi_ipc_nacl', - '-lppapi_proxy_nacl', - '-lppapi_shared_nacl', - '-lsandbox_linux_nacl_nonsfi', - '-lshared_memory_support_nacl', - '-ltracing_nacl', - ], - - 'conditions': [ - ['target_arch=="ia32" or target_arch=="x64"', { - 'extra_deps_newlib32_nonsfi': [ - '>(tc_lib_dir_nonsfi_helper32)/libbase_nacl_nonsfi.a', - '>(tc_lib_dir_nonsfi_helper32)/libcommand_buffer_client_nacl.a', - '>(tc_lib_dir_nonsfi_helper32)/libcommand_buffer_common_nacl.a', - '>(tc_lib_dir_nonsfi_helper32)/libcontent_common_nacl_nonsfi.a', - '>(tc_lib_dir_nonsfi_helper32)/libelf_loader.a', - '>(tc_lib_dir_nonsfi_helper32)/libevent_nacl_nonsfi.a', - '>(tc_lib_dir_nonsfi_helper32)/libgfx_geometry_nacl.a', - '>(tc_lib_dir_nonsfi_helper32)/libgfx_ipc_geometry_nacl.a', - '>(tc_lib_dir_nonsfi_helper32)/libgio.a', - '>(tc_lib_dir_nonsfi_helper32)/libgles2_cmd_helper_nacl.a', - '>(tc_lib_dir_nonsfi_helper32)/libgles2_implementation_nacl.a', - '>(tc_lib_dir_nonsfi_helper32)/libgles2_utils_nacl.a', - '>(tc_lib_dir_nonsfi_helper32)/libgpu_ipc_nacl.a', - '>(tc_lib_dir_nonsfi_helper32)/libipc_nacl_nonsfi.a', - '>(tc_lib_dir_nonsfi_helper32)/libmojo_cpp_bindings_nacl.a', - '>(tc_lib_dir_nonsfi_helper32)/libmojo_cpp_system_nacl.a', - '>(tc_lib_dir_nonsfi_helper32)/libmojo_public_system_nacl.a', - '>(tc_lib_dir_nonsfi_helper32)/libmojo_system_impl_nacl_nonsfi.a', - '>(tc_lib_dir_nonsfi_helper32)/libnacl_helper_nonsfi_sandbox.a', - '>(tc_lib_dir_nonsfi_helper32)/libplatform.a', - '>(tc_lib_dir_nonsfi_helper32)/libppapi_ipc_nacl.a', - '>(tc_lib_dir_nonsfi_helper32)/libppapi_proxy_nacl.a', - '>(tc_lib_dir_nonsfi_helper32)/libppapi_shared_nacl.a', - '>(tc_lib_dir_nonsfi_helper32)/libsandbox_linux_nacl_nonsfi.a', - '>(tc_lib_dir_nonsfi_helper32)/libshared_memory_support_nacl.a', - '>(tc_lib_dir_nonsfi_helper32)/libtracing_nacl.a', - ], - }], - ['target_arch=="arm"', { - 'extra_deps_newlib_arm_nonsfi': [ - '>(tc_lib_dir_nonsfi_helper_arm)/libbase_nacl_nonsfi.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libcommand_buffer_client_nacl.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libcommand_buffer_common_nacl.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libcontent_common_nacl_nonsfi.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libelf_loader.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libevent_nacl_nonsfi.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libgfx_geometry_nacl.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libgfx_ipc_geometry_nacl.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libgio.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libgles2_cmd_helper_nacl.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libgles2_implementation_nacl.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libgles2_utils_nacl.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libgpu_ipc_nacl.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libipc_nacl_nonsfi.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libmojo_cpp_bindings_nacl.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libmojo_cpp_system_nacl.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libmojo_public_system_nacl.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libmojo_system_impl_nacl_nonsfi.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libnacl_helper_nonsfi_sandbox.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libplatform.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libppapi_ipc_nacl.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libppapi_proxy_nacl.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libppapi_shared_nacl.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libsandbox_linux_nacl_nonsfi.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libshared_memory_support_nacl.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libtracing_nacl.a', - ], - }], - ], - }, - 'dependencies': [ - '../base/base_nacl.gyp:base_nacl_nonsfi', - '../content/content_nacl_nonsfi.gyp:content_common_nacl_nonsfi', - '../ipc/ipc_nacl.gyp:ipc_nacl_nonsfi', - '../mojo/mojo_edk_nacl.gyp:mojo_system_impl_nacl_nonsfi', - '../mojo/mojo_public_nacl.gyp:mojo_cpp_bindings_nacl', - '../mojo/mojo_public_nacl.gyp:mojo_cpp_system_nacl', - '../mojo/mojo_public_nacl.gyp:mojo_public_system_nacl', - '../native_client/src/nonsfi/irt/irt.gyp:nacl_sys_private', - '../native_client/src/nonsfi/loader/loader.gyp:elf_loader', - '../native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib', - '../ppapi/ppapi_proxy_nacl.gyp:ppapi_proxy_nacl', - '../sandbox/linux/sandbox_linux_nacl_nonsfi.gyp:sandbox_linux_nacl_nonsfi', - 'nacl_helper_nonsfi_sandbox', - ], - }, - - { - 'target_name': 'nacl_helper_nonsfi_sandbox', - 'type': 'none', - 'variables': { - 'nacl_untrusted_build': 1, - 'nlib_target': 'libnacl_helper_nonsfi_sandbox.a', - - 'build_glibc': 0, - 'build_newlib': 0, - 'build_irt': 0, - 'build_pnacl_newlib': 0, - 'build_nonsfi_helper': 1, - - 'sources': [ - 'nacl/loader/nonsfi/nonsfi_sandbox.cc', - 'nacl/loader/sandbox_linux/nacl_sandbox_linux.cc', - ], - }, - 'dependencies': [ - '../base/base_nacl.gyp:base_nacl_nonsfi', - '../content/content_nacl_nonsfi.gyp:content_common_nacl_nonsfi', - '../sandbox/linux/sandbox_linux_nacl_nonsfi.gyp:sandbox_linux_nacl_nonsfi', - ], - }, - ], - }], - - ['disable_nacl==0 and disable_nacl_untrusted==0 and enable_nacl_nonsfi_test==1', { - 'targets': [ - { - 'target_name': 'nacl_helper_nonsfi_unittests_main', - 'type': 'none', - 'variables': { - 'nacl_untrusted_build': 1, - 'nexe_target': 'nacl_helper_nonsfi_unittests_main', - # Rename the output binary file to - # nacl_helper_nonsfi_unittests_main and put it directly under - # out/{Debug,Release}/, so that this is in the standard location, - # for running on the buildbots. - 'out_newlib32_nonsfi': '<(PRODUCT_DIR)/nacl_helper_nonsfi_unittests_main', - 'out_newlib_arm_nonsfi': '<(PRODUCT_DIR)/nacl_helper_nonsfi_unittests_main', - - 'build_glibc': 0, - 'build_newlib': 0, - 'build_irt': 0, - 'build_pnacl_newlib': 0, - 'build_nonsfi_helper': 1, - - 'sources': [ - 'nacl/loader/nonsfi/nonsfi_sandbox_sigsys_unittest.cc', - 'nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc', - 'nacl/loader/nonsfi/run_all_unittests.cc', - ], - - 'link_flags': [ - '-lbase_nacl_nonsfi', - '-lcontent_common_nacl_nonsfi', - '-levent_nacl_nonsfi', - '-lgio', - '-lgtest_nacl', - '-lnacl_helper_nonsfi_sandbox', - '-lplatform', - '-lsandbox_linux_nacl_nonsfi', - '-lsandbox_linux_test_utils_nacl_nonsfi', - '-ltest_support_base_nacl_nonsfi', - ], - - 'conditions': [ - ['target_arch=="ia32" or target_arch=="x64"', { - 'extra_deps_newlib32_nonsfi': [ - '>(tc_lib_dir_nonsfi_helper32)/libbase_nacl_nonsfi.a', - '>(tc_lib_dir_nonsfi_helper32)/libcontent_common_nacl_nonsfi.a', - '>(tc_lib_dir_nonsfi_helper32)/libevent_nacl_nonsfi.a', - '>(tc_lib_dir_nonsfi_helper32)/libgio.a', - '>(tc_lib_dir_nonsfi_helper32)/libgtest_nacl.a', - '>(tc_lib_dir_nonsfi_helper32)/libnacl_helper_nonsfi_sandbox.a', - '>(tc_lib_dir_nonsfi_helper32)/libplatform.a', - '>(tc_lib_dir_nonsfi_helper32)/libsandbox_linux_nacl_nonsfi.a', - '>(tc_lib_dir_nonsfi_helper32)/libsandbox_linux_test_utils_nacl_nonsfi.a', - '>(tc_lib_dir_nonsfi_helper32)/libtest_support_base_nacl_nonsfi.a', - ], - }], - ['target_arch=="arm"', { - 'extra_deps_newlib_arm_nonsfi': [ - '>(tc_lib_dir_nonsfi_helper_arm)/libbase_nacl_nonsfi.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libcontent_common_nacl_nonsfi.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libevent_nacl_nonsfi.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libgio.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libgtest_nacl.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libnacl_helper_nonsfi_sandbox.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libplatform.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libsandbox_linux_nacl_nonsfi.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libsandbox_linux_test_utils_nacl_nonsfi.a', - '>(tc_lib_dir_nonsfi_helper_arm)/libtest_support_base_nacl_nonsfi.a', - ], - }], - ], - }, - - 'dependencies': [ - '../base/base_nacl.gyp:base_nacl_nonsfi', - '../base/base_nacl.gyp:test_support_base_nacl_nonsfi', - '../content/content_nacl_nonsfi.gyp:content_common_nacl_nonsfi', - '../native_client/src/nonsfi/irt/irt.gyp:nacl_sys_private', - '../native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib', - '../sandbox/linux/sandbox_linux_nacl_nonsfi.gyp:sandbox_linux_nacl_nonsfi', - '../sandbox/linux/sandbox_linux_nacl_nonsfi.gyp:sandbox_linux_test_utils_nacl_nonsfi', - '../testing/gtest_nacl.gyp:gtest_nacl', - 'nacl_helper_nonsfi_sandbox', - ], - }, - ], - }], - - ['disable_nacl==0 and disable_nacl_untrusted==0 and enable_nacl_nonsfi_test==1 and test_isolation_mode!="noop"', { - 'targets': [ - { - 'target_name': 'nacl_helper_nonsfi_unittests_run', - 'type': 'none', - 'dependencies': [ - 'nacl.gyp:nacl_helper_nonsfi_unittests', - 'nacl_helper_nonsfi_unittests_main', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'nacl_helper_nonsfi_unittests.isolate', - ], - }, - ], - }], - ], -}
diff --git a/components/navigation_interception.gypi b/components/navigation_interception.gypi deleted file mode 100644 index ff7339f..0000000 --- a/components/navigation_interception.gypi +++ /dev/null
@@ -1,79 +0,0 @@ -# Copyright (c) 2012 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. - -{ - 'targets': [ - { - # GN version: //components/navigation_interception - 'target_name': 'navigation_interception', - 'type': 'static_library', - 'defines!': ['CONTENT_IMPLEMENTATION'], - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_browser', - '../content/content.gyp:content_common', - '../net/net.gyp:net', - '../ui/base/ui_base.gyp:ui_base', - ], - 'include_dirs': [ - '..', - '../skia/config', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'navigation_interception/intercept_navigation_throttle.cc', - 'navigation_interception/intercept_navigation_throttle.h', - 'navigation_interception/navigation_params.cc', - 'navigation_interception/navigation_params.h', - ], - 'conditions': [ - ['OS=="android"', { - 'dependencies': [ - 'navigation_interception_jni_headers', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'navigation_interception/intercept_navigation_delegate.cc', - 'navigation_interception/intercept_navigation_delegate.h', - 'navigation_interception/navigation_params_android.cc', - 'navigation_interception/navigation_params_android.h', - ], - }], - ], - }, - ], - 'conditions': [ - ['OS=="android"', { - 'targets': [ - { - # GN version: //components/navigation_intercaption/android:navigation_interception_java - 'target_name': 'navigation_interception_java', - 'type': 'none', - 'dependencies': [ - '../base/base.gyp:base', - ], - 'variables': { - 'java_in_dir': 'navigation_interception/android/java', - }, - 'includes': [ '../build/java.gypi' ], - }, - { - # GN version: //components/navigation_intercaption:jni_headers - 'target_name': 'navigation_interception_jni_headers', - 'type': 'none', - 'sources': [ - # Note: sources list duplicated in GN build. - 'navigation_interception/android/java/src/org/chromium/components/navigation_interception/InterceptNavigationDelegate.java', - 'navigation_interception/android/java/src/org/chromium/components/navigation_interception/NavigationParams.java', - ], - 'variables': { - 'jni_gen_package': 'navigation_interception', - }, - 'includes': [ '../build/jni_generator.gypi' ], - }, - ], - }], - ], -}
diff --git a/components/navigation_metrics.gypi b/components/navigation_metrics.gypi deleted file mode 100644 index 5e20c46..0000000 --- a/components/navigation_metrics.gypi +++ /dev/null
@@ -1,26 +0,0 @@ -# Copyright 2013 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. - -{ - 'targets': [ - { - 'target_name': 'navigation_metrics', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../url/url.gyp:url_lib', - 'keyed_service_core', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'navigation_metrics/navigation_metrics.cc', - 'navigation_metrics/navigation_metrics.h', - 'navigation_metrics/origins_seen_service.cc', - 'navigation_metrics/origins_seen_service.h', - ], - }, - ], -}
diff --git a/components/net_log.gypi b/components/net_log.gypi deleted file mode 100644 index 3b5526da..0000000 --- a/components/net_log.gypi +++ /dev/null
@@ -1,31 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/net_log - 'target_name': 'net_log', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - 'data_reduction_proxy_core_common', - 'version_info', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'net_log/chrome_net_log.cc', - 'net_log/chrome_net_log.h', - 'net_log/net_export_ui_constants.cc', - 'net_log/net_export_ui_constants.h', - 'net_log/net_log_file_writer.cc', - 'net_log/net_log_file_writer.h', - ], - }, - ], -}
diff --git a/components/network_hints.gypi b/components/network_hints.gypi deleted file mode 100644 index f78f480..0000000 --- a/components/network_hints.gypi +++ /dev/null
@@ -1,74 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/network_hints/common - 'target_name': 'network_hints_common', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../ui/accessibility/accessibility.gyp:accessibility', - '../url/ipc/url_ipc.gyp:url_ipc', - ], - 'sources': [ - 'network_hints/common/network_hints_common.cc', - 'network_hints/common/network_hints_common.h', - 'network_hints/common/network_hints_message_generator.cc', - 'network_hints/common/network_hints_message_generator.h', - 'network_hints/common/network_hints_messages.cc', - 'network_hints/common/network_hints_messages.h', - ], - }, - { - # GN version: //components/network_hints/browser - 'target_name': 'network_hints_browser', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../content/content.gyp:content_browser', - '../net/net.gyp:net', - ], - 'sources': [ - 'network_hints/browser/network_hints_message_filter.cc', - 'network_hints/browser/network_hints_message_filter.h', - ], - }, - ], - 'conditions': [ - ['OS!="ios"', { - 'targets': [ - { - # GN version: //components/network_hints/renderer - 'target_name': 'network_hints_renderer', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - 'network_hints_common', - '../content/content.gyp:content_renderer', - '../third_party/WebKit/public/blink.gyp:blink', - ], - 'sources': [ - 'network_hints/renderer/dns_prefetch_queue.cc', - 'network_hints/renderer/dns_prefetch_queue.h', - 'network_hints/renderer/prescient_networking_dispatcher.cc', - 'network_hints/renderer/prescient_networking_dispatcher.h', - 'network_hints/renderer/renderer_dns_prefetch.cc', - 'network_hints/renderer/renderer_dns_prefetch.h', - 'network_hints/renderer/renderer_preconnect.cc', - 'network_hints/renderer/renderer_preconnect.h', - ], - }, - ], - }], - ], -}
diff --git a/components/network_session_configurator.gypi b/components/network_session_configurator.gypi deleted file mode 100644 index fa3e3742..0000000 --- a/components/network_session_configurator.gypi +++ /dev/null
@@ -1,27 +0,0 @@ -# Copyright 2016 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. - -{ - 'targets': [ - { - # GN version: //components/network_session_configurator - 'target_name': 'network_session_configurator', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - 'data_reduction_proxy_core_common', - 'variations', - 'version_info', - ], - 'sources': [ - 'network_session_configurator/network_session_configurator.cc', - 'network_session_configurator/network_session_configurator.h', - ], - }, - ], -}
diff --git a/components/network_time.gypi b/components/network_time.gypi deleted file mode 100644 index 8458771..0000000 --- a/components/network_time.gypi +++ /dev/null
@@ -1,28 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/network_time - 'target_name': 'network_time', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - 'client_update_protocol' - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'network_time/network_time_pref_names.cc', - 'network_time/network_time_pref_names.h', - 'network_time/network_time_tracker.cc', - 'network_time/network_time_tracker.h', - ], - }, - ], -}
diff --git a/components/ntp_snippets.gypi b/components/ntp_snippets.gypi deleted file mode 100644 index 9cd3394f..0000000 --- a/components/ntp_snippets.gypi +++ /dev/null
@@ -1,85 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/ntp_snippets - 'target_name': 'ntp_snippets', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../components/components_strings.gyp:components_strings', - '../google_apis/google_apis.gyp:google_apis', - '../net/net.gyp:net', - '../url/url.gyp:url_lib', - '../third_party/icu/icu.gyp:icuuc', - 'bookmarks_browser', - 'data_use_measurement_core', - 'image_fetcher', - 'keyed_service_core', - 'leveldb_proto', - 'offline_pages', - 'prefs/prefs.gyp:prefs', - 'signin_core_browser', - 'suggestions', - 'sync.gyp:sync', - 'variations', - 'variations_net', - ], - 'sources': [ - 'ntp_snippets/bookmarks/bookmark_last_visit_utils.cc', - 'ntp_snippets/bookmarks/bookmark_last_visit_utils.h', - 'ntp_snippets/bookmarks/bookmark_suggestions_provider.cc', - 'ntp_snippets/bookmarks/bookmark_suggestions_provider.h', - 'ntp_snippets/category_factory.cc', - 'ntp_snippets/category_factory.h', - 'ntp_snippets/category_info.cc', - 'ntp_snippets/category_info.h', - 'ntp_snippets/category_status.cc', - 'ntp_snippets/category_status.h', - 'ntp_snippets/category.cc', - 'ntp_snippets/category.h', - 'ntp_snippets/content_suggestion.cc', - 'ntp_snippets/content_suggestion.h', - 'ntp_snippets/content_suggestions_provider.cc', - 'ntp_snippets/content_suggestions_provider.h', - 'ntp_snippets/content_suggestions_service.cc', - 'ntp_snippets/content_suggestions_service.h', - 'ntp_snippets/ntp_snippet.cc', - 'ntp_snippets/ntp_snippet.h', - 'ntp_snippets/ntp_snippets_constants.cc', - 'ntp_snippets/ntp_snippets_constants.h', - 'ntp_snippets/ntp_snippets_database.cc', - 'ntp_snippets/ntp_snippets_database.h', - 'ntp_snippets/ntp_snippets_fetcher.cc', - 'ntp_snippets/ntp_snippets_fetcher.h', - 'ntp_snippets/ntp_snippets_scheduler.h', - 'ntp_snippets/ntp_snippets_service.cc', - 'ntp_snippets/ntp_snippets_service.h', - 'ntp_snippets/ntp_snippets_status_service.cc', - 'ntp_snippets/ntp_snippets_status_service.h', - 'ntp_snippets/offline_pages/offline_page_suggestions_provider.cc', - 'ntp_snippets/offline_pages/offline_page_suggestions_provider.h', - 'ntp_snippets/physical_web_pages/physical_web_page_suggestions_provider.cc', - 'ntp_snippets/physical_web_pages/physical_web_page_suggestions_provider.h', - 'ntp_snippets/pref_names.cc', - 'ntp_snippets/pref_names.h', - 'ntp_snippets/proto/ntp_snippets.proto', - 'ntp_snippets/request_throttler.cc', - 'ntp_snippets/request_throttler.h', - 'ntp_snippets/switches.cc', - 'ntp_snippets/switches.h', - ], - 'variables': { - 'proto_in_dir': 'ntp_snippets/proto', - 'proto_out_dir': 'components/ntp_snippets/proto', - }, - 'includes': [ '../build/protoc.gypi' ], - }, - ], -}
diff --git a/components/ntp_tiles.gypi b/components/ntp_tiles.gypi deleted file mode 100644 index 020435d..0000000 --- a/components/ntp_tiles.gypi +++ /dev/null
@@ -1,85 +0,0 @@ -# Copyright 2016 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. - -{ - 'targets': [ - { - # GN version: //components/ntp_tiles - 'target_name': 'ntp_tiles', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - 'history_core_browser', - 'pref_registry', - 'search_engines', - 'suggestions', - 'variations', - ], - 'sources': [ - 'ntp_tiles/constants.cc', - 'ntp_tiles/constants.h', - 'ntp_tiles/most_visited_sites.cc', - 'ntp_tiles/most_visited_sites.h', - 'ntp_tiles/popular_sites.cc', - 'ntp_tiles/popular_sites.h', - 'ntp_tiles/pref_names.h', - 'ntp_tiles/pref_names.cc', - 'ntp_tiles/switches.h', - 'ntp_tiles/switches.cc', - ], - 'conditions': [ - ['OS == "android"', { - 'dependencies': [ - 'ntp_tiles_jni_headers', - ], - }], - ], - }, - ], - - 'conditions': [ - ['OS == "android"', { - 'targets': [ - { - # GN: //components/ntp_tiles:ntp_tiles_enums_java - 'target_name': 'ntp_tiles_enums_java', - 'type': 'none', - 'variables': { - 'source_file': 'ntp_tiles/most_visited_sites.h', - }, - 'includes': [ - '../build/android/java_cpp_enum.gypi' - ], - }, - { - # GN version: //components/ntp_tiles/android:ntp_tiles_java - 'target_name': 'ntp_tiles_java', - 'type': 'none', - 'dependencies': [ - '../base/base.gyp:base', - ], - 'variables': { - 'java_in_dir': 'ntp_tiles/android/java', - }, - 'includes': [ '../build/java.gypi' ], - }, - { - # GN version: //components/ntp_tiles:jni - 'target_name': 'ntp_tiles_jni_headers', - 'type': 'none', - 'sources': [ - 'ntp_tiles/android/java/src/org/chromium/components/ntptiles/MostVisitedSites.java', - ], - 'variables': { - 'jni_gen_package': 'ntp_tiles', - }, - 'includes': [ '../build/jni_generator.gypi' ], - }, - ], - }], - ], -}
diff --git a/components/offline_pages.gypi b/components/offline_pages.gypi deleted file mode 100644 index af2f397..0000000 --- a/components/offline_pages.gypi +++ /dev/null
@@ -1,145 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN: //components/offline_pages:offline_pages - 'target_name': 'offline_pages', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - '../url/url.gyp:url_lib', - '../sql/sql.gyp:sql', - 'keyed_service_core', - ], - 'sources': [ - 'offline_pages/archive_manager.cc', - 'offline_pages/archive_manager.h', - 'offline_pages/client_namespace_constants.cc', - 'offline_pages/client_namespace_constants.h', - 'offline_pages/client_policy_controller.cc', - 'offline_pages/client_policy_controller.h', - 'offline_pages/offline_event_logger.cc', - 'offline_pages/offline_event_logger.h', - 'offline_pages/offline_page_archiver.h', - 'offline_pages/offline_page_client_policy.h', - 'offline_pages/offline_page_feature.cc', - 'offline_pages/offline_page_feature.h', - 'offline_pages/offline_page_item.cc', - 'offline_pages/offline_page_item.h', - 'offline_pages/offline_page_metadata_store.cc', - 'offline_pages/offline_page_metadata_store.h', - 'offline_pages/offline_page_metadata_store_sql.cc', - 'offline_pages/offline_page_metadata_store_sql.h', - 'offline_pages/offline_page_model.cc', - 'offline_pages/offline_page_model.h', - 'offline_pages/offline_page_model_event_logger.cc', - 'offline_pages/offline_page_model_event_logger.h', - 'offline_pages/offline_page_model_impl.cc', - 'offline_pages/offline_page_model_impl.h', - 'offline_pages/offline_page_storage_manager.cc', - 'offline_pages/offline_page_storage_manager.h', - 'offline_pages/offline_page_types.h', - 'offline_pages/snapshot_controller.cc', - 'offline_pages/snapshot_controller.h', - ], - }, - { - # GN: //components/offline_pages/background:background_offliner - 'target_name': 'offline_pages_background_offliner', - 'type': 'static_library', - 'include_dirs': [ - '..', - '../..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - '../sql/sql.gyp:sql', - '../url/url.gyp:url_lib', - 'keyed_service_core', - ], - 'sources': [ - 'offline_pages/background/device_conditions.h', - 'offline_pages/background/offliner.h', - 'offline_pages/background/offliner_factory.h', - 'offline_pages/background/offliner_policy.h', - 'offline_pages/background/request_coordinator.cc', - 'offline_pages/background/request_coordinator.h', - 'offline_pages/background/request_coordinator_event_logger.cc', - 'offline_pages/background/request_coordinator_event_logger.h', - 'offline_pages/background/request_picker.cc', - 'offline_pages/background/request_picker.h', - 'offline_pages/background/request_queue.cc', - 'offline_pages/background/request_queue.h', - 'offline_pages/background/request_queue_in_memory_store.cc', - 'offline_pages/background/request_queue_in_memory_store.h', - 'offline_pages/background/request_queue_store.h', - 'offline_pages/background/request_queue_store_sql.cc', - 'offline_pages/background/request_queue_store_sql.h', - 'offline_pages/background/save_page_request.cc', - 'offline_pages/background/save_page_request.h', - 'offline_pages/background/scheduler.h', - ], - }, - { - # GN: //components/offline_pages/downloads:offline_pages_ui_adapter - 'target_name': 'offline_pages_ui_adapter', - 'type': 'static_library', - 'include_dirs': [ - '..', - '../..', - ], - 'dependencies': [ - '../base/base.gyp:base', - ], - 'sources': [ - 'offline_pages/downloads/download_ui_adapter.cc', - 'offline_pages/downloads/download_ui_adapter.h', - 'offline_pages/downloads/download_ui_item.cc', - 'offline_pages/downloads/download_ui_item.h', - 'offline_pages/downloads/offline_page_download_notifier.h', - ], - }, - { - # GN version: //components/offline_pages:test_support - 'target_name': 'offline_pages_test_support', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../testing/gtest.gyp:gtest', - '../url/url.gyp:url_lib', - 'offline_pages', - ], - 'sources': [ - 'offline_pages/offline_page_test_archiver.cc', - 'offline_pages/offline_page_test_archiver.h', - 'offline_pages/offline_page_test_store.cc', - 'offline_pages/offline_page_test_store.h', - 'offline_pages/stub_offline_page_model.cc', - 'offline_pages/stub_offline_page_model.h', - ], - }, - ], - 'conditions': [ - ['OS == "android"', { - 'targets': [ - { - # GN: //components/offline_pages:offline_page_model_enums_java - 'target_name': 'offline_page_model_enums_java', - 'type': 'none', - 'variables': { - 'source_file': 'offline_pages/offline_page_types.h', - }, - 'includes': [ '../build/android/java_cpp_enum.gypi' ], - }, - ], - }], - ], -}
diff --git a/components/omnibox.gypi b/components/omnibox.gypi deleted file mode 100644 index 78dd792..0000000 --- a/components/omnibox.gypi +++ /dev/null
@@ -1,222 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/omnibox/browser - 'target_name': 'omnibox_browser', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../base/base.gyp:base_i18n', - '../net/net.gyp:net', - '../skia/skia.gyp:skia', - '../sql/sql.gyp:sql', - '../third_party/protobuf/protobuf.gyp:protobuf_lite', - '../ui/base/ui_base.gyp:ui_base', - '../ui/gfx/gfx.gyp:gfx', - '../ui/gfx/gfx.gyp:gfx_vector_icons', - '../url/url.gyp:url_lib', - 'bookmarks_browser', - 'metrics', - 'component_metrics_proto', - 'components_resources.gyp:components_resources', - 'components_strings.gyp:components_strings', - 'data_use_measurement_core', - 'history_core_browser', - 'keyed_service_core', - 'omnibox_common', - 'omnibox_in_memory_url_index_cache_proto', - 'open_from_clipboard', - 'pref_registry', - 'query_parser', - 'search', - 'search_engines', - 'toolbar', - 'url_formatter/url_formatter.gyp:url_formatter', - 'variations_net', - ], - 'export_dependent_settings': [ - 'component_metrics_proto', - 'history_core_browser', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'omnibox/browser/answers_cache.cc', - 'omnibox/browser/answers_cache.h', - 'omnibox/browser/autocomplete_classifier.cc', - 'omnibox/browser/autocomplete_classifier.h', - 'omnibox/browser/autocomplete_controller.cc', - 'omnibox/browser/autocomplete_controller.h', - 'omnibox/browser/autocomplete_controller_delegate.h', - 'omnibox/browser/autocomplete_input.cc', - 'omnibox/browser/autocomplete_input.h', - 'omnibox/browser/autocomplete_match.cc', - 'omnibox/browser/autocomplete_match.h', - 'omnibox/browser/autocomplete_match_type.cc', - 'omnibox/browser/autocomplete_match_type.h', - 'omnibox/browser/autocomplete_provider.cc', - 'omnibox/browser/autocomplete_provider.h', - 'omnibox/browser/autocomplete_provider_client.h', - 'omnibox/browser/autocomplete_provider_listener.h', - 'omnibox/browser/autocomplete_result.cc', - 'omnibox/browser/autocomplete_result.h', - 'omnibox/browser/autocomplete_scheme_classifier.h', - 'omnibox/browser/base_search_provider.cc', - 'omnibox/browser/base_search_provider.h', - 'omnibox/browser/bookmark_provider.cc', - 'omnibox/browser/bookmark_provider.h', - 'omnibox/browser/builtin_provider.cc', - 'omnibox/browser/builtin_provider.h', - 'omnibox/browser/clipboard_url_provider.cc', - 'omnibox/browser/clipboard_url_provider.h', - 'omnibox/browser/history_provider.cc', - 'omnibox/browser/history_provider.h', - 'omnibox/browser/history_quick_provider.cc', - 'omnibox/browser/history_quick_provider.h', - 'omnibox/browser/history_url_provider.cc', - 'omnibox/browser/history_url_provider.h', - 'omnibox/browser/in_memory_url_index.cc', - 'omnibox/browser/in_memory_url_index.h', - 'omnibox/browser/in_memory_url_index_types.cc', - 'omnibox/browser/in_memory_url_index_types.h', - 'omnibox/browser/keyword_extensions_delegate.cc', - 'omnibox/browser/keyword_extensions_delegate.h', - 'omnibox/browser/keyword_provider.cc', - 'omnibox/browser/keyword_provider.h', - 'omnibox/browser/match_compare.h', - 'omnibox/browser/omnibox_client.h', - 'omnibox/browser/omnibox_controller.cc', - 'omnibox/browser/omnibox_controller.h', - 'omnibox/browser/omnibox_edit_controller.cc', - 'omnibox/browser/omnibox_edit_controller.h', - 'omnibox/browser/omnibox_edit_model.cc', - 'omnibox/browser/omnibox_edit_model.h', - 'omnibox/browser/omnibox_event_global_tracker.cc', - 'omnibox/browser/omnibox_event_global_tracker.h', - 'omnibox/browser/omnibox_field_trial.cc', - 'omnibox/browser/omnibox_field_trial.h', - 'omnibox/browser/omnibox_log.cc', - 'omnibox/browser/omnibox_log.h', - 'omnibox/browser/omnibox_metrics_provider.cc', - 'omnibox/browser/omnibox_metrics_provider.h', - 'omnibox/browser/omnibox_navigation_observer.h', - 'omnibox/browser/omnibox_popup_model.cc', - 'omnibox/browser/omnibox_popup_model.h', - 'omnibox/browser/omnibox_popup_model_observer.h', - 'omnibox/browser/omnibox_popup_view.h', - 'omnibox/browser/omnibox_pref_names.cc', - 'omnibox/browser/omnibox_pref_names.h', - 'omnibox/browser/omnibox_switches.cc', - 'omnibox/browser/omnibox_switches.h', - 'omnibox/browser/omnibox_view.cc', - 'omnibox/browser/omnibox_view.h', - 'omnibox/browser/scored_history_match.cc', - 'omnibox/browser/scored_history_match.h', - 'omnibox/browser/search_provider.cc', - 'omnibox/browser/search_provider.h', - 'omnibox/browser/search_suggestion_parser.cc', - 'omnibox/browser/search_suggestion_parser.h', - 'omnibox/browser/shortcuts_backend.cc', - 'omnibox/browser/shortcuts_backend.h', - 'omnibox/browser/shortcuts_constants.cc', - 'omnibox/browser/shortcuts_constants.h', - 'omnibox/browser/shortcuts_database.cc', - 'omnibox/browser/shortcuts_database.h', - 'omnibox/browser/shortcuts_provider.cc', - 'omnibox/browser/shortcuts_provider.h', - 'omnibox/browser/suggestion_answer.cc', - 'omnibox/browser/suggestion_answer.h', - 'omnibox/browser/url_index_private_data.cc', - 'omnibox/browser/url_index_private_data.h', - 'omnibox/browser/url_prefix.cc', - 'omnibox/browser/url_prefix.h', - 'omnibox/browser/verbatim_match.cc', - 'omnibox/browser/verbatim_match.h', - 'omnibox/browser/zero_suggest_provider.cc', - 'omnibox/browser/zero_suggest_provider.h', - ], - }, - { - # GN version: //components/omnibox/common - 'target_name': 'omnibox_common', - 'type': 'none', - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'omnibox/common/omnibox_focus_state.h', - ], - }, - { - # Protobuf compiler / generator for the InMemoryURLIndex caching - # protocol buffer. - # GN version: //components/omnibox:in_memory_url_index_cache_proto - 'target_name': 'omnibox_in_memory_url_index_cache_proto', - 'type': 'static_library', - 'sources': [ 'omnibox/browser/in_memory_url_index_cache.proto', ], - 'variables': { - 'proto_in_dir': 'omnibox/browser', - 'proto_out_dir': 'components/omnibox/browser', - }, - 'includes': [ '../build/protoc.gypi', ], - }, - { - # GN version: //components/omnibox:test_support - 'target_name': 'omnibox_test_support', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../testing/gmock.gyp:gmock', - 'omnibox_browser', - 'component_metrics_proto', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'omnibox/browser/history_index_restore_observer.cc', - 'omnibox/browser/history_index_restore_observer.h', - 'omnibox/browser/in_memory_url_index_test_util.cc', - 'omnibox/browser/in_memory_url_index_test_util.h', - 'omnibox/browser/mock_autocomplete_provider_client.cc', - 'omnibox/browser/mock_autocomplete_provider_client.h', - 'omnibox/browser/shortcuts_provider_test_util.cc', - 'omnibox/browser/shortcuts_provider_test_util.h', - 'omnibox/browser/test_scheme_classifier.cc', - 'omnibox/browser/test_scheme_classifier.h', - ], - }, - ], - 'conditions': [ - ['OS == "android"', { - 'targets': [ - { - # GN: //components/omnibox:autocomplete_match_javagen - 'target_name': 'autocomplete_match_java', - 'type': 'none', - 'variables': { - 'source_file': 'omnibox/browser/autocomplete_match.h', - }, - 'includes': [ '../build/android/java_cpp_enum.gypi' ], - }, - { - # GN: //components/omnibox:autocomplete_match_type_javagen - 'target_name': 'autocomplete_match_type_java', - 'type': 'none', - 'variables': { - 'source_file': 'omnibox/browser/autocomplete_match_type.h', - }, - 'includes': [ '../build/android/java_cpp_enum.gypi' ], - }, - ], - }], - ], -}
diff --git a/components/onc.gypi b/components/onc.gypi deleted file mode 100644 index 5d1a5a0e..0000000 --- a/components/onc.gypi +++ /dev/null
@@ -1,27 +0,0 @@ -# Copyright 2013 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. - -{ - 'targets': [ - { - # GN version: //components/onc - 'target_name': 'onc_component', - 'type': '<(component)', - 'dependencies': [ - '../base/base.gyp:base', - ], - 'include_dirs': [ - '..', - ], - 'defines': [ - 'ONC_IMPLEMENTATION', - ], - 'sources': [ - 'onc/onc_constants.cc', - 'onc/onc_constants.h', - 'onc/onc_export.h', - ], - }, - ], -}
diff --git a/components/open_from_clipboard.gypi b/components/open_from_clipboard.gypi deleted file mode 100644 index d9901477..0000000 --- a/components/open_from_clipboard.gypi +++ /dev/null
@@ -1,43 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/open_from_clipboard - 'target_name': 'open_from_clipboard', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../url/url.gyp:url_lib', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'open_from_clipboard/clipboard_recent_content.cc', - 'open_from_clipboard/clipboard_recent_content.h', - 'open_from_clipboard/clipboard_recent_content_ios.h', - 'open_from_clipboard/clipboard_recent_content_ios.mm', - ], - }, - { - # GN version: //components/open_from_clipboard:test_support - 'target_name': 'open_from_clipboard_test_support', - 'type': 'static_library', - 'dependencies': [ - 'open_from_clipboard', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'open_from_clipboard/fake_clipboard_recent_content.cc', - 'open_from_clipboard/fake_clipboard_recent_content.h', - ], - }, - ], -}
diff --git a/components/os_crypt.gypi b/components/os_crypt.gypi deleted file mode 100644 index 35026814..0000000 --- a/components/os_crypt.gypi +++ /dev/null
@@ -1,140 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - 'target_name': 'os_crypt', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../crypto/crypto.gyp:crypto', - ], - 'sources': [ - 'os_crypt/ie7_password_win.cc', - 'os_crypt/ie7_password_win.h', - 'os_crypt/keychain_password_mac.h', - 'os_crypt/keychain_password_mac.mm', - 'os_crypt/os_crypt.h', - 'os_crypt/os_crypt_mac.mm', - 'os_crypt/os_crypt_posix.cc', - 'os_crypt/os_crypt_switches.cc', - 'os_crypt/os_crypt_switches.h', - 'os_crypt/os_crypt_win.cc', - ], - 'conditions': [ - ['OS=="mac"', { - 'sources!': [ - 'os_crypt/os_crypt_posix.cc', - ], - }], - ['OS=="win"', { - 'all_dependent_settings': { - 'msvs_settings': { - 'VCLinkerTool': { - 'AdditionalDependencies': [ - 'crypt32.lib', - ], - }, - }, - }, - 'msvs_settings': { - 'VCLinkerTool': { - 'AdditionalDependencies': [ - 'crypt32.lib', - ], - }, - }, - }], - ['OS=="linux" and chromeos!=1', { - 'sources': [ - 'os_crypt/key_storage_linux.cc', - 'os_crypt/key_storage_linux.h', - 'os_crypt/os_crypt_linux.cc', - ], - 'sources!': [ - 'os_crypt/os_crypt_posix.cc', - ], - 'conditions': [ - ['use_glib==1', { - 'sources': [ - 'os_crypt/key_storage_libsecret.cc', - 'os_crypt/key_storage_libsecret.h', - 'os_crypt/libsecret_util_linux.cc', - 'os_crypt/libsecret_util_linux.h', - ], - 'defines': [ - 'USE_LIBSECRET', - ], - 'include_dirs' : [ - '../third_party/libsecret/' - ], - 'dependencies': [ - '../build/linux/system.gyp:glib', - ], - }], - ['use_dbus==1', { - 'sources': [ - 'os_crypt/key_storage_kwallet.cc', - 'os_crypt/key_storage_kwallet.h', - 'os_crypt/kwallet_dbus.cc', - 'os_crypt/kwallet_dbus.h', - ], - 'defines': [ - 'USE_KWALLET', - ], - 'dependencies': [ - '../build/linux/system.gyp:dbus', - '../dbus/dbus.gyp:dbus', - ], - 'include_dirs': [ - '..', - ], - }] - ], - }], - ], - 'target_conditions': [ - ['OS=="ios"', { - 'sources/': [ - ['include', '^os_crypt/keychain_password_mac\\.mm$'], - ['include', '^os_crypt/os_crypt_mac\\.mm$'], - ], - }], - ], - }, - { - 'target_name': 'os_crypt_test_support', - 'type': 'static_library', - 'sources': [ - 'os_crypt/os_crypt_mocker.cc', - 'os_crypt/os_crypt_mocker.h', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../testing/gtest.gyp:gtest', - ], - 'conditions': [ - ['OS=="linux" and chromeos!=1', { - 'sources': [ - 'os_crypt/os_crypt_mocker_linux.cc', - 'os_crypt/os_crypt_mocker_linux.h', - ], - 'defines': [ - 'USE_LIBSECRET', - ], - 'include_dirs' : [ - '../third_party/libsecret/' - ], - 'dependencies': [ - '../build/linux/system.gyp:glib', - ], - }], - ] - } - ], -}
diff --git a/components/ownership.gypi b/components/ownership.gypi deleted file mode 100644 index 1c369d36..0000000 --- a/components/ownership.gypi +++ /dev/null
@@ -1,49 +0,0 @@ -# Copyright 2014 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. - -{ - 'conditions': [ - ['chromeos==1', { - 'targets': [{ - 'target_name': 'ownership', - 'type': '<(component)', - 'dependencies': [ - '<(DEPTH)/base/base.gyp:base', - '<(DEPTH)/components/components.gyp:keyed_service_core', - '<(DEPTH)/components/components.gyp:policy_component_common', - '<(DEPTH)/crypto/crypto.gyp:crypto', - ], - 'defines': [ - 'OWNERSHIP_IMPLEMENTATION', - ], - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)', - ], - 'sources': [ - 'ownership/mock_owner_key_util.cc', - 'ownership/mock_owner_key_util.h', - 'ownership/owner_key_util.cc', - 'ownership/owner_key_util.h', - 'ownership/owner_key_util_impl.cc', - 'ownership/owner_key_util_impl.h', - 'ownership/owner_settings_service.cc', - 'ownership/owner_settings_service.h', - ], - 'conditions': [ - ['configuration_policy==1', { - 'dependencies': [ - '<(DEPTH)/components/components.gyp:cloud_policy_proto', - '<(DEPTH)/components/components.gyp:policy', - ], - }], - ['use_nss_certs==1', { - 'dependencies': [ - '../build/linux/system.gyp:nss', - ], - }], - ], - }], - }], - ], -}
diff --git a/components/packed_ct_ev_whitelist.gypi b/components/packed_ct_ev_whitelist.gypi deleted file mode 100644 index e58129c6..0000000 --- a/components/packed_ct_ev_whitelist.gypi +++ /dev/null
@@ -1,30 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/packed_ct_ev_whitelist - 'target_name': 'packed_ct_ev_whitelist', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_common', - '../net/net.gyp:net', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'packed_ct_ev_whitelist/bit_stream_reader.cc', - 'packed_ct_ev_whitelist/bit_stream_reader.h', - 'packed_ct_ev_whitelist/packed_ct_ev_whitelist.cc', - 'packed_ct_ev_whitelist/packed_ct_ev_whitelist.h', - ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [4267, ], - }, - ], -}
diff --git a/components/pairing.gypi b/components/pairing.gypi deleted file mode 100644 index 6fea47c4..0000000 --- a/components/pairing.gypi +++ /dev/null
@@ -1,54 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - 'target_name': 'pairing', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - 'pairing_api_proto', - '../base/base.gyp:base', - '../device/bluetooth/bluetooth.gyp:device_bluetooth', - '../net/net.gyp:net', - ], - 'sources': [ - 'pairing/bluetooth_controller_pairing_controller.cc', - 'pairing/bluetooth_controller_pairing_controller.h', - 'pairing/bluetooth_host_pairing_controller.cc', - 'pairing/bluetooth_host_pairing_controller.h', - 'pairing/bluetooth_pairing_constants.cc', - 'pairing/bluetooth_pairing_constants.h', - 'pairing/controller_pairing_controller.cc', - 'pairing/controller_pairing_controller.h', - 'pairing/fake_controller_pairing_controller.cc', - 'pairing/fake_controller_pairing_controller.h', - 'pairing/fake_host_pairing_controller.cc', - 'pairing/fake_host_pairing_controller.h', - 'pairing/host_pairing_controller.cc', - 'pairing/host_pairing_controller.h', - 'pairing/message_buffer.cc', - 'pairing/message_buffer.h', - 'pairing/proto_decoder.cc', - 'pairing/proto_decoder.h', - 'pairing/shark_connection_listener.cc', - 'pairing/shark_connection_listener.h', - ], - }, - { - # Protobuf compiler / generator for the pairing api protocol buffer. - 'target_name': 'pairing_api_proto', - 'type': 'static_library', - 'sources': [ 'pairing/pairing_api.proto' ], - 'variables': { - 'proto_in_dir': 'pairing', - 'proto_out_dir': 'components/pairing', - }, - 'includes': [ '../build/protoc.gypi' ] - }, - ], -}
diff --git a/components/password_manager.gypi b/components/password_manager.gypi deleted file mode 100644 index ff47b26a..0000000 --- a/components/password_manager.gypi +++ /dev/null
@@ -1,368 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/password_manager/core/browser - 'target_name': 'password_manager_core_browser', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - '../sql/sql.gyp:sql', - '../components/sync.gyp:sync', - '../third_party/protobuf/protobuf.gyp:protobuf_lite', - '../url/url.gyp:url_lib', - 'autofill_core_common', - 'components_strings.gyp:components_strings', - 'keyed_service_core', - 'os_crypt', - '../third_party/re2/re2.gyp:re2', - 'password_manager_core_common', - 'password_manager_core_browser_proto', - 'url_formatter/url_formatter.gyp:url_formatter', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'password_manager/core/browser/affiliated_match_helper.cc', - 'password_manager/core/browser/affiliated_match_helper.h', - 'password_manager/core/browser/affiliation_backend.cc', - 'password_manager/core/browser/affiliation_backend.h', - 'password_manager/core/browser/affiliation_database.cc', - 'password_manager/core/browser/affiliation_database.h', - 'password_manager/core/browser/affiliation_fetch_throttler.cc', - 'password_manager/core/browser/affiliation_fetch_throttler.h', - 'password_manager/core/browser/affiliation_fetch_throttler_delegate.h', - 'password_manager/core/browser/affiliation_fetcher.cc', - 'password_manager/core/browser/affiliation_fetcher.h', - 'password_manager/core/browser/affiliation_fetcher_delegate.h', - 'password_manager/core/browser/affiliation_service.cc', - 'password_manager/core/browser/affiliation_service.h', - 'password_manager/core/browser/affiliation_utils.cc', - 'password_manager/core/browser/affiliation_utils.h', - 'password_manager/core/browser/browser_save_password_progress_logger.cc', - 'password_manager/core/browser/browser_save_password_progress_logger.h', - 'password_manager/core/browser/credential_manager_password_form_manager.cc', - 'password_manager/core/browser/credential_manager_password_form_manager.h', - 'password_manager/core/browser/credential_manager_pending_request_task.cc', - 'password_manager/core/browser/credential_manager_pending_request_task.h', - 'password_manager/core/browser/credential_manager_pending_require_user_mediation_task.cc', - 'password_manager/core/browser/credential_manager_pending_require_user_mediation_task.h', - 'password_manager/core/browser/credentials_filter.h', - 'password_manager/core/browser/export/csv_writer.cc', - 'password_manager/core/browser/export/csv_writer.h', - 'password_manager/core/browser/export/password_csv_writer.cc', - 'password_manager/core/browser/export/password_csv_writer.h', - 'password_manager/core/browser/export/password_exporter.cc', - 'password_manager/core/browser/export/password_exporter.h', - 'password_manager/core/browser/facet_manager.cc', - 'password_manager/core/browser/facet_manager.h', - 'password_manager/core/browser/facet_manager_host.h', - 'password_manager/core/browser/form_fetcher.h', - 'password_manager/core/browser/form_fetcher_impl.cc', - 'password_manager/core/browser/form_fetcher_impl.h', - 'password_manager/core/browser/form_saver.h', - 'password_manager/core/browser/form_saver_impl.cc', - 'password_manager/core/browser/form_saver_impl.h', - 'password_manager/core/browser/import/csv_reader.cc', - 'password_manager/core/browser/import/csv_reader.h', - 'password_manager/core/browser/import/password_csv_reader.cc', - 'password_manager/core/browser/import/password_csv_reader.h', - 'password_manager/core/browser/import/password_importer.cc', - 'password_manager/core/browser/import/password_importer.h', - 'password_manager/core/browser/keychain_migration_status_mac.h', - 'password_manager/core/browser/log_manager.cc', - 'password_manager/core/browser/log_manager.h', - 'password_manager/core/browser/log_receiver.h', - 'password_manager/core/browser/log_router.cc', - 'password_manager/core/browser/log_router.h', - 'password_manager/core/browser/login_database.cc', - 'password_manager/core/browser/login_database.h', - 'password_manager/core/browser/login_database_ios.cc', - 'password_manager/core/browser/login_database_mac.cc', - 'password_manager/core/browser/login_database_posix.cc', - 'password_manager/core/browser/login_database_win.cc', - 'password_manager/core/browser/login_model.cc', - 'password_manager/core/browser/login_model.h', - 'password_manager/core/browser/password_autofill_manager.cc', - 'password_manager/core/browser/password_autofill_manager.h', - 'password_manager/core/browser/password_bubble_experiment.cc', - 'password_manager/core/browser/password_bubble_experiment.h', - 'password_manager/core/browser/password_form_manager.cc', - 'password_manager/core/browser/password_form_manager.h', - 'password_manager/core/browser/password_generation_manager.cc', - 'password_manager/core/browser/password_generation_manager.h', - 'password_manager/core/browser/password_manager.cc', - 'password_manager/core/browser/password_manager.h', - 'password_manager/core/browser/password_manager_client.cc', - 'password_manager/core/browser/password_manager_client.h', - 'password_manager/core/browser/password_manager_constants.cc', - 'password_manager/core/browser/password_manager_constants.h', - 'password_manager/core/browser/password_manager_driver.h', - 'password_manager/core/browser/password_manager_internals_service.cc', - 'password_manager/core/browser/password_manager_internals_service.h', - 'password_manager/core/browser/password_manager_metrics_util.cc', - 'password_manager/core/browser/password_manager_metrics_util.h', - 'password_manager/core/browser/password_manager_settings_migration_experiment.cc', - 'password_manager/core/browser/password_manager_settings_migration_experiment.h', - 'password_manager/core/browser/password_manager_util.cc', - 'password_manager/core/browser/password_manager_util.h', - 'password_manager/core/browser/password_store.cc', - 'password_manager/core/browser/password_store.h', - 'password_manager/core/browser/password_store_change.cc', - 'password_manager/core/browser/password_store_change.h', - 'password_manager/core/browser/password_store_consumer.cc', - 'password_manager/core/browser/password_store_consumer.h', - 'password_manager/core/browser/password_store_default.cc', - 'password_manager/core/browser/password_store_default.h', - 'password_manager/core/browser/password_store_factory_util.cc', - 'password_manager/core/browser/password_store_factory_util.h', - 'password_manager/core/browser/password_store_sync.cc', - 'password_manager/core/browser/password_store_sync.h', - 'password_manager/core/browser/password_syncable_service.cc', - 'password_manager/core/browser/password_syncable_service.h', - 'password_manager/core/browser/password_ui_utils.cc', - 'password_manager/core/browser/password_ui_utils.h', - 'password_manager/core/browser/psl_matching_helper.cc', - 'password_manager/core/browser/psl_matching_helper.h', - 'password_manager/core/browser/sql_table_builder.cc', - 'password_manager/core/browser/sql_table_builder.h', - 'password_manager/core/browser/statistics_table.cc', - 'password_manager/core/browser/statistics_table.h', - 'password_manager/core/browser/test_affiliation_fetcher_factory.h', - 'password_manager/core/browser/types.h', - 'password_manager/core/browser/webdata/logins_table.cc', - 'password_manager/core/browser/webdata/logins_table.h', - 'password_manager/core/browser/webdata/logins_table_win.cc', - 'password_manager/core/browser/webdata/password_web_data_service_win.cc', - 'password_manager/core/browser/webdata/password_web_data_service_win.h', - ], - 'conditions': [ - ['OS=="ios"', { - 'sources!': [ - 'password_manager/core/browser/login_database_posix.cc', - ], - }], - ['OS=="mac"', { - 'sources!': [ - 'password_manager/core/browser/login_database_posix.cc', - ], - }], - ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [ 4267, ], - }, - { - # GN version: //components/password_manager/core/browser:proto - 'target_name': 'password_manager_core_browser_proto', - 'type': 'static_library', - 'sources': [ - 'password_manager/core/browser/affiliation_api.proto' - ], - 'variables': { - 'proto_in_dir': 'password_manager/core/browser', - 'proto_out_dir': 'components/password_manager/core/browser', - }, - 'includes': ['../build/protoc.gypi'], - }, - { - # GN version: //components/password_manager/core/browser:test_support - 'target_name': 'password_manager_core_browser_test_support', - 'type': 'static_library', - 'dependencies': [ - 'autofill_core_common', - '../base/base.gyp:base', - '../testing/gmock.gyp:gmock', - '../testing/gtest.gyp:gtest', - 'autofill_server_proto', - ], - 'export_dependent_settings': [ - '../testing/gmock.gyp:gmock', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'password_manager/core/browser/fake_affiliation_api.cc', - 'password_manager/core/browser/fake_affiliation_api.h', - 'password_manager/core/browser/fake_affiliation_fetcher.cc', - 'password_manager/core/browser/fake_affiliation_fetcher.h', - 'password_manager/core/browser/mock_affiliation_consumer.cc', - 'password_manager/core/browser/mock_affiliation_consumer.h', - 'password_manager/core/browser/mock_password_store.cc', - 'password_manager/core/browser/mock_password_store.h', - 'password_manager/core/browser/password_manager_test_utils.cc', - 'password_manager/core/browser/password_manager_test_utils.h', - # Note: sources list duplicated in GN build. - 'password_manager/core/browser/stub_credentials_filter.cc', - 'password_manager/core/browser/stub_credentials_filter.h', - 'password_manager/core/browser/stub_form_saver.h', - 'password_manager/core/browser/stub_log_manager.cc', - 'password_manager/core/browser/stub_log_manager.h', - 'password_manager/core/browser/stub_password_manager_client.cc', - 'password_manager/core/browser/stub_password_manager_client.h', - 'password_manager/core/browser/stub_password_manager_driver.cc', - 'password_manager/core/browser/stub_password_manager_driver.h', - 'password_manager/core/browser/test_password_store.cc', - 'password_manager/core/browser/test_password_store.h', - ], - }, - { - # GN version: //components/password_manager/core/common - 'target_name': 'password_manager_core_common', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'password_manager/core/common/credential_manager_types.cc', - 'password_manager/core/common/credential_manager_types.h', - 'password_manager/core/common/experiments.cc', - 'password_manager/core/common/experiments.h', - 'password_manager/core/common/password_manager_features.cc', - 'password_manager/core/common/password_manager_features.h', - 'password_manager/core/common/password_manager_pref_names.cc', - 'password_manager/core/common/password_manager_pref_names.h', - 'password_manager/core/common/password_manager_ui.h', - ], - }, - { - # GN version: //components/password_manager/sync/browser - 'target_name': 'password_manager_sync_browser', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../google_apis/google_apis.gyp:google_apis', - '../net/net.gyp:net', - '../components/sync.gyp:sync', - 'autofill_core_common', - 'password_manager_core_browser', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'password_manager/sync/browser/password_data_type_controller.cc', - 'password_manager/sync/browser/password_data_type_controller.h', - 'password_manager/sync/browser/password_manager_setting_migrator_service.cc', - 'password_manager/sync/browser/password_manager_setting_migrator_service.h', - 'password_manager/sync/browser/password_model_worker.cc', - 'password_manager/sync/browser/password_model_worker.h', - 'password_manager/sync/browser/password_sync_util.cc', - 'password_manager/sync/browser/password_sync_util.h', - 'password_manager/sync/browser/sync_credentials_filter.cc', - 'password_manager/sync/browser/sync_credentials_filter.h', - ], - }, - ], - 'conditions': [ - ['OS != "ios"', { - 'targets': [ - { - # GN version: //components/password_manager/content/public/interfaces - 'target_name': 'password_manager_content_mojo_bindings_mojom', - 'type': 'none', - 'variables': { - 'mojom_files': [ - 'password_manager/content/public/interfaces/credential_manager.mojom', - ], - 'mojom_typemaps': [ - 'password_manager/content/public/cpp/credential_manager.typemap', - '<(DEPTH)/url/mojo/gurl.typemap', - '<(DEPTH)/url/mojo/origin.typemap', - ], - }, - 'include_dirs': [ - '..', - ], - 'includes': [ - '../mojo/mojom_bindings_generator_explicit.gypi', - ], - }, - { - # GN version: //components/password_manager/content/public/interfaces - 'target_name': 'password_manager_content_mojo_bindings', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../mojo/mojo_public.gyp:mojo_cpp_bindings', - '../url/url.gyp:url_mojom', - 'password_manager_content_mojo_bindings_mojom', - 'password_manager_core_common', - ], - 'export_dependent_settings': [ - '../url/url.gyp:url_mojom', - ], - 'sources': [ - 'password_manager/content/public/cpp/credential_manager_struct_traits.cc', - ], - }, - { - # GN version: //components/password_manager/content/renderer - 'target_name': 'password_manager_content_renderer', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_common', - '../third_party/WebKit/public/blink.gyp:blink', - 'password_manager_content_mojo_bindings', - 'password_manager_core_common', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'password_manager/content/renderer/credential_manager_client.cc', - 'password_manager/content/renderer/credential_manager_client.h', - ], - }, - { - # GN version: //components/password_manager/content/browser - 'target_name': 'password_manager_content_browser', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_browser', - '../content/content.gyp:content_common', - '../ipc/ipc.gyp:ipc', - '../mojo/mojo_base.gyp:mojo_common_lib', - '../net/net.gyp:net', - 'autofill_content_browser', - 'autofill_content_common', - 'autofill_content_mojo_bindings', - 'autofill_core_common', - 'keyed_service_content', - 'password_manager_content_mojo_bindings', - 'password_manager_core_browser', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'password_manager/content/browser/bad_message.cc', - 'password_manager/content/browser/bad_message.h', - 'password_manager/content/browser/content_password_manager_driver.cc', - 'password_manager/content/browser/content_password_manager_driver.h', - 'password_manager/content/browser/content_password_manager_driver_factory.cc', - 'password_manager/content/browser/content_password_manager_driver_factory.h', - 'password_manager/content/browser/credential_manager_impl.cc', - 'password_manager/content/browser/credential_manager_impl.h', - 'password_manager/content/browser/password_manager_internals_service_factory.cc', - 'password_manager/content/browser/password_manager_internals_service_factory.h', - ], - }, - ], - }], - ], -}
diff --git a/components/pdf.gypi b/components/pdf.gypi deleted file mode 100644 index 89c126d..0000000 --- a/components/pdf.gypi +++ /dev/null
@@ -1,66 +0,0 @@ -# Copyright 2014 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. - -{ - 'variables': { - 'chromium_code': 1, - }, - 'targets': [{ - 'target_name': 'pdf_common', - 'type': 'static_library', - 'dependencies': [ - '<(DEPTH)/base/base.gyp:base', - '<(DEPTH)/content/content.gyp:content_common', - '<(DEPTH)/ipc/ipc.gyp:ipc', - '<(DEPTH)/url/url.gyp:url_lib', - '<(DEPTH)/url/ipc/url_ipc.gyp:url_ipc', - ], - 'sources': [ - 'pdf/common/pdf_message_generator.cc', - 'pdf/common/pdf_message_generator.h', - 'pdf/common/pdf_messages.h', - ], - }, { - 'target_name': 'pdf_browser', - 'type': 'static_library', - 'dependencies': [ - '<(DEPTH)/content/content.gyp:content_browser', - 'pdf_common', - ], - 'sources': [ - 'pdf/browser/open_pdf_in_reader_prompt_client.h', - 'pdf/browser/pdf_web_contents_helper.cc', - 'pdf/browser/pdf_web_contents_helper.h', - 'pdf/browser/pdf_web_contents_helper_client.h', - ], - }, { - 'target_name': 'pdf_renderer', - 'type': 'static_library', - 'dependencies': [ - '<(DEPTH)/content/content.gyp:content_renderer', - '<(DEPTH)/gin/gin.gyp:gin', - '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared', - '<(DEPTH)/third_party/icu/icu.gyp:icuuc', - '<(DEPTH)/third_party/icu/icu.gyp:icui18n', - '<(DEPTH)/v8/src/v8.gyp:v8', - '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', - 'components_resources.gyp:components_resources', - 'components_strings.gyp:components_strings', - 'pdf_common', - ], - 'sources': [ - 'pdf/renderer/pdf_accessibility_tree.cc', - 'pdf/renderer/pdf_accessibility_tree.h', - 'pdf/renderer/pepper_pdf_host.cc', - 'pdf/renderer/pepper_pdf_host.h', - ], - 'conditions': [ - ['OS=="win"', { - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [4267, ], - }, - ], - ], - }], -}
diff --git a/components/physical_web.gypi b/components/physical_web.gypi deleted file mode 100644 index d462fa1..0000000 --- a/components/physical_web.gypi +++ /dev/null
@@ -1,23 +0,0 @@ -# Copyright 2016 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. - -{ - 'targets': [ - { - # GN version: //components/physical_web/data_source - 'target_name': 'physical_web_data_source', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'physical_web/data_source/physical_web_data_source.h', - ], - }, - ], -}
diff --git a/components/plugins.gypi b/components/plugins.gypi deleted file mode 100644 index ed37c649..0000000 --- a/components/plugins.gypi +++ /dev/null
@@ -1,50 +0,0 @@ -# Copyright 2013 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. - -{ - 'conditions': [ - ['OS!="ios"', { - 'targets': [ - { - # GN version: //components/plugins/renderer - 'target_name': 'plugins_renderer', - 'type': 'static_library', - 'dependencies': [ - '../gin/gin.gyp:gin', - '../skia/skia.gyp:skia', - '../third_party/WebKit/public/blink.gyp:blink', - '../third_party/re2/re2.gyp:re2', - '../v8/src/v8.gyp:v8', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'plugins/renderer/plugin_placeholder.cc', - 'plugins/renderer/plugin_placeholder.h', - 'plugins/renderer/webview_plugin.cc', - 'plugins/renderer/webview_plugin.h', - ], - 'conditions' : [ - ['enable_plugins==1', { - 'sources': [ - # Note: sources list duplicated in GN build. - 'plugins/renderer/loadable_plugin_placeholder.cc', - 'plugins/renderer/loadable_plugin_placeholder.h', - ] - }], - ['OS=="android"', { - 'sources': [ - # Note: sources list duplicated in GN build. - 'plugins/renderer/mobile_youtube_plugin.cc', - 'plugins/renderer/mobile_youtube_plugin.h', - ] - }], - ], - }, - ], - }], - ], -}
diff --git a/components/policy.gypi b/components/policy.gypi deleted file mode 100644 index 92504487..0000000 --- a/components/policy.gypi +++ /dev/null
@@ -1,598 +0,0 @@ -# Copyright 2013 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. - -{ - 'includes': [ - # Included to get 'mac_bundle_id' and other variables. - '../build/chrome_settings.gypi', - ], - 'variables': { - 'chromium_code': 1, - 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', - 'policy_out_dir': '<(SHARED_INTERMEDIATE_DIR)/policy', - 'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out', - 'generate_policy_source_script_path': - 'policy/tools/generate_policy_source.py', - 'policy_constant_header_path': - '<(policy_out_dir)/policy/policy_constants.h', - 'policy_constant_source_path': - '<(policy_out_dir)/policy/policy_constants.cc', - 'protobuf_decoder_path': - '<(policy_out_dir)/policy/cloud_policy_generated.cc', - 'app_restrictions_path': - '<(policy_out_dir)/app_restrictions.xml', - 'risk_tag_header_path': - '<(policy_out_dir)/risk_tag.h', - # This is the "full" protobuf, which defines one protobuf message per - # policy. It is also the format currently used by the server. - 'chrome_settings_proto_path': - '<(policy_out_dir)/policy/chrome_settings.proto', - # This protobuf is equivalent to chrome_settings.proto but shares messages - # for policies of the same type, so that less classes have to be generated - # and compiled. - 'cloud_policy_proto_path': - '<(policy_out_dir)/policy/cloud_policy.proto', - }, - 'conditions': [ - ['component=="static_library"', { - 'targets': [ - { - # GN version: //components/policy:policy_component - 'target_name': 'policy_component', - 'type': 'none', - 'dependencies': [ - 'policy_component_common', - 'policy_component_browser', - ], - }, - { - # GN version: //components/policy:policy_component_common - 'target_name': 'policy_component_common', - 'type': 'static_library', - 'includes': [ - 'policy/policy_common.gypi', - ], - }, - { - # GN version: //components/policy:policy_component_browser - 'target_name': 'policy_component_browser', - 'type': 'static_library', - 'dependencies': [ - 'policy_component_common', - ], - 'includes': [ - 'policy/policy_browser.gypi', - ], - 'conditions': [ - ['OS=="android"', { - 'dependencies': ['policy_jni_headers']}, - ], - ], - }, - ], - }, { # component=="shared_library" - 'targets': [ - { - # GN version: //components/policy:policy_component - 'target_name': 'policy_component', - 'type': 'shared_library', - 'includes': [ - 'policy/policy_common.gypi', - 'policy/policy_browser.gypi', - ], - }, - { - # GN version: //components/policy:policy_component_common - 'target_name': 'policy_component_common', - 'type': 'none', - 'dependencies': [ - 'policy_component', - ], - 'conditions': [ - ['OS=="android"', { - 'dependencies': ['policy_jni_headers']}, - ], - ], - }, - { - # GN version: //components/policy:policy_component_browser - 'target_name': 'policy_component_browser', - 'type': 'none', - 'dependencies': [ - 'policy_component', - ], - }, - ], - }], - ['configuration_policy==1', { - 'targets': [ - { - # GN version: //components/policy:cloud_policy_code_generate - 'target_name': 'cloud_policy_code_generate', - 'type': 'none', - 'actions': [ - { - 'inputs': [ - 'policy/resources/policy_templates.json', - '<(DEPTH)/chrome/VERSION', - '<(generate_policy_source_script_path)', - ], - 'outputs': [ - '<(policy_constant_header_path)', - '<(policy_constant_source_path)', - '<(protobuf_decoder_path)', - '<(chrome_settings_proto_path)', - '<(cloud_policy_proto_path)', - '<(app_restrictions_path)', - '<(risk_tag_header_path)', - ], - 'action_name': 'generate_policy_source', - 'action': [ - 'python', - '<@(generate_policy_source_script_path)', - '--policy-constants-header=<(policy_constant_header_path)', - '--policy-constants-source=<(policy_constant_source_path)', - '--chrome-settings-protobuf=<(chrome_settings_proto_path)', - '--cloud-policy-protobuf=<(cloud_policy_proto_path)', - '--cloud-policy-decoder=<(protobuf_decoder_path)', - '--app-restrictions-definition=<(app_restrictions_path)', - '--risk-tag-header=<(risk_tag_header_path)', - '<(DEPTH)/chrome/VERSION', - '<(OS)', - '<(chromeos)', - 'policy/resources/policy_templates.json', - ], - 'message': 'Generating policy source', - 'conditions': [ - ['OS!="android"', { - 'outputs!': [ - '<(app_restrictions_path)', - ], - }], - ], - }, - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '<(policy_out_dir)', - '<(protoc_out_dir)', - ], - }, - }, - { - # GN version: //components/policy:cloud_policy_proto_generated_compile - 'target_name': 'cloud_policy_proto_generated_compile', - 'type': '<(component)', - 'sources': [ - '<(cloud_policy_proto_path)', - ], - 'variables': { - 'proto_in_dir': '<(policy_out_dir)/policy', - 'proto_out_dir': 'policy/proto', - 'cc_generator_options': 'dllexport_decl=POLICY_PROTO_EXPORT:', - 'cc_include': 'components/policy/policy_proto_export.h', - }, - 'dependencies': [ - 'cloud_policy_code_generate', - ], - 'includes': [ - '../build/protoc.gypi', - ], - 'defines': [ - 'POLICY_PROTO_COMPILATION', - ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [4267, ], - }, - { - # This target builds the "full" protobuf, used for tests only. - # GN version: //components/policy:chrome_settings_proto_generated_compile - 'target_name': 'chrome_settings_proto_generated_compile', - 'type': 'static_library', - 'sources': [ - '<(chrome_settings_proto_path)', - ], - 'variables': { - 'proto_in_dir': '<(policy_out_dir)/policy', - 'proto_out_dir': 'policy/proto', - }, - 'dependencies': [ - 'cloud_policy_code_generate', - 'cloud_policy_proto_generated_compile', - ], - 'includes': [ - '../build/protoc.gypi', - ], - }, - { - # GN version: //components/policy - 'target_name': 'policy', - 'type': 'static_library', - 'hard_dependency': 1, - 'direct_dependent_settings': { - 'include_dirs': [ - '<(policy_out_dir)', - '<(protoc_out_dir)', - ], - }, - 'sources': [ - '<(policy_constant_header_path)', - '<(policy_constant_source_path)', - '<(risk_tag_header_path)', - '<(protobuf_decoder_path)', - ], - 'include_dirs': [ - '<(DEPTH)', - ], - 'dependencies': [ - 'cloud_policy_code_generate', - 'cloud_policy_proto_generated_compile', - '<(DEPTH)/base/base.gyp:base', - '<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite', - ], - 'defines': [ - 'POLICY_COMPONENT_IMPLEMENTATION', - ], - }, - { - # GN version: //components/policy/proto - 'target_name': 'cloud_policy_proto', - 'type': '<(component)', - 'sources': [ - 'policy/proto/chrome_extension_policy.proto', - 'policy/proto/device_management_backend.proto', - 'policy/proto/device_management_local.proto', - 'policy/proto/policy_signing_key.proto', - ], - 'variables': { - 'proto_in_dir': 'policy/proto', - 'proto_out_dir': 'policy/proto', - 'cc_generator_options': 'dllexport_decl=POLICY_PROTO_EXPORT:', - 'cc_include': 'components/policy/policy_proto_export.h', - }, - 'includes': [ - '../build/protoc.gypi', - ], - 'conditions': [ - ['OS=="android" or OS=="ios"', { - 'sources!': [ - 'policy/proto/chrome_extension_policy.proto', - ], - }], - ['chromeos==0', { - 'sources!': [ - 'policy/proto/device_management_local.proto', - ], - }], - ], - 'defines': [ - 'POLICY_PROTO_COMPILATION', - ], - }, - { - # GN version: //components/policy:test_support - 'target_name': 'policy_test_support', - 'type': 'none', - 'hard_dependency': 1, - 'direct_dependent_settings': { - 'include_dirs': [ - '<(policy_out_dir)', - '<(protoc_out_dir)', - ], - }, - 'dependencies': [ - 'chrome_settings_proto_generated_compile', - 'policy', - ], - }, - { - # GN version: //components/policy:policy_component_test_support - 'target_name': 'policy_component_test_support', - 'type': 'static_library', - # This must be undefined so that POLICY_EXPORT works correctly in - # the static_library build. - 'defines!': [ - 'POLICY_COMPONENT_IMPLEMENTATION', - ], - 'dependencies': [ - 'cloud_policy_proto', - 'policy_component', - 'policy_test_support', - '../testing/gmock.gyp:gmock', - '../testing/gtest.gyp:gtest', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'policy/core/browser/configuration_policy_pref_store_test.cc', - 'policy/core/browser/configuration_policy_pref_store_test.h', - 'policy/core/common/cloud/mock_cloud_external_data_manager.cc', - 'policy/core/common/cloud/mock_cloud_external_data_manager.h', - 'policy/core/common/cloud/mock_cloud_policy_client.cc', - 'policy/core/common/cloud/mock_cloud_policy_client.h', - 'policy/core/common/cloud/mock_cloud_policy_store.cc', - 'policy/core/common/cloud/mock_cloud_policy_store.h', - 'policy/core/common/cloud/mock_device_management_service.cc', - 'policy/core/common/cloud/mock_device_management_service.h', - 'policy/core/common/cloud/mock_user_cloud_policy_store.cc', - 'policy/core/common/cloud/mock_user_cloud_policy_store.h', - 'policy/core/common/cloud/policy_builder.cc', - 'policy/core/common/cloud/policy_builder.h', - 'policy/core/common/configuration_policy_provider_test.cc', - 'policy/core/common/configuration_policy_provider_test.h', - 'policy/core/common/fake_async_policy_loader.cc', - 'policy/core/common/fake_async_policy_loader.h', - 'policy/core/common/mock_configuration_policy_provider.cc', - 'policy/core/common/mock_configuration_policy_provider.h', - 'policy/core/common/mock_policy_service.cc', - 'policy/core/common/mock_policy_service.h', - 'policy/core/common/policy_test_utils.cc', - 'policy/core/common/policy_test_utils.h', - 'policy/core/common/preferences_mock_mac.cc', - 'policy/core/common/preferences_mock_mac.h', - 'policy/core/common/remote_commands/test_remote_command_job.cc', - 'policy/core/common/remote_commands/test_remote_command_job.h', - 'policy/core/common/remote_commands/testing_remote_commands_server.cc', - 'policy/core/common/remote_commands/testing_remote_commands_server.h', - ], - 'conditions': [ - ['OS=="android"', { - 'sources!': [ - 'policy/core/common/fake_async_policy_loader.cc', - 'policy/core/common/fake_async_policy_loader.h', - ], - }], - ['chromeos==1', { - 'sources!': [ - 'policy/core/common/cloud/mock_user_cloud_policy_store.cc', - 'policy/core/common/cloud/mock_user_cloud_policy_store.h', - ], - }], - ], - }, - ], - }], - ['OS=="android"', - { - 'targets' : [ - { - 'target_name' : 'policy_jni_headers', - 'type': 'none', - 'sources': [ - 'policy/android/java/src/org/chromium/policy/CombinedPolicyProvider.java', - 'policy/android/java/src/org/chromium/policy/PolicyConverter.java', - ], - 'variables': { - 'jni_gen_package': 'policy', - }, - 'includes': [ '../build/jni_generator.gypi' ], - }, - { - 'target_name': 'components_policy_junit_tests', - 'type': 'none', - 'dependencies': [ - '../testing/android/junit/junit_test.gyp:junit_test_support', - ], - 'variables': { - 'main_class': 'org.chromium.testing.local.JunitTestMain', - 'src_paths': [ - '../testing/android/junit/DummyTest.java', - ], - 'wrapper_script_name': 'helper/<(_target_name)', - }, - 'includes': [ '../build/host_jar.gypi' ], - }, - ], - }], - ['OS=="android" and configuration_policy==1', { - 'targets': [ - { - 'target_name': 'app_restrictions_resources', - 'type': 'none', - 'variables': { - 'resources_zip': '<(PRODUCT_DIR)/res.java/<(_target_name).zip', - 'input_resources_dir': - '<(SHARED_INTERMEDIATE_DIR)/chrome/app/policy/android', - 'create_zip_script': '../build/android/gyp/zip.py', - }, - 'copies': [ - { - 'destination': '<(input_resources_dir)/xml-v21/', - 'files': [ - '<(SHARED_INTERMEDIATE_DIR)/policy/app_restrictions.xml' - ], - }, - ], - 'actions': [ - { - 'action_name': 'create_resources_zip', - 'inputs': [ - '<(create_zip_script)', - '<(input_resources_dir)/xml-v21/app_restrictions.xml', - '<(input_resources_dir)/values-v21/restriction_values.xml', - ], - 'outputs': [ - '<(resources_zip)' - ], - 'action': [ - 'python', '<(create_zip_script)', - '--input-dir', '<(input_resources_dir)', - '--output', '<(resources_zip)', - ], - } - ], - 'all_dependent_settings': { - 'variables': { - 'additional_input_paths': ['<(resources_zip)'], - 'dependencies_res_zip_paths': ['<(resources_zip)'], - }, - }, - }, - { - # GN: //components/policy/android:policy_java - 'target_name': 'policy_java', - 'type': 'none', - 'dependencies': [ - '../base/base.gyp:base_java', - ], - 'variables': { - 'java_in_dir': 'policy/android/java', - }, - 'includes': [ '../build/java.gypi' ], - }, - { - # GN: //components/policy/android:policy_java_test_support - 'target_name': 'policy_java_test_support', - 'type': 'none', - 'dependencies': [ - '../base/base.gyp:base_java', - '../base/base.gyp:base_java_test_support', - 'policy_java' - ], - 'variables': { - 'java_in_dir': 'policy/android/javatests', - }, - 'includes': [ '../build/java.gypi' ], - }, - ], - }], - ['OS=="win" and target_arch=="ia32" and configuration_policy==1', { - 'targets': [ - { - 'target_name': 'policy_win64', - 'type': 'static_library', - 'hard_dependency': 1, - 'sources': [ - '<(policy_constant_header_path)', - '<(policy_constant_source_path)', - '<(risk_tag_header_path)', - ], - 'include_dirs': [ - '<(DEPTH)', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '<(policy_out_dir)' - ], - }, - 'dependencies': [ - 'cloud_policy_code_generate', - ], - 'configurations': { - 'Common_Base': { - 'msvs_target_platform': 'x64', - }, - }, - }, - ], - }], - ['OS!="ios"', { - 'targets': [ - { - # policy_templates has different inputs and outputs, so it can't use - # the rules of chrome_strings - 'target_name': 'policy_templates', - 'type': 'none', - 'variables': { - 'grit_grd_file': 'policy/resources/policy_templates.grd', - 'grit_info_cmd': [ - 'python', - '<(DEPTH)/tools/grit/grit_info.py', - '<@(grit_defines)', - ], - }, - 'includes': [ - '../build/grit_target.gypi', - ], - 'actions': [ - { - 'action_name': 'policy_templates', - 'includes': [ - '../build/grit_action.gypi', - ], - }, - ], - }, - ], - }], - ['OS=="mac"', { - 'targets': [ - { - # This is the bundle of the manifest file of Chrome. - # It contains the manifest file and its string tables. - 'target_name': 'chrome_manifest_bundle', - 'type': 'loadable_module', - 'mac_bundle': 1, - 'product_extension': 'manifest', - 'product_name': '<(mac_bundle_id)', - 'variables': { - # This avoids stripping debugging symbols from the target, which - # would fail because there is no binary code here. - 'mac_strip': 0, - }, - 'dependencies': [ - # Provides app-Manifest.plist and its string tables: - 'policy_templates', - ], - 'actions': [ - { - 'action_name': 'Copy MCX manifest file to manifest bundle', - 'inputs': [ - '<(grit_out_dir)/app/policy/mac/app-Manifest.plist', - ], - 'outputs': [ - '<(INTERMEDIATE_DIR)/app_manifest/<(mac_bundle_id).manifest', - ], - 'action': [ - # Use plutil -convert xml1 to put the plist into Apple's - # canonical format. As a side effect, this ensures that the - # plist is well-formed. - 'plutil', - '-convert', - 'xml1', - '<@(_inputs)', - '-o', - '<@(_outputs)', - ], - 'message': - 'Copying the MCX policy manifest file to the manifest bundle', - 'process_outputs_as_mac_bundle_resources': 1, - }, - { - 'action_name': - 'Copy Localizable.strings files to manifest bundle', - 'variables': { - 'input_path': '<(grit_out_dir)/app/policy/mac/strings', - # Directory to collect the Localizable.strings files before - # they are copied to the bundle. - 'output_path': '<(INTERMEDIATE_DIR)/app_manifest', - # The reason we are not enumerating all the locales is that - # the translations would eat up 3.5MB disk space in the - # application bundle: - 'available_locales': 'en', - }, - 'inputs': [ - # TODO: remove this helper when we have loops in GYP - '>!@(<(apply_locales_cmd) -d \'<(input_path)/ZZLOCALE.lproj/Localizable.strings\' <(available_locales))', - ], - 'outputs': [ - # TODO: remove this helper when we have loops in GYP - '>!@(<(apply_locales_cmd) -d \'<(output_path)/ZZLOCALE.lproj/Localizable.strings\' <(available_locales))', - ], - 'action': [ - 'cp', '-R', - '<(input_path)/', - '<(output_path)', - ], - 'message': - 'Copy the Localizable.strings files to the manifest bundle', - 'process_outputs_as_mac_bundle_resources': 1, - }, - ], - }, - ], - }], - ], -}
diff --git a/components/policy/policy_browser.gypi b/components/policy/policy_browser.gypi deleted file mode 100644 index 6b2b6c0..0000000 --- a/components/policy/policy_browser.gypi +++ /dev/null
@@ -1,84 +0,0 @@ -# Copyright 2014 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. - -{ - 'dependencies': [ - '../base/base.gyp:base', - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '../net/net.gyp:net', - '../ui/base/ui_base.gyp:ui_base', - '../url/url.gyp:url_lib', - 'bookmarks_browser', - 'bookmarks_managed', - 'components_strings.gyp:components_strings', - 'keyed_service_core', - 'pref_registry', - 'prefs/prefs.gyp:prefs', - 'url_matcher', - ], - 'defines': [ - 'POLICY_COMPONENT_IMPLEMENTATION', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note that these sources are always included, even for builds that - # disable policy. Most source files should go in the conditional - # sources list below. - # url_blacklist_manager.h is used by managed mode. - 'core/browser/url_blacklist_manager.cc', - 'core/browser/url_blacklist_manager.h', - ], - 'conditions': [ - # GN version: //components/policy/core/browser - ['configuration_policy==1', { - 'dependencies': [ - '../third_party/icu/icu.gyp:icui18n', - '../third_party/icu/icu.gyp:icuuc', - 'autofill_core_common', - 'cloud_policy_proto', - 'policy', - 'proxy_config', - ], - 'sources': [ - 'core/browser/autofill_policy_handler.cc', - 'core/browser/autofill_policy_handler.h', - 'core/browser/browser_policy_connector.cc', - 'core/browser/browser_policy_connector.h', - 'core/browser/browser_policy_connector_base.cc', - 'core/browser/browser_policy_connector_base.h', - 'core/browser/browser_policy_connector_ios.h', - 'core/browser/browser_policy_connector_ios.mm', - 'core/browser/cloud/message_util.cc', - 'core/browser/cloud/message_util.h', - 'core/browser/configuration_policy_handler.cc', - 'core/browser/configuration_policy_handler.h', - 'core/browser/configuration_policy_handler_list.cc', - 'core/browser/configuration_policy_handler_list.h', - 'core/browser/configuration_policy_pref_store.cc', - 'core/browser/configuration_policy_pref_store.h', - 'core/browser/policy_error_map.cc', - 'core/browser/policy_error_map.h', - 'core/browser/proxy_policy_handler.cc', - 'core/browser/proxy_policy_handler.h', - 'core/browser/url_blacklist_policy_handler.cc', - 'core/browser/url_blacklist_policy_handler.h', - ], - 'conditions': [ - ['OS=="android"', { - 'sources': [ - 'core/browser/android/android_combined_policy_provider.cc', - 'core/browser/android/android_combined_policy_provider.h', - 'core/browser/android/component_jni_registrar.cc', - 'core/browser/android/component_jni_registrar.h', - 'core/browser/android/policy_converter.cc', - 'core/browser/android/policy_converter.h', - ], - 'dependencies': [ 'policy_jni_headers' ] - }] - ] - }], - ], -}
diff --git a/components/policy/policy_common.gypi b/components/policy/policy_common.gypi deleted file mode 100644 index e808ab9a..0000000 --- a/components/policy/policy_common.gypi +++ /dev/null
@@ -1,238 +0,0 @@ -# Copyright 2014 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. - -{ - # GN version: //components/policy/core/common - 'dependencies': [ - '../base/base.gyp:base', - ], - 'defines': [ - 'POLICY_COMPONENT_IMPLEMENTATION', - ], - 'include_dirs': [ - '..', - ], - 'conditions': [ - ['configuration_policy==1', { - 'dependencies': [ - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '../google_apis/google_apis.gyp:google_apis', - '../net/net.gyp:net', - '../third_party/re2/re2.gyp:re2', - '../url/url.gyp:url_lib', - 'cloud_policy_proto', - 'data_use_measurement_core', - 'json_schema', - 'policy', - 'prefs/prefs.gyp:prefs', - ], - 'sources': [ - 'core/common/async_policy_loader.cc', - 'core/common/async_policy_loader.h', - 'core/common/async_policy_provider.cc', - 'core/common/async_policy_provider.h', - 'core/common/cloud/cloud_external_data_manager.cc', - 'core/common/cloud/cloud_external_data_manager.h', - 'core/common/cloud/cloud_policy_client.cc', - 'core/common/cloud/cloud_policy_client.h', - 'core/common/cloud/cloud_policy_client_registration_helper.cc', - 'core/common/cloud/cloud_policy_client_registration_helper.h', - 'core/common/cloud/cloud_policy_constants.cc', - 'core/common/cloud/cloud_policy_constants.h', - 'core/common/cloud/cloud_policy_core.cc', - 'core/common/cloud/cloud_policy_core.h', - 'core/common/cloud/cloud_policy_manager.cc', - 'core/common/cloud/cloud_policy_manager.h', - 'core/common/cloud/cloud_policy_refresh_scheduler.cc', - 'core/common/cloud/cloud_policy_refresh_scheduler.h', - 'core/common/cloud/cloud_policy_service.cc', - 'core/common/cloud/cloud_policy_service.h', - 'core/common/cloud/cloud_policy_store.cc', - 'core/common/cloud/cloud_policy_store.h', - 'core/common/cloud/cloud_policy_validator.cc', - 'core/common/cloud/cloud_policy_validator.h', - 'core/common/cloud/component_cloud_policy_service.cc', - 'core/common/cloud/component_cloud_policy_service.h', - 'core/common/cloud/component_cloud_policy_store.cc', - 'core/common/cloud/component_cloud_policy_store.h', - 'core/common/cloud/component_cloud_policy_updater.cc', - 'core/common/cloud/component_cloud_policy_updater.h', - 'core/common/cloud/device_management_service.cc', - 'core/common/cloud/device_management_service.h', - 'core/common/cloud/enterprise_metrics.cc', - 'core/common/cloud/enterprise_metrics.h', - 'core/common/cloud/external_policy_data_fetcher.cc', - 'core/common/cloud/external_policy_data_fetcher.h', - 'core/common/cloud/external_policy_data_updater.cc', - 'core/common/cloud/external_policy_data_updater.h', - 'core/common/cloud/policy_header_io_helper.cc', - 'core/common/cloud/policy_header_io_helper.h', - 'core/common/cloud/policy_header_service.cc', - 'core/common/cloud/policy_header_service.h', - 'core/common/cloud/resource_cache.cc', - 'core/common/cloud/resource_cache.h', - 'core/common/cloud/user_cloud_policy_manager.cc', - 'core/common/cloud/user_cloud_policy_manager.h', - 'core/common/cloud/user_cloud_policy_store.cc', - 'core/common/cloud/user_cloud_policy_store.h', - 'core/common/cloud/user_cloud_policy_store_base.cc', - 'core/common/cloud/user_cloud_policy_store_base.h', - 'core/common/cloud/user_info_fetcher.cc', - 'core/common/cloud/user_info_fetcher.h', - 'core/common/config_dir_policy_loader.cc', - 'core/common/config_dir_policy_loader.h', - 'core/common/configuration_policy_provider.cc', - 'core/common/configuration_policy_provider.h', - 'core/common/external_data_fetcher.cc', - 'core/common/external_data_fetcher.h', - 'core/common/external_data_manager.h', - 'core/common/mac_util.cc', - 'core/common/mac_util.h', - 'core/common/policy_bundle.cc', - 'core/common/policy_bundle.h', - 'core/common/policy_details.h', - 'core/common/policy_load_status.cc', - 'core/common/policy_load_status.h', - 'core/common/policy_loader_ios.h', - 'core/common/policy_loader_ios.mm', - 'core/common/policy_loader_mac.h', - 'core/common/policy_loader_mac.mm', - 'core/common/policy_loader_win.cc', - 'core/common/policy_loader_win.h', - 'core/common/policy_map.cc', - 'core/common/policy_map.h', - 'core/common/policy_namespace.cc', - 'core/common/policy_namespace.h', - 'core/common/policy_pref_names.cc', - 'core/common/policy_pref_names.h', - 'core/common/policy_service.cc', - 'core/common/policy_service.h', - 'core/common/policy_service_impl.cc', - 'core/common/policy_service_impl.h', - 'core/common/policy_statistics_collector.cc', - 'core/common/policy_statistics_collector.h', - 'core/common/policy_switches.cc', - 'core/common/policy_switches.h', - 'core/common/policy_types.h', - 'core/common/preferences_mac.cc', - 'core/common/preferences_mac.h', - 'core/common/preg_parser_win.cc', - 'core/common/preg_parser_win.h', - 'core/common/registry_dict_win.cc', - 'core/common/registry_dict_win.h', - 'core/common/remote_commands/remote_command_job.cc', - 'core/common/remote_commands/remote_command_job.h', - 'core/common/remote_commands/remote_commands_factory.cc', - 'core/common/remote_commands/remote_commands_factory.h', - 'core/common/remote_commands/remote_commands_queue.cc', - 'core/common/remote_commands/remote_commands_queue.h', - 'core/common/remote_commands/remote_commands_service.cc', - 'core/common/remote_commands/remote_commands_service.h', - 'core/common/schema.cc', - 'core/common/schema.h', - 'core/common/schema_internal.h', - 'core/common/schema_map.cc', - 'core/common/schema_map.h', - 'core/common/schema_registry.cc', - 'core/common/schema_registry.h', - 'core/common/schema_registry_tracking_policy_provider.cc', - 'core/common/schema_registry_tracking_policy_provider.h', - 'policy_export.h', - ], - 'conditions': [ - ['OS=="android"', { - 'sources!': [ - 'core/common/async_policy_loader.cc', - 'core/common/async_policy_loader.h', - 'core/common/async_policy_provider.cc', - 'core/common/async_policy_provider.h', - ], - }], - ['OS=="android" or OS=="ios"', { - 'sources': [ - 'core/common/cloud/component_cloud_policy_service_stub.cc', - ], - 'sources!': [ - 'core/common/cloud/component_cloud_policy_service.cc', - 'core/common/cloud/component_cloud_policy_store.cc', - 'core/common/cloud/component_cloud_policy_store.h', - 'core/common/cloud/component_cloud_policy_updater.cc', - 'core/common/cloud/component_cloud_policy_updater.h', - 'core/common/cloud/external_policy_data_fetcher.cc', - 'core/common/cloud/external_policy_data_fetcher.h', - 'core/common/cloud/external_policy_data_updater.cc', - 'core/common/cloud/external_policy_data_updater.h', - 'core/common/cloud/resource_cache.cc', - 'core/common/cloud/resource_cache.h', - 'core/common/config_dir_policy_loader.cc', - 'core/common/config_dir_policy_loader.h', - 'core/common/policy_load_status.cc', - 'core/common/policy_load_status.h', - ], - }], - ['chromeos==1', { - 'sources': [ - 'core/common/proxy_policy_provider.cc', - 'core/common/proxy_policy_provider.h', - ], - 'sources!': [ - 'core/common/cloud/cloud_policy_client_registration_helper.cc', - 'core/common/cloud/cloud_policy_client_registration_helper.h', - 'core/common/cloud/user_cloud_policy_manager.cc', - 'core/common/cloud/user_cloud_policy_manager.h', - 'core/common/cloud/user_cloud_policy_store.cc', - 'core/common/cloud/user_cloud_policy_store.h', - ], - }], - ['OS!="ios" and OS!="mac"', { - 'sources!': [ - 'core/common/mac_util.cc', - 'core/common/mac_util.h', - ], - }], - ['OS=="win"', { - 'all_dependent_settings': { - 'msvs_settings': { - 'VCLinkerTool': { - 'AdditionalDependencies': [ - 'shlwapi.lib', - 'userenv.lib', - 'ntdsapi.lib', - ], - }, - }, - }, - 'msvs_settings': { - 'VCLinkerTool': { - 'AdditionalDependencies': [ - 'shlwapi.lib', - 'userenv.lib', - 'ntdsapi.lib', - ], - }, - }, - }], - ], - }, { # configuration_policy==0 - # Some of the policy code is always enabled, so that other parts of - # Chrome can always interface with the PolicyService without having - # to #ifdef. - 'sources': [ - 'core/common/external_data_fetcher.cc', - 'core/common/external_data_fetcher.h', - 'core/common/external_data_manager.h', - 'core/common/policy_map.cc', - 'core/common/policy_map.h', - 'core/common/policy_namespace.cc', - 'core/common/policy_namespace.h', - 'core/common/policy_pref_names.cc', - 'core/common/policy_pref_names.h', - 'core/common/policy_service.cc', - 'core/common/policy_service.h', - 'core/common/policy_service_stub.cc', - 'core/common/policy_service_stub.h', - ], - }], - ], -}
diff --git a/components/power.gypi b/components/power.gypi deleted file mode 100644 index a1757a0c..0000000 --- a/components/power.gypi +++ /dev/null
@@ -1,25 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - 'target_name': 'power', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - 'keyed_service_content', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'power/origin_power_map.cc', - 'power/origin_power_map.h', - 'power/origin_power_map_factory.cc', - 'power/origin_power_map_factory.h', - ], - }, - ], -}
diff --git a/components/precache.gypi b/components/precache.gypi deleted file mode 100644 index 017b352..0000000 --- a/components/precache.gypi +++ /dev/null
@@ -1,110 +0,0 @@ -# Copyright 2013 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. - -{ - 'targets': [ - { - # GN version: //components/precache/core - 'target_name': 'precache_core', - 'type': 'static_library', - 'dependencies': [ - 'precache_core_proto', - '../base/base.gyp:base', - '../third_party/protobuf/protobuf.gyp:protobuf_lite', - '../url/url.gyp:url_lib', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'precache/core/fetcher_pool.h', - 'precache/core/precache_database.cc', - 'precache/core/precache_database.h', - 'precache/core/precache_fetcher.cc', - 'precache/core/precache_fetcher.h', - 'precache/core/precache_referrer_host_table.cc', - 'precache/core/precache_referrer_host_table.h', - 'precache/core/precache_switches.cc', - 'precache/core/precache_switches.h', - 'precache/core/precache_session_table.cc', - 'precache/core/precache_session_table.h', - 'precache/core/precache_url_table.cc', - 'precache/core/precache_url_table.h', - ], - 'includes': [ 'precache/precache_defines.gypi', ], - 'direct_dependent_settings': { - # Make direct dependents also include the precache defines. This allows - # the unit tests to use these defines. - 'includes': [ 'precache/precache_defines.gypi', ], - }, - }, - { - # GN version: //components/precache/core:proto - 'target_name': 'precache_core_proto', - 'type': 'static_library', - 'sources': [ - 'precache/core/proto/precache.proto', - 'precache/core/proto/timestamp.proto', - 'precache/core/proto/unfinished_work.proto', - ], - 'variables': { - 'proto_in_dir': 'precache/core/proto', - 'proto_out_dir': 'components/precache/core/proto', - }, - 'includes': [ '../build/protoc.gypi', ], - }, - ], - 'conditions': [ - ['OS!="ios"', { - 'targets': [ - { - # GN Version: //components/precache/content - 'target_name': 'precache_content', - 'type': 'static_library', - 'dependencies': [ - 'precache_core', - 'precache_core_proto', - '../base/base.gyp:base', - '../components/sync.gyp:sync', - '../content/content.gyp:content_browser', - '../url/url.gyp:url_lib', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'precache/content/precache_manager.cc', - 'precache/content/precache_manager.h', - ], - }, - ], - }], - ['OS=="android"', { - 'targets': [{ - 'target_name': 'precache_java', - 'type': 'none', - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_java', - ], - 'variables': { - 'java_in_dir': 'precache/android/java', - }, - 'includes': [ '../build/java.gypi' ], - }, { - 'target_name': 'precache_javatests', - 'type': 'none', - 'dependencies': [ - 'precache_java', - '../base/base.gyp:base_java_test_support', - ], - 'variables': { - 'java_in_dir': 'precache/android/javatests', - }, - 'includes': [ '../build/java.gypi' ], - }], - }], - ], -}
diff --git a/components/precache/precache_defines.gypi b/components/precache/precache_defines.gypi deleted file mode 100644 index a7868e7..0000000 --- a/components/precache/precache_defines.gypi +++ /dev/null
@@ -1,24 +0,0 @@ -# Copyright 2013 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. - -{ - 'variables': { - # These values are duplicated in the GN build in: - # //components/precache/core:precache_config - 'precache_config_settings_url%': 'https://www.gstatic.com/chrome/wifiprefetch/precache_config', - 'precache_manifest_url_prefix%': 'https://www.gstatic.com/chrome/wifiprefetch/hosts/', - }, - 'conditions': [ - ['precache_config_settings_url != ""', { - 'defines': [ - 'PRECACHE_CONFIG_SETTINGS_URL="<(precache_config_settings_url)"', - ], - }], - ['precache_manifest_url_prefix != ""', { - 'defines': [ - 'PRECACHE_MANIFEST_URL_PREFIX="<(precache_manifest_url_prefix)"', - ], - }], - ], -}
diff --git a/components/pref_registry.gypi b/components/pref_registry.gypi deleted file mode 100644 index 0499e19..0000000 --- a/components/pref_registry.gypi +++ /dev/null
@@ -1,41 +0,0 @@ -# Copyright (c) 2013 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. - -{ - 'targets': [ - { - # GN version: //components/pref_registry - 'target_name': 'pref_registry', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - 'prefs/prefs.gyp:prefs', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'pref_registry/pref_registry_syncable.cc', - 'pref_registry/pref_registry_syncable.h', - ], - }, - { - # GN version: //components/pref_registry:test_support - 'target_name': 'pref_registry_test_support', - 'type': 'static_library', - 'dependencies': [ - 'pref_registry', - 'prefs/prefs.gyp:prefs_test_support', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'pref_registry/testing_pref_service_syncable.cc', - 'pref_registry/testing_pref_service_syncable.h', - ], - }, - ], -}
diff --git a/components/prefs/pref_service.cc b/components/prefs/pref_service.cc index 4891ff5..e909d58 100644 --- a/components/prefs/pref_service.cc +++ b/components/prefs/pref_service.cc
@@ -98,7 +98,7 @@ // Guarantee that initialization happens after this function returned. base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE, - base::Bind(&PersistentPrefStore::ReadPrefsAsync, user_pref_store_.get(), + base::Bind(&PersistentPrefStore::ReadPrefsAsync, user_pref_store_, new ReadErrorHandler(read_error_callback_))); } }
diff --git a/components/prefs/prefs.gyp b/components/prefs/prefs.gyp deleted file mode 100644 index 3897576..0000000 --- a/components/prefs/prefs.gyp +++ /dev/null
@@ -1,89 +0,0 @@ -# Copyright (c) 2013 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. - -{ - 'targets': [ - { - 'target_name': 'prefs', - 'type': '<(component)', - 'dependencies': [ - '../../base/base.gyp:base', - ], - 'include_dirs': [ - '../..', - ], - 'defines': [ - 'COMPONENTS_PREFS_IMPLEMENTATION', - ], - 'sources': [ - 'default_pref_store.cc', - 'default_pref_store.h', - 'in_memory_pref_store.cc', - 'in_memory_pref_store.h', - 'json_pref_store.cc', - 'json_pref_store.h', - 'overlay_user_pref_store.cc', - 'overlay_user_pref_store.h', - 'pref_change_registrar.cc', - 'pref_change_registrar.h', - 'pref_member.cc', - 'pref_member.h', - 'pref_notifier_impl.cc', - 'pref_notifier_impl.h', - 'pref_registry.cc', - 'pref_registry.h', - 'pref_registry_simple.cc', - 'pref_registry_simple.h', - 'pref_service.cc', - 'pref_service.h', - 'pref_service_factory.cc', - 'pref_service_factory.h', - 'pref_store.cc', - 'pref_store.h', - 'pref_value_map.cc', - 'pref_value_map.h', - 'pref_value_store.cc', - 'pref_value_store.h', - 'scoped_user_pref_update.cc', - 'scoped_user_pref_update.h', - 'value_map_pref_store.cc', - 'value_map_pref_store.h', - ], - 'conditions': [ - ['OS!="ios"', { - 'sources': [ - 'base_prefs_export.h', - 'persistent_pref_store.h', - 'pref_filter.h', - 'pref_notifier.h', - 'pref_observer.h', - 'writeable_pref_store.h', - ] - }] - ], - }, - { - 'target_name': 'prefs_test_support', - 'type': 'static_library', - 'include_dirs': [ - '../..', - ], - 'dependencies': [ - 'prefs', - '<(DEPTH)/testing/gmock.gyp:gmock', - '<(DEPTH)/testing/gtest.gyp:gtest', - ], - 'sources': [ - 'mock_pref_change_callback.cc', - 'mock_pref_change_callback.h', - 'pref_store_observer_mock.cc', - 'pref_store_observer_mock.h', - 'testing_pref_service.cc', - 'testing_pref_service.h', - 'testing_pref_store.cc', - 'testing_pref_store.h', - ], - }, - ], -}
diff --git a/components/previews.gypi b/components/previews.gypi deleted file mode 100644 index 0839ec24..0000000 --- a/components/previews.gypi +++ /dev/null
@@ -1,24 +0,0 @@ -# Copyright 2016 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. - -{ - 'targets': [ - { - # GN version: //components/previews - 'target_name': 'previews', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - 'variations', - ], - 'sources': [ - 'previews/previews_experiments.cc', - 'previews/previews_experiments.h', - ] - }, - ], -}
diff --git a/components/printing.gypi b/components/printing.gypi deleted file mode 100644 index 3409644..0000000 --- a/components/printing.gypi +++ /dev/null
@@ -1,82 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN: //components/printing/common:printing_common - 'target_name': 'printing_common', - 'type': 'static_library', - 'dependencies': [ - '<(DEPTH)/base/base.gyp:base', - '<(DEPTH)/ipc/ipc.gyp:ipc', - '<(DEPTH)/printing/printing.gyp:printing', - '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', - '<(DEPTH)/ui/gfx/gfx.gyp:gfx', - ], - 'sources': [ - "printing/common/print_messages.cc", - "printing/common/print_messages.h", - "printing/common/printing_param_traits_macros.h", - ], - },{ - # GN: //components/printing/common:printing_renderer - 'target_name': 'printing_renderer', - 'type': 'static_library', - 'dependencies': [ - '<(DEPTH)/base/base.gyp:base', - '<(DEPTH)/content/content.gyp:content_common', - '<(DEPTH)/content/content.gyp:content_renderer', - '<(DEPTH)/net/net.gyp:net', - '<(DEPTH)/printing/printing.gyp:printing', - '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', - '<(DEPTH)/ui/base/ui_base.gyp:ui_base', - 'components_resources.gyp:components_resources', - 'printing_common', - ], - 'sources': [ - 'printing/renderer/print_web_view_helper.cc', - 'printing/renderer/print_web_view_helper.h', - 'printing/renderer/print_web_view_helper_android.cc', - 'printing/renderer/print_web_view_helper_linux.cc', - 'printing/renderer/print_web_view_helper_mac.mm', - 'printing/renderer/print_web_view_helper_pdf_win.cc', - ], - # TODO(dgn): C4267: http://crbug.com/167187 size_t -> int - 'msvs_disabled_warnings': [ 4267 ], - },{ - # GN: //components/printing/browser:printing_browser - 'target_name': 'printing_browser', - 'type': 'static_library', - 'dependencies': [ - '<(DEPTH)/printing/printing.gyp:printing', - '<(DEPTH)/skia/skia.gyp:skia', - ], - 'sources': [ - 'printing/browser/print_manager.cc', - 'printing/browser/print_manager.h', - 'printing/browser/print_manager_utils.cc', - 'printing/browser/print_manager_utils.h', - ], - },{ - # GN: //components/printing/test:printing_test_support - 'target_name': 'printing_test_support', - 'type': 'static_library', - 'dependencies': [ - '../content/content_shell_and_tests.gyp:test_support_content', - '../skia/skia.gyp:skia', - '<(DEPTH)/testing/gtest.gyp:gtest', - 'printing_renderer', - ], - 'sources': [ - 'printing/test/mock_printer.cc', - 'printing/test/mock_printer.h', - 'printing/test/print_mock_render_thread.cc', - 'printing/test/print_mock_render_thread.h', - 'printing/test/print_test_content_renderer_client.cc', - 'printing/test/print_test_content_renderer_client.h', - ], - }, - ], -}
diff --git a/components/profile_metrics.gypi b/components/profile_metrics.gypi deleted file mode 100644 index 49e713a..0000000 --- a/components/profile_metrics.gypi +++ /dev/null
@@ -1,24 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/profile_metrics - 'target_name': 'profile_metrics', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'profile_metrics/counts.cc', - 'profile_metrics/counts.h', - ], - }, - ], -}
diff --git a/components/proximity_auth.gypi b/components/proximity_auth.gypi deleted file mode 100644 index 0b6d7b4..0000000 --- a/components/proximity_auth.gypi +++ /dev/null
@@ -1,270 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/proximity_auth and - # //components/proximity_auth/ble. - 'target_name': 'proximity_auth', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - ':cryptauth', - ':cryptauth_proto', - ':proximity_auth_logging', - '../base/base.gyp:base', - '../device/bluetooth/bluetooth.gyp:device_bluetooth', - '../net/net.gyp:net', - 'prefs/prefs.gyp:prefs', - ], - 'sources': [ - "proximity_auth/authenticator.h", - "proximity_auth/ble/bluetooth_low_energy_characteristics_finder.cc", - "proximity_auth/ble/bluetooth_low_energy_characteristics_finder.h", - "proximity_auth/ble/bluetooth_low_energy_connection.cc", - "proximity_auth/ble/bluetooth_low_energy_connection.h", - "proximity_auth/ble/bluetooth_low_energy_connection_finder.cc", - "proximity_auth/ble/bluetooth_low_energy_connection_finder.h", - "proximity_auth/ble/bluetooth_low_energy_device_whitelist.cc", - "proximity_auth/ble/bluetooth_low_energy_device_whitelist.h", - "proximity_auth/ble/bluetooth_low_energy_weave_client_connection.cc", - "proximity_auth/ble/bluetooth_low_energy_weave_client_connection.h", - "proximity_auth/ble/bluetooth_low_energy_weave_defines.h", - "proximity_auth/ble/bluetooth_low_energy_weave_packet_generator.cc", - "proximity_auth/ble/bluetooth_low_energy_weave_packet_generator.h", - "proximity_auth/ble/bluetooth_low_energy_weave_packet_receiver.cc", - "proximity_auth/ble/bluetooth_low_energy_weave_packet_receiver.h", - "proximity_auth/ble/remote_attribute.h", - "proximity_auth/ble/fake_wire_message.cc", - "proximity_auth/ble/fake_wire_message.h", - "proximity_auth/ble/pref_names.cc", - "proximity_auth/ble/pref_names.h", - "proximity_auth/bluetooth_connection.cc", - "proximity_auth/bluetooth_connection.h", - "proximity_auth/bluetooth_connection_finder.cc", - "proximity_auth/bluetooth_connection_finder.h", - "proximity_auth/bluetooth_throttler.h", - "proximity_auth/bluetooth_throttler_impl.cc", - "proximity_auth/bluetooth_throttler_impl.h", - "proximity_auth/bluetooth_util.cc", - "proximity_auth/bluetooth_util.h", - "proximity_auth/bluetooth_util_chromeos.cc", - "proximity_auth/cryptauth_enroller_factory_impl.cc", - "proximity_auth/cryptauth_enroller_factory_impl.h", - "proximity_auth/connection.cc", - "proximity_auth/connection.h", - "proximity_auth/connection_finder.h", - "proximity_auth/connection_observer.h", - "proximity_auth/device_to_device_authenticator.cc", - "proximity_auth/device_to_device_authenticator.h", - "proximity_auth/device_to_device_initiator_operations.cc", - "proximity_auth/device_to_device_initiator_operations.h", - "proximity_auth/device_to_device_secure_context.cc", - "proximity_auth/device_to_device_secure_context.h", - "proximity_auth/messenger.h", - "proximity_auth/messenger_impl.cc", - "proximity_auth/messenger_impl.h", - "proximity_auth/messenger_observer.h", - "proximity_auth/metrics.cc", - "proximity_auth/metrics.h", - "proximity_auth/proximity_auth_client.h", - "proximity_auth/proximity_auth_pref_manager.cc", - "proximity_auth/proximity_auth_pref_manager.h", - "proximity_auth/proximity_auth_pref_names.cc", - "proximity_auth/proximity_auth_pref_names.h", - "proximity_auth/proximity_auth_system.cc", - "proximity_auth/proximity_auth_system.h", - "proximity_auth/proximity_monitor.h", - "proximity_auth/proximity_monitor_impl.cc", - "proximity_auth/proximity_monitor_impl.h", - "proximity_auth/proximity_monitor_observer.h", - "proximity_auth/remote_device.cc", - "proximity_auth/remote_device.h", - "proximity_auth/remote_device_loader.cc", - "proximity_auth/remote_device_loader.h", - "proximity_auth/remote_device_life_cycle.h", - "proximity_auth/remote_device_life_cycle_impl.h", - "proximity_auth/remote_device_life_cycle_impl.cc", - "proximity_auth/remote_status_update.cc", - "proximity_auth/remote_status_update.h", - "proximity_auth/screenlock_bridge.cc", - "proximity_auth/screenlock_bridge.h", - "proximity_auth/screenlock_state.h", - "proximity_auth/secure_context.h", - "proximity_auth/switches.cc", - "proximity_auth/switches.h", - "proximity_auth/throttled_bluetooth_connection_finder.cc", - "proximity_auth/throttled_bluetooth_connection_finder.h", - "proximity_auth/unlock_manager.cc", - "proximity_auth/unlock_manager.h", - "proximity_auth/wire_message.cc", - "proximity_auth/wire_message.h", - ], - - 'export_dependent_settings': [ - 'cryptauth_proto', - ], - }, - { - 'target_name': 'proximity_auth_test_support', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - ':cryptauth_test_support', - '../base/base.gyp:base', - '../testing/gmock.gyp:gmock', - ], - 'sources': [ - "proximity_auth/device_to_device_responder_operations.cc", - "proximity_auth/device_to_device_responder_operations.h", - "proximity_auth/fake_connection.cc", - "proximity_auth/fake_connection.h", - "proximity_auth/fake_secure_context.cc", - "proximity_auth/fake_secure_context.h", - "proximity_auth/mock_proximity_auth_client.cc", - "proximity_auth/mock_proximity_auth_client.h", - "proximity_auth/proximity_auth_test_util.cc", - "proximity_auth/proximity_auth_test_util.h", - ], - }, - { - # GN version: //components/proximity_auth/logging - 'target_name': 'proximity_auth_logging', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - ], - 'sources': [ - "proximity_auth/logging/log_buffer.cc", - "proximity_auth/logging/log_buffer.h", - "proximity_auth/logging/logging.h", - "proximity_auth/logging/logging.cc", - ] - }, - { - # GN version: //components/proximity_auth/cryptauth/proto - 'target_name': 'cryptauth_proto', - 'type': 'static_library', - 'sources': [ - 'proximity_auth/cryptauth/proto/cryptauth_api.proto', - 'proximity_auth/cryptauth/proto/securemessage.proto', - ], - 'variables': { - 'proto_in_dir': 'proximity_auth/cryptauth/proto', - 'proto_out_dir': 'components/proximity_auth/cryptauth/proto', - }, - 'includes': [ '../build/protoc.gypi' ] - }, - { - 'target_name': 'cryptauth', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - 'cryptauth_proto', - '../base/base.gyp:base', - '../crypto/crypto.gyp:crypto', - '../components/components.gyp:gcm_driver', - '../google_apis/google_apis.gyp:google_apis', - '../net/net.gyp:net', - ], - 'sources': [ - "proximity_auth/cryptauth/cryptauth_access_token_fetcher.h", - "proximity_auth/cryptauth/cryptauth_access_token_fetcher_impl.cc", - "proximity_auth/cryptauth/cryptauth_access_token_fetcher_impl.h", - "proximity_auth/cryptauth/cryptauth_api_call_flow.cc", - "proximity_auth/cryptauth/cryptauth_api_call_flow.h", - "proximity_auth/cryptauth/cryptauth_client.h", - "proximity_auth/cryptauth/cryptauth_client_impl.cc", - "proximity_auth/cryptauth/cryptauth_client_impl.h", - "proximity_auth/cryptauth/cryptauth_device_manager.cc", - "proximity_auth/cryptauth/cryptauth_device_manager.h", - "proximity_auth/cryptauth/cryptauth_enroller.h", - "proximity_auth/cryptauth/cryptauth_enroller_impl.cc", - "proximity_auth/cryptauth/cryptauth_enroller_impl.h", - "proximity_auth/cryptauth/cryptauth_enrollment_manager.cc", - "proximity_auth/cryptauth/cryptauth_enrollment_manager.h", - "proximity_auth/cryptauth/cryptauth_enrollment_utils.cc", - "proximity_auth/cryptauth/cryptauth_gcm_manager.cc", - "proximity_auth/cryptauth/cryptauth_gcm_manager.h", - "proximity_auth/cryptauth/cryptauth_gcm_manager_impl.cc", - "proximity_auth/cryptauth/cryptauth_gcm_manager_impl.h", - "proximity_auth/cryptauth/pref_names.cc", - "proximity_auth/cryptauth/pref_names.h", - "proximity_auth/cryptauth/secure_message_delegate.cc", - "proximity_auth/cryptauth/secure_message_delegate.h", - "proximity_auth/cryptauth/switches.cc", - "proximity_auth/cryptauth/switches.h", - "proximity_auth/cryptauth/sync_scheduler.cc", - "proximity_auth/cryptauth/sync_scheduler.h", - "proximity_auth/cryptauth/sync_scheduler_impl.cc", - "proximity_auth/cryptauth/sync_scheduler_impl.h", - ], - 'export_dependent_settings': [ - 'cryptauth_proto', - ], - }, - { - 'target_name': 'cryptauth_test_support', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - 'cryptauth_proto', - '../base/base.gyp:base', - '../testing/gmock.gyp:gmock', - ], - 'sources': [ - "proximity_auth/cryptauth/fake_cryptauth_gcm_manager.cc", - "proximity_auth/cryptauth/fake_cryptauth_gcm_manager.h", - "proximity_auth/cryptauth/fake_secure_message_delegate.cc", - "proximity_auth/cryptauth/fake_secure_message_delegate.h", - "proximity_auth/cryptauth/mock_cryptauth_client.cc", - "proximity_auth/cryptauth/mock_cryptauth_client.h", - "proximity_auth/cryptauth/mock_sync_scheduler.cc", - "proximity_auth/cryptauth/mock_sync_scheduler.h", - ], - 'export_dependent_settings': [ - 'cryptauth_proto', - ], - }, - { - # GN version: //components/proximity_auth/webui - 'target_name': 'proximity_auth_webui', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_browser', - '../ui/resources/ui_resources.gyp:ui_resources', - 'components_resources.gyp:components_resources', - 'cryptauth', - 'cryptauth_proto', - 'proximity_auth', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'proximity_auth/webui/proximity_auth_ui.cc', - 'proximity_auth/webui/proximity_auth_ui.h', - 'proximity_auth/webui/proximity_auth_webui_handler.cc', - 'proximity_auth/webui/proximity_auth_webui_handler.h', - 'proximity_auth/webui/reachable_phone_flow.cc', - 'proximity_auth/webui/reachable_phone_flow.h', - 'proximity_auth/webui/url_constants.cc', - 'proximity_auth/webui/url_constants.h', - ], - }, - ], -}
diff --git a/components/proxy_config.gypi b/components/proxy_config.gypi deleted file mode 100644 index f30b9f8..0000000 --- a/components/proxy_config.gypi +++ /dev/null
@@ -1,41 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/proxy_config - 'target_name': 'proxy_config', - 'type': '<(component)', - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - '../url/url.gyp:url_lib', - 'pref_registry', - 'prefs/prefs.gyp:prefs', - ], - 'include_dirs': [ - '..', - ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [ 4267, ], - 'defines': [ - 'PROXY_CONFIG_IMPLEMENTATION', - ], - 'sources': [ - 'proxy_config/pref_proxy_config_tracker.cc', - 'proxy_config/pref_proxy_config_tracker.h', - 'proxy_config/pref_proxy_config_tracker_impl.cc', - 'proxy_config/pref_proxy_config_tracker_impl.h', - 'proxy_config/proxy_config_dictionary.cc', - 'proxy_config/proxy_config_dictionary.h', - 'proxy_config/proxy_config_export.h', - 'proxy_config/proxy_config_pref_names.cc', - 'proxy_config/proxy_config_pref_names.h', - 'proxy_config/proxy_prefs.cc', - 'proxy_config/proxy_prefs.h', - ], - }, - ], -}
diff --git a/components/query_parser.gypi b/components/query_parser.gypi deleted file mode 100644 index 0b7f189f..0000000 --- a/components/query_parser.gypi +++ /dev/null
@@ -1,26 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - 'target_name': 'query_parser', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../base/base.gyp:base_i18n', - '../third_party/icu/icu.gyp:icuuc', - ], - 'sources': [ - 'query_parser/query_parser.cc', - 'query_parser/query_parser.h', - 'query_parser/snippet.cc', - 'query_parser/snippet.h', - ], - }, - ], -}
diff --git a/components/quirks.gypi b/components/quirks.gypi deleted file mode 100644 index 1e2c8e7..0000000 --- a/components/quirks.gypi +++ /dev/null
@@ -1,36 +0,0 @@ -# Copyright 2016 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. - -{ - 'targets': [ - { - # GN version: //components/quirks - 'target_name': 'quirks', - 'type': '<(component)', - 'dependencies': [ - '../base/base.gyp:base', - '../components/prefs/prefs.gyp:prefs', - '../net/net.gyp:net', - '../url/url.gyp:url_lib', - 'version_info', - ], - 'include_dirs': [ - '..', - ], - 'defines': [ - 'QUIRKS_IMPLEMENTATION', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'quirks/pref_names.cc', - 'quirks/pref_names.h', - 'quirks/quirks_client.cc', - 'quirks/quirks_client.h', - 'quirks/quirks_export.h', - 'quirks/quirks_manager.cc', - 'quirks/quirks_manager.h', - ], - }, - ], -}
diff --git a/components/rappor.gypi b/components/rappor.gypi deleted file mode 100644 index 8dd2dcf3..0000000 --- a/components/rappor.gypi +++ /dev/null
@@ -1,76 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/rappor - 'target_name': 'rappor', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../crypto/crypto.gyp:crypto', - '../net/net.gyp:net', - '../third_party/smhasher/smhasher.gyp:cityhash', - 'data_use_measurement_core', - 'metrics', - 'variations', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'rappor/bloom_filter.cc', - 'rappor/bloom_filter.h', - 'rappor/byte_vector_utils.cc', - 'rappor/byte_vector_utils.h', - 'rappor/log_uploader.cc', - 'rappor/log_uploader.h', - 'rappor/log_uploader_interface.h', - 'rappor/proto/rappor_metric.proto', - 'rappor/rappor_metric.cc', - 'rappor/rappor_metric.h', - 'rappor/rappor_parameters.cc', - 'rappor/rappor_parameters.h', - 'rappor/rappor_pref_names.cc', - 'rappor/rappor_pref_names.h', - 'rappor/rappor_prefs.cc', - 'rappor/rappor_prefs.h', - 'rappor/rappor_service.cc', - 'rappor/rappor_service.h', - 'rappor/rappor_utils.cc', - 'rappor/rappor_utils.h', - 'rappor/reports.cc', - 'rappor/reports.h', - 'rappor/sample.cc', - 'rappor/sample.h', - 'rappor/sampler.cc', - 'rappor/sampler.h', - ], - 'variables': { - 'proto_in_dir': 'rappor/proto', - 'proto_out_dir': 'components/rappor/proto', - }, - 'includes': [ '../build/protoc.gypi' ], - }, - { - # GN version: //components/rappor:test_support - 'target_name': 'rappor_test_support', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - 'rappor', - ], - 'sources': [ - 'rappor/test_log_uploader.cc', - 'rappor/test_log_uploader.h', - 'rappor/test_rappor_service.cc', - 'rappor/test_rappor_service.h', - ], - }, - ], -}
diff --git a/components/renderer_context_menu.gypi b/components/renderer_context_menu.gypi deleted file mode 100644 index 4e516d2..0000000 --- a/components/renderer_context_menu.gypi +++ /dev/null
@@ -1,32 +0,0 @@ -# Copyright 2014 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. -{ - 'targets': [ - { - 'target_name': 'renderer_context_menu', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_browser', - '../components/components.gyp:search_engines', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'renderer_context_menu/context_menu_content_type.cc', - 'renderer_context_menu/context_menu_content_type.h', - 'renderer_context_menu/context_menu_delegate.cc', - 'renderer_context_menu/context_menu_delegate.h', - 'renderer_context_menu/render_view_context_menu_base.cc', - 'renderer_context_menu/render_view_context_menu_base.h', - 'renderer_context_menu/render_view_context_menu_observer.cc', - 'renderer_context_menu/render_view_context_menu_observer.h', - 'renderer_context_menu/render_view_context_menu_proxy.h', - 'renderer_context_menu/views/toolkit_delegate_views.cc', - 'renderer_context_menu/views/toolkit_delegate_views.h', - ], - }, - ], -}
diff --git a/components/rlz.gypi b/components/rlz.gypi deleted file mode 100644 index 9030258..0000000 --- a/components/rlz.gypi +++ /dev/null
@@ -1,38 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/rlz - 'target_name': 'rlz', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - '../rlz/rlz.gyp:rlz_lib', - 'google_core_browser', - ], - 'sources': [ - 'rlz/rlz_tracker.cc', - 'rlz/rlz_tracker.h', - 'rlz/rlz_tracker_chromeos.cc', - 'rlz/rlz_tracker_delegate.h', - 'rlz/rlz_tracker_ios.cc', - 'rlz/rlz_tracker_mac.cc', - 'rlz/rlz_tracker_win.cc', - ], - 'conditions': [ - ['OS == "ios"', { - 'dependencies': [ - '../ui/base/ui_base.gyp:ui_base', - ], - }], - ], - }, - ], -}
diff --git a/components/safe_browsing_db.gypi b/components/safe_browsing_db.gypi deleted file mode 100644 index 0eafb82..0000000 --- a/components/safe_browsing_db.gypi +++ /dev/null
@@ -1,146 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/safe_browsing_db:safe_browsing_db_shared - 'target_name': 'safe_browsing_db_shared', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../components/components.gyp:metrics', - '../crypto/crypto.gyp:crypto', - ':safebrowsing_proto', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'safe_browsing_db/database_manager.h', - 'safe_browsing_db/database_manager.cc', - 'safe_browsing_db/hit_report.h', - 'safe_browsing_db/hit_report.cc', - 'safe_browsing_db/prefix_set.h', - 'safe_browsing_db/prefix_set.cc', - 'safe_browsing_db/util.h', - 'safe_browsing_db/util.cc', - 'safe_browsing_db/v4_protocol_manager_util.h', - 'safe_browsing_db/v4_protocol_manager_util.cc', - 'safe_browsing_db/v4_get_hash_protocol_manager.h', - 'safe_browsing_db/v4_get_hash_protocol_manager.cc', - ], - 'include_dirs': [ - '..', - ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [4267, ], - }, - { - # GN version: //components/safe_browsing_db - 'target_name': 'safe_browsing_db', - 'type': 'static_library', - 'dependencies': [ - ':safe_browsing_db_shared', - ':v4_store_proto', - ], - 'sources': [ - 'safe_browsing_db/v4_database.h', - 'safe_browsing_db/v4_database.cc', - 'safe_browsing_db/v4_local_database_manager.h', - 'safe_browsing_db/v4_local_database_manager.cc', - 'safe_browsing_db/v4_rice.h', - 'safe_browsing_db/v4_rice.cc', - 'safe_browsing_db/v4_store.h', - 'safe_browsing_db/v4_store.cc', - 'safe_browsing_db/v4_update_protocol_manager.h', - 'safe_browsing_db/v4_update_protocol_manager.cc', - ], - 'include_dirs': [ - '..', - ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [4267, ], - }, - { - # GN version: //components/safe_browsing_db:safe_browsing_db_mobile - 'target_name': 'safe_browsing_db_mobile', - 'type': 'static_library', - 'dependencies': [ - ':safe_browsing_db_shared', - ':safe_browsing_metadata_proto', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'safe_browsing_db/remote_database_manager.h', - 'safe_browsing_db/remote_database_manager.cc', - 'safe_browsing_db/safe_browsing_api_handler.h', - 'safe_browsing_db/safe_browsing_api_handler.cc', - 'safe_browsing_db/safe_browsing_api_handler_util.h', - 'safe_browsing_db/safe_browsing_api_handler_util.cc', - ], - 'include_dirs': [ - '..', - ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [4267, ], - }, - { - # GN version: //components/safe_browsing_db:safebrowsing_proto - # Protobuf compiler / generator for the Safe Browsing protocol buffer. - 'target_name': 'safebrowsing_proto', - 'type': 'static_library', - 'sources': [ 'safe_browsing_db/safebrowsing.proto' ], - 'variables': { - 'proto_in_dir': 'safe_browsing_db', - 'proto_out_dir': 'components/safe_browsing_db', - }, - 'includes': [ '../build/protoc.gypi' ] - }, - { - # Protobuf compiler / generator for the safebrowsing full hash metadata - # protocol buffer. - # GN version: //components/safe_browsing_db:metadata_proto - 'target_name': 'safe_browsing_metadata_proto', - 'type': 'static_library', - 'sources': [ 'safe_browsing_db/metadata.proto' ], - 'variables': { - 'proto_in_dir': 'safe_browsing_db', - 'proto_out_dir': 'components/safe_browsing_db', - }, - 'includes': [ '../build/protoc.gypi' ] - }, - { - # GN version: //components/safe_browsing_db:v4_store_proto - # Protobuf compiler / generator for the Safe Browsing protocol buffer for - # storing hash-prefixes on disk. - 'target_name': 'v4_store_proto', - 'type': 'static_library', - 'dependencies': [ - ':safebrowsing_proto', - ], - 'sources': [ 'safe_browsing_db/v4_store.proto' ], - 'variables': { - 'proto_in_dir': 'safe_browsing_db', - 'proto_out_dir': 'components/safe_browsing_db', - }, - 'includes': [ '../build/protoc.gypi' ] - }, - { - # GN version: //components/safe_browsing_db:test_database_manager - 'target_name': 'test_database_manager', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - ':safe_browsing_db', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'safe_browsing_db/test_database_manager.h', - 'safe_browsing_db/test_database_manager.cc', - ], - 'include_dirs': [ - '..', - ], - }, - ], -}
diff --git a/components/safe_json.gypi b/components/safe_json.gypi deleted file mode 100644 index bdd3464..0000000 --- a/components/safe_json.gypi +++ /dev/null
@@ -1,127 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/safe_json - 'target_name': 'safe_json', - 'type': 'static_library', - 'dependencies': [ - 'safe_json_mojo_bindings', - '../base/base.gyp:base', - '../components/components_strings.gyp:components_strings', - '../content/content.gyp:content_browser', - '../content/content.gyp:content_common', - '../ui/base/ui_base.gyp:ui_base', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'safe_json/android/component_jni_registrar.cc', - 'safe_json/android/component_jni_registrar.h', - 'safe_json/json_sanitizer.cc', - 'safe_json/json_sanitizer.h', - 'safe_json/json_sanitizer_android.cc', - 'safe_json/safe_json_parser.cc', - 'safe_json/safe_json_parser.h', - 'safe_json/safe_json_parser_android.cc', - 'safe_json/safe_json_parser_android.h', - 'safe_json/safe_json_parser_impl.cc', - 'safe_json/safe_json_parser_impl.h', - ], - 'conditions': [ - ['OS == "android"', { - 'dependencies': [ - 'safe_json_jni_headers', - ], - 'sources!': [ - 'safe_json/json_sanitizer.cc', - 'safe_json/safe_json_parser_impl.cc', - 'safe_json/safe_json_parser_impl.h', - ], - }], - ], - }, - { - 'target_name': 'safe_json_test_support', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - ':safe_json', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'safe_json/testing_json_parser.cc', - 'safe_json/testing_json_parser.h', - ], - }, - { - # GN version: //components/safe_json/public/interfaces - 'target_name': 'safe_json_mojo_bindings', - 'type': 'static_library', - 'variables': { - 'mojom_typemaps': [ - 'safe_json/public/interfaces/safe_json.typemap', - ], - 'use_new_wrapper_types': 'false', - }, - 'sources': [ - 'safe_json/public/interfaces/safe_json.mojom', - ], - 'includes': [ '../mojo/mojom_bindings_generator.gypi'], - }, - { - 'target_name': 'safe_json_parser_mojo', - 'type': 'static_library', - 'dependencies': [ - 'safe_json_mojo_bindings', - '../base/base.gyp:base', - '../content/content.gyp:content_common', - '../content/content.gyp:content_utility', - '../ipc/ipc.gyp:ipc', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'safe_json/utility/safe_json_parser_mojo_impl.cc', - 'safe_json/utility/safe_json_parser_mojo_impl.h', - ], - }, - ], - 'conditions': [ - ['OS=="android"', { - 'targets': [ - { - # GN version: //components/safe_json/android:safe_json_java - 'target_name': 'safe_json_java', - 'type': 'none', - 'dependencies': [ - '../base/base.gyp:base', - ], - 'variables': { - 'java_in_dir': 'safe_json/android/java', - }, - 'includes': [ '../build/java.gypi' ], - }, - { - # GN version: //components/safe_json:jni - 'target_name': 'safe_json_jni_headers', - 'type': 'none', - 'sources': [ - 'safe_json/android/java/src/org/chromium/components/safejson/JsonSanitizer.java', - ], - 'variables': { - 'jni_gen_package': 'safe_json', - }, - 'includes': [ '../build/jni_generator.gypi' ], - }, - ], - }], - ] -}
diff --git a/components/search.gypi b/components/search.gypi deleted file mode 100644 index 5c79aa70..0000000 --- a/components/search.gypi +++ /dev/null
@@ -1,27 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - 'target_name': 'search', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../url/url.gyp:url_lib', - 'google_core_browser', - 'search_engines', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'search/search.cc', - 'search/search.h', - 'search/search_switches.cc', - 'search/search_switches.h', - ], - }, - ], -}
diff --git a/components/search_engines.gypi b/components/search_engines.gypi deleted file mode 100644 index b36e827..0000000 --- a/components/search_engines.gypi +++ /dev/null
@@ -1,112 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/search_engines - 'target_name': 'search_engines', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../google_apis/google_apis.gyp:google_apis', - '../net/net.gyp:net', - '../sql/sql.gyp:sql', - '../components/sync.gyp:sync', - '../third_party/libxml/libxml.gyp:libxml', - '../ui/gfx/gfx.gyp:gfx', - '../url/url.gyp:url_lib', - 'component_metrics_proto', - 'components_strings.gyp:components_strings', - 'components.gyp:infobars_core', - 'google_core_browser', - 'history_core_browser', - 'keyed_service_core', - 'policy', - 'pref_registry', - 'prefs/prefs.gyp:prefs', - 'rappor', - 'search_engines/prepopulated_engines.gyp:prepopulated_engines', - 'url_formatter/url_formatter.gyp:url_formatter', - 'webdata_common', - ], - 'export_dependent_settings': [ - 'component_metrics_proto', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'search_engines/default_search_manager.cc', - 'search_engines/default_search_manager.h', - 'search_engines/default_search_policy_handler.cc', - 'search_engines/default_search_policy_handler.h', - 'search_engines/default_search_pref_migration.cc', - 'search_engines/default_search_pref_migration.h', - 'search_engines/keyword_table.cc', - 'search_engines/keyword_table.h', - 'search_engines/keyword_web_data_service.cc', - 'search_engines/keyword_web_data_service.h', - 'search_engines/search_engine_data_type_controller.cc', - 'search_engines/search_engine_data_type_controller.h', - 'search_engines/search_engine_type.h', - 'search_engines/search_engines_pref_names.cc', - 'search_engines/search_engines_pref_names.h', - 'search_engines/search_engines_switches.cc', - 'search_engines/search_engines_switches.h', - 'search_engines/search_host_to_urls_map.cc', - 'search_engines/search_host_to_urls_map.h', - 'search_engines/search_terms_data.cc', - 'search_engines/search_terms_data.h', - 'search_engines/template_url.cc', - 'search_engines/template_url.h', - 'search_engines/template_url_data.cc', - 'search_engines/template_url_data.h', - 'search_engines/template_url_fetcher.cc', - 'search_engines/template_url_fetcher.h', - 'search_engines/template_url_id.h', - 'search_engines/template_url_parser.cc', - 'search_engines/template_url_parser.h', - 'search_engines/template_url_prepopulate_data.cc', - 'search_engines/template_url_prepopulate_data.h', - 'search_engines/template_url_service.cc', - 'search_engines/template_url_service.h', - 'search_engines/template_url_service_client.h', - 'search_engines/template_url_service_observer.h', - 'search_engines/util.cc', - 'search_engines/util.h', - ], - 'conditions': [ - ['configuration_policy==0', { - 'dependencies!': [ - 'policy' - ], - 'sources!': [ - 'search_engines/default_search_policy_handler.cc', - 'search_engines/default_search_policy_handler.h', - ], - }], - ], - }, - { - # GN version: //components/search_engines:test_support - 'target_name': 'search_engines_test_support', - 'type': 'static_library', - 'dependencies': [ - '../testing/gtest.gyp:gtest', - 'search_engines', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'search_engines/default_search_pref_test_util.cc', - 'search_engines/default_search_pref_test_util.h', - 'search_engines/testing_search_terms_data.cc', - 'search_engines/testing_search_terms_data.h', - ], - }, - ], -}
diff --git a/components/search_engines/prepopulated_engines.gyp b/components/search_engines/prepopulated_engines.gyp deleted file mode 100644 index c67aa68..0000000 --- a/components/search_engines/prepopulated_engines.gyp +++ /dev/null
@@ -1,25 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/search_engines:prepopulated_engines - 'target_name': 'prepopulated_engines', - 'type': 'static_library', - 'sources': [ - 'prepopulated_engines.json', - ], - 'includes': [ - '../../build/json_to_struct.gypi', - ], - 'variables': { - 'chromium_code': 1, - 'schema_file': 'prepopulated_engines_schema.json', - 'namespace': 'TemplateURLPrepopulateData', - 'cc_dir': 'components/search_engines', - }, - }, - ], -}
diff --git a/components/search_provider_logos.gypi b/components/search_provider_logos.gypi deleted file mode 100644 index a46b767..0000000 --- a/components/search_provider_logos.gypi +++ /dev/null
@@ -1,34 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - 'target_name': 'search_provider_logos', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - '../skia/skia.gyp:skia', - '../ui/gfx/gfx.gyp:gfx', - '../url/url.gyp:url_lib', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'search_provider_logos/google_logo_api.cc', - 'search_provider_logos/google_logo_api.h', - 'search_provider_logos/logo_cache.cc', - 'search_provider_logos/logo_cache.h', - 'search_provider_logos/logo_common.cc', - 'search_provider_logos/logo_common.h', - 'search_provider_logos/logo_tracker.cc', - 'search_provider_logos/logo_tracker.h', - 'search_provider_logos/switches.cc', - 'search_provider_logos/switches.h', - ], - }, - ], -}
diff --git a/components/security_interstitials.gypi b/components/security_interstitials.gypi deleted file mode 100644 index 025aba7f..0000000 --- a/components/security_interstitials.gypi +++ /dev/null
@@ -1,42 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/security_interstitials/core - 'target_name': 'security_interstitials_core', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../base/base.gyp:base_i18n', - '../net/net.gyp:net', - '../ui/base/ui_base.gyp:ui_base', - 'components_strings.gyp:components_strings', - 'google_core_browser', - 'history_core_browser', - 'metrics', - 'rappor', - 'ssl_errors', - 'url_formatter/url_formatter.gyp:url_formatter' - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'security_interstitials/core/bad_clock_ui.cc', - 'security_interstitials/core/bad_clock_ui.h', - 'security_interstitials/core/common_string_util.cc', - 'security_interstitials/core/common_string_util.h', - 'security_interstitials/core/controller_client.cc', - 'security_interstitials/core/controller_client.h', - 'security_interstitials/core/metrics_helper.cc', - 'security_interstitials/core/metrics_helper.h', - 'security_interstitials/core/ssl_error_ui.cc', - 'security_interstitials/core/ssl_error_ui.h', - ] - } - ] -} \ No newline at end of file
diff --git a/components/security_state.gypi b/components/security_state.gypi deleted file mode 100644 index d1376b4..0000000 --- a/components/security_state.gypi +++ /dev/null
@@ -1,42 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - 'target_name': 'security_state', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'security_state/security_state_model.cc', - 'security_state/security_state_model.h', - 'security_state/security_state_model_client.h', - 'security_state/switches.cc', - 'security_state/switches.h', - ] - }, - ], - 'conditions' : [ - ['OS=="android"', { - 'targets': [ - { - # GN: //components/security_state:security_state_enums_java - 'target_name': 'security_state_enums_java', - 'type': 'none', - 'variables': { - 'source_file': 'security_state/security_state_model.h', - }, - 'includes': [ '../build/android/java_cpp_enum.gypi' ], - }, - ], - }, - ], - ], -}
diff --git a/components/session_manager.gypi b/components/session_manager.gypi deleted file mode 100644 index e87d3e0..0000000 --- a/components/session_manager.gypi +++ /dev/null
@@ -1,27 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN: //components/session_manager/core - 'target_name': 'session_manager_component', - 'type': '<(component)', - 'dependencies': [ - '../base/base.gyp:base', - ], - 'include_dirs': [ - '..', - ], - 'defines': [ - 'SESSION_IMPLEMENTATION', - ], - 'sources': [ - 'session_manager/core/session_manager.cc', - 'session_manager/core/session_manager.h', - 'session_manager/session_manager_export.h', - ], - }, - ], -}
diff --git a/components/sessions.gypi b/components/sessions.gypi deleted file mode 100644 index 33ca3729..0000000 --- a/components/sessions.gypi +++ /dev/null
@@ -1,167 +0,0 @@ -# Copyright 2013 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. - -{ - 'variables': { - # Core sources shared by sessions_content and sessions_ios. These can't - # be a separate shared library since one symbol is implemented higher up in - # the sessions_content/ios layer. - 'sessions_core_sources': [ - 'sessions/core/base_session_service.cc', - 'sessions/core/base_session_service.h', - 'sessions/core/base_session_service_commands.cc', - 'sessions/core/base_session_service_commands.h', - 'sessions/core/base_session_service_delegate.h', - 'sessions/core/live_tab.cc', - 'sessions/core/live_tab.h', - 'sessions/core/live_tab_context.h', - 'sessions/core/persistent_tab_restore_service.cc', - 'sessions/core/persistent_tab_restore_service.h', - 'sessions/core/serialized_navigation_driver.h', - 'sessions/core/serialized_navigation_entry.cc', - 'sessions/core/serialized_navigation_entry.h', - 'sessions/core/session_backend.cc', - 'sessions/core/session_backend.h', - 'sessions/core/session_command.cc', - 'sessions/core/session_command.h', - 'sessions/core/session_constants.cc', - 'sessions/core/session_constants.h', - 'sessions/core/session_id.cc', - 'sessions/core/session_id.h', - 'sessions/core/session_service_commands.cc', - 'sessions/core/session_service_commands.h', - 'sessions/core/session_types.cc', - 'sessions/core/session_types.h', - 'sessions/core/tab_restore_service.cc', - 'sessions/core/tab_restore_service.h', - 'sessions/core/tab_restore_service_client.cc', - 'sessions/core/tab_restore_service_client.h', - 'sessions/core/tab_restore_service_helper.cc', - 'sessions/core/tab_restore_service_helper.h', - 'sessions/core/tab_restore_service_observer.h', - ], - }, - 'targets': [ - { - # GN version: //components/sessions:test_support - 'target_name': 'sessions_test_support', - 'type': 'static_library', - 'dependencies': [ - '../skia/skia.gyp:skia', - '../components/sync.gyp:sync', - '../testing/gtest.gyp:gtest', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'sessions/core/serialized_navigation_entry_test_helper.cc', - 'sessions/core/serialized_navigation_entry_test_helper.h', - ], - 'conditions': [ - ['OS!="ios" and OS!="android"', { - 'sources': [ - 'sessions/core/base_session_service_test_helper.cc', - 'sessions/core/base_session_service_test_helper.h', - ], - }], - ], - }, - ], - - # Platform-specific targets. - 'conditions': [ - ['OS!="ios"', { - 'targets': [ - { - # GN version: //components/sessions - 'target_name': 'sessions_content', - 'type': '<(component)', - 'dependencies': [ - '../base/base.gyp:base', - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '../content/content.gyp:content_browser', - '../skia/skia.gyp:skia', - '../components/sync.gyp:sync', - '../third_party/protobuf/protobuf.gyp:protobuf_lite', - '../ui/base/ui_base.gyp:ui_base', - '../ui/gfx/gfx.gyp:gfx_geometry', - '../url/url.gyp:url_lib', - 'keyed_service_core', - 'variations', - ], - 'include_dirs': [ - '..', - ], - 'defines': [ - 'SESSIONS_IMPLEMENTATION', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - '<@(sessions_core_sources)', - - 'sessions/content/content_live_tab.cc', - 'sessions/content/content_live_tab.h', - 'sessions/content/content_platform_specific_tab_data.cc', - 'sessions/content/content_platform_specific_tab_data.h', - 'sessions/content/content_record_password_state.cc', - 'sessions/content/content_record_password_state.h', - 'sessions/content/content_serialized_navigation_builder.cc', - 'sessions/content/content_serialized_navigation_builder.h', - 'sessions/content/content_serialized_navigation_driver.cc', - 'sessions/content/content_serialized_navigation_driver.h', - ], - 'conditions': [ - ['OS=="android"', { - 'sources': [ - 'sessions/core/in_memory_tab_restore_service.cc', - 'sessions/core/in_memory_tab_restore_service.h', - ], - 'sources!': [ - 'sessions/core/persistent_tab_restore_service.cc', - ], - }, - ], - ], - }], - }, { # OS==ios - 'targets': [ - { - # GN version: //components/sessions - 'target_name': 'sessions_ios', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../ios/web/ios_web.gyp:ios_web', - '../components/sync.gyp:sync', - '../third_party/protobuf/protobuf.gyp:protobuf_lite', - '../ui/base/ui_base.gyp:ui_base', - '../ui/gfx/gfx.gyp:gfx_geometry', - '../url/url.gyp:url_lib', - 'keyed_service_core', - 'variations', - ], - 'include_dirs': [ - '..', - ], - 'defines': [ - 'SESSIONS_IMPLEMENTATION', - ], - 'sources': [ - '<@(sessions_core_sources)', - - 'sessions/ios/ios_live_tab.h', - 'sessions/ios/ios_live_tab.mm', - 'sessions/ios/ios_serialized_navigation_builder.h', - 'sessions/ios/ios_serialized_navigation_builder.mm', - 'sessions/ios/ios_serialized_navigation_driver.cc', - 'sessions/ios/ios_serialized_navigation_driver.h', - ], - }, - ], - }], - ], - -}
diff --git a/components/signin.gypi b/components/signin.gypi deleted file mode 100644 index 2bd8d1b1..0000000 --- a/components/signin.gypi +++ /dev/null
@@ -1,266 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/signin/core/common - 'target_name': 'signin_core_common', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'sources': [ - 'signin/core/common/profile_management_switches.cc', - 'signin/core/common/profile_management_switches.h', - 'signin/core/common/signin_pref_names.cc', - 'signin/core/common/signin_pref_names.h', - 'signin/core/common/signin_switches.cc', - 'signin/core/common/signin_switches.h', - ], - }, - { - # GN version: //components/signin/core/account_id - 'target_name': 'signin_core_account_id', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'sources': [ - 'signin/core/account_id/account_id.cc', - 'signin/core/account_id/account_id.h', - ], - }, - { - # GN version: //components/signin/core/browser - 'target_name': 'signin_core_browser', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../base/base.gyp:base_i18n', - '../crypto/crypto.gyp:crypto', - '../google_apis/google_apis.gyp:google_apis', - '../net/net.gyp:net', - '../sql/sql.gyp:sql', - '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp', - '../third_party/icu/icu.gyp:icui18n', - '../third_party/icu/icu.gyp:icuuc', - 'content_settings_core_browser', - 'content_settings_core_common', - 'google_core_browser', - 'invalidation_public', - 'keyed_service_core', - 'metrics', - 'os_crypt', - 'prefs/prefs.gyp:prefs', - 'signin_core_common', - 'signin_core_account_id', - 'webdata_common', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: file list duplicated in GN build. - 'signin/core/browser/about_signin_internals.cc', - 'signin/core/browser/about_signin_internals.h', - 'signin/core/browser/account_fetcher_service.cc', - 'signin/core/browser/account_fetcher_service.h', - 'signin/core/browser/account_info.cc', - 'signin/core/browser/account_info.h', - 'signin/core/browser/account_info_fetcher.cc', - 'signin/core/browser/account_info_fetcher.h', - 'signin/core/browser/account_investigator.cc', - 'signin/core/browser/account_investigator.h', - 'signin/core/browser/account_reconcilor.cc', - 'signin/core/browser/account_reconcilor.h', - 'signin/core/browser/account_tracker_service.cc', - 'signin/core/browser/account_tracker_service.h', - 'signin/core/browser/android/component_jni_registrar.cc', - 'signin/core/browser/android/component_jni_registrar.h', - 'signin/core/browser/child_account_info_fetcher.cc', - 'signin/core/browser/child_account_info_fetcher.h', - 'signin/core/browser/child_account_info_fetcher_android.cc', - 'signin/core/browser/child_account_info_fetcher_android.h', - 'signin/core/browser/child_account_info_fetcher_impl.cc', - 'signin/core/browser/child_account_info_fetcher_impl.h', - 'signin/core/browser/device_activity_fetcher.cc', - 'signin/core/browser/device_activity_fetcher.h', - 'signin/core/browser/gaia_cookie_manager_service.cc', - 'signin/core/browser/gaia_cookie_manager_service.h', - 'signin/core/browser/profile_identity_provider.cc', - 'signin/core/browser/profile_identity_provider.h', - 'signin/core/browser/profile_oauth2_token_service.cc', - 'signin/core/browser/profile_oauth2_token_service.h', - 'signin/core/browser/refresh_token_annotation_request.cc', - 'signin/core/browser/refresh_token_annotation_request.h', - 'signin/core/browser/signin_client.cc', - 'signin/core/browser/signin_client.h', - 'signin/core/browser/signin_cookie_changed_subscription.cc', - 'signin/core/browser/signin_cookie_changed_subscription.h', - 'signin/core/browser/signin_error_controller.cc', - 'signin/core/browser/signin_error_controller.h', - 'signin/core/browser/signin_header_helper.cc', - 'signin/core/browser/signin_header_helper.h', - 'signin/core/browser/signin_internals_util.cc', - 'signin/core/browser/signin_internals_util.h', - 'signin/core/browser/signin_investigator.cc', - 'signin/core/browser/signin_investigator.h', - 'signin/core/browser/signin_manager.cc', - 'signin/core/browser/signin_manager.h', - 'signin/core/browser/signin_manager_base.cc', - 'signin/core/browser/signin_manager_base.h', - 'signin/core/browser/signin_metrics.cc', - 'signin/core/browser/signin_metrics.h', - 'signin/core/browser/signin_status_metrics_provider.cc', - 'signin/core/browser/signin_status_metrics_provider.h', - 'signin/core/browser/signin_status_metrics_provider_base.cc', - 'signin/core/browser/signin_status_metrics_provider_base.h', - 'signin/core/browser/signin_status_metrics_provider_delegate.cc', - 'signin/core/browser/signin_status_metrics_provider_delegate.h', - 'signin/core/browser/signin_tracker.cc', - 'signin/core/browser/signin_tracker.h', - 'signin/core/browser/webdata/token_service_table.cc', - 'signin/core/browser/webdata/token_service_table.h', - 'signin/core/browser/webdata/token_web_data.cc', - 'signin/core/browser/webdata/token_web_data.h', - ], - 'conditions': [ - ['OS=="android"', { - 'dependencies': [ - 'signin_core_browser_jni_headers', - ], - 'sources!': [ - 'signin/core/browser/child_account_info_fetcher_impl.cc', - 'signin/core/browser/child_account_info_fetcher_impl.h', - ], - }], - ['chromeos==1', { - 'sources!': [ - 'signin/core/browser/signin_manager.cc', - 'signin/core/browser/signin_status_metrics_provider.cc', - 'signin/core/browser/signin_status_metrics_provider_delegate.cc', - ], - }], - ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [4267, ], - }, - { - # GN version: //components/signin/core/browser:test_support - 'target_name': 'signin_core_browser_test_support', - 'type': 'static_library', - 'dependencies': [ - 'signin_core_browser', - '../testing/gtest.gyp:gtest', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: file list duplicated in GN build. - 'signin/core/browser/fake_account_fetcher_service.cc', - 'signin/core/browser/fake_account_fetcher_service.h', - 'signin/core/browser/fake_auth_status_provider.cc', - 'signin/core/browser/fake_auth_status_provider.h', - 'signin/core/browser/fake_gaia_cookie_manager_service.cc', - 'signin/core/browser/fake_gaia_cookie_manager_service.h', - 'signin/core/browser/fake_profile_oauth2_token_service.cc', - 'signin/core/browser/fake_profile_oauth2_token_service.h', - 'signin/core/browser/fake_signin_manager.cc', - 'signin/core/browser/fake_signin_manager.h', - 'signin/core/browser/test_signin_client.cc', - 'signin/core/browser/test_signin_client.h', - ], - }, - ], - 'conditions': [ - ['OS == "android"', { - 'targets': [ - { - # GN version: //components/signin/core/browser/android:java - 'target_name': 'signin_core_browser_java', - 'type': 'none', - 'dependencies': [ - '../base/base.gyp:base', - '../components/sync.gyp:sync_java', - ], - 'variables': { - 'java_in_dir': 'signin/core/browser/android/java', - }, - 'includes': [ '../build/java.gypi' ], - }, - { - # GN version: //components/signin/core/browser/android:jni_headers - 'target_name': 'signin_core_browser_jni_headers', - 'type': 'none', - 'sources': [ - 'signin/core/browser/android/java/src/org/chromium/components/signin/ChildAccountInfoFetcher.java', - ], - 'variables': { - 'jni_gen_package': 'components/signin', - }, - 'includes': [ '../build/jni_generator.gypi' ], - }, - { - # GN: //components/signin/core/browser:investigated_scenario_java - 'target_name': 'investigated_scenario_java', - 'type': 'none', - 'variables': { - 'source_file': 'signin/core/browser/signin_investigator.h', - }, - 'includes': [ '../build/android/java_cpp_enum.gypi' ], - }, - ], - }], - ['OS == "ios"', { - 'targets': [ - { - # GN version: //components/signin/ios/browser - 'target_name': 'signin_ios_browser', - 'type': 'static_library', - 'dependencies': [ - '../ios/web/ios_web.gyp:ios_web', - 'signin_core_browser', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: file list duplicated in GN build. - 'signin/ios/browser/account_consistency_service.h', - 'signin/ios/browser/account_consistency_service.mm', - 'signin/ios/browser/manage_accounts_delegate.h', - 'signin/ios/browser/merge_session_observer_bridge.h', - 'signin/ios/browser/merge_session_observer_bridge.mm', - 'signin/ios/browser/oauth2_token_service_observer_bridge.h', - 'signin/ios/browser/oauth2_token_service_observer_bridge.mm', - 'signin/ios/browser/profile_oauth2_token_service_ios_delegate.h', - 'signin/ios/browser/profile_oauth2_token_service_ios_delegate.mm', - 'signin/ios/browser/profile_oauth2_token_service_ios_provider.h', - 'signin/ios/browser/profile_oauth2_token_service_ios_provider.mm', - ], - }, - { - # GN version: //components/signin/ios/browser:test_support - 'target_name': 'signin_ios_browser_test_support', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../google_apis/google_apis.gyp:google_apis_test_support', - 'signin_ios_browser', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: file list duplicated in GN build. - 'signin/ios/browser/fake_profile_oauth2_token_service_ios_provider.h', - 'signin/ios/browser/fake_profile_oauth2_token_service_ios_provider.mm', - ], - }, - ], - }], - ], -}
diff --git a/components/spellcheck.gypi b/components/spellcheck.gypi deleted file mode 100644 index 4615ec7..0000000 --- a/components/spellcheck.gypi +++ /dev/null
@@ -1,82 +0,0 @@ -# Copyright 2016 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. - -{ - 'targets': [ - { - # GN version: //components/spellcheck/common - 'target_name': 'spellcheck_common', - 'type': 'static_library', - 'dependencies': [ - '../third_party/icu/icu.gyp:icui18n', - '../third_party/icu/icu.gyp:icuuc', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'spellcheck/common/spellcheck_bdict_language.h', - 'spellcheck/common/spellcheck_common.cc', - 'spellcheck/common/spellcheck_common.h', - 'spellcheck/common/spellcheck_marker.h', - 'spellcheck/common/spellcheck_message_generator.cc', - 'spellcheck/common/spellcheck_message_generator.h', - 'spellcheck/common/spellcheck_messages.h', - 'spellcheck/common/spellcheck_result.h', - 'spellcheck/common/spellcheck_switches.cc', - 'spellcheck/common/spellcheck_switches.h', - ], - }, - { - # GN version: //components/spellcheck/renderer - 'target_name': 'spellcheck_renderer', - 'type': 'static_library', - 'dependencies': [ - 'spellcheck_common', - '../third_party/icu/icu.gyp:icui18n', - '../third_party/icu/icu.gyp:icuuc', - '../third_party/WebKit/public/blink.gyp:blink', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'spellcheck/renderer/custom_dictionary_engine.cc', - 'spellcheck/renderer/custom_dictionary_engine.h', - 'spellcheck/renderer/hunspell_engine.cc', - 'spellcheck/renderer/hunspell_engine.h', - 'spellcheck/renderer/platform_spelling_engine.cc', - 'spellcheck/renderer/platform_spelling_engine.h', - 'spellcheck/renderer/spellcheck.cc', - 'spellcheck/renderer/spellcheck.h', - 'spellcheck/renderer/spellcheck_language.cc', - 'spellcheck/renderer/spellcheck_language.h', - 'spellcheck/renderer/spellcheck_provider.cc', - 'spellcheck/renderer/spellcheck_provider.h', - 'spellcheck/renderer/spellcheck_worditerator.cc', - 'spellcheck/renderer/spellcheck_worditerator.h', - 'spellcheck/renderer/spelling_engine.h', - ], - 'conditions': [ - ['OS=="android"', { - 'sources!': [ - 'spellcheck/hunspell_engine.cc', - 'spellcheck/hunspell_engine.h', - ] - }], - ['OS!="android"', { - 'dependencies': [ - '../third_party/hunspell/hunspell.gyp:hunspell', - ], - }], - ['use_browser_spellchecker==0', { - 'sources!': [ - 'spellcheck/platform_spelling_engine.cc', - 'spellcheck/platform_spelling_engine.h', - ] - }], - ], - }, - ], -}
diff --git a/components/ssl_config.gypi b/components/ssl_config.gypi deleted file mode 100644 index 2e742b21e..0000000 --- a/components/ssl_config.gypi +++ /dev/null
@@ -1,31 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/ssl_config - 'target_name': 'ssl_config', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - 'content_settings_core_browser', - 'content_settings_core_common', - 'prefs/prefs.gyp:prefs', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'ssl_config/ssl_config_prefs.cc', - 'ssl_config/ssl_config_prefs.h', - 'ssl_config/ssl_config_service_manager.h', - 'ssl_config/ssl_config_service_manager_pref.cc', - 'ssl_config/ssl_config_switches.cc', - 'ssl_config/ssl_config_switches.h', - ], - }, - ], -}
diff --git a/components/ssl_config/ssl_config_service_manager_pref.cc b/components/ssl_config/ssl_config_service_manager_pref.cc index 3e0da65c..a3736de 100644 --- a/components/ssl_config/ssl_config_service_manager_pref.cc +++ b/components/ssl_config/ssl_config_service_manager_pref.cc
@@ -270,7 +270,7 @@ // update |cached_config_|. io_task_runner_->PostTask(FROM_HERE, base::Bind(&SSLConfigServicePref::SetNewSSLConfig, - ssl_config_service_.get(), new_config)); + ssl_config_service_, new_config)); } void SSLConfigServiceManagerPref::GetSSLConfigFromPrefs(
diff --git a/components/ssl_errors.gypi b/components/ssl_errors.gypi deleted file mode 100644 index 9d4f395..0000000 --- a/components/ssl_errors.gypi +++ /dev/null
@@ -1,31 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/ssl_errors - 'target_name': 'ssl_errors', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base_i18n', - '../net/net.gyp:net', - '../ui/base/ui_base.gyp:ui_base', - 'components_strings.gyp:components_strings', - 'network_time', - 'url_formatter/url_formatter.gyp:url_formatter', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'ssl_errors/error_classification.cc', - 'ssl_errors/error_classification.h', - 'ssl_errors/error_info.cc', - 'ssl_errors/error_info.h', - ] - } - ] -} \ No newline at end of file
diff --git a/components/startup_metric_utils.gypi b/components/startup_metric_utils.gypi deleted file mode 100644 index 419a1307..0000000 --- a/components/startup_metric_utils.gypi +++ /dev/null
@@ -1,91 +0,0 @@ -# Copyright 2013 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. - -# We have 2 separate browser targets because //components/html_viewer requires -# startup_metric_utils_browser, but has symbols that conflict with mojo symbols -# that startup_metric_utils_browser_host indirectly depends on. - -{ - 'targets': [ - { - # GN version: //components/startup_metric_utils/browser:lib - 'target_name': 'startup_metric_utils_browser', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - 'components.gyp:version_info', - 'prefs/prefs.gyp:prefs', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'startup_metric_utils/browser/pref_names.cc', - 'startup_metric_utils/browser/pref_names.h', - 'startup_metric_utils/browser/startup_metric_utils.cc', - 'startup_metric_utils/browser/startup_metric_utils.h', - ], - }, - { - # GN version: //components/startup_metric_utils/browser:host - 'target_name': 'startup_metric_utils_browser_host', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_browser', - 'startup_metric_utils_browser', - 'startup_metric_utils_interfaces' - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'startup_metric_utils/browser/startup_metric_host_impl.cc', - 'startup_metric_utils/browser/startup_metric_host_impl.h', - ], - }, - { - # GN version: //components/startup_metric_utils/common:interfaces - 'target_name': 'startup_metric_utils_interfaces', - 'type': 'static_library', - 'sources': [ - 'startup_metric_utils/common/startup_metric.mojom', - ], - 'dependencies': [ - '<(DEPTH)/mojo/mojo_base.gyp:mojo_common_custom_types_mojom', - ], - 'variables': { - 'mojom_typemaps': [ - '<(DEPTH)/mojo/common/common_custom_types.typemap', - ], - 'use_new_wrapper_types': 'false', - }, - 'includes': [ - '../mojo/mojom_bindings_generator.gypi', - ], - }, - ], - 'conditions': [ - ['OS == "win"', { - 'targets': [ - { - # GN version: //components/startup_metric_utils/common - 'target_name': 'startup_metric_utils_win', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - 'components.gyp:variations', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'startup_metric_utils/common/pre_read_field_trial_utils_win.cc', - 'startup_metric_utils/common/pre_read_field_trial_utils_win.h', - ], - }, - ], - }], - ], -}
diff --git a/components/storage_monitor.gypi b/components/storage_monitor.gypi deleted file mode 100644 index d517672..0000000 --- a/components/storage_monitor.gypi +++ /dev/null
@@ -1,132 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/storage_monitor - 'target_name': 'storage_monitor', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - ], - 'sources': [ - 'storage_monitor/image_capture_device.h', - 'storage_monitor/image_capture_device.mm', - 'storage_monitor/image_capture_device_manager.h', - 'storage_monitor/image_capture_device_manager.mm', - 'storage_monitor/media_storage_util.cc', - 'storage_monitor/media_storage_util.h', - 'storage_monitor/media_transfer_protocol_device_observer_linux.cc', - 'storage_monitor/media_transfer_protocol_device_observer_linux.h', - 'storage_monitor/mtab_watcher_linux.cc', - 'storage_monitor/mtab_watcher_linux.h', - 'storage_monitor/portable_device_watcher_win.cc', - 'storage_monitor/portable_device_watcher_win.h', - 'storage_monitor/removable_device_constants.cc', - 'storage_monitor/removable_device_constants.h', - 'storage_monitor/removable_storage_observer.h', - 'storage_monitor/storage_info.cc', - 'storage_monitor/storage_info.h', - 'storage_monitor/storage_monitor.cc', - 'storage_monitor/storage_monitor.h', - 'storage_monitor/storage_monitor_chromeos.cc', - 'storage_monitor/storage_monitor_chromeos.h', - 'storage_monitor/storage_monitor_linux.cc', - 'storage_monitor/storage_monitor_linux.h', - 'storage_monitor/storage_monitor_mac.h', - 'storage_monitor/storage_monitor_mac.mm', - 'storage_monitor/storage_monitor_win.cc', - 'storage_monitor/storage_monitor_win.h', - 'storage_monitor/transient_device_ids.cc', - 'storage_monitor/transient_device_ids.h', - 'storage_monitor/udev_util_linux.cc', - 'storage_monitor/udev_util_linux.h', - 'storage_monitor/volume_mount_watcher_win.cc', - 'storage_monitor/volume_mount_watcher_win.h', - ], - 'conditions': [ - ['OS == "mac"', { - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/DiskArbitration.framework', - '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', - '$(SDKROOT)/System/Library/Frameworks/ImageCaptureCore.framework', - ], - }, - }], - ['OS=="linux"', { - 'dependencies': [ - '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol', - '../device/media_transfer_protocol/media_transfer_protocol.gyp:mtp_file_entry_proto', - '../device/media_transfer_protocol/media_transfer_protocol.gyp:mtp_storage_info_proto', - ], - }], - ['use_udev==1', { - 'dependencies': [ - '../device/udev_linux/udev.gyp:udev_linux', - ], - }, { # use_udev==0 - 'sources!': [ - 'storage_monitor/storage_monitor_linux.cc', - 'storage_monitor/storage_monitor_linux.h', - 'storage_monitor/udev_util_linux.cc', - 'storage_monitor/udev_util_linux.h', - ], - }], - ['chromeos==1', { - 'sources!': [ - 'storage_monitor/mtab_watcher_linux.cc', - 'storage_monitor/mtab_watcher_linux.h', - 'storage_monitor/storage_monitor_linux.cc', - 'storage_monitor/storage_monitor_linux.h', - ], - }], - ], - }, - { - # GN version: //components/storage_monitor:test_support - 'target_name': 'storage_monitor_test_support', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - 'storage_monitor', - ], - 'sources': [ - 'storage_monitor/mock_removable_storage_observer.cc', - 'storage_monitor/mock_removable_storage_observer.h', - 'storage_monitor/test_media_transfer_protocol_manager_linux.cc', - 'storage_monitor/test_media_transfer_protocol_manager_linux.h', - 'storage_monitor/test_portable_device_watcher_win.cc', - 'storage_monitor/test_portable_device_watcher_win.h', - 'storage_monitor/test_storage_monitor.cc', - 'storage_monitor/test_storage_monitor.h', - 'storage_monitor/test_storage_monitor_win.cc', - 'storage_monitor/test_storage_monitor_win.h', - 'storage_monitor/test_volume_mount_watcher_win.cc', - 'storage_monitor/test_volume_mount_watcher_win.h', - ], - 'conditions': [ - ['OS=="linux"', { - 'dependencies': [ - '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol', - '../device/media_transfer_protocol/media_transfer_protocol.gyp:mtp_file_entry_proto', - '../device/media_transfer_protocol/media_transfer_protocol.gyp:mtp_storage_info_proto', - ], - }], - ['OS=="win"', { - 'dependencies': [ - '../testing/gtest.gyp:gtest', - ], - }], - ], - }, - ], -}
diff --git a/components/subresource_filter.gypi b/components/subresource_filter.gypi deleted file mode 100644 index 06960a39..0000000 --- a/components/subresource_filter.gypi +++ /dev/null
@@ -1,227 +0,0 @@ -# Copyright 2016 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. - -{ - 'targets': [ - { - # GN version: //components/subresource_filter/core/browser - 'target_name': 'subresource_filter_core_browser', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../components/components.gyp:variations', - '../components/prefs/prefs.gyp:prefs', - '../third_party/protobuf/protobuf.gyp:protobuf_lite', - 'subresource_filter_core_common', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'subresource_filter/core/browser/ruleset_distributor.h', - 'subresource_filter/core/browser/ruleset_service.cc', - 'subresource_filter/core/browser/ruleset_service.h', - 'subresource_filter/core/browser/subresource_filter_client.h', - 'subresource_filter/core/browser/subresource_filter_constants.cc', - 'subresource_filter/core/browser/subresource_filter_constants.h', - 'subresource_filter/core/browser/subresource_filter_features.cc', - 'subresource_filter/core/browser/subresource_filter_features.h', - ], - }, - { - # GN version: //components/subresource_filter/core/browser:test_support - 'target_name': 'subresource_filter_core_browser_test_support', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../components/components.gyp:variations', - '../testing/gtest.gyp:gtest', - 'subresource_filter_core_browser', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'subresource_filter/core/browser/subresource_filter_features_test_support.cc', - 'subresource_filter/core/browser/subresource_filter_features_test_support.h', - ], - }, - { - # GN version: //components/subresource_filter/core/common - 'target_name': 'subresource_filter_core_common', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - '../third_party/flatbuffers/flatbuffers.gyp:flatbuffers', - '../third_party/protobuf/protobuf.gyp:protobuf_lite', - '../url/url.gyp:url_lib', - 'subresource_filter_core_common_ruleset_flatbuffer', - 'subresource_filter_core_common_ruleset_proto', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'subresource_filter/core/common/activation_scope.cc', - 'subresource_filter/core/common/activation_scope.h', - 'subresource_filter/core/common/activation_state.cc', - 'subresource_filter/core/common/activation_state.h', - 'subresource_filter/core/common/closed_hash_map.h', - 'subresource_filter/core/common/copying_file_stream.cc', - 'subresource_filter/core/common/copying_file_stream.h', - 'subresource_filter/core/common/fuzzy_pattern_matching.cc', - 'subresource_filter/core/common/fuzzy_pattern_matching.h', - 'subresource_filter/core/common/indexed_ruleset.cc', - 'subresource_filter/core/common/indexed_ruleset.h', - 'subresource_filter/core/common/knuth_morris_pratt.h', - 'subresource_filter/core/common/memory_mapped_ruleset.cc', - 'subresource_filter/core/common/memory_mapped_ruleset.h', - 'subresource_filter/core/common/ngram_extractor.h', - 'subresource_filter/core/common/string_splitter.h', - 'subresource_filter/core/common/uint64_hasher.h', - 'subresource_filter/core/common/unindexed_ruleset.cc', - 'subresource_filter/core/common/unindexed_ruleset.h', - 'subresource_filter/core/common/url_pattern.cc', - 'subresource_filter/core/common/url_pattern.h', - 'subresource_filter/core/common/url_pattern_matching.h', - ], - 'export_dependent_settings': [ - 'subresource_filter_core_common_ruleset_flatbuffer', - 'subresource_filter_core_common_ruleset_proto', - ], - }, - { - # GN version: //components/subresource_filter/core/common/flat:flatbuffer - 'target_name': 'subresource_filter_core_common_ruleset_flatbuffer', - 'type': 'none', - 'sources': [ - # Note: sources list duplicated in GN build. - 'subresource_filter/core/common/flat/rules.fbs', - ], - 'variables': { - 'flatc_out_dir': 'components/subresource_filter/core/common/flat' - }, - 'includes': ['../third_party/flatbuffers/flatc.gypi'], - 'dependencies': [ - '<(DEPTH)/third_party/flatbuffers/flatbuffers.gyp:flatbuffers', - ] - }, - { - # GN version: //components/subresource_filter/core/common/proto:proto - 'target_name': 'subresource_filter_core_common_ruleset_proto', - 'type': 'static_library', - 'sources': [ - # Note: sources list duplicated in GN build. - 'subresource_filter/core/common/proto/rules.proto', - ], - 'variables': { - 'proto_in_dir': 'subresource_filter/core/common/proto', - 'proto_out_dir': 'components/subresource_filter/core/common/proto', - }, - 'includes': [ '../build/protoc.gypi' ], - }, - { - # GN version: //components/subresource_filter/core/common:test_support - 'target_name': 'subresource_filter_core_common_test_support', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../testing/gtest.gyp:gtest', - '../third_party/protobuf/protobuf.gyp:protobuf_lite', - 'subresource_filter_core_common', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'subresource_filter/core/common/test_ruleset_creator.cc', - 'subresource_filter/core/common/test_ruleset_creator.h', - ], - }, - ], - 'conditions': [ - ['OS != "ios"', { - 'targets': [ - { - # GN version: //components/subresource_filter/content/common - 'target_name': 'subresource_filter_content_common', - 'type': 'static_library', - 'dependencies': [ - '../content/content.gyp:content_common', - '../ipc/ipc.gyp:ipc', - 'subresource_filter_core_common', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'subresource_filter/content/common/subresource_filter_message_generator.cc', - 'subresource_filter/content/common/subresource_filter_message_generator.h', - 'subresource_filter/content/common/subresource_filter_messages.h', - ], - }, - { - # GN version: //components/subresource_filter/content/renderer - 'target_name': 'subresource_filter_content_renderer', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_common', - '../content/content.gyp:content_renderer', - '../ipc/ipc.gyp:ipc', - 'subresource_filter_content_common', - 'subresource_filter_core_common', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'subresource_filter/content/renderer/document_subresource_filter.cc', - 'subresource_filter/content/renderer/document_subresource_filter.h', - 'subresource_filter/content/renderer/ruleset_dealer.cc', - 'subresource_filter/content/renderer/ruleset_dealer.h', - 'subresource_filter/content/renderer/subresource_filter_agent.cc', - 'subresource_filter/content/renderer/subresource_filter_agent.h', - ], - }, - { - # GN version: //components/subresource_filter/content/browser - 'target_name': 'subresource_filter_content_browser', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_browser', - '../content/content.gyp:content_common', - '../ipc/ipc.gyp:ipc', - 'subresource_filter_content_common', - 'subresource_filter_core_browser', - 'subresource_filter_core_common', - '../url/url.gyp:url_lib', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'subresource_filter/content/browser/content_ruleset_distributor.cc', - 'subresource_filter/content/browser/content_ruleset_distributor.h', - 'subresource_filter/content/browser/content_subresource_filter_driver.cc', - 'subresource_filter/content/browser/content_subresource_filter_driver.h', - 'subresource_filter/content/browser/content_subresource_filter_driver_factory.cc', - 'subresource_filter/content/browser/content_subresource_filter_driver_factory.h', - 'subresource_filter/content/browser/subresource_filter_navigation_throttle.cc', - 'subresource_filter/content/browser/subresource_filter_navigation_throttle.h', - ], - }, - ], - }], - ], -}
diff --git a/components/suggestions.gypi b/components/suggestions.gypi deleted file mode 100644 index e960d74e..0000000 --- a/components/suggestions.gypi +++ /dev/null
@@ -1,59 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/suggestions - 'target_name': 'suggestions', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - '../ui/gfx/gfx.gyp:gfx', - '../url/url.gyp:url_lib', - 'components.gyp:data_use_measurement_core', - 'components.gyp:image_fetcher', - 'components.gyp:keyed_service_core', - 'components.gyp:pref_registry', - 'components.gyp:variations', - 'components.gyp:variations_net', - 'sync.gyp:sync', - ], - 'sources': [ - 'suggestions/blacklist_store.cc', - 'suggestions/blacklist_store.h', - 'suggestions/image_encoder.h', - 'suggestions/image_manager.cc', - 'suggestions/image_manager.h', - 'suggestions/proto/suggestions.proto', - 'suggestions/suggestions_pref_names.cc', - 'suggestions/suggestions_pref_names.h', - 'suggestions/suggestions_service.cc', - 'suggestions/suggestions_service.h', - 'suggestions/suggestions_store.cc', - 'suggestions/suggestions_store.h', - ], - 'variables': { - 'proto_in_dir': 'suggestions/proto', - 'proto_out_dir': 'components/suggestions/proto', - }, - 'includes': [ '../build/protoc.gypi' ], - 'conditions': [ - ['OS == "ios"', { - 'sources': [ - 'suggestions/image_encoder_ios.mm', - ] - }, { # 'OS != "ios"' - 'sources': [ - 'suggestions/image_encoder.cc', - ] - } - ]] - }, - ], -}
diff --git a/components/supervised_user_error_page.gypi b/components/supervised_user_error_page.gypi deleted file mode 100644 index b6f0005..0000000 --- a/components/supervised_user_error_page.gypi +++ /dev/null
@@ -1,41 +0,0 @@ -{ - 'targets': [ - { - # GN version: //components/supervised_user_error_page - 'target_name': 'supervised_user_error_page', - 'type': 'static_library', - 'dependencies': [ - 'components_resources.gyp:components_resources', - 'components_strings.gyp:components_strings', - '../base/base.gyp:base', - '../ui/base/ui_base.gyp:ui_base' - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'supervised_user_error_page/supervised_user_error_page.cc', - 'supervised_user_error_page/supervised_user_error_page.h', - ], - }, - ], - 'conditions': [ - ['OS == "android"', { - 'targets': [ - { - # GN version: //components/supervised_user_error_page:gin - 'target_name': 'supervised_user_error_page_gin', - 'type': 'static_library', - 'dependencies': [ - 'components.gyp:web_restrictions_interfaces', - '../content/content.gyp:content_renderer', - ], - 'sources': [ - 'supervised_user_error_page/supervised_user_gin_wrapper.cc', - 'supervised_user_error_page/supervised_user_gin_wrapper.h', - ], - } - ], - }], - ], -}
diff --git a/components/sync.gyp b/components/sync.gyp deleted file mode 100644 index b2f474b..0000000 --- a/components/sync.gyp +++ /dev/null
@@ -1,702 +0,0 @@ -# Copyright 2013 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. - -{ - 'variables': { - 'chromium_code': 1, - # Setting these two variables allows other targets to use the - # sync_proto_sources variable as the list of sync protocol buffer files. - 'sync_proto_sources_dir': 'sync/protocol', - 'sync_proto_sources': [ - '<@(sync_proto_source_paths)', - ], - }, - - 'includes': [ - 'sync/protocol/protocol.gypi', - 'sync/sync_android.gypi', - 'sync/sync_tests.gypi', - ], - - 'targets': [ - # This target will add '-lsync_core' and '-lsync_proto' to the link line of - # targets that depend on it. Anything that depends on sync code should - # declare a dependency on this target. - { - 'target_name': 'sync', - 'type': 'none', - 'dependencies': [ - 'sync_core', - 'sync_proto', - ], - 'export_dependent_settings': [ - 'sync_core', - 'sync_proto', - ], - }, - - # Contains everything related to sync implementation that does not depend - # on chrome/ or components/. Do not depend on this directly. Depend on - # the 'sync' target to get the sync protobufs, too. - { - 'target_name': 'sync_core', - 'type': '<(component)', - 'variables': { 'enable_wexit_time_destructors': 1, }, - 'defines': [ - 'SYNC_IMPLEMENTATION', - ], - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../base/base.gyp:base_i18n', - '../crypto/crypto.gyp:crypto', - '../google_apis/google_apis.gyp:google_apis', - '../net/net.gyp:net', - '../sql/sql.gyp:sql', - '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', - '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp', - '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', - '../third_party/protobuf/protobuf.gyp:protobuf_lite', - '../third_party/zlib/zlib.gyp:zlib', - '../url/url.gyp:url_lib', - 'components.gyp:data_use_measurement_core', - 'components.gyp:invalidation_public', - 'components.gyp:metrics', - 'components.gyp:os_crypt', - 'components.gyp:signin_core_browser', - 'components.gyp:version_info', - 'attachment_store_proto', - 'sync_proto', - ], - 'export_dependent_settings': [ - '../net/net.gyp:net', - 'sync_proto', - ], - 'sources': [ - 'sync/api/attachments/attachment.cc', - 'sync/api/attachments/attachment.h', - 'sync/api/attachments/attachment_id.cc', - 'sync/api/attachments/attachment_id.h', - 'sync/api/attachments/attachment_metadata.cc', - 'sync/api/attachments/attachment_metadata.h', - 'sync/api/attachments/attachment_store.cc', - 'sync/api/attachments/attachment_store.h', - 'sync/api/attachments/attachment_store_backend.cc', - 'sync/api/attachments/attachment_store_backend.h', - 'sync/api/conflict_resolution.cc', - 'sync/api/conflict_resolution.h', - 'sync/api/data_batch.h', - 'sync/api/entity_change.cc', - 'sync/api/entity_change.h', - 'sync/api/entity_data.cc', - 'sync/api/entity_data.h', - 'sync/api/metadata_batch.cc', - 'sync/api/metadata_batch.h', - 'sync/api/metadata_change_list.h', - 'sync/api/model_type_change_processor.cc', - 'sync/api/model_type_change_processor.h', - 'sync/api/model_type_service.cc', - 'sync/api/model_type_service.h', - 'sync/api/model_type_store.cc', - 'sync/api/model_type_store.h', - 'sync/api/string_ordinal.h', - 'sync/api/sync_change.cc', - 'sync/api/sync_change.h', - 'sync/api/sync_change_processor.cc', - 'sync/api/sync_change_processor.h', - 'sync/api/sync_data.cc', - 'sync/api/sync_data.h', - 'sync/api/sync_error.cc', - 'sync/api/sync_error.h', - 'sync/api/sync_error_factory.cc', - 'sync/api/sync_error_factory.h', - 'sync/api/sync_merge_result.cc', - 'sync/api/sync_merge_result.h', - 'sync/api/syncable_service.cc', - 'sync/api/syncable_service.h', - 'sync/api/time.h', - 'sync/base/sync_export.h', - 'sync/engine_impl/all_status.cc', - 'sync/engine_impl/all_status.h', - 'sync/engine_impl/apply_control_data_updates.cc', - 'sync/engine_impl/apply_control_data_updates.h', - 'sync/engine_impl/backoff_delay_provider.cc', - 'sync/engine_impl/backoff_delay_provider.h', - 'sync/engine_impl/clear_server_data.cc', - 'sync/engine_impl/clear_server_data.h', - 'sync/engine_impl/commit.cc', - 'sync/engine_impl/commit.h', - 'sync/engine_impl/commit_contribution.cc', - 'sync/engine_impl/commit_contribution.h', - 'sync/engine_impl/commit_contributor.cc', - 'sync/engine_impl/commit_contributor.h', - 'sync/engine_impl/commit_processor.cc', - 'sync/engine_impl/commit_processor.h', - 'sync/engine_impl/commit_queue.cc', - 'sync/engine_impl/commit_queue.h', - 'sync/engine_impl/commit_util.cc', - 'sync/engine_impl/commit_util.h', - 'sync/engine_impl/conflict_resolver.cc', - 'sync/engine_impl/conflict_resolver.h', - 'sync/engine_impl/conflict_util.cc', - 'sync/engine_impl/conflict_util.h', - 'sync/engine_impl/directory_commit_contribution.cc', - 'sync/engine_impl/directory_commit_contribution.h', - 'sync/engine_impl/directory_commit_contributor.cc', - 'sync/engine_impl/directory_commit_contributor.h', - 'sync/engine_impl/directory_update_handler.cc', - 'sync/engine_impl/directory_update_handler.h', - 'sync/engine_impl/get_commit_ids.cc', - 'sync/engine_impl/get_commit_ids.h', - 'sync/engine_impl/get_updates_delegate.cc', - 'sync/engine_impl/get_updates_delegate.h', - 'sync/engine_impl/get_updates_processor.cc', - 'sync/engine_impl/get_updates_processor.h', - 'sync/engine_impl/model_type_worker.cc', - 'sync/engine_impl/model_type_worker.h', - 'sync/engine_impl/net/server_connection_manager.cc', - 'sync/engine_impl/net/server_connection_manager.h', - 'sync/engine_impl/net/url_translator.cc', - 'sync/engine_impl/net/url_translator.h', - 'sync/engine_impl/non_blocking_type_commit_contribution.cc', - 'sync/engine_impl/non_blocking_type_commit_contribution.h', - 'sync/engine_impl/nudge_handler.cc', - 'sync/engine_impl/nudge_handler.h', - 'sync/engine_impl/nudge_source.cc', - 'sync/engine_impl/nudge_source.h', - 'sync/engine_impl/process_updates_util.cc', - 'sync/engine_impl/process_updates_util.h', - 'sync/engine_impl/sync_cycle_event.cc', - 'sync/engine_impl/sync_cycle_event.h', - 'sync/engine_impl/sync_engine_event_listener.cc', - 'sync/engine_impl/sync_engine_event_listener.h', - 'sync/engine_impl/sync_scheduler.cc', - 'sync/engine_impl/sync_scheduler.h', - 'sync/engine_impl/sync_scheduler_impl.cc', - 'sync/engine_impl/sync_scheduler_impl.h', - 'sync/engine_impl/syncer.cc', - 'sync/engine_impl/syncer.h', - 'sync/engine_impl/syncer_proto_util.cc', - 'sync/engine_impl/syncer_proto_util.h', - 'sync/engine_impl/syncer_types.h', - 'sync/engine_impl/syncer_util.cc', - 'sync/engine_impl/syncer_util.h', - 'sync/engine_impl/traffic_logger.cc', - 'sync/engine_impl/traffic_logger.h', - 'sync/engine_impl/update_applicator.cc', - 'sync/engine_impl/update_applicator.h', - 'sync/engine_impl/update_handler.cc', - 'sync/engine_impl/update_handler.h', - 'sync/engine_impl/worker_entity_tracker.cc', - 'sync/engine_impl/worker_entity_tracker.h', - 'sync/core/activation_context.cc', - 'sync/core_impl/attachments/attachment_downloader.cc', - 'sync/core_impl/attachments/attachment_downloader_impl.cc', - 'sync/core_impl/attachments/attachment_service.cc', - 'sync/core_impl/attachments/attachment_service_impl.cc', - 'sync/core_impl/attachments/attachment_service_proxy.cc', - 'sync/core_impl/attachments/attachment_service_proxy_for_test.cc', - 'sync/core_impl/attachments/attachment_store_frontend.cc', - 'sync/core_impl/attachments/attachment_uploader.cc', - 'sync/core_impl/attachments/attachment_uploader_impl.cc', - 'sync/core_impl/attachments/attachment_util.cc', - 'sync/core_impl/attachments/fake_attachment_downloader.cc', - 'sync/core_impl/attachments/fake_attachment_uploader.cc', - 'sync/core_impl/attachments/in_memory_attachment_store.cc', - 'sync/core_impl/attachments/on_disk_attachment_store.cc', - 'sync/core_impl/attachments/task_queue.cc', - 'sync/core/base_node.cc', - 'sync/core/base_transaction.cc', - 'sync/core/change_record.cc', - 'sync/core_impl/change_reorder_buffer.cc', - 'sync/core_impl/change_reorder_buffer.h', - 'sync/core_impl/debug_info_event_listener.cc', - 'sync/core_impl/debug_info_event_listener.h', - 'sync/core/delete_journal.cc', - 'sync/engine/events/clear_server_data_request_event.cc', - 'sync/engine/events/clear_server_data_response_event.cc', - 'sync/engine/events/commit_request_event.cc', - 'sync/engine/events/commit_response_event.cc', - 'sync/engine/events/configure_get_updates_request_event.cc', - 'sync/engine/events/get_updates_response_event.cc', - 'sync/engine/events/normal_get_updates_request_event.cc', - 'sync/engine/events/poll_get_updates_request_event.cc', - 'sync/engine/events/protocol_event.cc', - 'sync/core/http_bridge.cc', - 'sync/core/http_bridge_network_resources.cc', - 'sync/core/internal_components_factory_impl.cc', - 'sync/core_impl/js_mutation_event_observer.cc', - 'sync/core_impl/js_mutation_event_observer.h', - 'sync/core_impl/js_sync_encryption_handler_observer.cc', - 'sync/core_impl/js_sync_encryption_handler_observer.h', - 'sync/core_impl/js_sync_manager_observer.cc', - 'sync/core_impl/js_sync_manager_observer.h', - 'sync/core/model_type_connector.cc', - 'sync/core_impl/model_type_connector_proxy.cc', - 'sync/core/model_type_store_backend.cc', - 'sync/core/model_type_store_impl.cc', - 'sync/core/processor_entity_tracker.cc', - 'sync/core_impl/protocol_event_buffer.cc', - 'sync/core_impl/protocol_event_buffer.h', - 'sync/core/activation_context.h', - 'sync/core/attachments/attachment_downloader.h', - 'sync/core/attachments/attachment_downloader_impl.h', - 'sync/core/attachments/attachment_service.h', - 'sync/core/attachments/attachment_service_impl.h', - 'sync/core/attachments/attachment_service_proxy.h', - 'sync/core/attachments/attachment_service_proxy_for_test.h', - 'sync/core/attachments/attachment_store_frontend.h', - 'sync/core/attachments/attachment_uploader.h', - 'sync/core/attachments/attachment_uploader_impl.h', - 'sync/core/attachments/attachment_util.h', - 'sync/core/attachments/fake_attachment_downloader.h', - 'sync/core/attachments/fake_attachment_uploader.h', - 'sync/core/attachments/in_memory_attachment_store.h', - 'sync/core/attachments/on_disk_attachment_store.h', - 'sync/core/attachments/task_queue.h', - 'sync/base/attachment_id_proto.cc', - 'sync/base/attachment_id_proto.h', - 'sync/base/cancelation_observer.cc', - 'sync/base/cancelation_observer.h', - 'sync/base/cancelation_signal.cc', - 'sync/base/cancelation_signal.h', - 'sync/base/enum_set.h', - 'sync/base/enum_set.h', - 'sync/base/invalidation_interface.cc', - 'sync/base/invalidation_interface.h', - 'sync/base/model_type.h', - 'sync/base/node_ordinal.cc', - 'sync/base/node_ordinal.h', - 'sync/base/ordinal.h', - 'sync/base/progress_marker_map.cc', - 'sync/base/progress_marker_map.h', - 'sync/base/stop_source.h', - 'sync/base/unique_position.cc', - 'sync/base/unique_position.h', - 'sync/core/base_node.h', - 'sync/core/base_transaction.h', - 'sync/core/change_record.h', - 'sync/core/configure_reason.h', - 'sync/core/connection_status.h', - 'sync/core/data_batch_impl.h', - 'sync/core/data_batch_impl.cc', - 'sync/core/data_type_association_stats.cc', - 'sync/core/data_type_association_stats.h', - 'sync/core/data_type_debug_info_listener.cc', - 'sync/core/data_type_debug_info_listener.h', - 'sync/core/data_type_error_handler.h', - 'sync/core/delete_journal.h', - 'sync/engine/model_safe_worker.cc', - 'sync/engine/model_safe_worker.h', - 'sync/engine/passive_model_worker.cc', - 'sync/engine/passive_model_worker.h', - 'sync/engine/polling_constants.cc', - 'sync/engine/polling_constants.h', - 'sync/engine/sync_status.cc', - 'sync/engine/sync_status.h', - 'sync/engine/events/clear_server_data_request_event.h', - 'sync/engine/events/clear_server_data_response_event.h', - 'sync/engine/events/commit_request_event.h', - 'sync/engine/events/commit_response_event.h', - 'sync/engine/events/configure_get_updates_request_event.h', - 'sync/engine/events/get_updates_response_event.h', - 'sync/engine/events/normal_get_updates_request_event.h', - 'sync/engine/events/poll_get_updates_request_event.h', - 'sync/engine/events/protocol_event.h', - 'sync/core/http_bridge.h', - 'sync/core/http_bridge_network_resources.h', - 'sync/core/http_post_provider_factory.h', - 'sync/core/http_post_provider_interface.h', - 'sync/core/internal_components_factory.h', - 'sync/core/internal_components_factory_impl.h', - 'sync/core/model_type_connector.h', - 'sync/core/model_type_connector_proxy.h', - 'sync/core/model_type_processor.cc', - 'sync/core/model_type_processor.h', - 'sync/core/model_type_store_backend.h', - 'sync/core/model_type_store_impl.h', - 'sync/core/network_resources.h', - 'sync/core/non_blocking_sync_common.cc', - 'sync/core/non_blocking_sync_common.h', - 'sync/core/processor_entity_tracker.h', - 'sync/core/read_node.h', - 'sync/core/read_transaction.h', - 'sync/sessions/commit_counters.cc', - 'sync/sessions/commit_counters.h', - 'sync/sessions/model_neutral_state.cc', - 'sync/sessions/model_neutral_state.h', - 'sync/sessions/status_counters.cc', - 'sync/sessions/status_counters.h', - 'sync/sessions/sync_session_snapshot.cc', - 'sync/sessions/sync_session_snapshot.h', - 'sync/sessions/type_debug_info_observer.cc', - 'sync/sessions/type_debug_info_observer.h', - 'sync/sessions/update_counters.cc', - 'sync/sessions/update_counters.h', - 'sync/core/shared_model_type_processor.h', - 'sync/core/shutdown_reason.h', - 'sync/core/simple_metadata_change_list.cc', - 'sync/core/simple_metadata_change_list.h', - 'sync/core/sync_auth_provider.h', - 'sync/core/sync_encryption_handler.cc', - 'sync/core/sync_encryption_handler.h', - 'sync/core/sync_manager.cc', - 'sync/core/sync_manager.h', - 'sync/core/sync_manager_factory.h', - 'sync/core/user_share.h', - 'sync/base/experiments.h', - 'sync/base/immutable.h', - 'sync/base/proto_value_ptr.h', - 'sync/base/sync_db_util.h', - 'sync/base/sync_string_conversions.cc', - 'sync/base/sync_string_conversions.h', - 'sync/base/syncer_error.cc', - 'sync/base/syncer_error.h', - 'sync/base/unrecoverable_error_handler.h', - 'sync/base/unrecoverable_error_info.cc', - 'sync/base/unrecoverable_error_info.h', - 'sync/base/weak_handle.cc', - 'sync/base/weak_handle.h', - 'sync/core/write_node.h', - 'sync/core/write_transaction.h', - 'sync/core/read_node.cc', - 'sync/core/read_transaction.cc', - 'sync/core/shared_model_type_processor.cc', - 'sync/core/sync_db_util.cc', - 'sync/core_impl/sync_encryption_handler_impl.cc', - 'sync/core_impl/sync_encryption_handler_impl.h', - 'sync/core/sync_manager_factory.cc', - 'sync/core_impl/sync_manager_impl.cc', - 'sync/core_impl/sync_manager_impl.h', - 'sync/core_impl/syncapi_internal.cc', - 'sync/core_impl/syncapi_internal.h', - 'sync/core_impl/syncapi_server_connection_manager.cc', - 'sync/core_impl/syncapi_server_connection_manager.h', - 'sync/core/user_share.cc', - 'sync/core/write_node.cc', - 'sync/core/write_transaction.cc', - 'sync/js/js_backend.h', - 'sync/js/js_controller.h', - 'sync/js/js_event_details.cc', - 'sync/js/js_event_details.h', - 'sync/js/js_event_handler.h', - 'sync/js/sync_js_controller.cc', - 'sync/js/sync_js_controller.h', - 'sync/protocol/proto_enum_conversions.cc', - 'sync/protocol/proto_enum_conversions.h', - 'sync/protocol/proto_value_conversions.cc', - 'sync/protocol/proto_value_conversions.h', - 'sync/protocol/sync_protocol_error.cc', - 'sync/protocol/sync_protocol_error.h', - 'sync/sessions_impl/data_type_tracker.cc', - 'sync/sessions_impl/data_type_tracker.h', - 'sync/sessions_impl/debug_info_getter.h', - 'sync/sessions_impl/directory_type_debug_info_emitter.cc', - 'sync/sessions_impl/directory_type_debug_info_emitter.h', - 'sync/sessions_impl/model_type_registry.cc', - 'sync/sessions_impl/model_type_registry.h', - 'sync/sessions_impl/nudge_tracker.cc', - 'sync/sessions_impl/nudge_tracker.h', - 'sync/sessions_impl/status_controller.cc', - 'sync/sessions_impl/status_controller.h', - 'sync/sessions_impl/sync_session.cc', - 'sync/sessions_impl/sync_session.h', - 'sync/sessions_impl/sync_session_context.cc', - 'sync/sessions_impl/sync_session_context.h', - 'sync/syncable/dir_open_result.h', - 'sync/syncable/directory.cc', - 'sync/syncable/directory.h', - 'sync/syncable/directory_backing_store.cc', - 'sync/syncable/directory_backing_store.h', - 'sync/syncable/directory_change_delegate.h', - 'sync/syncable/entry.cc', - 'sync/syncable/entry.h', - 'sync/syncable/entry_kernel.cc', - 'sync/syncable/entry_kernel.h', - 'sync/syncable/in_memory_directory_backing_store.cc', - 'sync/syncable/in_memory_directory_backing_store.h', - 'sync/syncable/invalid_directory_backing_store.cc', - 'sync/syncable/invalid_directory_backing_store.h', - 'sync/syncable/metahandle_set.h', - 'sync/syncable/model_neutral_mutable_entry.cc', - 'sync/syncable/model_neutral_mutable_entry.h', - 'sync/syncable/model_type.cc', - 'sync/syncable/mutable_entry.cc', - 'sync/syncable/mutable_entry.h', - 'sync/syncable/nigori_handler.cc', - 'sync/syncable/nigori_handler.h', - 'sync/syncable/nigori_util.cc', - 'sync/syncable/nigori_util.h', - 'sync/syncable/on_disk_directory_backing_store.cc', - 'sync/syncable/on_disk_directory_backing_store.h', - 'sync/syncable/parent_child_index.cc', - 'sync/syncable/parent_child_index.h', - 'sync/syncable/scoped_kernel_lock.cc', - 'sync/syncable/scoped_kernel_lock.h', - 'sync/syncable/scoped_parent_child_index_updater.cc', - 'sync/syncable/scoped_parent_child_index_updater.h', - 'sync/syncable/syncable-inl.h', - 'sync/syncable/syncable_base_transaction.cc', - 'sync/syncable/syncable_base_transaction.h', - 'sync/syncable/syncable_base_write_transaction.cc', - 'sync/syncable/syncable_base_write_transaction.h', - 'sync/syncable/syncable_changes_version.h', - 'sync/syncable/syncable_columns.h', - 'sync/syncable/syncable_delete_journal.cc', - 'sync/syncable/syncable_delete_journal.h', - 'sync/syncable/syncable_enum_conversions.cc', - 'sync/syncable/syncable_enum_conversions.h', - 'sync/syncable/syncable_id.cc', - 'sync/syncable/syncable_id.h', - 'sync/syncable/syncable_model_neutral_write_transaction.cc', - 'sync/syncable/syncable_model_neutral_write_transaction.h', - 'sync/syncable/syncable_proto_util.cc', - 'sync/syncable/syncable_proto_util.h', - 'sync/syncable/syncable_read_transaction.cc', - 'sync/syncable/syncable_read_transaction.h', - 'sync/syncable/syncable_util.cc', - 'sync/syncable/syncable_util.h', - 'sync/syncable/syncable_write_transaction.cc', - 'sync/syncable/syncable_write_transaction.h', - 'sync/syncable/transaction_observer.h', - 'sync/syncable/write_transaction_info.cc', - 'sync/syncable/write_transaction_info.h', - 'sync/base/cryptographer.cc', - 'sync/base/cryptographer.h', - 'sync/base/data_type_histogram.cc', - 'sync/base/data_type_histogram.h', - 'sync/base/encryptor.h', - 'sync/base/extensions_activity.cc', - 'sync/base/extensions_activity.h', - 'sync/base/get_session_name.cc', - 'sync/base/get_session_name.h', - 'sync/base/get_session_name_ios.h', - 'sync/base/get_session_name_ios.mm', - 'sync/base/get_session_name_linux.cc', - 'sync/base/get_session_name_linux.h', - 'sync/base/get_session_name_mac.h', - 'sync/base/get_session_name_mac.mm', - 'sync/base/get_session_name_win.cc', - 'sync/base/get_session_name_win.h', - 'sync/base/logging.cc', - 'sync/base/logging.h', - 'sync/base/nigori.cc', - 'sync/base/nigori.h', - 'sync/base/time.cc', - 'sync/base/time.h', - 'sync/driver/about_sync_util.cc', - 'sync/driver/about_sync_util.h', - 'sync/driver/backend_data_type_configurer.cc', - 'sync/driver/backend_data_type_configurer.h', - 'sync/driver/backend_migrator.cc', - 'sync/driver/backend_migrator.h', - 'sync/driver/change_processor.cc', - 'sync/driver/change_processor.h', - 'sync/driver/data_type_controller.cc', - 'sync/driver/data_type_controller.h', - 'sync/driver/data_type_encryption_handler.cc', - 'sync/driver/data_type_encryption_handler.h', - 'sync/driver/data_type_manager.cc', - 'sync/driver/data_type_manager.h', - 'sync/driver/data_type_manager_impl.cc', - 'sync/driver/data_type_manager_impl.h', - 'sync/driver/data_type_manager_observer.h', - 'sync/driver/data_type_status_table.cc', - 'sync/driver/data_type_status_table.h', - 'sync/driver/device_count_metrics_provider.cc', - 'sync/driver/device_count_metrics_provider.h', - 'sync/driver/device_info.cc', - 'sync/driver/device_info.h', - 'sync/driver/device_info_data_type_controller.cc', - 'sync/driver/device_info_data_type_controller.h', - 'sync/driver/device_info_service.cc', - 'sync/driver/device_info_service.h', - 'sync/driver/device_info_sync_service.cc', - 'sync/driver/device_info_sync_service.h', - 'sync/driver/device_info_tracker.h', - 'sync/driver/device_info_util.cc', - 'sync/driver/device_info_util.h', - 'sync/driver/directory_data_type_controller.cc', - 'sync/driver/directory_data_type_controller.h', - 'sync/driver/frontend_data_type_controller.cc', - 'sync/driver/frontend_data_type_controller.h', - 'sync/driver/generic_change_processor.cc', - 'sync/driver/generic_change_processor.h', - 'sync/driver/generic_change_processor_factory.cc', - 'sync/driver/generic_change_processor_factory.h', - 'sync/driver/glue/browser_thread_model_worker.cc', - 'sync/driver/glue/browser_thread_model_worker.h', - 'sync/driver/glue/chrome_report_unrecoverable_error.cc', - 'sync/driver/glue/chrome_report_unrecoverable_error.h', - 'sync/driver/glue/sync_backend_host.cc', - 'sync/driver/glue/sync_backend_host.h', - 'sync/driver/glue/sync_backend_host_core.cc', - 'sync/driver/glue/sync_backend_host_core.h', - 'sync/driver/glue/sync_backend_host_impl.cc', - 'sync/driver/glue/sync_backend_host_impl.h', - 'sync/driver/glue/sync_backend_registrar.cc', - 'sync/driver/glue/sync_backend_registrar.h', - 'sync/driver/glue/ui_model_worker.cc', - 'sync/driver/glue/ui_model_worker.h', - 'sync/driver/invalidation_adapter.cc', - 'sync/driver/invalidation_adapter.h', - 'sync/driver/invalidation_helper.cc', - 'sync/driver/invalidation_helper.h', - 'sync/driver/local_device_info_provider.h', - 'sync/driver/local_device_info_provider_impl.cc', - 'sync/driver/local_device_info_provider_impl.h', - 'sync/driver/model_association_manager.cc', - 'sync/driver/model_association_manager.h', - 'sync/driver/model_associator.h', - 'sync/driver/non_blocking_data_type_controller.cc', - 'sync/driver/non_blocking_data_type_controller.h', - 'sync/driver/non_ui_data_type_controller.cc', - 'sync/driver/non_ui_data_type_controller.h', - 'sync/driver/non_ui_model_type_controller.cc', - 'sync/driver/non_ui_model_type_controller.h', - 'sync/driver/pref_names.cc', - 'sync/driver/pref_names.h', - 'sync/driver/profile_sync_auth_provider.cc', - 'sync/driver/profile_sync_auth_provider.h', - 'sync/driver/protocol_event_observer.cc', - 'sync/driver/protocol_event_observer.h', - 'sync/driver/proxy_data_type_controller.cc', - 'sync/driver/proxy_data_type_controller.h', - 'sync/driver/shared_change_processor.cc', - 'sync/driver/shared_change_processor.h', - 'sync/driver/shared_change_processor_ref.cc', - 'sync/driver/shared_change_processor_ref.h', - 'sync/driver/signin_manager_wrapper.cc', - 'sync/driver/signin_manager_wrapper.h', - 'sync/driver/startup_controller.cc', - 'sync/driver/startup_controller.h', - 'sync/driver/sync_api_component_factory.h', - 'sync/driver/sync_client.cc', - 'sync/driver/sync_client.h', - 'sync/driver/sync_driver_switches.cc', - 'sync/driver/sync_driver_switches.h', - 'sync/driver/sync_error_controller.cc', - 'sync/driver/sync_error_controller.h', - 'sync/driver/sync_frontend.cc', - 'sync/driver/sync_frontend.h', - 'sync/driver/sync_prefs.cc', - 'sync/driver/sync_prefs.h', - 'sync/driver/sync_service.cc', - 'sync/driver/sync_service.h', - 'sync/driver/sync_service_observer.cc', - 'sync/driver/sync_service_observer.h', - 'sync/driver/sync_service_utils.cc', - 'sync/driver/sync_service_utils.h', - 'sync/driver/sync_stopped_reporter.cc', - 'sync/driver/sync_stopped_reporter.h', - 'sync/driver/sync_type_preference_provider.h', - 'sync/driver/sync_util.cc', - 'sync/driver/sync_util.h', - 'sync/driver/system_encryptor.cc', - 'sync/driver/system_encryptor.h', - 'sync/driver/ui_data_type_controller.cc', - 'sync/driver/ui_data_type_controller.h', - 'sync/driver/ui_model_type_controller.cc', - 'sync/driver/ui_model_type_controller.h', - 'sync/driver/user_selectable_sync_type.h', - ], - - 'conditions': [ - ['OS=="linux" and chromeos==1', { - # Required by get_session_name.cc on Chrome OS. - 'dependencies': [ - '../chromeos/chromeos.gyp:chromeos', - ], - }], - ['OS=="mac"', { - 'link_settings': { - 'libraries': [ - # Required by get_session_name_mac.mm on Mac. - '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framework', - ] - }, - }], - ['OS=="android"', { - 'dependencies': [ - 'sync_jni_headers', - ], - 'sources': [ - 'sync/android/model_type_helper.cc', - 'sync/android/model_type_helper.h', - 'sync/android/sync_jni_registrar.cc', - 'sync/android/sync_jni_registrar.h', - ], - }], - ['configuration_policy==1', { - 'dependencies': [ - 'components.gyp:policy', - 'components.gyp:policy_component', - ], - 'sources': [ - 'sync/driver/sync_policy_handler.cc', - 'sync/driver/sync_policy_handler.h', - ], - }], - ], - }, - { - # Contains sync protobuf definitions. Do not depend on this directly. - # Depend on the 'sync' target to get the relevant C++ code, too. - # - # GN version: //components/sync/protocol - 'target_name': 'sync_proto', - 'type': '<(component)', - 'include_dirs': [ - '..', - ], - 'defines': [ - 'SYNC_PROTO_IMPLEMENTATION', - ], - 'sources': [ - # When adding a new proto source file, add its path to the list defined - # in sync/protocol/protocol.gypi. - '<@(sync_proto_sources)', - ], - 'variables': { - 'enable_wexit_time_destructors': 1, - 'proto_in_dir': './sync/protocol', - 'proto_out_dir': 'components/sync/protocol', - 'cc_generator_options': 'dllexport_decl=SYNC_PROTO_EXPORT:', - 'cc_include': 'components/sync/protocol/sync_proto_export.h', - }, - 'includes': [ - '../build/protoc.gypi' - ], - }, - { - # Contains attachment_store protobuf definitions. Do not depend on this - # directly. - # Depend on the 'sync' target to get the relevant C++ code, too. - # - # GN version: //components/sync/core_impl/attachments/proto - 'target_name': 'attachment_store_proto', - 'type': 'static_library', - 'sources': [ - # NOTE: If you add a file to this list, also add it to - # sync/core_impl/attachments/proto/BUILD.gn - 'sync/core_impl/attachments/proto/attachment_store.proto', - ], - 'variables': { - 'enable_wexit_time_destructors': 1, - 'proto_in_dir': './sync/core_impl/attachments/proto', - 'proto_out_dir': 'components/sync/core_impl/attachments/proto', - 'cc_generator_options': 'dllexport_decl=SYNC_EXPORT:', - 'cc_include': 'components/sync/base/sync_export.h', - }, - 'includes': [ - '../build/protoc.gypi' - ], - 'defines': [ - 'SYNC_IMPLEMENTATION' - ], - }, - ], -}
diff --git a/components/sync/BUILD.gn b/components/sync/BUILD.gn index 70d18ae0..55b8e6d 100644 --- a/components/sync/BUILD.gn +++ b/components/sync/BUILD.gn
@@ -598,7 +598,6 @@ configs += [ "//build/config/compiler:wexit_time_destructors" ] } -# GYP version: sync/sync_tests.gypi:test_support_sync_core static_library("test_support_sync_core") { testonly = true sources = [ @@ -669,7 +668,6 @@ configs += [ "//build/config/compiler:wexit_time_destructors" ] } -# GYP version: sync/sync_tests.gypi:test_support_sync_core_impl static_library("test_support_sync_core_impl") { testonly = true sources = [ @@ -706,7 +704,6 @@ configs += [ "//build/config/compiler:wexit_time_destructors" ] } -# GYP version: sync/sync_tests.gypi:test_support_sync_api static_library("test_support_sync_api") { testonly = true sources = [ @@ -956,7 +953,6 @@ defines = [ "SYNC_TEST" ] } -# GYP version: sync/sync_tests.gypi:test_support_sync_fake_server static_library("test_support_sync_fake_server") { testonly = true sources = [ @@ -1001,7 +997,6 @@ configs += [ "//build/config/compiler:wexit_time_destructors" ] } -# GYP version: sync/sync_tests.gypi:test_support_sync_testserver static_library("test_support_sync_testserver") { testonly = true sources = [ @@ -1024,7 +1019,6 @@ } if (!is_ios) { - # GYP version: sync/sync_tests.gypi:run_sync_testserver executable("run_sync_testserver") { testonly = true sources = [ @@ -1046,7 +1040,6 @@ if (is_android) { import("//build/config/android/rules.gni") - # GYP: //components/sync/sync_tests.gypi:fake_server_jni generate_jni("fake_server_jni") { testonly = true jni_package = "sync/test/fake_server" @@ -1070,7 +1063,6 @@ args += rebase_path(sync_protocol_sources, root_build_dir) } - # GYP: //components/sync/sync_tests.gypi:test_support_sync_proto_java proto_java_library("test_support_sync_proto_java") { proto_path = _test_support_sync_prepared_protos_dir sources = get_target_outputs(":test_support_sync_proto_java_prepare") @@ -1079,7 +1071,6 @@ ] } - # GYP: //components/sync/sync_tests.gypi:sync_java_test_support android_library("sync_java_test_support") { testonly = true deps = [ @@ -1096,7 +1087,6 @@ ] } - # GYP: //components/sync/sync_tests.gypi:test_support_sync_fake_server_android static_library("test_support_sync_fake_server_android") { testonly = true sources = [
diff --git a/components/sync/driver/glue/sync_backend_host_impl.cc b/components/sync/driver/glue/sync_backend_host_impl.cc index 340ed57..de9b155 100644 --- a/components/sync/driver/glue/sync_backend_host_impl.cc +++ b/components/sync/driver/glue/sync_backend_host_impl.cc
@@ -138,7 +138,7 @@ DCHECK(ui_thread_->BelongsToCurrentThread()); registrar_->sync_thread()->task_runner()->PostTask( FROM_HERE, - base::Bind(&SyncBackendHostCore::DoRefreshTypes, core_.get(), types)); + base::Bind(&SyncBackendHostCore::DoRefreshTypes, core_, types)); } void SyncBackendHostImpl::UpdateCredentials( @@ -146,7 +146,7 @@ DCHECK(registrar_->sync_thread()->IsRunning()); registrar_->sync_thread()->task_runner()->PostTask( FROM_HERE, base::Bind(&SyncBackendHostCore::DoUpdateCredentials, - core_.get(), credentials)); + core_, credentials)); } void SyncBackendHostImpl::StartSyncingWithServer() { @@ -156,7 +156,7 @@ registrar_->GetModelSafeRoutingInfo(&routing_info); registrar_->sync_thread()->task_runner()->PostTask( - FROM_HERE, base::Bind(&SyncBackendHostCore::DoStartSyncing, core_.get(), + FROM_HERE, base::Bind(&SyncBackendHostCore::DoStartSyncing, core_, routing_info, sync_prefs_->GetLastPollTime())); } @@ -184,7 +184,7 @@ // Post an encryption task on the syncer thread. registrar_->sync_thread()->task_runner()->PostTask( FROM_HERE, base::Bind(&SyncBackendHostCore::DoSetEncryptionPassphrase, - core_.get(), passphrase, is_explicit)); + core_, passphrase, is_explicit)); } bool SyncBackendHostImpl::SetDecryptionPassphrase( @@ -213,7 +213,7 @@ // Post a decryption task on the syncer thread. registrar_->sync_thread()->task_runner()->PostTask( FROM_HERE, base::Bind(&SyncBackendHostCore::DoSetDecryptionPassphrase, - core_.get(), passphrase)); + core_, passphrase)); // Since we were able to decrypt the cached pending keys with the passphrase // provided, we immediately alert the UI layer that the passphrase was @@ -264,7 +264,7 @@ // Shut down and destroy sync manager. registrar_->sync_thread()->task_runner()->PostTask( FROM_HERE, - base::Bind(&SyncBackendHostCore::DoShutdown, core_.get(), reason)); + base::Bind(&SyncBackendHostCore::DoShutdown, core_, reason)); core_ = NULL; // Worker cleanup. @@ -410,7 +410,7 @@ void SyncBackendHostImpl::EnableEncryptEverything() { registrar_->sync_thread()->task_runner()->PostTask( FROM_HERE, - base::Bind(&SyncBackendHostCore::DoEnableEncryptEverything, core_.get())); + base::Bind(&SyncBackendHostCore::DoEnableEncryptEverything, core_)); } void SyncBackendHostImpl::ActivateDirectoryDataType( @@ -523,7 +523,7 @@ void SyncBackendHostImpl::InitCore( std::unique_ptr<DoInitializeOptions> options) { registrar_->sync_thread()->task_runner()->PostTask( - FROM_HERE, base::Bind(&SyncBackendHostCore::DoInitialize, core_.get(), + FROM_HERE, base::Bind(&SyncBackendHostCore::DoInitialize, core_, base::Passed(&options))); } @@ -545,7 +545,7 @@ config_types.to_unapply = to_unapply; registrar_->sync_thread()->task_runner()->PostTask( FROM_HERE, - base::Bind(&SyncBackendHostCore::DoConfigureSyncer, core_.get(), reason, + base::Bind(&SyncBackendHostCore::DoConfigureSyncer, core_, reason, config_types, routing_info, ready_task, retry_callback)); } @@ -674,14 +674,14 @@ syncer::InvalidatorState state) { registrar_->sync_thread()->task_runner()->PostTask( FROM_HERE, base::Bind(&SyncBackendHostCore::DoOnInvalidatorStateChange, - core_.get(), state)); + core_, state)); } void SyncBackendHostImpl::OnIncomingInvalidation( const syncer::ObjectIdInvalidationMap& invalidation_map) { registrar_->sync_thread()->task_runner()->PostTask( FROM_HERE, base::Bind(&SyncBackendHostCore::DoOnIncomingInvalidation, - core_.get(), invalidation_map)); + core_, invalidation_map)); } std::string SyncBackendHostImpl::GetOwnerName() const { @@ -816,7 +816,7 @@ registrar_->sync_thread()->task_runner()->PostTask( FROM_HERE, - base::Bind(&SyncBackendHostCore::DoRefreshTypes, core_.get(), types)); + base::Bind(&SyncBackendHostCore::DoRefreshTypes, core_, types)); } void SyncBackendHostImpl::ClearServerData( @@ -824,7 +824,7 @@ DCHECK(ui_thread_->BelongsToCurrentThread()); registrar_->sync_thread()->task_runner()->PostTask( FROM_HERE, base::Bind(&SyncBackendHostCore::DoClearServerData, - core_.get(), callback)); + core_, callback)); } void SyncBackendHostImpl::OnCookieJarChanged(bool account_mismatch, @@ -832,7 +832,7 @@ DCHECK(ui_thread_->BelongsToCurrentThread()); registrar_->sync_thread()->task_runner()->PostTask( FROM_HERE, base::Bind(&SyncBackendHostCore::DoOnCookieJarChanged, - core_.get(), account_mismatch, empty_jar)); + core_, account_mismatch, empty_jar)); } void SyncBackendHostImpl::ClearServerDataDoneOnFrontendLoop(
diff --git a/components/sync/driver/non_ui_data_type_controller_unittest.cc b/components/sync/driver/non_ui_data_type_controller_unittest.cc index 05b8cf1e..3c2542c8 100644 --- a/components/sync/driver/non_ui_data_type_controller_unittest.cc +++ b/components/sync/driver/non_ui_data_type_controller_unittest.cc
@@ -485,7 +485,7 @@ FROM_HERE, base::Bind( &NonUIDataTypeControllerFake::OnSingleDataTypeUnrecoverableError, - non_ui_dtc_.get(), error)); + non_ui_dtc_, error)); WaitForDTC(); }
diff --git a/components/sync/protocol/protocol.gypi b/components/sync/protocol/protocol.gypi deleted file mode 100644 index 0477262c..0000000 --- a/components/sync/protocol/protocol.gypi +++ /dev/null
@@ -1,60 +0,0 @@ -# Copyright 2015 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. - -{ - 'variables': { - # The directory that contains the sync protocol buffer definitions. - # This variable can be overridden for other builds that require the proto - # files to be stored in an intermediate directory. - 'sync_proto_sources_dir%': '.', - - # The list of sync protocol buffer definitions. - 'sync_proto_source_paths': [ - '<(sync_proto_sources_dir)/app_notification_specifics.proto', - '<(sync_proto_sources_dir)/app_setting_specifics.proto', - '<(sync_proto_sources_dir)/app_specifics.proto', - '<(sync_proto_sources_dir)/app_list_specifics.proto', - '<(sync_proto_sources_dir)/arc_package_specifics.proto', - '<(sync_proto_sources_dir)/article_specifics.proto', - '<(sync_proto_sources_dir)/attachments.proto', - '<(sync_proto_sources_dir)/autofill_specifics.proto', - '<(sync_proto_sources_dir)/bookmark_specifics.proto', - '<(sync_proto_sources_dir)/client_commands.proto', - '<(sync_proto_sources_dir)/client_debug_info.proto', - '<(sync_proto_sources_dir)/data_type_state.proto', - '<(sync_proto_sources_dir)/device_info_specifics.proto', - '<(sync_proto_sources_dir)/dictionary_specifics.proto', - '<(sync_proto_sources_dir)/encryption.proto', - '<(sync_proto_sources_dir)/entity_metadata.proto', - '<(sync_proto_sources_dir)/experiment_status.proto', - '<(sync_proto_sources_dir)/experiments_specifics.proto', - '<(sync_proto_sources_dir)/extension_setting_specifics.proto', - '<(sync_proto_sources_dir)/extension_specifics.proto', - '<(sync_proto_sources_dir)/favicon_image_specifics.proto', - '<(sync_proto_sources_dir)/favicon_tracking_specifics.proto', - '<(sync_proto_sources_dir)/get_updates_caller_info.proto', - '<(sync_proto_sources_dir)/history_delete_directive_specifics.proto', - '<(sync_proto_sources_dir)/history_status.proto', - '<(sync_proto_sources_dir)/nigori_specifics.proto', - '<(sync_proto_sources_dir)/managed_user_setting_specifics.proto', - '<(sync_proto_sources_dir)/managed_user_shared_setting_specifics.proto', - '<(sync_proto_sources_dir)/managed_user_specifics.proto', - '<(sync_proto_sources_dir)/managed_user_whitelist_specifics.proto', - '<(sync_proto_sources_dir)/password_specifics.proto', - '<(sync_proto_sources_dir)/preference_specifics.proto', - '<(sync_proto_sources_dir)/priority_preference_specifics.proto', - '<(sync_proto_sources_dir)/search_engine_specifics.proto', - '<(sync_proto_sources_dir)/session_specifics.proto', - '<(sync_proto_sources_dir)/sync.proto', - '<(sync_proto_sources_dir)/sync_enums.proto', - '<(sync_proto_sources_dir)/synced_notification_app_info_specifics.proto', - '<(sync_proto_sources_dir)/synced_notification_specifics.proto', - '<(sync_proto_sources_dir)/test.proto', - '<(sync_proto_sources_dir)/theme_specifics.proto', - '<(sync_proto_sources_dir)/typed_url_specifics.proto', - '<(sync_proto_sources_dir)/unique_position.proto', - '<(sync_proto_sources_dir)/wifi_credential_specifics.proto', - ], - }, -}
diff --git a/components/sync/protocol/protocol_sources.gni b/components/sync/protocol/protocol_sources.gni index f703074..3bf86373 100644 --- a/components/sync/protocol/protocol_sources.gni +++ b/components/sync/protocol/protocol_sources.gni
@@ -2,13 +2,49 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -protocol_gypi = exec_script( - "//build/gypi_to_gn.py", - [ - rebase_path("//components/sync/protocol/protocol.gypi"), - "--replace=<(sync_proto_sources_dir)=//components/sync/protocol", - ], - "scope", - [ "//components/sync/protocol/protocol.gypi" ]) - -sync_protocol_sources = protocol_gypi.sync_proto_source_paths +sync_protocol_sources = [ + "//components/sync/protocol/app_notification_specifics.proto", + "//components/sync/protocol/app_setting_specifics.proto", + "//components/sync/protocol/app_specifics.proto", + "//components/sync/protocol/app_list_specifics.proto", + "//components/sync/protocol/arc_package_specifics.proto", + "//components/sync/protocol/article_specifics.proto", + "//components/sync/protocol/attachments.proto", + "//components/sync/protocol/autofill_specifics.proto", + "//components/sync/protocol/bookmark_specifics.proto", + "//components/sync/protocol/client_commands.proto", + "//components/sync/protocol/client_debug_info.proto", + "//components/sync/protocol/data_type_state.proto", + "//components/sync/protocol/device_info_specifics.proto", + "//components/sync/protocol/dictionary_specifics.proto", + "//components/sync/protocol/encryption.proto", + "//components/sync/protocol/entity_metadata.proto", + "//components/sync/protocol/experiment_status.proto", + "//components/sync/protocol/experiments_specifics.proto", + "//components/sync/protocol/extension_setting_specifics.proto", + "//components/sync/protocol/extension_specifics.proto", + "//components/sync/protocol/favicon_image_specifics.proto", + "//components/sync/protocol/favicon_tracking_specifics.proto", + "//components/sync/protocol/get_updates_caller_info.proto", + "//components/sync/protocol/history_delete_directive_specifics.proto", + "//components/sync/protocol/history_status.proto", + "//components/sync/protocol/nigori_specifics.proto", + "//components/sync/protocol/managed_user_setting_specifics.proto", + "//components/sync/protocol/managed_user_shared_setting_specifics.proto", + "//components/sync/protocol/managed_user_specifics.proto", + "//components/sync/protocol/managed_user_whitelist_specifics.proto", + "//components/sync/protocol/password_specifics.proto", + "//components/sync/protocol/preference_specifics.proto", + "//components/sync/protocol/priority_preference_specifics.proto", + "//components/sync/protocol/search_engine_specifics.proto", + "//components/sync/protocol/session_specifics.proto", + "//components/sync/protocol/sync.proto", + "//components/sync/protocol/sync_enums.proto", + "//components/sync/protocol/synced_notification_app_info_specifics.proto", + "//components/sync/protocol/synced_notification_specifics.proto", + "//components/sync/protocol/test.proto", + "//components/sync/protocol/theme_specifics.proto", + "//components/sync/protocol/typed_url_specifics.proto", + "//components/sync/protocol/unique_position.proto", + "//components/sync/protocol/wifi_credential_specifics.proto", +]
diff --git a/components/sync/sync_android.gypi b/components/sync/sync_android.gypi deleted file mode 100644 index f2402431..0000000 --- a/components/sync/sync_android.gypi +++ /dev/null
@@ -1,59 +0,0 @@ -# Copyright 2013 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. - -{ - 'conditions': [ - ['OS == "android"', { - 'targets': [ - { - # GN: //components/sync/android:sync_java - 'target_name': 'sync_java', - 'type': 'none', - 'variables': { - 'java_in_dir': '../../components/sync/android/java', - }, - 'dependencies': [ - 'model_type_java', - 'stop_source_java', - 'sync_jni_headers', - '../../base/base.gyp:base_java', - '../../net/net.gyp:net_java', - '../../third_party/android_tools/android_tools.gyp:google_play_services_javalib', - '../../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_javalib', - '../../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib', - ], - 'includes': [ '../../build/java.gypi' ], - }, - { - 'target_name': 'sync_jni_headers', - 'type': 'none', - 'sources': [ - 'android/java/src/org/chromium/components/sync/ModelTypeHelper.java', - ], - 'variables': { - 'jni_gen_package': 'sync', - }, - 'includes': [ '../../build/jni_generator.gypi' ], - }, - # GN: //components/sync/android:java_enums - { - 'target_name': 'model_type_java', - 'type': 'none', - 'variables': { - 'source_file': 'base/model_type.h', - }, - 'includes': [ '../../build/android/java_cpp_enum.gypi' ], - }, - { - 'target_name': 'stop_source_java', - 'type': 'none', - 'variables': { - 'source_file': 'base/stop_source.h', - }, - 'includes': [ '../../build/android/java_cpp_enum.gypi' ], - }, - ], - }], - ], -}
diff --git a/components/sync/sync_tests.gypi b/components/sync/sync_tests.gypi deleted file mode 100644 index 9121f44..0000000 --- a/components/sync/sync_tests.gypi +++ /dev/null
@@ -1,408 +0,0 @@ -# Copyright 2013 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. - -{ - 'targets': [ - # Test support files for the 'sync_core' target. - # GN version: //components/sync:test_support_sync_core - { - 'target_name': 'test_support_sync_core', - 'type': 'static_library', - 'variables': { 'enable_wexit_time_destructors': 1, }, - 'include_dirs': [ - '..', - ], - 'defines': [ - 'SYNC_TEST' - ], - 'dependencies': [ - '../base/base.gyp:base', - '../testing/gmock.gyp:gmock', - '../testing/gtest.gyp:gtest', - 'sync', - ], - 'export_dependent_settings': [ - '../testing/gmock.gyp:gmock', - '../testing/gtest.gyp:gtest', - 'sync', - ], - 'sources': [ - 'base/model_type_test_util.cc', - 'base/model_type_test_util.h', - 'js/js_test_util.cc', - 'js/js_test_util.h', - 'sessions_impl/test_util.cc', - 'sessions_impl/test_util.h', - 'test/callback_counter.h', - "test/directory_backing_store_corruption_testing.cc", - "test/directory_backing_store_corruption_testing.h", - 'test/engine/fake_model_worker.cc', - 'test/engine/fake_model_worker.h', - 'test/engine/fake_sync_scheduler.cc', - 'test/engine/fake_sync_scheduler.h', - 'test/engine/mock_connection_manager.cc', - 'test/engine/mock_connection_manager.h', - 'test/engine/mock_model_type_processor.cc', - 'test/engine/mock_model_type_processor.h', - 'test/engine/mock_model_type_worker.cc', - 'test/engine/mock_model_type_worker.h', - 'test/engine/mock_nudge_handler.cc', - 'test/engine/mock_nudge_handler.h', - 'test/engine/mock_update_handler.cc', - 'test/engine/mock_update_handler.h', - 'test/engine/single_type_mock_server.cc', - 'test/engine/single_type_mock_server.h', - 'test/engine/test_directory_setter_upper.cc', - 'test/engine/test_directory_setter_upper.h', - 'test/engine/test_id_factory.h', - 'test/engine/test_syncable_utils.cc', - 'test/engine/test_syncable_utils.h', - 'base/fake_encryptor.cc', - 'base/fake_encryptor.h', - 'test/fake_sync_encryption_handler.cc', - 'test/fake_sync_encryption_handler.h', - 'test/mock_invalidation.cc', - 'test/mock_invalidation.h', - 'test/mock_invalidation_tracker.cc', - 'test/mock_invalidation_tracker.h', - 'test/null_directory_change_delegate.cc', - 'test/null_directory_change_delegate.h', - 'test/null_transaction_observer.cc', - 'test/null_transaction_observer.h', - 'test/sessions/mock_debug_info_getter.cc', - 'test/sessions/mock_debug_info_getter.h', - 'test/sessions/test_scoped_session_event_listener.h', - 'test/test_directory_backing_store.cc', - 'test/test_directory_backing_store.h', - 'test/test_transaction_observer.cc', - 'test/test_transaction_observer.h', - 'test/trackable_mock_invalidation.cc', - 'test/trackable_mock_invalidation.h', - 'base/mock_unrecoverable_error_handler.cc', - 'base/mock_unrecoverable_error_handler.h', - 'base/test_unrecoverable_error_handler.cc', - 'base/test_unrecoverable_error_handler.h', - ], - }, - - # Test support files for the python sync test server. - # GN version: //components/sync:test_support_sync_testserver - { - 'target_name': 'test_support_sync_testserver', - 'type': 'static_library', - 'variables': { 'enable_wexit_time_destructors': 1, }, - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net_test_support', - # The sync test server uses Python modules generated by the sync protos. - '../third_party/protobuf/protobuf.gyp:py_proto', - 'sync', - ], - 'export_dependent_settings': [ - '../base/base.gyp:base', - '../net/net.gyp:net_test_support', - ], - 'sources': [ - 'test/local_sync_test_server.cc', - 'test/local_sync_test_server.h', - ], - }, - - # Test support files for the fake sync server. - # GN version: //components/sync:test_support_sync_fake_server - { - 'target_name': 'test_support_sync_fake_server', - 'type': 'static_library', - 'variables': { 'enable_wexit_time_destructors': 1, }, - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - '../testing/gtest.gyp:gtest', - '../third_party/protobuf/protobuf.gyp:protobuf_lite', - 'sync', - ], - 'export_dependent_settings': [ - 'sync', - ], - 'sources': [ - 'test/fake_server/bookmark_entity.cc', - 'test/fake_server/bookmark_entity.h', - 'test/fake_server/bookmark_entity_builder.cc', - 'test/fake_server/bookmark_entity_builder.h', - 'test/fake_server/entity_builder_factory.cc', - 'test/fake_server/entity_builder_factory.h', - 'test/fake_server/fake_server.cc', - 'test/fake_server/fake_server.h', - 'test/fake_server/fake_server_entity.cc', - 'test/fake_server/fake_server_entity.h', - 'test/fake_server/fake_server_http_post_provider.cc', - 'test/fake_server/fake_server_http_post_provider.h', - 'test/fake_server/fake_server_network_resources.cc', - 'test/fake_server/fake_server_network_resources.h', - 'test/fake_server/fake_server_verifier.cc', - 'test/fake_server/fake_server_verifier.h', - 'test/fake_server/permanent_entity.cc', - 'test/fake_server/permanent_entity.h', - 'test/fake_server/sessions_hierarchy.cc', - 'test/fake_server/sessions_hierarchy.h', - 'test/fake_server/tombstone_entity.cc', - 'test/fake_server/tombstone_entity.h', - 'test/fake_server/unique_client_entity.cc', - 'test/fake_server/unique_client_entity.h', - ], - }, - - # Test support files for the 'sync_core_impl' target. - # GN version: //components/sync:test_support_sync_core_impl - { - 'target_name': 'test_support_sync_core_impl', - 'type': 'static_library', - 'variables': { 'enable_wexit_time_destructors': 1, }, - 'include_dirs': [ - '..', - ], - 'defines': [ - 'SYNC_TEST' - ], - 'dependencies': [ - '../base/base.gyp:base', - '../testing/gtest.gyp:gtest', - 'sync', - 'test_support_sync_core', - ], - 'export_dependent_settings': [ - '../testing/gtest.gyp:gtest', - 'sync', - 'test_support_sync_core', - ], - 'sources': [ - 'core/test/data_type_error_handler_mock.h', - 'core/test/fake_model_type_connector.h', - 'core/test/fake_model_type_processor.h', - 'core/test/fake_sync_manager.h', - 'core/test/model_type_store_test_util.h', - 'core/test/sync_manager_factory_for_profile_sync_test.h', - 'core/test/test_entry_factory.h', - 'core/test/test_internal_components_factory.h', - 'core/test/test_user_share.h', - 'core_impl/test/data_type_error_handler_mock.cc', - 'core_impl/test/fake_model_type_connector.cc', - 'core_impl/test/fake_model_type_processor.cc', - 'core_impl/test/fake_sync_manager.cc', - 'core_impl/test/model_type_store_test_util.cc', - 'core_impl/test/sync_manager_factory_for_profile_sync_test.cc', - 'core_impl/test/sync_manager_for_profile_sync_test.cc', - 'core_impl/test/sync_manager_for_profile_sync_test.h', - 'core_impl/test/test_entry_factory.cc', - 'core_impl/test/test_internal_components_factory.cc', - 'core_impl/test/test_user_share.cc', - ], - }, - - # Test support files for the 'sync_api' target. - # GN version: //components/sync:test_support_sync_api - { - 'target_name': 'test_support_sync_api', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'defines': [ - 'SYNC_TEST' - ], - 'dependencies': [ - '../testing/gmock.gyp:gmock', - 'sync', - ], - 'export_dependent_settings': [ - '../testing/gmock.gyp:gmock', - 'sync', - ], - 'sources': [ - 'api/fake_model_type_change_processor.cc', - 'api/fake_model_type_change_processor.h', - 'api/fake_model_type_service.cc', - 'api/fake_model_type_service.h', - 'api/fake_sync_change_processor.cc', - 'api/fake_sync_change_processor.h', - 'api/fake_syncable_service.cc', - 'api/fake_syncable_service.h', - 'api/mock_model_type_store.cc', - 'api/mock_model_type_store.h', - 'api/sync_change_processor_wrapper_for_test.cc', - 'api/sync_change_processor_wrapper_for_test.h', - 'api/sync_error_factory_mock.cc', - 'api/sync_error_factory_mock.h', - ], - }, - { - 'target_name': 'test_support_sync_driver', - 'type': 'static_library', - 'dependencies': [ - 'sync', - 'test_support_sync_core_impl', - 'components.gyp:version_info', - '../base/base.gyp:base', - '../testing/gmock.gyp:gmock', - '../testing/gtest.gyp:gtest', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'driver/change_processor_mock.cc', - 'driver/change_processor_mock.h', - 'driver/data_type_controller_mock.cc', - 'driver/data_type_controller_mock.h', - 'driver/data_type_manager_mock.cc', - 'driver/data_type_manager_mock.h', - 'driver/fake_data_type_controller.cc', - 'driver/fake_data_type_controller.h', - 'driver/fake_generic_change_processor.cc', - 'driver/fake_generic_change_processor.h', - 'driver/fake_sync_client.cc', - 'driver/fake_sync_client.h', - 'driver/fake_sync_service.cc', - 'driver/fake_sync_service.h', - 'driver/frontend_data_type_controller_mock.cc', - 'driver/frontend_data_type_controller_mock.h', - 'driver/glue/sync_backend_host_mock.cc', - 'driver/glue/sync_backend_host_mock.h', - 'driver/local_device_info_provider_mock.cc', - 'driver/local_device_info_provider_mock.h', - 'driver/model_associator_mock.cc', - 'driver/model_associator_mock.h', - 'driver/non_ui_data_type_controller_mock.cc', - 'driver/non_ui_data_type_controller_mock.h', - 'driver/sync_api_component_factory_mock.cc', - 'driver/sync_api_component_factory_mock.h', - ], - }, - ], - 'conditions': [ - ['OS != "ios"', { - 'targets': [ - # A tool that can be used to launch a python sync server instance. - { - 'target_name': 'run_sync_testserver', - 'type': 'executable', - 'dependencies': [ - '../base/base.gyp:base', - '../base/base.gyp:test_support_base', - '../net/net.gyp:net_test_support', - '../testing/gtest.gyp:gtest', - 'test_support_sync_testserver', - ], - 'sources': [ - 'tools/testserver/run_sync_testserver.cc', - ], - }, - ], - }], - ['OS == "android"', { - 'targets': [ - { - # GN: //components/sync/android:sync_javatests - 'target_name': 'sync_javatests', - 'type': 'none', - 'variables': { - 'java_in_dir': '../components/sync/android/javatests', - }, - 'dependencies': [ - 'sync_java', - 'sync_java_test_support', - '../base/base.gyp:base_java_test_support', - ], - 'includes': [ '../../build/java.gypi' ], - }, - { - # GN: //components/sync:sync_java_test_support - 'target_name': 'sync_java_test_support', - 'type': 'none', - 'variables': { - 'java_in_dir': '../components/sync/test/android/javatests', - }, - 'dependencies': [ - 'sync_java', - '../base/base.gyp:base_java_test_support', - ], - 'includes': [ '../../build/java.gypi' ], - }, - { - # GN: //components/sync:sync_fake_server_jni_headers - 'target_name': 'sync_fake_server_jni_headers', - 'type': 'none', - 'sources': [ - '../chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/FakeServerHelper.java', - ], - 'variables': { - 'jni_gen_package': 'sync/test/fake_server', - 'jni_generator_ptr_type': 'long', - }, - 'includes': [ '../../build/jni_generator.gypi' ], - }, - { - # GN: //components/sync:test_support_sync_proto_java - 'target_name': 'test_support_sync_proto_java', - 'type': 'none', - 'variables': { - 'proto_in_dir': '<(INTERMEDIATE_DIR)/sync_protos', - # Set this variable so that sync_proto_source_paths refers to the - # temporary proto definitions created here. - 'sync_proto_sources_dir': '<(INTERMEDIATE_DIR)/sync_protos', - }, - 'actions': [ - { - 'action_name': 'run_script', - 'inputs': [ - 'protocol/prepare_protos_for_java_tests.py', - # Use the original list of proto files (defined in sync.gyp). - '<@(sync_proto_sources)', - ], - 'outputs': [ - '<@(sync_proto_source_paths)', - ], - 'action': [ - 'python', - 'protocol/prepare_protos_for_java_tests.py', - '--output_dir', - '<(INTERMEDIATE_DIR)/sync_protos', - # Use the original list of proto files (defined in sync.gyp). - '<@(sync_proto_sources)' - ], - }, - ], - 'sources': [ - '<@(sync_proto_source_paths)', - ], - 'includes': ['protocol/protocol.gypi', '../../build/protoc_java.gypi'], - }, - { - # GN: //components/sync:test_support_sync_fake_server_android - 'target_name': 'test_support_sync_fake_server_android', - 'type': 'static_library', - 'dependencies': [ - 'sync_fake_server_jni_headers', - 'test_support_sync_fake_server', - '../testing/gtest.gyp:gtest', - '../base/base.gyp:base', - ], - 'export_dependent_settings': [ - '../testing/gtest.gyp:gtest', - ], - 'sources': [ - 'test/fake_server/android/fake_server_helper_android.cc', - 'test/fake_server/android/fake_server_helper_android.h', - ], - }, - ], - }], - ], -}
diff --git a/components/sync/tools/sync_tools.gyp b/components/sync/tools/sync_tools.gyp deleted file mode 100644 index c5bf2776..0000000 --- a/components/sync/tools/sync_tools.gyp +++ /dev/null
@@ -1,78 +0,0 @@ -# Copyright 2014 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. - -{ - 'variables': { - 'chromium_code': 1, - }, - - 'targets': [ - { - # GN: //components/sync/tools:common - 'target_name': 'sync_tools_helper', - 'type': 'static_library', - 'include_dirs': [ - '../../..', - ], - 'dependencies': [ - '../../../base/base.gyp:base', - '../../../components/components.gyp:invalidation_impl', - '../../sync.gyp:sync', - ], - 'export_dependent_settings': [ - '../../../base/base.gyp:base', - '../../sync.gyp:sync', - ], - 'sources': [ - 'null_invalidation_state_tracker.cc', - 'null_invalidation_state_tracker.h', - ], - }, - # A tool to listen to sync notifications and print them out. - { - # GN: //components/sync/tools:sync_listen_notifications - 'target_name': 'sync_listen_notifications', - 'type': 'executable', - 'defines': [ - 'SYNC_TEST', - ], - 'dependencies': [ - '../../../base/base.gyp:base', - '../../../components/components.gyp:invalidation_impl', - '../../../jingle/jingle.gyp:notifier', - '../../../net/net.gyp:net', - '../../../net/net.gyp:net_test_support', - '../../sync.gyp:sync', - 'sync_tools_helper', - ], - 'sources': [ - 'sync_listen_notifications.cc', - ], - }, - - # A standalone command-line sync client. - { - # GN: //components/sync/tools:sync_client - 'target_name': 'sync_client', - 'type': 'executable', - 'defines': [ - 'SYNC_TEST', - ], - 'dependencies': [ - '../../../base/base.gyp:base', - '../../../components/components.gyp:invalidation_impl', - '../../../jingle/jingle.gyp:notifier', - '../../../net/net.gyp:net', - '../../../net/net.gyp:net_test_support', - '../../sync.gyp:sync', - '../../sync.gyp:test_support_sync_core', - 'sync_tools_helper', - ], - 'sources': [ - 'sync_client.cc', - ], - }, - ] -} -
diff --git a/components/sync_bookmarks.gypi b/components/sync_bookmarks.gypi deleted file mode 100644 index cea0e3b..0000000 --- a/components/sync_bookmarks.gypi +++ /dev/null
@@ -1,35 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/sync_bookmarks - 'target_name': 'sync_bookmarks', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../components/sync.gyp:sync', - '../ui/gfx/gfx.gyp:gfx', - 'bookmarks_browser', - 'favicon_core', - 'history_core_browser', - 'sync.gyp:sync', - 'undo_component', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: file list duplicated in GN build. - 'sync_bookmarks/bookmark_change_processor.cc', - 'sync_bookmarks/bookmark_change_processor.h', - 'sync_bookmarks/bookmark_data_type_controller.cc', - 'sync_bookmarks/bookmark_data_type_controller.h', - 'sync_bookmarks/bookmark_model_associator.cc', - 'sync_bookmarks/bookmark_model_associator.h', - ], - }, - ], -}
diff --git a/components/sync_sessions.gypi b/components/sync_sessions.gypi deleted file mode 100644 index 7b10786d..0000000 --- a/components/sync_sessions.gypi +++ /dev/null
@@ -1,97 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/sync_sessions - 'target_name': 'sync_sessions', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../components/sync.gyp:sync', - '../url/url.gyp:url_lib', - 'bookmarks_browser', - 'history_core_browser', - 'prefs/prefs.gyp:prefs', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'sync_sessions/favicon_cache.cc', - 'sync_sessions/favicon_cache.h', - 'sync_sessions/local_session_event_router.h', - 'sync_sessions/open_tabs_ui_delegate.cc', - 'sync_sessions/open_tabs_ui_delegate.h', - 'sync_sessions/revisit/bookmarks_by_url_provider_impl.cc', - 'sync_sessions/revisit/bookmarks_by_url_provider_impl.h', - 'sync_sessions/revisit/bookmarks_page_revisit_observer.cc', - 'sync_sessions/revisit/bookmarks_page_revisit_observer.h', - 'sync_sessions/revisit/current_tab_matcher.cc', - 'sync_sessions/revisit/current_tab_matcher.h', - 'sync_sessions/revisit/offset_tab_matcher.cc', - 'sync_sessions/revisit/offset_tab_matcher.h', - 'sync_sessions/revisit/page_equality.h', - 'sync_sessions/revisit/page_visit_observer.h', - 'sync_sessions/revisit/page_revisit_broadcaster.cc', - 'sync_sessions/revisit/page_revisit_broadcaster.h', - 'sync_sessions/revisit/sessions_page_revisit_observer.cc', - 'sync_sessions/revisit/sessions_page_revisit_observer.h', - 'sync_sessions/revisit/typed_url_page_revisit_observer.cc', - 'sync_sessions/revisit/typed_url_page_revisit_observer.h', - 'sync_sessions/revisit/typed_url_page_revisit_task.cc', - 'sync_sessions/revisit/typed_url_page_revisit_task.h', - 'sync_sessions/session_data_type_controller.cc', - 'sync_sessions/session_data_type_controller.h', - 'sync_sessions/sessions_sync_manager.cc', - 'sync_sessions/sessions_sync_manager.h', - 'sync_sessions/synced_tab_delegate.cc', - 'sync_sessions/synced_tab_delegate.h', - 'sync_sessions/synced_session.cc', - 'sync_sessions/synced_session.h', - 'sync_sessions/synced_session_tracker.cc', - 'sync_sessions/synced_session_tracker.h', - 'sync_sessions/synced_window_delegate.h', - 'sync_sessions/synced_window_delegates_getter.cc', - 'sync_sessions/synced_window_delegates_getter.h', - 'sync_sessions/sync_sessions_client.cc', - 'sync_sessions/sync_sessions_client.h', - 'sync_sessions/sync_sessions_metrics.cc', - 'sync_sessions/sync_sessions_metrics.h', - 'sync_sessions/tab_node_pool.cc', - 'sync_sessions/tab_node_pool.h', - ], - 'conditions': [ - ['OS!="ios"', { - 'dependencies': [ - 'sessions_content', - ], - }, { # OS==ios - 'dependencies': [ - 'sessions_ios', - ], - }], - ], - }, - { - 'target_name': 'sync_sessions_test_support', - 'type': 'static_library', - 'dependencies': [ - 'sync_sessions', - '../base/base.gyp:base', - '../components/sync.gyp:sync', - '../testing/gtest.gyp:gtest', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'sync_sessions/fake_sync_sessions_client.cc', - 'sync_sessions/fake_sync_sessions_client.h', - ], - } - ] -}
diff --git a/components/syncable_prefs.gypi b/components/syncable_prefs.gypi deleted file mode 100644 index cf8a7bf..0000000 --- a/components/syncable_prefs.gypi +++ /dev/null
@@ -1,64 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/syncable_prefs - 'target_name': 'syncable_prefs', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../components/sync.gyp:sync', - 'pref_registry', - 'prefs/prefs.gyp:prefs', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'syncable_prefs/pref_model_associator.cc', - 'syncable_prefs/pref_model_associator.h', - 'syncable_prefs/pref_model_associator_client.h', - 'syncable_prefs/pref_service_syncable.cc', - 'syncable_prefs/pref_service_syncable.h', - 'syncable_prefs/pref_service_syncable_factory.cc', - 'syncable_prefs/pref_service_syncable_factory.h', - 'syncable_prefs/pref_service_syncable_observer.h', - 'syncable_prefs/synced_pref_change_registrar.cc', - 'syncable_prefs/synced_pref_change_registrar.h', - 'syncable_prefs/synced_pref_observer.h', - ], - 'conditions': [ - ['configuration_policy==1', { - # This define is only used for compiling the .cc files in this target. - 'defines': [ "SYNCABLE_PREFS_USE_POLICY" ], - 'dependencies': [ - 'cloud_policy_code_generate', - 'policy_component_browser', - 'policy_component_common', - ], - }], - ], - }, - { - # GN version: //components/syncable_prefs:test_support - 'target_name': 'syncable_prefs_test_support', - 'type': 'static_library', - 'dependencies': [ - '../testing/gtest.gyp:gtest', - 'syncable_prefs', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'syncable_prefs/pref_service_mock_factory.cc', - 'syncable_prefs/pref_service_mock_factory.h', - 'syncable_prefs/testing_pref_service_syncable.cc', - 'syncable_prefs/testing_pref_service_syncable.h', - ], - }, - ], -}
diff --git a/components/test_runner/test_runner.gyp b/components/test_runner/test_runner.gyp deleted file mode 100644 index 36264c2..0000000 --- a/components/test_runner/test_runner.gyp +++ /dev/null
@@ -1,226 +0,0 @@ -# Copyright 2015 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. - -{ - 'variables': { - # This turns on e.g. the filename-based detection of which - # platforms to include source files on (e.g. files ending in - # _mac.h or _mac.cc are only compiled on MacOSX). - 'chromium_code': 1, - }, - 'targets': [ - { - # GN version: //components/test_runner:test_runner - 'target_name': 'test_runner', - 'type': '<(component)', - 'defines': [ - 'TEST_RUNNER_IMPLEMENTATION', - ], - 'dependencies': [ - 'resources', - '../../base/base.gyp:base', - '../../base/base.gyp:base_i18n', - '../../cc/cc.gyp:cc', - '../../cc/blink/cc_blink.gyp:cc_blink', - '../../gin/gin.gyp:gin', - '../../gpu/gpu.gyp:gpu', - '../../net/net.gyp:net', - '../../skia/skia.gyp:skia', - '../../third_party/WebKit/public/blink.gyp:blink', - '../../ui/display/display.gyp:display', - '../../ui/events/blink/events_blink.gyp:events_blink', - '../../ui/events/events.gyp:dom_keycode_converter', - '../../ui/events/events.gyp:events_base', - '../../ui/gfx/gfx.gyp:gfx', - '../../ui/gfx/gfx.gyp:gfx_geometry', - '../../ui/gfx/gfx.gyp:gfx_test_support', - '../../url/url.gyp:url_lib', - '../../v8/src/v8.gyp:v8', - ], - 'include_dirs': [ - '..', - ], - # Note: sources list duplicated in GN build. - 'sources': [ - 'accessibility_controller.cc', - 'accessibility_controller.h', - 'app_banner_client.cc', - 'app_banner_client.h', - 'event_sender.cc', - 'event_sender.h', - 'gamepad_controller.cc', - 'gamepad_controller.h', - 'gc_controller.cc', - 'gc_controller.h', - 'layout_and_paint_async_then.cc', - 'layout_and_paint_async_then.h', - 'layout_dump.cc', - 'layout_dump.h', - 'layout_test_runtime_flags.cc', - 'layout_test_runtime_flags.h', - 'mock_color_chooser.cc', - 'mock_color_chooser.h', - 'mock_content_settings_client.cc', - 'mock_content_settings_client.h', - 'mock_credential_manager_client.cc', - 'mock_credential_manager_client.h', - 'mock_grammar_check.cc', - 'mock_grammar_check.h', - 'mock_screen_orientation_client.cc', - 'mock_screen_orientation_client.h', - 'mock_spell_check.cc', - 'mock_spell_check.h', - 'mock_web_audio_device.cc', - 'mock_web_audio_device.h', - 'mock_web_document_subresource_filter.cc', - 'mock_web_document_subresource_filter.h', - 'mock_web_media_stream_center.cc', - 'mock_web_media_stream_center.h', - 'mock_web_midi_accessor.cc', - 'mock_web_midi_accessor.h', - 'mock_web_speech_recognizer.cc', - 'mock_web_speech_recognizer.h', - 'mock_web_theme_engine.cc', - 'mock_web_theme_engine.h', - 'mock_web_user_media_client.cc', - 'mock_web_user_media_client.h', - 'mock_webrtc_data_channel_handler.cc', - 'mock_webrtc_data_channel_handler.h', - 'mock_webrtc_dtmf_sender_handler.cc', - 'mock_webrtc_dtmf_sender_handler.h', - 'mock_webrtc_peer_connection_handler.cc', - 'mock_webrtc_peer_connection_handler.h', - 'pixel_dump.cc', - 'pixel_dump.h', - 'spell_check_client.cc', - 'spell_check_client.h', - 'test_common.cc', - 'test_common.h', - 'test_interfaces.cc', - 'test_interfaces.h', - 'test_plugin.cc', - 'test_plugin.h', - 'test_preferences.cc', - 'test_preferences.h', - 'test_runner.cc', - 'test_runner.h', - 'test_runner_export.h', - 'test_runner_for_specific_view.cc', - 'test_runner_for_specific_view.h', - 'text_input_controller.cc', - 'text_input_controller.h', - 'tracked_dictionary.cc', - 'tracked_dictionary.h', - 'web_ax_object_proxy.cc', - 'web_ax_object_proxy.h', - 'web_frame_test_client.cc', - 'web_frame_test_client.h', - 'web_frame_test_proxy.cc', - 'web_frame_test_proxy.h', - 'web_task.cc', - 'web_task.h', - 'web_test_delegate.h', - 'web_test_interfaces.cc', - 'web_test_interfaces.h', - 'web_test_runner.h', - 'web_view_test_client.cc', - 'web_view_test_client.h', - 'web_view_test_proxy.cc', - 'web_view_test_proxy.h', - 'web_widget_test_client.cc', - 'web_widget_test_client.h', - 'web_widget_test_proxy.cc', - 'web_widget_test_proxy.h', - ], - 'msvs_settings': { - 'VCLinkerTool': { - 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS - }, - }, - 'conditions': [ - ['OS=="win"', { - 'configurations': { - 'Debug_Base': { - 'msvs_settings': { - 'VCLinkerTool': { - 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', - }, - }, - }, - }, - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [ 4267, ], - }], # OS=="win" - ], - }, - { - # GN version: //components/test_runner:resources - 'target_name': 'resources', - 'type': 'none', - 'conditions': [ - ['OS=="win"', { - 'copies': [{ - 'destination': '<(PRODUCT_DIR)', - 'files': ['resources/fonts/AHEM____.TTF'], - }], - }], - ['OS=="mac"', { - 'all_dependent_settings': { - 'mac_bundle_resources': [ - 'resources/fonts/AHEM____.TTF', - 'resources/fonts/ChromiumAATTest.ttf', - '<(SHARED_INTERMEDIATE_DIR)/webkit/missingImage.png', - '<(SHARED_INTERMEDIATE_DIR)/webkit/textAreaResizeCorner.png', - ], - }, - }], - ['use_x11 == 1', { - 'copies': [{ - 'destination': '<(PRODUCT_DIR)', - 'files': [ - 'resources/fonts/AHEM____.TTF', - 'resources/fonts/fonts.conf', - '../../third_party/gardiner_mod/GardinerModBug.ttf', - '../../third_party/gardiner_mod/GardinerModCat.ttf', - ] - }], - }], - ['OS=="android"', { - 'copies': [{ - 'destination': '<(PRODUCT_DIR)', - 'files': [ - 'resources/fonts/AHEM____.TTF', - 'resources/fonts/android_main_fonts.xml', - 'resources/fonts/android_fallback_fonts.xml', - ] - }], - }], - ], - }, - ], - 'conditions': [ - ['OS=="mac" or OS=="win"', { - 'targets': [ - { - # GN version: //components/test_runner:layout_test_helper - 'target_name': 'layout_test_helper', - 'type': 'executable', - 'sources': [ - 'helper/layout_test_helper_mac.mm', - 'helper/layout_test_helper_win.cc', - ], - 'conditions': [ - ['OS=="mac"', { - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', - ], - }, - }], - ], - }, - ], - }], # OS=="mac" or OS=="win" - ] -}
diff --git a/components/timers.gypi b/components/timers.gypi deleted file mode 100644 index 205a802..0000000 --- a/components/timers.gypi +++ /dev/null
@@ -1,23 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/timers - 'target_name': 'timers', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - ], - 'sources': [ - 'timers/alarm_timer_chromeos.cc', - 'timers/alarm_timer_chromeos.h', - ], - }, - ], -}
diff --git a/components/toolbar.gypi b/components/toolbar.gypi deleted file mode 100644 index 1166d46..0000000 --- a/components/toolbar.gypi +++ /dev/null
@@ -1,63 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/toolbar - 'target_name': 'toolbar', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - '../ui/base/ui_base.gyp:ui_base', - '../ui/gfx/gfx.gyp:gfx', - '../ui/gfx/gfx.gyp:gfx_vector_icons', - '../url/url.gyp:url_lib', - 'components_resources.gyp:components_resources', - 'components_strings.gyp:components_strings', - 'google_core_browser', - 'prefs/prefs.gyp:prefs', - 'security_state', - 'url_formatter/url_formatter.gyp:url_formatter', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'toolbar/toolbar_model.cc', - 'toolbar/toolbar_model.h', - 'toolbar/toolbar_model_delegate.h', - 'toolbar/toolbar_model_impl.cc', - 'toolbar/toolbar_model_impl.h', - ], - }, - { - # GN version: //components/toolbar:test_support - 'target_name': 'toolbar_test_support', - 'type': 'static_library', - 'dependencies': [ - '../ui/gfx/gfx.gyp:gfx_vector_icons', - 'components_resources.gyp:components_resources', - 'toolbar', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'toolbar/test_toolbar_model.cc', - 'toolbar/test_toolbar_model.h', - ], - 'conditions': [ - ['toolkit_views==1', { - # Needed to get the TOOLKIT_VIEWS define. - 'dependencies': [ - '<(DEPTH)/ui/views/views.gyp:views', - ], - }], - ], - }, - ], -}
diff --git a/components/tracing.gyp b/components/tracing.gyp deleted file mode 100644 index 1ea16ddd..0000000 --- a/components/tracing.gyp +++ /dev/null
@@ -1,118 +0,0 @@ -# Copyright (c) 2012 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. - -# This file is intentionally a gyp file rather than a gypi for dependencies -# reasons. The other gypi files include content.gyp and content_common depends -# on this, thus if you try to rename this to gypi and include it in -# components.gyp, you will get a circular dependency error. -{ - 'variables': { - 'chromium_code': 1, - }, - 'targets' : [ - { - 'target_name': 'tracing', - 'type': '<(component)', - 'dependencies': [ - '../base/base.gyp:base', - '../ipc/ipc.gyp:ipc', - ], - 'include_dirs': [ - '..', - ], - 'defines': [ - 'TRACING_IMPLEMENTATION=1', - ], - 'sources': [ - 'tracing/browser/trace_config_file.cc', - 'tracing/browser/trace_config_file.h', - 'tracing/child/child_memory_dump_manager_delegate_impl.cc', - 'tracing/child/child_memory_dump_manager_delegate_impl.h', - 'tracing/child/child_trace_message_filter.cc', - 'tracing/child/child_trace_message_filter.h', - 'tracing/common/graphics_memory_dump_provider_android.cc', - 'tracing/common/graphics_memory_dump_provider_android.h', - 'tracing/common/process_metrics_memory_dump_provider.cc', - 'tracing/common/process_metrics_memory_dump_provider.h', - 'tracing/common/trace_to_console.cc', - 'tracing/common/trace_to_console.h', - 'tracing/common/tracing_messages.cc', - 'tracing/common/tracing_messages.h', - 'tracing/common/tracing_switches.cc', - 'tracing/common/tracing_switches.h', - 'tracing/core/proto_utils.h', - 'tracing/core/proto_zero_message.cc', - 'tracing/core/proto_zero_message.h', - 'tracing/core/proto_zero_message_handle.cc', - 'tracing/core/proto_zero_message_handle.h', - 'tracing/core/scattered_stream_writer.cc', - 'tracing/core/scattered_stream_writer.h', - 'tracing/core/trace_buffer_writer.cc', - 'tracing/core/trace_buffer_writer.h', - 'tracing/core/trace_ring_buffer.cc', - 'tracing/core/trace_ring_buffer.h', - 'tracing/tracing_export.h', - ], - 'target_conditions': [ - ['>(nacl_untrusted_build)==1', { - 'sources!': [ - 'tracing/common/process_metrics_memory_dump_provider.cc', - ], - }], - ] - }, - { - 'target_name': 'proto_zero_plugin', - 'type': 'executable', - 'toolsets': ['host'], - 'sources': [ - 'tracing/tools/proto_zero_plugin/proto_zero_generator.cc', - 'tracing/tools/proto_zero_plugin/proto_zero_generator.h', - 'tracing/tools/proto_zero_plugin/proto_zero_plugin.cc', - ], - 'include_dirs': [ - '..', - '../third_party/protobuf/src', - ], - 'dependencies': [ - '../third_party/protobuf/protobuf.gyp:protoc_lib', - ], - }, - { - 'target_name': 'proto_zero_testing_messages', - 'type': 'static_library', - 'variables': { - 'proto_in_dir': 'tracing/test', - 'proto_out_dir': 'components/tracing/test', - 'generator_plugin': 'proto_zero_plugin', - 'generator_plugin_suffix': '.pbzero', - 'generate_cc': 0, - 'generate_python': 0, - }, - 'sources': [ - 'tracing/test/example_messages.proto', - ], - 'dependencies': [ - 'proto_zero_plugin#host', - ], - 'includes': ['../build/protoc.gypi'], - }, - { - # Official protobuf used by tests to verify that the Tracing V2 output is - # effectively proto-compatible. - # GN version: //components/tracing:golden_protos_for_tests - 'target_name': 'golden_protos_for_tests', - 'type': 'static_library', - 'variables': { - 'proto_in_dir': 'tracing/proto', - 'proto_out_dir': 'components/tracing/test/golden_protos', - }, - 'sources': [ - 'tracing/proto/events_chunk.proto', - ], - 'includes': ['../build/protoc.gypi'], - }, - ], -}
diff --git a/components/tracing_nacl.gyp b/components/tracing_nacl.gyp deleted file mode 100644 index 9b0b511d..0000000 --- a/components/tracing_nacl.gyp +++ /dev/null
@@ -1,52 +0,0 @@ -# Copyright 2014 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. - -{ - 'includes': [ - '../build/common_untrusted.gypi', - ], - 'conditions': [ - ['disable_nacl==0 and disable_nacl_untrusted==0', { - 'targets': [ - { - 'target_name': 'tracing_nacl', - 'type': 'none', - 'defines!': ['CONTENT_IMPLEMENTATION'], - 'dependencies': [ - '../base/base_nacl.gyp:base_nacl', - '../base/base_nacl.gyp:base_nacl_nonsfi', - '../ipc/ipc_nacl.gyp:ipc_nacl', - '../ipc/ipc_nacl.gyp:ipc_nacl_nonsfi', - ], - 'include_dirs': [ - '..', - ], - 'variables': { - 'nacl_untrusted_build': 1, - 'nlib_target': 'libtracing_nacl.a', - 'build_glibc': 0, - 'build_newlib': 0, - 'build_irt': 1, - 'build_pnacl_newlib': 0, - 'build_nonsfi_helper': 1, - }, - 'sources': [ - 'tracing/browser/trace_config_file.cc', - 'tracing/browser/trace_config_file.h', - 'tracing/child/child_memory_dump_manager_delegate_impl.cc', - 'tracing/child/child_memory_dump_manager_delegate_impl.h', - 'tracing/child/child_trace_message_filter.cc', - 'tracing/child/child_trace_message_filter.h', - 'tracing/common/tracing_messages.cc', - 'tracing/common/tracing_messages.h', - 'tracing/common/tracing_switches.cc', - 'tracing/common/tracing_switches.h', - 'tracing/tracing_export.h', - ], - }, - ], - }], - ], -}
diff --git a/components/translate.gypi b/components/translate.gypi deleted file mode 100644 index 9e390c72cc..0000000 --- a/components/translate.gypi +++ /dev/null
@@ -1,257 +0,0 @@ -# Copyright 2013 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. - -{ - 'targets': [ - { - # GN version: //components/translate/core/browser - 'target_name': 'translate_core_browser', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../base/base.gyp:base_i18n', - '../google_apis/google_apis.gyp:google_apis', - '../net/net.gyp:net', - '../ui/base/ui_base.gyp:ui_base', - '../url/url.gyp:url_lib', - 'components_resources.gyp:components_resources', - 'components_strings.gyp:components_strings', - 'data_use_measurement_core', - 'infobars_core', - 'language_usage_metrics', - 'pref_registry', - 'translate_core_common', - 'variations', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'translate/core/browser/language_state.cc', - 'translate/core/browser/language_state.h', - 'translate/core/browser/page_translated_details.h', - 'translate/core/browser/translate_accept_languages.cc', - 'translate/core/browser/translate_accept_languages.h', - 'translate/core/browser/translate_browser_metrics.cc', - 'translate/core/browser/translate_browser_metrics.h', - 'translate/core/browser/translate_client.h', - 'translate/core/browser/translate_download_manager.cc', - 'translate/core/browser/translate_download_manager.h', - 'translate/core/browser/translate_driver.h', - 'translate/core/browser/translate_error_details.h', - 'translate/core/browser/translate_event_details.cc', - 'translate/core/browser/translate_event_details.h', - 'translate/core/browser/translate_experiment.cc', - 'translate/core/browser/translate_experiment.h', - 'translate/core/browser/translate_language_list.cc', - 'translate/core/browser/translate_language_list.h', - 'translate/core/browser/translate_manager.cc', - 'translate/core/browser/translate_manager.h', - 'translate/core/browser/translate_prefs.cc', - 'translate/core/browser/translate_prefs.h', - 'translate/core/browser/translate_script.cc', - 'translate/core/browser/translate_script.h', - 'translate/core/browser/translate_step.h', - 'translate/core/browser/translate_ui_delegate.cc', - 'translate/core/browser/translate_ui_delegate.h', - 'translate/core/browser/translate_url_fetcher.cc', - 'translate/core/browser/translate_url_fetcher.h', - 'translate/core/browser/translate_url_util.cc', - 'translate/core/browser/translate_url_util.h', - ], - 'conditions': [ - ['use_aura==0', { - 'sources': [ - 'translate/core/browser/translate_infobar_delegate.cc', - 'translate/core/browser/translate_infobar_delegate.h', - ], - }], - ['OS == "mac"', { - 'sources': [ - 'translate/core/browser/options_menu_model.cc', - 'translate/core/browser/options_menu_model.h', - ], - }], - ], - }, - { - # GN version: //components/translate/core/common - 'target_name': 'translate_core_common', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../url/url.gyp:url_lib', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'translate/core/common/language_detection_details.cc', - 'translate/core/common/language_detection_details.h', - 'translate/core/common/translate_constants.cc', - 'translate/core/common/translate_constants.h', - 'translate/core/common/translate_errors.h', - 'translate/core/common/translate_metrics.cc', - 'translate/core/common/translate_metrics.h', - 'translate/core/common/translate_pref_names.cc', - 'translate/core/common/translate_pref_names.h', - 'translate/core/common/translate_switches.cc', - 'translate/core/common/translate_switches.h', - 'translate/core/common/translate_util.cc', - 'translate/core/common/translate_util.h', - ], - }, - { - # GN version: //components/translate/core/language_detection - 'target_name': 'translate_core_language_detection', - 'type': 'static_library', - 'dependencies': [ - 'translate_core_common', - '../base/base.gyp:base', - '../url/url.gyp:url_lib', - '../third_party/cld_2/cld_2.gyp:cld_2', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'translate/core/language_detection/language_detection_util.cc', - 'translate/core/language_detection/language_detection_util.h', - ], - }, - ], - 'conditions': [ - ['OS != "ios"', { - 'targets': [ - { - # GN version: //components/translate/content/browser - 'target_name': 'translate_content_browser', - 'type': 'static_library', - 'dependencies': [ - 'translate_content_common', - 'translate_core_browser', - '../base/base.gyp:base', - '../content/content.gyp:content_browser', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'translate/content/browser/content_translate_driver.cc', - 'translate/content/browser/content_translate_driver.h', - ], - }, - { - # GN version: //components/translate/content/common - 'target_name': 'translate_content_common', - 'type': 'static_library', - 'variables': { - 'mojom_typemaps': [ - 'translate/content/common/translate.typemap', - '<(DEPTH)/mojo/common/common_custom_types.typemap', - '<(DEPTH)/url/mojo/gurl.typemap', - ], - }, - 'sources': [ - 'translate/content/common/translate_struct_traits.cc', - 'translate/content/common/translate.mojom', - ], - 'export_dependent_settings': [ - '../mojo/mojo_base.gyp:mojo_common_custom_types_mojom', - '../url/url.gyp:url_mojom', - ], - 'dependencies': [ - 'translate_core_common', - 'translate_core_language_detection', - '../base/base.gyp:base', - '../mojo/mojo_base.gyp:mojo_common_custom_types_mojom', - '../mojo/mojo_public.gyp:mojo_cpp_bindings', - '../url/url.gyp:url_mojom', - ], - 'includes': [ '../mojo/mojom_bindings_generator.gypi' ], - }, - { - # GN version: //components/translate/content/renderer - 'target_name': 'translate_content_renderer', - 'type': 'static_library', - 'dependencies': [ - 'translate_content_common', - 'translate_core_common', - 'translate_core_language_detection', - '../base/base.gyp:base', - '../content/content.gyp:content_common', - '../content/content.gyp:content_renderer', - '../third_party/WebKit/public/blink.gyp:blink', - '../third_party/cld_2/cld_2.gyp:cld_2', - '../url/url.gyp:url_lib', - '../v8/src/v8.gyp:v8', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'translate/content/renderer/translate_helper.cc', - 'translate/content/renderer/translate_helper.h', - ], - }, - ], - }], - ['OS == "ios"', { - 'targets': [ - { - # GN version: //components/translate/ios/browser - 'target_name': 'translate_ios_browser', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - 'translate_core_language_detection', - 'translate_core_browser', - 'translate_core_common', - 'translate_ios_injected_js', - '../base/base.gyp:base', - '../ios/web/ios_web.gyp:ios_web', - '../url/url.gyp:url_lib', - ], - 'sources': [ - 'translate/ios/browser/ios_translate_driver.h', - 'translate/ios/browser/ios_translate_driver.mm', - 'translate/ios/browser/js_language_detection_manager.h', - 'translate/ios/browser/js_language_detection_manager.mm', - 'translate/ios/browser/js_translate_manager.h', - 'translate/ios/browser/js_translate_manager.mm', - 'translate/ios/browser/language_detection_controller.h', - 'translate/ios/browser/language_detection_controller.mm', - 'translate/ios/browser/translate_controller.h', - 'translate/ios/browser/translate_controller.mm', - ], - }, - { - # GN version: //components/translate/ios/browser:injected_js - 'target_name': 'translate_ios_injected_js', - 'type': 'none', - 'sources': [ - 'translate/ios/browser/resources/language_detection.js', - 'translate/ios/browser/resources/translate_ios.js', - ], - 'link_settings': { - 'mac_bundle_resources': [ - '<(SHARED_INTERMEDIATE_DIR)/translate_ios.js', - '<(SHARED_INTERMEDIATE_DIR)/language_detection.js', - ], - }, - 'includes': [ - '../ios/web/js_compile_checked.gypi', - ], - }, - ], - }], - ], -}
diff --git a/components/undo.gypi b/components/undo.gypi deleted file mode 100644 index 17ca2d8..0000000 --- a/components/undo.gypi +++ /dev/null
@@ -1,33 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/undo - 'target_name': 'undo_component', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../ui/base/ui_base.gyp:ui_base', - 'bookmarks_browser', - 'components_strings.gyp:components_strings', - 'keyed_service_core', - ], - 'sources': [ - 'undo/bookmark_undo_service.cc', - 'undo/bookmark_undo_service.h', - 'undo/bookmark_undo_utils.cc', - 'undo/bookmark_undo_utils.h', - 'undo/undo_manager.cc', - 'undo/undo_manager.h', - 'undo/undo_manager_observer.h', - 'undo/undo_operation.h', - ], - }, - ], -}
diff --git a/components/update_client.gypi b/components/update_client.gypi deleted file mode 100644 index 0cfa4b2..0000000 --- a/components/update_client.gypi +++ /dev/null
@@ -1,98 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/update_client - 'target_name': 'update_client', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../courgette/courgette.gyp:courgette_lib', - '../crypto/crypto.gyp:crypto', - '../third_party/libxml/libxml.gyp:libxml', - '../third_party/zlib/google/zip.gyp:zip', - '../net/net.gyp:net', - '../url/url.gyp:url_lib', - 'client_update_protocol', - 'crx_file', - ], - - 'include_dirs': [ - '..', - ], - 'sources': [ - 'update_client/action.cc', - 'update_client/action.h', - 'update_client/action_update.cc', - 'update_client/action_update.h', - 'update_client/action_update_check.cc', - 'update_client/action_update_check.h', - 'update_client/action_wait.cc', - 'update_client/action_wait.h', - 'update_client/background_downloader_win.cc', - 'update_client/background_downloader_win.h', - 'update_client/component_patcher.cc', - 'update_client/component_patcher.h', - 'update_client/component_patcher_operation.cc', - 'update_client/component_patcher_operation.h', - 'update_client/component_unpacker.cc', - 'update_client/component_unpacker.h', - 'update_client/configurator.h', - 'update_client/crx_downloader.cc', - 'update_client/crx_downloader.h', - 'update_client/crx_update_item.h', - 'update_client/persisted_data.cc', - 'update_client/persisted_data.h', - 'update_client/ping_manager.cc', - 'update_client/ping_manager.h', - 'update_client/request_sender.cc', - 'update_client/request_sender.h', - 'update_client/task.h', - 'update_client/task_update.cc', - 'update_client/task_update.h', - 'update_client/update_checker.cc', - 'update_client/update_checker.h', - 'update_client/update_client.cc', - 'update_client/update_client.h', - 'update_client/update_client_internal.h', - 'update_client/update_engine.cc', - 'update_client/update_engine.h', - 'update_client/update_query_params.cc', - 'update_client/update_query_params.h', - 'update_client/update_query_params_delegate.cc', - 'update_client/update_query_params_delegate.h', - 'update_client/update_response.cc', - 'update_client/update_response.h', - 'update_client/url_fetcher_downloader.cc', - 'update_client/url_fetcher_downloader.h', - 'update_client/utils.cc', - 'update_client/utils.h', - ], - }, - { - # GN version: //components/update_client:test_support - 'target_name': 'update_client_test_support', - 'type': 'static_library', - 'dependencies': [ - 'update_client', - '../testing/gmock.gyp:gmock', - '../testing/gtest.gyp:gtest', - ], - - 'include_dirs': [ - '..', - ], - 'sources': [ - 'update_client/test_configurator.cc', - 'update_client/test_configurator.h', - 'update_client/test_installer.cc', - 'update_client/test_installer.h', - 'update_client/url_request_post_interceptor.cc', - 'update_client/url_request_post_interceptor.h', - ], - }, - ], -}
diff --git a/components/upload_list.gypi b/components/upload_list.gypi deleted file mode 100644 index e0bf6b1..0000000 --- a/components/upload_list.gypi +++ /dev/null
@@ -1,25 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/upload_list - 'target_name': 'upload_list', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - ], - 'sources': [ - 'upload_list/crash_upload_list.cc', - 'upload_list/crash_upload_list.h', - 'upload_list/upload_list.cc', - 'upload_list/upload_list.h', - ], - }, - ], -}
diff --git a/components/url_formatter/url_formatter.gyp b/components/url_formatter/url_formatter.gyp deleted file mode 100644 index c5ad043..0000000 --- a/components/url_formatter/url_formatter.gyp +++ /dev/null
@@ -1,84 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/url_formatter - 'target_name': 'url_formatter', - 'type': 'static_library', - 'dependencies': [ - '../../base/base.gyp:base', - '../../net/net.gyp:net', - '../../third_party/icu/icu.gyp:icui18n', - '../../third_party/icu/icu.gyp:icuuc', - '../../url/url.gyp:url_lib', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'android/component_jni_registrar.cc', - 'android/component_jni_registrar.h', - 'elide_url.cc', - 'elide_url.h', - 'url_fixer.cc', - 'url_fixer.h', - 'url_formatter.cc', - 'url_formatter.h', - 'url_formatter_android.cc', - 'url_formatter_android.h', - ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [4267, ], - - 'conditions': [ - ['OS != "android"', { - 'dependencies': [ - '../../ui/gfx/gfx.gyp:gfx', - ], - 'sources!': [ - 'android/component_jni_registrar.cc', - 'android/component_jni_registrar.h', - 'url_formatter_android.cc', - 'url_formatter_android.h', - ] - }], - ['OS == "android"', { - 'dependencies': [ - 'url_formatter_jni_headers', - ] - }], - ], - }, - ], - 'conditions': [ - ['OS == "android"', { - 'targets' : [ - { - # GN: //components/url_formatter/android:jni_headers - 'target_name' : 'url_formatter_jni_headers', - 'type': 'none', - 'sources': [ - 'android/java/src/org/chromium/components/url_formatter/UrlFormatter.java', - ], - 'variables': { - 'jni_gen_package': 'url_formatter', - }, - 'includes': [ '../../build/jni_generator.gypi' ], - }, - { - # GN: //components/url_formatter/android:url_formatter_java - 'target_name': 'url_formatter_java', - 'type': 'none', - 'dependencies': [ - '../../base/base.gyp:base_java', - ], - 'variables': { - 'java_in_dir': 'android/java', - }, - 'includes': [ '../../build/java.gypi' ], - }, - ], - }], - ], -}
diff --git a/components/url_matcher.gypi b/components/url_matcher.gypi deleted file mode 100644 index 4d2e328..0000000 --- a/components/url_matcher.gypi +++ /dev/null
@@ -1,43 +0,0 @@ -# Copyright 2013 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. - -{ - 'targets': [ - { - 'target_name': 'url_matcher', - 'type': '<(component)', - 'dependencies': [ - '../third_party/re2/re2.gyp:re2', - '../base/base.gyp:base', - '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '../url/url.gyp:url_lib', - ], - 'include_dirs': [ - '..', - ], - 'defines': [ - 'URL_MATCHER_IMPLEMENTATION', - ], - 'sources': [ - 'url_matcher/regex_set_matcher.cc', - 'url_matcher/regex_set_matcher.h', - 'url_matcher/string_pattern.cc', - 'url_matcher/string_pattern.h', - 'url_matcher/substring_set_matcher.cc', - 'url_matcher/substring_set_matcher.h', - 'url_matcher/url_matcher.cc', - 'url_matcher/url_matcher.h', - 'url_matcher/url_matcher_constants.cc', - 'url_matcher/url_matcher_constants.h', - 'url_matcher/url_matcher_export.h', - 'url_matcher/url_matcher_factory.cc', - 'url_matcher/url_matcher_factory.h', - 'url_matcher/url_matcher_helpers.cc', - 'url_matcher/url_matcher_helpers.h', - ], - # Disable c4267 warnings until we fix size_t to int truncations. - 'msvs_disabled_warnings': [ 4267, ], - }, - ], -}
diff --git a/components/user_manager.gypi b/components/user_manager.gypi deleted file mode 100644 index 9cb57d2..0000000 --- a/components/user_manager.gypi +++ /dev/null
@@ -1,84 +0,0 @@ -# Copyright 2014 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. - -{ - 'variables': { - # Cross-platform user_manager sources. - 'user_manager_shared_sources': [ - 'user_manager/empty_user_info.cc', - 'user_manager/empty_user_info.h', - 'user_manager/user_info.cc', - 'user_manager/user_info.h', - 'user_manager/user_info_impl.cc', - 'user_manager/user_info_impl.h', - 'user_manager/user_manager_export.h', - ], - # Chrome OS user_manager sources. - 'user_manager_chromeos_sources': [ - 'user_manager/known_user.cc', - 'user_manager/known_user.h', - 'user_manager/remove_user_delegate.h', - 'user_manager/user.cc', - 'user_manager/user.h', - 'user_manager/user_image/user_image.cc', - 'user_manager/user_image/user_image.h', - 'user_manager/user_manager.cc', - 'user_manager/user_manager.h', - 'user_manager/user_manager_base.cc', - 'user_manager/user_manager_base.h', - 'user_manager/user_type.h', - ], - }, - 'targets': [{ - 'target_name': 'user_manager', - 'type': '<(component)', - 'dependencies': [ - '<(DEPTH)/base/base.gyp:base', - '<(DEPTH)/components/components.gyp:signin_core_account_id', - '<(DEPTH)/skia/skia.gyp:skia', - '<(DEPTH)/ui/gfx/gfx.gyp:gfx', - ], - 'defines': [ - 'USER_MANAGER_IMPLEMENTATION', - ], - 'include_dirs': [ - '<(DEPTH)', - '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources', - '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings', - ], - 'sources': [ '<@(user_manager_shared_sources)' ], - 'conditions': [ - ['chromeos == 1', { - 'dependencies': [ - '<(DEPTH)/components/components.gyp:session_manager_component', - '<(DEPTH)/components/prefs/prefs.gyp:prefs', - '<(DEPTH)/google_apis/google_apis.gyp:google_apis', - '<(DEPTH)/url/url.gyp:url_lib', - ], - 'sources': [ '<@(user_manager_chromeos_sources)' ], - }], - ], - }, - { - # GN version: //components/user_manager:test_support - 'target_name': 'user_manager_test_support', - 'type': 'static_library', - 'conditions': [ - ['chromeos == 1', { - 'dependencies': [ - '<(DEPTH)/base/base.gyp:base', - '<(DEPTH)/base/base.gyp:test_support_base', - '<(DEPTH)/skia/skia.gyp:skia', - '<(DEPTH)/testing/gmock.gyp:gmock', - '<(DEPTH)/testing/gtest.gyp:gtest', - 'user_manager', - ], - 'sources': [ - 'user_manager/fake_user_manager.cc', - 'user_manager/fake_user_manager.h', - ], - }], - ] - },], -}
diff --git a/components/user_prefs.gypi b/components/user_prefs.gypi deleted file mode 100644 index c0253822..0000000 --- a/components/user_prefs.gypi +++ /dev/null
@@ -1,101 +0,0 @@ -# Copyright (c) 2013 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. - -{ - 'targets': [ - { - 'target_name': 'user_prefs', - 'type': '<(component)', - 'dependencies': [ - '../base/base.gyp:base', - 'prefs/prefs.gyp:prefs', - ], - 'include_dirs': [ - '..', - ], - 'defines': [ - 'USER_PREFS_IMPLEMENTATION', - ], - 'sources': [ - 'user_prefs/user_prefs.cc', - 'user_prefs/user_prefs.h', - 'user_prefs/user_prefs_export.h', - ], - }, - { - 'target_name': 'user_prefs_tracked', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - ], - 'sources': [ - 'user_prefs/tracked/device_id.h', - 'user_prefs/tracked/device_id_mac.cc', - 'user_prefs/tracked/device_id_stub.cc', - 'user_prefs/tracked/device_id_win.cc', - 'user_prefs/tracked/dictionary_hash_store_contents.cc', - 'user_prefs/tracked/dictionary_hash_store_contents.h', - 'user_prefs/tracked/hash_store_contents.h', - 'user_prefs/tracked/interceptable_pref_filter.cc', - 'user_prefs/tracked/interceptable_pref_filter.h', - 'user_prefs/tracked/pref_hash_calculator.cc', - 'user_prefs/tracked/pref_hash_calculator.h', - 'user_prefs/tracked/pref_hash_filter.cc', - 'user_prefs/tracked/pref_hash_filter.h', - 'user_prefs/tracked/pref_hash_store.h', - 'user_prefs/tracked/pref_hash_store_impl.cc', - 'user_prefs/tracked/pref_hash_store_impl.h', - 'user_prefs/tracked/pref_hash_store_transaction.h', - 'user_prefs/tracked/pref_names.cc', - 'user_prefs/tracked/pref_names.h', - 'user_prefs/tracked/registry_hash_store_contents_win.cc', - 'user_prefs/tracked/registry_hash_store_contents_win.h', - 'user_prefs/tracked/segregated_pref_store.cc', - 'user_prefs/tracked/segregated_pref_store.h', - 'user_prefs/tracked/tracked_atomic_preference.cc', - 'user_prefs/tracked/tracked_atomic_preference.h', - 'user_prefs/tracked/tracked_preference.h', - 'user_prefs/tracked/tracked_preference_helper.cc', - 'user_prefs/tracked/tracked_preference_helper.h', - 'user_prefs/tracked/tracked_preference_histogram_names.cc', - 'user_prefs/tracked/tracked_preference_histogram_names.h', - 'user_prefs/tracked/tracked_preference_validation_delegate.h', - 'user_prefs/tracked/tracked_preferences_migration.cc', - 'user_prefs/tracked/tracked_preferences_migration.h', - 'user_prefs/tracked/tracked_split_preference.cc', - 'user_prefs/tracked/tracked_split_preference.h', - ], - 'conditions': [ - ['OS=="win" or (OS=="mac" and OS!="ios")', { - 'sources!': [ - 'user_prefs/tracked/device_id_stub.cc', - ], - }], - ['OS=="ios"', { - 'sources!': [ - 'user_prefs/tracked/device_id_mac.cc', - ], - }], - ], - - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [4267, ], - }, - { - 'target_name': 'user_prefs_tracked_test_support', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - ], - 'sources': [ - 'user_prefs/tracked/mock_validation_delegate.cc', - 'user_prefs/tracked/mock_validation_delegate.h', - ], - }, - ], -}
diff --git a/components/variations.gypi b/components/variations.gypi deleted file mode 100644 index e67f11f..0000000 --- a/components/variations.gypi +++ /dev/null
@@ -1,179 +0,0 @@ -# Copyright (c) 2012 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. - -{ - 'targets': [ - { - # GN version: //components/variations - 'target_name': 'variations', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - # List of dependencies is intentionally very minimal. Please avoid - # adding extra dependencies without first checking with OWNERS. - '../base/base.gyp:base', - '../crypto/crypto.gyp:crypto', - '../third_party/mt19937ar/mt19937ar.gyp:mt19937ar', - '../third_party/protobuf/protobuf.gyp:protobuf_lite', - '../third_party/zlib/google/zip.gyp:compression_utils', - 'crash_core_common', - 'prefs/prefs.gyp:prefs', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'variations/active_field_trials.cc', - 'variations/active_field_trials.h', - 'variations/android/component_jni_registrar.cc', - 'variations/android/component_jni_registrar.h', - 'variations/android/variations_associated_data_android.cc', - 'variations/android/variations_associated_data_android.h', - 'variations/android/variations_seed_bridge.cc', - 'variations/android/variations_seed_bridge.h', - 'variations/caching_permuted_entropy_provider.cc', - 'variations/caching_permuted_entropy_provider.h', - 'variations/entropy_provider.cc', - 'variations/entropy_provider.h', - 'variations/experiment_labels.cc', - 'variations/experiment_labels.h', - 'variations/metrics_util.cc', - 'variations/metrics_util.h', - 'variations/pref_names.cc', - 'variations/pref_names.h', - 'variations/processed_study.cc', - 'variations/processed_study.h', - 'variations/proto/client_variations.proto', - 'variations/proto/permuted_entropy_cache.proto', - 'variations/proto/study.proto', - 'variations/proto/variations_seed.proto', - 'variations/study_filtering.cc', - 'variations/study_filtering.h', - "variations/synthetic_trials.cc", - "variations/synthetic_trials.h", - 'variations/variations_associated_data.cc', - 'variations/variations_associated_data.h', - 'variations/variations_experiment_util.cc', - 'variations/variations_experiment_util.h', - 'variations/variations_http_header_provider.cc', - 'variations/variations_http_header_provider.h', - 'variations/variations_request_scheduler.cc', - 'variations/variations_request_scheduler.h', - 'variations/variations_request_scheduler_mobile.cc', - 'variations/variations_request_scheduler_mobile.h', - 'variations/variations_seed_processor.cc', - 'variations/variations_seed_processor.h', - 'variations/variations_seed_simulator.cc', - 'variations/variations_seed_simulator.h', - 'variations/variations_seed_store.cc', - 'variations/variations_seed_store.h', - 'variations/variations_switches.cc', - 'variations/variations_switches.h', - 'variations/variations_url_constants.cc', - 'variations/variations_url_constants.h', - 'variations/variations_util.cc', - 'variations/variations_util.h', - ], - 'variables': { - 'proto_in_dir': 'variations/proto', - 'proto_out_dir': 'components/variations/proto', - }, - 'includes': [ '../build/protoc.gypi' ], - 'conditions': [ - ['OS == "android"', { - 'dependencies': [ - 'variations_jni_headers', - ], - }], - ['OS!="android" and OS!="ios"', { - 'sources!': [ - 'variations/variations_request_scheduler_mobile.cc', - ], - }], - ], - }, - { - # GN version: //components/variations/service - 'target_name': 'variations_service', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - '../ui/base/ui_base.gyp:ui_base', - 'data_use_measurement_core', - 'metrics', - 'network_time', - 'pref_registry', - 'prefs/prefs.gyp:prefs', - 'variations', - 'version_info', - 'web_resource', - ], - 'sources': [ - 'variations/service/ui_string_overrider.h', - 'variations/service/ui_string_overrider.cc', - 'variations/service/variations_service.cc', - 'variations/service/variations_service.h', - 'variations/service/variations_service_client.h', - ], - }, - { - # GN version: //components/variations/net:net - 'target_name': 'variations_net', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - '../url/url.gyp:url_lib', - 'components.gyp:google_core_browser', - 'components.gyp:metrics', - 'variations', - ], - 'export_dependent_settings': [ - 'components.gyp:metrics', - ], - 'sources': [ - 'variations/net/variations_http_headers.cc', - 'variations/net/variations_http_headers.h', - ], - }, - ], - 'conditions': [ - ['OS=="android"', { - 'targets': [ - { - # GN version: //components/variations/android:variations_java - 'target_name': 'variations_java', - 'type': 'none', - 'dependencies': [ - '../base/base.gyp:base', - ], - 'variables': { - 'java_in_dir': 'variations/android/java', - }, - 'includes': [ '../build/java.gypi' ], - }, - { - # GN version: //components/variations:jni - 'target_name': 'variations_jni_headers', - 'type': 'none', - 'sources': [ - 'variations/android/java/src/org/chromium/components/variations/VariationsAssociatedData.java', - 'variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedBridge.java', - ], - 'variables': { - 'jni_gen_package': 'variations', - }, - 'includes': [ '../build/jni_generator.gypi' ], - }, - ], - }], - ] -}
diff --git a/components/version_info.gypi b/components/version_info.gypi deleted file mode 100644 index d81d85d..0000000 --- a/components/version_info.gypi +++ /dev/null
@@ -1,94 +0,0 @@ -# Copyright 2015 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. - -{ - 'variables': { - 'conditions': [ - ['branding == "Chrome"', { - 'use_unofficial_version_number%': 0, - }, { - 'use_unofficial_version_number%': 1, - }], - ], - }, - 'targets': [ - { - # GN version: //components/version_info - 'target_name': 'version_info', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - 'components_strings.gyp:components_strings', - 'generate_version_info', - ], - 'sources': [ - 'version_info/version_info.cc', - 'version_info/version_info.h', - ], - 'conditions': [ - ['use_unofficial_version_number==1', { - 'dependencies': [ - '../ui/base/ui_base.gyp:ui_base', - ], - 'defines': ['USE_UNOFFICIAL_VERSION_NUMBER'], - }], - ], - }, - { - # GN version: //components/version_info:generate_version - 'target_name': 'generate_version_info', - 'type': 'none', - 'direct_dependent_settings': { - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)', - ], - }, - # Because generate_version_info generates a header, the target must set - # the hard_dependency flag. - 'hard_dependency': 1, - 'actions': [ - { - 'action_name': 'generation_version_info', - 'message': 'Generating version information', - 'variables': { - 'extra_version_flags': [], - 'lastchange_path': '../build/util/LASTCHANGE', - 'version_py_path': '../build/util/version.py', - 'template_input_path': 'version_info/version_info_values.h.version', - # Use VERSION and BRANDING files from //chrome even if this is bad - # dependency until they are moved to src/ for VERSION and to the - # version_info component for BRANDING. Synchronisation with TPM and - # all release script is required for thoses moves. They are tracked - # by issues http://crbug.com/512347 and http://crbug.com/513603. - 'version_path': '../chrome/VERSION', - 'branding_path': '../chrome/app/theme/<(branding_path_component)/BRANDING', - }, - 'inputs': [ - '<(version_py_path)', - '<(template_input_path)', - '<(version_path)', - '<(branding_path)', - '<(lastchange_path)', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/components/version_info/version_info_values.h', - ], - 'action': [ - 'python', - '<(version_py_path)', - '-f', '<(version_path)', - '-f', '<(branding_path)', - '-f', '<(lastchange_path)', - '<@(extra_version_flags)', - '<(template_input_path)', - '<@(_outputs)', - ], - }, - ], - }, - ], -}
diff --git a/components/version_ui.gypi b/components/version_ui.gypi deleted file mode 100644 index 9212ce15..0000000 --- a/components/version_ui.gypi +++ /dev/null
@@ -1,27 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //components/version_ui - 'target_name': 'version_ui', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - 'variations', - '../base/base.gyp:base', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'version_ui/version_handler_helper.cc', - 'version_ui/version_handler_helper.h', - 'version_ui/version_ui_constants.cc', - 'version_ui/version_ui_constants.h', - ], - }, - ], -}
diff --git a/components/visitedlink.gypi b/components/visitedlink.gypi deleted file mode 100644 index bca40f2f..0000000 --- a/components/visitedlink.gypi +++ /dev/null
@@ -1,66 +0,0 @@ -# Copyright (c) 2013 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. - -{ - 'targets': [ - { - 'target_name': 'visitedlink_common', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_common', - '../ipc/ipc.gyp:ipc', - '../url/url.gyp:url_lib', - ], - 'sources': [ - 'visitedlink/common/visitedlink_common.cc', - 'visitedlink/common/visitedlink_common.h', - 'visitedlink/common/visitedlink_message_generator.cc', - 'visitedlink/common/visitedlink_message_generator.h', - 'visitedlink/common/visitedlink_messages.h', - ], - }, - { - 'target_name': 'visitedlink_browser', - 'type': 'static_library', - 'include_dirs': [ - '../skia/config', - ], - 'dependencies': [ - 'visitedlink_common', - '../base/base.gyp:base', - '../content/content.gyp:content_browser', - '../content/content.gyp:content_common', - ], - 'sources': [ - 'visitedlink/browser/visitedlink_delegate.h', - 'visitedlink/browser/visitedlink_event_listener.cc', - 'visitedlink/browser/visitedlink_event_listener.h', - 'visitedlink/browser/visitedlink_master.cc', - 'visitedlink/browser/visitedlink_master.h', - ], - } - ], - 'conditions': [ - ['OS != "ios"', { - 'targets': [ - { - 'target_name': 'visitedlink_renderer', - 'type': 'static_library', - 'dependencies': [ - 'visitedlink_common', - '../base/base.gyp:base', - '../content/content.gyp:content_common', - '../content/content.gyp:content_renderer', - '../third_party/WebKit/public/blink.gyp:blink', - ], - 'sources': [ - 'visitedlink/renderer/visitedlink_slave.cc', - 'visitedlink/renderer/visitedlink_slave.h', - ], - }, - ], - }], - ], -}
diff --git a/components/wallpaper.gypi b/components/wallpaper.gypi deleted file mode 100644 index 1cafb7e..0000000 --- a/components/wallpaper.gypi +++ /dev/null
@@ -1,47 +0,0 @@ -# Copyright 2014 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. -{ - 'targets': [ - { - 'target_name': 'wallpaper', - 'type': '<(component)', - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content', - '../skia/skia.gyp:skia', - '../ui/gfx/gfx.gyp:gfx', - '../ui/gfx/gfx.gyp:gfx_geometry', - '../url/url.gyp:url_lib', - 'prefs/prefs.gyp:prefs', - ], - 'include_dirs': [ - '..', - ], - 'defines':[ - 'WALLPAPER_IMPLEMENTATION', - ], - 'sources': [ - 'wallpaper/wallpaper_layout.h', - 'wallpaper/wallpaper_files_id.cc', - 'wallpaper/wallpaper_files_id.h', - 'wallpaper/wallpaper_resizer.cc', - 'wallpaper/wallpaper_resizer.h', - 'wallpaper/wallpaper_resizer_observer.h', - ], - 'conditions': [ - ['chromeos==1', { - 'dependencies': [ - '../chromeos/chromeos.gyp:chromeos', - '../components/components.gyp:signin_core_account_id', - '../components/components.gyp:user_manager', - ], - 'sources': [ - 'wallpaper/wallpaper_manager_base.cc', - 'wallpaper/wallpaper_manager_base.h', - ], - }], - ], - }, - ], -}
diff --git a/components/web_cache.gypi b/components/web_cache.gypi deleted file mode 100644 index 98ec980..0000000 --- a/components/web_cache.gypi +++ /dev/null
@@ -1,48 +0,0 @@ -# Copyright (c) 2014 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. - -{ - 'targets': [ - { - # GN version: //components/web_cache/public/interfaces - 'target_name': 'web_cache_mojo_bindings', - 'type': 'static_library', - 'sources': [ - # NOTE: Sources duplicated in //components/web_cache/public/interfaces/BUILD.gn - 'web_cache/public/interfaces/web_cache.mojom', - ], - 'includes': [ '../mojo/mojom_bindings_generator.gypi'], - }, - { - 'target_name': 'web_cache_browser', - 'type': 'static_library', - 'dependencies': [ - '<(DEPTH)/base/base.gyp:base', - '<(DEPTH)/content/content.gyp:content_browser', - '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', - 'web_cache_mojo_bindings', - ], - 'sources': [ - 'web_cache/browser/web_cache_manager.cc', - 'web_cache/browser/web_cache_manager.h', - ], - # Disable c4267 warnings until we fix size_t to int truncations. - 'msvs_disabled_warnings': [ 4267, ], - }, - { - 'target_name': 'web_cache_renderer', - 'type': 'static_library', - 'dependencies': [ - '<(DEPTH)/base/base.gyp:base', - '<(DEPTH)/content/content.gyp:content_renderer', - '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', - 'web_cache_mojo_bindings', - ], - 'sources': [ - 'web_cache/renderer/web_cache_impl.cc', - 'web_cache/renderer/web_cache_impl.h', - ], - }, - ], -}
diff --git a/components/web_contents_delegate_android.gypi b/components/web_contents_delegate_android.gypi deleted file mode 100644 index 17a3f5f..0000000 --- a/components/web_contents_delegate_android.gypi +++ /dev/null
@@ -1,76 +0,0 @@ -# Copyright (c) 2012 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. - -{ - 'conditions': [ - ['OS=="android"', { - 'targets': [ - { - # GN: //components/web_contents_delegate_android:web_contents_delegate_android - 'target_name': 'web_contents_delegate_android', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_browser', - '../content/content.gyp:content_common', - '../net/net.gyp:net', - '../skia/skia.gyp:skia', - '../ui/android/ui_android.gyp:ui_android', - '../ui/base/ui_base.gyp:ui_base', - '../ui/gfx/gfx.gyp:gfx', - '../ui/gfx/gfx.gyp:gfx_geometry', - 'web_contents_delegate_android_jni_headers', - ], - 'include_dirs': [ - '..', - '../skia/config', - ], - 'sources': [ - 'web_contents_delegate_android/color_chooser_android.cc', - 'web_contents_delegate_android/color_chooser_android.h', - 'web_contents_delegate_android/component_jni_registrar.cc', - 'web_contents_delegate_android/component_jni_registrar.h', - 'web_contents_delegate_android/validation_message_bubble_android.cc', - 'web_contents_delegate_android/validation_message_bubble_android.h', - 'web_contents_delegate_android/web_contents_delegate_android.cc', - 'web_contents_delegate_android/web_contents_delegate_android.h', - ], - }, - { - # GN: //components/web_contents_delegate_android:web_contents_delegate_android_java - # and //components/web_contents_delegate_android:web_contents_delegate_android_java_resources - 'target_name': 'web_contents_delegate_android_java', - 'type': 'none', - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_java', - '../ui/android/ui_android.gyp:ui_java', - ], - 'variables': { - 'java_in_dir': 'web_contents_delegate_android/android/java', - 'has_java_resources': 1, - 'R_package': 'org.chromium.components.web_contents_delegate_android', - 'R_package_relpath': 'org/chromium/components/web_contents_delegate_android', - }, - 'includes': [ '../build/java.gypi' ], - }, - { - # GN: //components/web_contents_delegate_android:web_contents_delegate_android_jni_headers - 'target_name': 'web_contents_delegate_android_jni_headers', - 'type': 'none', - 'sources': [ - 'web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java', - 'web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ValidationMessageBubble.java', - 'web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java', - ], - 'variables': { - 'jni_gen_package': 'web_contents_delegate_android', - }, - 'includes': [ '../build/jni_generator.gypi' ], - }, - ], - }], - ], -}
diff --git a/components/web_modal.gypi b/components/web_modal.gypi deleted file mode 100644 index cb257da..0000000 --- a/components/web_modal.gypi +++ /dev/null
@@ -1,48 +0,0 @@ -# Copyright (c) 2013 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. - -{ - 'targets': [ - { - # GN version: //components/web_modal - 'target_name': 'web_modal', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_browser', - '../skia/skia.gyp:skia', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'web_modal/modal_dialog_host.cc', - 'web_modal/modal_dialog_host.h', - 'web_modal/single_web_contents_dialog_manager.h', - 'web_modal/web_contents_modal_dialog_host.cc', - 'web_modal/web_contents_modal_dialog_host.h', - 'web_modal/web_contents_modal_dialog_manager.cc', - 'web_modal/web_contents_modal_dialog_manager.h', - 'web_modal/web_contents_modal_dialog_manager_delegate.cc', - 'web_modal/web_contents_modal_dialog_manager_delegate.h', - ], - }, - { - # GN version: //components/web_modal:test_support - 'target_name': 'web_modal_test_support', - 'type': 'static_library', - 'dependencies': [ - 'web_modal', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'web_modal/test_web_contents_modal_dialog_host.cc', - 'web_modal/test_web_contents_modal_dialog_host.h', - 'web_modal/test_web_contents_modal_dialog_manager_delegate.cc', - 'web_modal/test_web_contents_modal_dialog_manager_delegate.h', - ], - }, - ], -}
diff --git a/components/web_resource.gypi b/components/web_resource.gypi deleted file mode 100644 index c3a0503..0000000 --- a/components/web_resource.gypi +++ /dev/null
@@ -1,50 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/web_resource - 'target_name': 'web_resource', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../ui/base/ui_base.gyp:ui_base', - '../net/net.gyp:net', - 'pref_registry', - 'version_info', - ], - 'sources': [ - 'web_resource/eula_accepted_notifier.cc', - 'web_resource/eula_accepted_notifier.h', - 'web_resource/promo_resource_service.cc', - 'web_resource/promo_resource_service.h', - 'web_resource/resource_request_allowed_notifier.cc', - 'web_resource/resource_request_allowed_notifier.h', - 'web_resource/web_resource_pref_names.cc', - 'web_resource/web_resource_pref_names.h', - 'web_resource/web_resource_service.cc', - 'web_resource/web_resource_service.h', - ], - }, - { - # GN version: //components/web_resources:test_support - 'target_name': 'web_resource_test_support', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - 'web_resource', - ], - 'sources': [ - 'web_resource/resource_request_allowed_notifier_test_util.cc', - 'web_resource/resource_request_allowed_notifier_test_util.h', - ], - }, - ], -}
diff --git a/components/web_restrictions.gypi b/components/web_restrictions.gypi deleted file mode 100644 index c55a3f5..0000000 --- a/components/web_restrictions.gypi +++ /dev/null
@@ -1,119 +0,0 @@ -# Copyright 2015 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. - -{ - 'conditions': [ - ['OS == "android"', { - 'targets': [ - { - 'target_name': 'web_restrictions_java_browser', - 'type': 'none', - 'variables': { - 'java_in_dir': 'web_restrictions/browser/java', - }, - 'dependencies': [ - '../base/base.gyp:base', - ], - 'includes': [ '../build/java.gypi' ], - }, - { - # GN: //components/web_restrictions:web_restrictions_jni_headers - 'target_name': 'web_restrictions_jni_headers', - 'type': 'none', - 'sources': [ - 'web_restrictions/browser/java/src/org/chromium/components/webrestrictions/browser/WebRestrictionsClient.java', - 'web_restrictions/browser/java/src/org/chromium/components/webrestrictions/browser/WebRestrictionsClientResult.java', - ], - 'variables': { - 'jni_gen_package': 'components/web_restrictions', - }, - 'includes': [ '../build/jni_generator.gypi' ], - }, - { - # GN: //components/web_restrictions:browser - 'target_name': 'web_restrictions_browser', - 'type': 'static_library', - 'dependencies': [ - '<(DEPTH)/base/base.gyp:base', - '<(DEPTH)/content/content.gyp:content_browser', - 'web_restrictions_interfaces', - 'web_restrictions_jni_headers', - ], - 'sources': [ - "web_restrictions/browser/web_restrictions_client.cc", - "web_restrictions/browser/web_restrictions_client.h", - "web_restrictions/browser/web_restrictions_client_result.cc", - "web_restrictions/browser/web_restrictions_client_result.h", - "web_restrictions/browser/web_restrictions_mojo_implementation.cc", - "web_restrictions/browser/web_restrictions_mojo_implementation.h", - "web_restrictions/browser/web_restrictions_resource_throttle.cc", - "web_restrictions/browser/web_restrictions_resource_throttle.h", - ], - }, - { - 'target_name': 'web_restrictions_test_support_jni_headers', - 'type': 'none', - 'sources': [ - 'web_restrictions/browser/javatest/src/org/chromium/components/webrestrictions/browser/MockWebRestrictionsClient.java', - ], - 'variables': { - 'jni_gen_package': 'components/web_restrictions', - }, - 'includes': [ '../build/jni_generator.gypi' ], - }, - { - 'target_name': 'web_restrictions_test_support_java', - 'type': 'none', - 'dependencies': [ - 'components.gyp:web_restrictions_java_browser', - '../base/base.gyp:base_java', - ], - 'variables': { - 'java_in_dir': [ - 'web_restrictions/browser/javatest/' - ], - }, - 'includes': [ '../build/java.gypi' ], - }, - { - 'target_name': 'web_restrictions_test_support', - 'type': 'static_library', - 'dependencies': [ - '<(DEPTH)/base/base.gyp:base', - 'web_restrictions_test_support_jni_headers', - ], - 'sources': [ - 'web_restrictions/browser/mock_web_restrictions_client.cc', - 'web_restrictions/browser/mock_web_restrictions_client.h', - ], - }, - { - 'target_name': 'components_web_restrictions_junit_tests', - 'type': 'none', - 'dependencies': [ - '../testing/android/junit/junit_test.gyp:junit_test_support', - ], - 'variables': { - 'main_class': 'org.chromium.testing.local.JunitTestMain', - 'src_paths': [ - '../testing/android/junit/DummyTest.java', - ], - 'wrapper_script_name': 'helper/<(_target_name)', - }, - 'includes': [ '../build/host_jar.gypi' ], - }, - { - 'target_name': 'web_restrictions_interfaces', - 'type': 'static_library', - 'includes': [ - '../mojo/mojom_bindings_generator.gypi', - ], - 'sources': [ - 'web_restrictions/interfaces/web_restrictions.mojom' - ], - }, - ], - } - ]] -}
diff --git a/components/webcrypto/webcrypto.gyp b/components/webcrypto/webcrypto.gyp deleted file mode 100644 index e4cf9af..0000000 --- a/components/webcrypto/webcrypto.gyp +++ /dev/null
@@ -1,69 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - 'target_name': 'webcrypto', - 'type': 'static_library', - 'dependencies': [ - '../../base/base.gyp:base', - '../../crypto/crypto.gyp:crypto', - '../../third_party/boringssl/boringssl.gyp:boringssl', - '../../third_party/WebKit/public/blink.gyp:blink', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'algorithm_dispatch.cc', - 'algorithm_dispatch.h', - 'algorithm_implementation.cc', - 'algorithm_implementation.h', - 'algorithm_implementations.h', - 'algorithm_registry.cc', - 'algorithm_registry.h', - 'algorithms/aes.cc', - 'algorithms/aes.h', - 'algorithms/aes_cbc.cc', - 'algorithms/aes_ctr.cc', - 'algorithms/aes_gcm.cc', - 'algorithms/aes_kw.cc', - 'algorithms/asymmetric_key_util.cc', - 'algorithms/asymmetric_key_util.h', - 'algorithms/ec.cc', - 'algorithms/ec.h', - 'algorithms/ecdh.cc', - 'algorithms/ecdsa.cc', - 'algorithms/hkdf.cc', - 'algorithms/hmac.cc', - 'algorithms/pbkdf2.cc', - 'algorithms/rsa.cc', - 'algorithms/rsa.h', - 'algorithms/rsa_oaep.cc', - 'algorithms/rsa_pss.cc', - 'algorithms/rsa_sign.cc', - 'algorithms/rsa_sign.h', - 'algorithms/rsa_ssa.cc', - 'algorithms/secret_key_util.cc', - 'algorithms/secret_key_util.h', - 'algorithms/sha.cc', - 'algorithms/util.cc', - 'algorithms/util.h', - 'blink_key_handle.cc', - 'blink_key_handle.h', - 'crypto_data.cc', - 'crypto_data.h', - 'generate_key_result.cc', - 'generate_key_result.h', - 'jwk.cc', - 'jwk.h', - 'status.cc', - 'status.h', - 'webcrypto_impl.cc', - 'webcrypto_impl.h', - ], - }, - ], -}
diff --git a/components/webdata.gypi b/components/webdata.gypi deleted file mode 100644 index 48d9ac5a..0000000 --- a/components/webdata.gypi +++ /dev/null
@@ -1,41 +0,0 @@ -# Copyright (c) 2013 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. - -{ - 'targets': [ - { - 'target_name': 'webdata_common', - 'type': '<(component)', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../sql/sql.gyp:sql', - ], - 'defines': [ - 'WEBDATA_IMPLEMENTATION', - ], - 'sources': [ - 'webdata/common/web_data_request_manager.cc', - 'webdata/common/web_data_request_manager.h', - 'webdata/common/web_data_results.h', - 'webdata/common/web_data_service_base.cc', - 'webdata/common/web_data_service_base.h', - 'webdata/common/web_data_service_consumer.h', - 'webdata/common/web_database.cc', - 'webdata/common/web_database.h', - 'webdata/common/web_database_backend.cc', - 'webdata/common/web_database_backend.h', - 'webdata/common/web_database_service.cc', - 'webdata/common/web_database_service.h', - 'webdata/common/web_database_table.cc', - 'webdata/common/web_database_table.h', - 'webdata/common/webdata_constants.cc', - 'webdata/common/webdata_constants.h', - 'webdata/common/webdata_export.h' - ], - }, - ], -}
diff --git a/components/webdata_services.gypi b/components/webdata_services.gypi deleted file mode 100644 index 05283cf..0000000 --- a/components/webdata_services.gypi +++ /dev/null
@@ -1,49 +0,0 @@ -# Copyright (c) 2013 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. - -{ - 'targets': [ - { - # GN version: //components/webdata_services - 'target_name': 'webdata_services', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../sql/sql.gyp:sql', - '../components/sync.gyp:sync', - 'autofill_core_browser', - 'keyed_service_core', - 'password_manager_core_browser', - 'search_engines', - 'signin_core_browser', - 'webdata_common', - ], - 'sources': [ - 'webdata_services/web_data_service_wrapper.cc', - 'webdata_services/web_data_service_wrapper.h', - ], - }, - { - # GN version: //components/webdata_services:test_support - 'target_name': 'webdata_services_test_support', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - 'autofill_core_browser', - 'signin_core_browser', - 'webdata_services', - ], - 'sources': [ - 'webdata_services/web_data_service_test_util.cc', - 'webdata_services/web_data_service_test_util.h', - ], - }, - ], -}
diff --git a/components/wifi.gypi b/components/wifi.gypi deleted file mode 100644 index 3d71215..0000000 --- a/components/wifi.gypi +++ /dev/null
@@ -1,81 +0,0 @@ -# Copyright 2013 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. - -{ - 'targets': [ - { - 'target_name': 'wifi_component', - 'type': '<(component)', - 'dependencies': [ - '../base/base.gyp:base', - '../crypto/crypto.gyp:crypto', - '../third_party/libxml/libxml.gyp:libxml', - 'onc_component', - ], - 'include_dirs': [ - '..', - ], - 'defines': [ - 'WIFI_IMPLEMENTATION', - ], - 'sources': [ - 'wifi/network_properties.cc', - 'wifi/network_properties.h', - 'wifi/wifi_export.h', - 'wifi/wifi_service.cc', - 'wifi/wifi_service.h', - 'wifi/wifi_service_mac.mm', - 'wifi/wifi_service_win.cc', - ], - 'conditions': [ - ['OS == "win"', { - 'link_settings': { - 'libraries': [ - '-liphlpapi.lib', - ], - }, - }], - ['OS == "mac"', { - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/CoreWLAN.framework', - '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framework', - ] - }, - }], - ], - }, - { - 'target_name': 'wifi_test_support', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - 'onc_component', - 'wifi_component', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'wifi/fake_wifi_service.cc', - 'wifi/fake_wifi_service.h', - ], - }, - { - 'target_name': 'wifi_test', - 'type': 'executable', - 'dependencies': [ - '../base/base.gyp:base', - 'onc_component', - 'wifi_component', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'wifi/wifi_test.cc', - ], - }, - ], -}
diff --git a/components/wifi_sync.gypi b/components/wifi_sync.gypi deleted file mode 100644 index 3e3ffcf..0000000 --- a/components/wifi_sync.gypi +++ /dev/null
@@ -1,34 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/wifi_sync - 'target_name': 'wifi_sync', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../components/components.gyp:onc_component', - '../components/sync.gyp:sync', - ], - 'sources': [ - 'wifi_sync/network_state_helper_chromeos.cc', - 'wifi_sync/network_state_helper_chromeos.h', - 'wifi_sync/wifi_config_delegate.h', - 'wifi_sync/wifi_config_delegate_chromeos.cc', - 'wifi_sync/wifi_config_delegate_chromeos.h', - 'wifi_sync/wifi_credential.cc', - 'wifi_sync/wifi_credential.h', - 'wifi_sync/wifi_credential_syncable_service.cc', - 'wifi_sync/wifi_credential_syncable_service.h', - 'wifi_sync/wifi_credential_syncable_service_factory.cc', - 'wifi_sync/wifi_credential_syncable_service_factory.h', - 'wifi_sync/wifi_security_class.cc', - 'wifi_sync/wifi_security_class.h', - 'wifi_sync/wifi_security_class_chromeos.cc', - ], - }, - ], -}
diff --git a/components/zoom.gypi b/components/zoom.gypi deleted file mode 100644 index 01ce038..0000000 --- a/components/zoom.gypi +++ /dev/null
@@ -1,53 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/zoom - 'target_name': 'zoom', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_browser', - '../content/content.gyp:content_common', - '../ipc/ipc.gyp:ipc', - '../net/net.gyp:net', - '../url/url.gyp:url_lib', - ], - 'sources': [ - 'zoom/page_zoom.cc', - 'zoom/page_zoom.h', - 'zoom/page_zoom_constants.cc', - 'zoom/page_zoom_constants.h', - 'zoom/zoom_controller.cc', - 'zoom/zoom_controller.h', - 'zoom/zoom_event_manager.cc', - 'zoom/zoom_event_manager.h', - 'zoom/zoom_event_manager_observer.h', - 'zoom/zoom_observer.h' - ], - }, - { - 'target_name': 'zoom_test_support', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../content/content.gyp:content_browser', - '../content/content.gyp:content_common', - '../components/components.gyp:zoom', - ], - 'sources': [ - 'zoom/test/zoom_test_utils.cc', - 'zoom/test/zoom_test_utils.h' - ], - } - ], -}
diff --git a/content/browser/accessibility/dump_accessibility_browsertest_base.cc b/content/browser/accessibility/dump_accessibility_browsertest_base.cc index 454f3cb..af1e10e 100644 --- a/content/browser/accessibility/dump_accessibility_browsertest_base.cc +++ b/content/browser/accessibility/dump_accessibility_browsertest_base.cc
@@ -75,9 +75,7 @@ typedef AccessibilityTreeFormatter::Filter Filter; -DumpAccessibilityTestBase::DumpAccessibilityTestBase() - : is_blink_pass_(false), - enable_accessibility_after_navigating_(false) { +DumpAccessibilityTestBase::DumpAccessibilityTestBase() { } DumpAccessibilityTestBase::~DumpAccessibilityTestBase() { @@ -247,28 +245,15 @@ AddDefaultFilters(&filters_); ParseHtmlForExtraDirectives(html_contents, &filters_, &wait_for); - // Get the test URL. + // Load the test html and wait for the "load complete" AX event. GURL url(embedded_test_server()->GetURL( "/" + std::string(file_dir) + "/" + file_path.BaseName().MaybeAsASCII())); - - if (enable_accessibility_after_navigating_) { - // Load the url, then enable accessibility. - NavigateToURL(shell(), url); - AccessibilityNotificationWaiter accessibility_waiter( - shell()->web_contents(), - AccessibilityModeComplete, - ui::AX_EVENT_NONE); - accessibility_waiter.WaitForNotification(); - } else { - // Enable accessibility, then load the test html and wait for the - // "load complete" AX event. - AccessibilityNotificationWaiter accessibility_waiter( - shell()->web_contents(), - AccessibilityModeComplete, - ui::AX_EVENT_LOAD_COMPLETE); - NavigateToURL(shell(), url); - accessibility_waiter.WaitForNotification(); - } + AccessibilityNotificationWaiter accessibility_waiter( + shell()->web_contents(), + AccessibilityModeComplete, + ui::AX_EVENT_LOAD_COMPLETE); + NavigateToURL(shell(), url); + accessibility_waiter.WaitForNotification(); // Get the url of every frame in the frame tree. WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
diff --git a/content/browser/accessibility/dump_accessibility_browsertest_base.h b/content/browser/accessibility/dump_accessibility_browsertest_base.h index 32762eea..58a69bc 100644 --- a/content/browser/accessibility/dump_accessibility_browsertest_base.h +++ b/content/browser/accessibility/dump_accessibility_browsertest_base.h
@@ -107,10 +107,6 @@ // Whether we're doing a native pass or internal/blink tree pass. bool is_blink_pass_; - - // Whether we should enable accessibility after navigating to the page, - // otherwise we enable it first. - bool enable_accessibility_after_navigating_; }; } // namespace content
diff --git a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc index 89c7fd0d..560027b 100644 --- a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc +++ b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
@@ -848,12 +848,6 @@ RunHtmlTest(FILE_PATH_LITERAL("frameset.html")); } -IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, - AccessibilityFramesetPostEnable) { - enable_accessibility_after_navigating_ = true; - RunHtmlTest(FILE_PATH_LITERAL("frameset.html")); -} - IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityHead) { RunHtmlTest(FILE_PATH_LITERAL("head.html")); } @@ -888,12 +882,6 @@ } IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, - AccessibilityIframePostEnable) { - enable_accessibility_after_navigating_ = true; - RunHtmlTest(FILE_PATH_LITERAL("iframe.html")); -} - -IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityIframeCrossProcess) { RunHtmlTest(FILE_PATH_LITERAL("iframe-cross-process.html")); }
diff --git a/content/browser/appcache/chrome_appcache_service_unittest.cc b/content/browser/appcache/chrome_appcache_service_unittest.cc index b02441a2..4af3d1f 100644 --- a/content/browser/appcache/chrome_appcache_service_unittest.cc +++ b/content/browser/appcache/chrome_appcache_service_unittest.cc
@@ -105,7 +105,7 @@ BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, base::Bind(&ChromeAppCacheService::InitializeOnIOThread, - appcache_service.get(), appcache_path, + appcache_service, appcache_path, browser_context_.GetResourceContext(), base::RetainedRef(mock_request_context_getter), mock_policy)); // Steps needed to initialize the storage of AppCache data.
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index bc64398dc3..b9cdb4f 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc
@@ -976,7 +976,6 @@ #if defined(OS_ANDROID) g_browser_main_loop_shutting_down = true; - ui::ContextProviderFactory::SetInstance(nullptr); #endif if (RenderProcessHost::run_renderer_in_process()) @@ -1131,8 +1130,14 @@ // it. { TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:GPUChannelFactory"); - if (BrowserGpuChannelHostFactory::instance()) + if (BrowserGpuChannelHostFactory::instance()) { +#if defined(OS_ANDROID) + // Clean up the references to the factory before terminating it. + ui::ContextProviderFactory::SetInstance(nullptr); + ContextProviderFactoryImpl::Terminate(); +#endif BrowserGpuChannelHostFactory::Terminate(); + } } // Must happen after the I/O thread is shutdown since this class lives on the @@ -1213,6 +1218,8 @@ established_gpu_channel = false; always_uses_gpu = ShouldStartGpuProcessOnBrowserStartup(); BrowserGpuChannelHostFactory::Initialize(established_gpu_channel); + ContextProviderFactoryImpl::Initialize( + BrowserGpuChannelHostFactory::instance()); ui::ContextProviderFactory::SetInstance( ContextProviderFactoryImpl::GetInstance()); #elif defined(USE_AURA) || defined(OS_MACOSX)
diff --git a/content/browser/devtools/devtools_agent_host_impl.cc b/content/browser/devtools/devtools_agent_host_impl.cc index f9e0673..95dd03a 100644 --- a/content/browser/devtools/devtools_agent_host_impl.cc +++ b/content/browser/devtools/devtools_agent_host_impl.cc
@@ -36,7 +36,7 @@ } // namespace char DevToolsAgentHost::kTypePage[] = "page"; -char DevToolsAgentHost::kTypeFrame[] = "frame"; +char DevToolsAgentHost::kTypeFrame[] = "iframe"; char DevToolsAgentHost::kTypeSharedWorker[] = "shared_worker"; char DevToolsAgentHost::kTypeServiceWorker[] = "service_worker"; char DevToolsAgentHost::kTypeExternal[] = "external";
diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/browser/devtools/protocol/network_handler.cc index 4029b4b..34f0552 100644 --- a/content/browser/devtools/protocol/network_handler.cc +++ b/content/browser/devtools/protocol/network_handler.cc
@@ -259,8 +259,7 @@ typedef DevToolsProtocolClient::Response Response; -NetworkHandler::NetworkHandler() - : host_(nullptr), enabled_(false), weak_factory_(this) { +NetworkHandler::NetworkHandler() : host_(nullptr), weak_factory_(this) { } NetworkHandler::~NetworkHandler() { @@ -274,19 +273,6 @@ client_.swap(client); } -Response NetworkHandler::Enable(const int* max_total_size, - const int* max_resource_size) { - // Start collecting ssl info. - enabled_ = true; - return Response::FallThrough(); -} - -Response NetworkHandler::Disable() { - // Stop collecting ssl info. - enabled_ = false; - return Response::FallThrough(); -} - Response NetworkHandler::ClearBrowserCache() { if (host_) GetContentClient()->browser()->ClearCache(host_);
diff --git a/content/browser/devtools/protocol/network_handler.h b/content/browser/devtools/protocol/network_handler.h index e4a96e4..5deccb3 100644 --- a/content/browser/devtools/protocol/network_handler.h +++ b/content/browser/devtools/protocol/network_handler.h
@@ -26,9 +26,6 @@ void SetRenderFrameHost(RenderFrameHostImpl* host); void SetClient(std::unique_ptr<Client> client); - Response Enable(const int* max_total_size, - const int* max_resource_size); - Response Disable(); Response ClearBrowserCache(); Response ClearBrowserCookies(); Response GetCookies(DevToolsCommandId command_id); @@ -66,7 +63,6 @@ RenderFrameHostImpl* host_; std::unique_ptr<Client> client_; - bool enabled_; base::WeakPtrFactory<NetworkHandler> weak_factory_; DISALLOW_COPY_AND_ASSIGN(NetworkHandler);
diff --git a/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc b/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc index 0ed06c3..685e7bd 100644 --- a/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc +++ b/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc
@@ -32,6 +32,7 @@ #if defined(OS_ANDROID) #include "content/browser/renderer_host/context_provider_factory_impl_android.h" +#include "content/test/mock_gpu_channel_establish_factory.h" #endif namespace content { @@ -85,6 +86,7 @@ ImageTransportFactory::InitializeForUnitTests( base::WrapUnique(new NoTransportImageTransportFactory)); #else + ContextProviderFactoryImpl::Initialize(&gpu_channel_factory_); ui::ContextProviderFactory::SetInstance( ContextProviderFactoryImpl::GetInstance()); #endif @@ -115,6 +117,7 @@ ImageTransportFactory::Terminate(); #else ui::ContextProviderFactory::SetInstance(nullptr); + ContextProviderFactoryImpl::Terminate(); #endif } @@ -131,6 +134,10 @@ RenderWidgetHostViewChildFrame* view_; MockCrossProcessFrameConnector* test_frame_connector_; +#if defined(OS_ANDROID) + MockGpuChannelEstablishFactory gpu_channel_factory_; +#endif + private: DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrameTest); };
diff --git a/content/browser/frame_host/render_widget_host_view_guest_unittest.cc b/content/browser/frame_host/render_widget_host_view_guest_unittest.cc index 3a53e2284..6946b4ef 100644 --- a/content/browser/frame_host/render_widget_host_view_guest_unittest.cc +++ b/content/browser/frame_host/render_widget_host_view_guest_unittest.cc
@@ -32,6 +32,7 @@ #if defined(OS_ANDROID) #include "content/browser/renderer_host/context_provider_factory_impl_android.h" +#include "content/test/mock_gpu_channel_establish_factory.h" #endif namespace content { @@ -59,6 +60,7 @@ std::unique_ptr<ImageTransportFactory>( new NoTransportImageTransportFactory)); #else + ContextProviderFactoryImpl::Initialize(&gpu_channel_factory_); ui::ContextProviderFactory::SetInstance( ContextProviderFactoryImpl::GetInstance()); #endif @@ -87,6 +89,7 @@ ImageTransportFactory::Terminate(); #else ui::ContextProviderFactory::SetInstance(nullptr); + ContextProviderFactoryImpl::Terminate(); #endif } @@ -100,6 +103,10 @@ RenderWidgetHostImpl* widget_host_; RenderWidgetHostViewGuest* view_; +#if defined(OS_ANDROID) + MockGpuChannelEstablishFactory gpu_channel_factory_; +#endif + private: DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewGuestTest); }; @@ -166,6 +173,10 @@ ImageTransportFactory::InitializeForUnitTests( std::unique_ptr<ImageTransportFactory>( new NoTransportImageTransportFactory)); +#else + ContextProviderFactoryImpl::Initialize(&gpu_channel_factory_); + ui::ContextProviderFactory::SetInstance( + ContextProviderFactoryImpl::GetInstance()); #endif browser_context_.reset(new TestBrowserContext); MockRenderProcessHost* process_host = @@ -195,6 +206,9 @@ base::RunLoop().RunUntilIdle(); #if !defined(OS_ANDROID) ImageTransportFactory::Terminate(); +#else + ui::ContextProviderFactory::SetInstance(nullptr); + ContextProviderFactoryImpl::Terminate(); #endif } @@ -211,6 +225,10 @@ std::unique_ptr<TestWebContents> web_contents_; TestBrowserPluginGuest* browser_plugin_guest_; +#if defined(OS_ANDROID) + MockGpuChannelEstablishFactory gpu_channel_factory_; +#endif + // Tests should set these to NULL if they've already triggered their // destruction. RenderWidgetHostImpl* widget_host_;
diff --git a/content/browser/indexed_db/indexed_db_backing_store.cc b/content/browser/indexed_db/indexed_db_backing_store.cc index 4c3b139..f62b871 100644 --- a/content/browser/indexed_db/indexed_db_backing_store.cc +++ b/content/browser/indexed_db/indexed_db_backing_store.cc
@@ -2445,7 +2445,7 @@ content::BrowserThread::PostTask( content::BrowserThread::IO, FROM_HERE, base::Bind(&LocalWriteClosure::WriteBlobToFileOnIOThread, - write_closure.get(), path, descriptor.url(), + write_closure, path, descriptor.url(), descriptor.last_modified(), request_context_getter_)); } return true;
diff --git a/content/browser/leveldb_wrapper_impl.cc b/content/browser/leveldb_wrapper_impl.cc index 4a8403f..576e66cc 100644 --- a/content/browser/leveldb_wrapper_impl.cc +++ b/content/browser/leveldb_wrapper_impl.cc
@@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/threading/thread_task_runner_handle.h" +#include "components/leveldb/public/cpp/util.h" #include "content/public/browser/browser_thread.h" -#include "mojo/common/common_type_converters.h" namespace content { @@ -249,18 +249,18 @@ return; // TODO(michaeln): Import from sqlite localstorage db. - database_->GetPrefixed(mojo::Array<uint8_t>::From(prefix_), + database_->GetPrefixed(leveldb::StdStringToUint8Vector(prefix_), base::Bind(&LevelDBWrapperImpl::OnLoadComplete, weak_ptr_factory_.GetWeakPtr())); } void LevelDBWrapperImpl::OnLoadComplete( leveldb::mojom::DatabaseError status, - mojo::Array<leveldb::mojom::KeyValuePtr> data) { + std::vector<leveldb::mojom::KeyValuePtr> data) { DCHECK(!map_); map_.reset(new ValueMap); for (auto& it : data) - (*map_)[it->key.PassStorage()] = it->value.PassStorage(); + (*map_)[it->key] = it->value; // We proceed without using a backing store, nothing will be persisted but the // class is functional for the lifetime of the object. @@ -323,18 +323,18 @@ data_rate_limiter_.add_samples(commit_batch_->GetDataSize()); // Commit all our changes in a single batch. - mojo::Array<leveldb::mojom::BatchedOperationPtr> operations; + std::vector<leveldb::mojom::BatchedOperationPtr> operations; if (commit_batch_->clear_all_first) { leveldb::mojom::BatchedOperationPtr item = leveldb::mojom::BatchedOperation::New(); item->type = leveldb::mojom::BatchOperationType::DELETE_PREFIXED_KEY; - item->key = mojo::Array<uint8_t>::From(std::string(prefix_)); + item->key = leveldb::StdStringToUint8Vector(prefix_); operations.push_back(std::move(item)); } for (auto& it : commit_batch_->changed_values) { leveldb::mojom::BatchedOperationPtr item = leveldb::mojom::BatchedOperation::New(); - item->key = std::vector<uint8_t>(it.first); + item->key = std::move(it.first); if (!it.second) { item->type = leveldb::mojom::BatchOperationType::DELETE_KEY; } else {
diff --git a/content/browser/leveldb_wrapper_impl.h b/content/browser/leveldb_wrapper_impl.h index 97bca9ef..e4a978c3 100644 --- a/content/browser/leveldb_wrapper_impl.h +++ b/content/browser/leveldb_wrapper_impl.h
@@ -107,7 +107,7 @@ void OnConnectionError(); void LoadMap(const base::Closure& completion_callback); void OnLoadComplete(leveldb::mojom::DatabaseError status, - mojo::Array<leveldb::mojom::KeyValuePtr> data); + std::vector<leveldb::mojom::KeyValuePtr> data); void CreateCommitBatchIfNeeded(); void StartCommitTimer(); base::TimeDelta ComputeCommitDelay() const;
diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc index 64ed74c..d46781e 100644 --- a/content/browser/renderer_host/compositor_impl_android.cc +++ b/content/browser/renderer_host/compositor_impl_android.cc
@@ -394,6 +394,7 @@ root_window_(root_window), needs_animate_(false), pending_swapbuffers_(0U), + num_successive_gpu_process_initialization_failures_(0), num_successive_context_creation_failures_(0), output_surface_request_pending_(false), needs_begin_frames_(false), @@ -649,26 +650,50 @@ #endif void CompositorImpl::CreateCompositorOutputSurface( - const scoped_refptr<cc::ContextProvider>& context_provider) { - // This callback should run only if we have a pending output surface request, - // since that is when we should have queued a context request. - // In case the surface was invalidated after the context request was queued, - // the request should have been dropped by the ContextProviderFactory. + const scoped_refptr<cc::ContextProvider>& context_provider, + ui::ContextProviderFactory::ContextCreationResult result) { DCHECK(output_surface_request_pending_); - DCHECK(host_->visible()); - DCHECK(window_); - DCHECK_NE(surface_handle_, gpu::kNullSurfaceHandle); - DCHECK(context_provider); - scoped_refptr<ContextProviderCommandBuffer> context_provider_command_buffer = - static_cast<ContextProviderCommandBuffer*>(context_provider.get()); - std::unique_ptr<cc::OutputSurface> display_output_surface( - new OutputSurfaceWithoutParent( - context_provider_command_buffer, - base::Bind(&CompositorImpl::PopulateGpuCapabilities, - base::Unretained(this)))); - InitializeDisplay(std::move(display_output_surface), nullptr, - std::move(context_provider)); + switch (result) { + // Don't retry if we are shutting down or if the Gpu Surface handle was + // lost. The Gpu Surface handle loss should happen only if we are invisible + // or this was from a previous request and the current surface has changed, + // in which case we would have made another request with the factory. + case ui::ContextProviderFactory::ContextCreationResult:: + FAILURE_FACTORY_SHUTDOWN: + case ui::ContextProviderFactory::ContextCreationResult:: + FAILURE_GPU_SURFACE_HANDLE_LOST: + break; + case ui::ContextProviderFactory::ContextCreationResult:: + FAILURE_GPU_PROCESS_INITIALIZATION_FAILED: + // Retry only if we are visible. + if (host_->visible()) { + LOG_IF(FATAL, + ++num_successive_gpu_process_initialization_failures_ >= 2) + << "Too many GPU Process initialization failures. Giving up... "; + HandlePendingOutputSurfaceRequest(); + } + break; + case ui::ContextProviderFactory::ContextCreationResult::SUCCESS: + DCHECK(host_->visible()); + DCHECK(window_); + DCHECK_NE(surface_handle_, gpu::kNullSurfaceHandle); + DCHECK(context_provider); + + num_successive_gpu_process_initialization_failures_ = 0; + scoped_refptr<ContextProviderCommandBuffer> + context_provider_command_buffer = + static_cast<ContextProviderCommandBuffer*>( + context_provider.get()); + std::unique_ptr<cc::OutputSurface> display_output_surface( + new OutputSurfaceWithoutParent( + context_provider_command_buffer, + base::Bind(&CompositorImpl::PopulateGpuCapabilities, + base::Unretained(this)))); + InitializeDisplay(std::move(display_output_surface), nullptr, + std::move(context_provider)); + break; + } } void CompositorImpl::InitializeDisplay(
diff --git a/content/browser/renderer_host/compositor_impl_android.h b/content/browser/renderer_host/compositor_impl_android.h index 6638afd..23b2e249 100644 --- a/content/browser/renderer_host/compositor_impl_android.h +++ b/content/browser/renderer_host/compositor_impl_android.h
@@ -127,7 +127,8 @@ void CreateVulkanOutputSurface(); #endif void CreateCompositorOutputSurface( - const scoped_refptr<cc::ContextProvider>& context_provider); + const scoped_refptr<cc::ContextProvider>& context_provider, + ui::ContextProviderFactory::ContextCreationResult result); void InitializeDisplay( std::unique_ptr<cc::OutputSurface> display_output_surface, scoped_refptr<cc::VulkanContextProvider> vulkan_context_provider, @@ -168,6 +169,7 @@ // the GPU thread. unsigned int pending_swapbuffers_; + size_t num_successive_gpu_process_initialization_failures_; size_t num_successive_context_creation_failures_; // Whether there is an OutputSurface request pending from the current
diff --git a/content/browser/renderer_host/context_provider_factory_impl_android.cc b/content/browser/renderer_host/context_provider_factory_impl_android.cc index 40cc97c..d3f14fa 100644 --- a/content/browser/renderer_host/context_provider_factory_impl_android.cc +++ b/content/browser/renderer_host/context_provider_factory_impl_android.cc
@@ -11,7 +11,6 @@ #include "cc/output/context_provider.h" #include "cc/output/vulkan_in_process_context_provider.h" #include "cc/surfaces/surface_manager.h" -#include "content/browser/gpu/browser_gpu_channel_host_factory.h" #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h" #include "content/browser/gpu/compositor_util.h" #include "content/browser/gpu/gpu_surface_tracker.h" @@ -39,19 +38,44 @@ return command_buffer_metrics::CONTEXT_TYPE_UNKNOWN; } +ContextProviderFactoryImpl* instance = nullptr; + } // namespace // static -ContextProviderFactoryImpl* ContextProviderFactoryImpl::GetInstance() { - return base::Singleton<ContextProviderFactoryImpl>::get(); +void ContextProviderFactoryImpl::Initialize( + gpu::GpuChannelEstablishFactory* gpu_channel_factory) { + DCHECK(!instance); + instance = new ContextProviderFactoryImpl(gpu_channel_factory); } -ContextProviderFactoryImpl::ContextProviderFactoryImpl() - : in_handle_pending_requests_(false), - surface_client_id_(0), - weak_factory_(this) {} +void ContextProviderFactoryImpl::Terminate() { + DCHECK(instance); + delete instance; + instance = nullptr; +} -ContextProviderFactoryImpl::~ContextProviderFactoryImpl() {} +// static +ContextProviderFactoryImpl* ContextProviderFactoryImpl::GetInstance() { + return instance; +} + +ContextProviderFactoryImpl::ContextProviderFactoryImpl( + gpu::GpuChannelEstablishFactory* gpu_channel_factory) + : gpu_channel_factory_(gpu_channel_factory), + in_handle_pending_requests_(false), + in_shutdown_(false), + surface_client_id_(0), + weak_factory_(this) { + DCHECK(gpu_channel_factory_); +} + +ContextProviderFactoryImpl::~ContextProviderFactoryImpl() { + in_shutdown_ = true; + if (!context_provider_requests_.empty()) + HandlePendingRequests(nullptr, + ContextCreationResult::FAILURE_FACTORY_SHUTDOWN); +} ContextProviderFactoryImpl::ContextProvidersRequest::ContextProvidersRequest() : context_type(command_buffer_metrics::CONTEXT_TYPE_UNKNOWN), @@ -145,10 +169,17 @@ context_request.result_callback = result_callback; context_provider_requests_.push_back(context_request); - HandlePendingRequests(); + + // If the channel is available, the factory will run the callback + // synchronously so we'll handle this request there. + EstablishGpuChannel(); } -void ContextProviderFactoryImpl::HandlePendingRequests() { +void ContextProviderFactoryImpl::HandlePendingRequests( + scoped_refptr<gpu::GpuChannelHost> gpu_channel_host, + ContextCreationResult result) { + DCHECK(!in_shutdown_) + << "The factory is shutting down, can't handle new requests"; DCHECK(!context_provider_requests_.empty()) << "We don't have any pending requests?"; @@ -161,53 +192,52 @@ base::AutoReset<bool> auto_reset_in_handle_requests( &in_handle_pending_requests_, true); - scoped_refptr<gpu::GpuChannelHost> gpu_channel_host( - EnsureGpuChannelEstablished()); - - // If we don't have a Gpu Channel Host, we will come back here when the Gpu - // channel is established, since OnGpuChannelEstablished triggers handling - // of the requests we couldn't process right now. - if (!gpu_channel_host) - return; - std::list<ContextProvidersRequest> context_requests = context_provider_requests_; context_provider_requests_.clear(); for (ContextProvidersRequest& context_request : context_requests) { scoped_refptr<cc::ContextProvider> context_provider; + ContextCreationResult result_to_report = result; const bool create_onscreen_context = context_request.surface_handle != gpu::kNullSurfaceHandle; // Is the request for an onscreen context? Make sure the surface is - // still valid in that case. DO NOT run the callback if we don't have a - // valid surface. + // still valid in that case. if (create_onscreen_context && !GpuSurfaceTracker::GetInstance()->IsValidSurfaceHandle( context_request.surface_handle)) { - continue; + // Choose what to report based on severity, factory shutdown trumps + // everything, otherwise report GpuSurfaceHandle loss. + result_to_report = + result_to_report == ContextCreationResult::FAILURE_FACTORY_SHUTDOWN + ? result_to_report + : ContextCreationResult::FAILURE_GPU_SURFACE_HANDLE_LOST; + } else if (gpu_channel_host) { + DCHECK_EQ(ContextCreationResult::SUCCESS, result); + + context_provider = new ContextProviderCommandBuffer( + gpu_channel_host, gpu::GPU_STREAM_DEFAULT, + gpu::GpuStreamPriority::NORMAL, context_request.surface_handle, + GURL(std::string("chrome://gpu/ContextProviderFactoryImpl::") + + std::string("CompositorContextProvider")), + context_request.automatic_flushes, context_request.support_locking, + context_request.shared_memory_limits, context_request.attributes, + static_cast<ContextProviderCommandBuffer*>( + context_request.shared_context_provider), + context_request.context_type); } - context_provider = new ContextProviderCommandBuffer( - gpu_channel_host, gpu::GPU_STREAM_DEFAULT, - gpu::GpuStreamPriority::NORMAL, context_request.surface_handle, - GURL(std::string("chrome://gpu/ContextProviderFactoryImpl::") + - std::string("CompositorContextProvider")), - context_request.automatic_flushes, context_request.support_locking, - context_request.shared_memory_limits, context_request.attributes, - static_cast<ContextProviderCommandBuffer*>( - context_request.shared_context_provider), - context_request.context_type); - context_request.result_callback.Run(context_provider); + context_request.result_callback.Run(context_provider, result_to_report); } } if (!context_provider_requests_.empty()) - HandlePendingRequests(); + EstablishGpuChannel(); } -gpu::GpuChannelHost* ContextProviderFactoryImpl::EnsureGpuChannelEstablished() { +void ContextProviderFactoryImpl::EstablishGpuChannel() { #if defined(ADDRESS_SANITIZER) || defined(THREAD_SANITIZER) || \ defined(SYZYASAN) || defined(CYGPROFILE_INSTRUMENTATION) const int64_t kGpuChannelTimeoutInSeconds = 40; @@ -215,36 +245,35 @@ const int64_t kGpuChannelTimeoutInSeconds = 10; #endif - BrowserGpuChannelHostFactory* factory = - BrowserGpuChannelHostFactory::instance(); - - if (factory->GetGpuChannel()) - return factory->GetGpuChannel(); - - factory->EstablishGpuChannel( - base::Bind(&ContextProviderFactoryImpl::OnGpuChannelEstablished, - weak_factory_.GetWeakPtr())); + // Start the timer first, if the result comes synchronously, we want it to + // stop in the callback. establish_gpu_channel_timeout_.Start( FROM_HERE, base::TimeDelta::FromSeconds(kGpuChannelTimeoutInSeconds), this, &ContextProviderFactoryImpl::OnGpuChannelTimeout); - return nullptr; + gpu_channel_factory_->EstablishGpuChannel( + base::Bind(&ContextProviderFactoryImpl::OnGpuChannelEstablished, + weak_factory_.GetWeakPtr())); } void ContextProviderFactoryImpl::OnGpuChannelEstablished( scoped_refptr<gpu::GpuChannelHost> gpu_channel) { establish_gpu_channel_timeout_.Stop(); - // This should happen only during shutdown. So early out instead of queuing - // more requests with the factory. - if (!gpu_channel) - return; - // We can queue the Gpu Channel initialization requests multiple times as // we get context requests. So we might have already handled any pending // requests when this callback runs. - if (!context_provider_requests_.empty()) - HandlePendingRequests(); + if (context_provider_requests_.empty()) + return; + + if (gpu_channel) { + HandlePendingRequests(std::move(gpu_channel), + ContextCreationResult::SUCCESS); + } else { + HandlePendingRequests( + nullptr, + ContextCreationResult::FAILURE_GPU_PROCESS_INITIALIZATION_FAILED); + } } void ContextProviderFactoryImpl::OnGpuChannelTimeout() {
diff --git a/content/browser/renderer_host/context_provider_factory_impl_android.h b/content/browser/renderer_host/context_provider_factory_impl_android.h index 3a820fb..c0fe933 100644 --- a/content/browser/renderer_host/context_provider_factory_impl_android.h +++ b/content/browser/renderer_host/context_provider_factory_impl_android.h
@@ -17,17 +17,13 @@ #include "gpu/ipc/common/surface_handle.h" #include "ui/android/context_provider_factory.h" -namespace base { -template <typename T> -struct DefaultSingletonTraits; -} - namespace cc { class VulkanInProcessContextProvider; } namespace gpu { class GpuChannelHost; +class GpuChannelEstablishFactory; } namespace content { @@ -36,13 +32,19 @@ class CONTENT_EXPORT ContextProviderFactoryImpl : public ui::ContextProviderFactory { public: + // The factory must outlive the ContextProviderFactoryImpl instance, which + // will be destroyed when terminate is called. + static void Initialize(gpu::GpuChannelEstablishFactory* gpu_channel_factory); + + static void Terminate(); + static ContextProviderFactoryImpl* GetInstance(); ~ContextProviderFactoryImpl() override; // The callback may be triggered synchronously, if the Gpu Channel is already - // initialized. In case the surface_handle is invalidated before the context - // can be created, the request is dropped and the callback will *not* run. + // initialized. In case the context creation fails, a null context is passed + // with the failure reason. void CreateDisplayContextProvider( gpu::SurfaceHandle surface_handle, gpu::SharedMemoryLimits shared_memory_limits, @@ -68,7 +70,8 @@ gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override; private: - friend struct base::DefaultSingletonTraits<ContextProviderFactoryImpl>; + ContextProviderFactoryImpl( + gpu::GpuChannelEstablishFactory* gpu_channel_factory); void CreateContextProviderInternal( command_buffer_metrics::ContextType context_type, @@ -95,14 +98,16 @@ ContextProviderCallback result_callback; }; - ContextProviderFactoryImpl(); - // Will return nullptr if the Gpu channel has not been established. - gpu::GpuChannelHost* EnsureGpuChannelEstablished(); + void EstablishGpuChannel(); void OnGpuChannelEstablished(scoped_refptr<gpu::GpuChannelHost> gpu_channel); void OnGpuChannelTimeout(); - void HandlePendingRequests(); + void HandlePendingRequests( + scoped_refptr<gpu::GpuChannelHost> gpu_channel_host, + ContextCreationResult result); + + gpu::GpuChannelEstablishFactory* gpu_channel_factory_; std::list<ContextProvidersRequest> context_provider_requests_; @@ -112,6 +117,8 @@ bool in_handle_pending_requests_; + bool in_shutdown_; + base::OneShotTimer establish_gpu_channel_timeout_; std::unique_ptr<cc::SurfaceManager> surface_manager_;
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc index 52f6bef..d1c7d8e 100644 --- a/content/browser/renderer_host/render_widget_host_unittest.cc +++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -39,6 +39,7 @@ #if defined(OS_ANDROID) #include "content/browser/renderer_host/context_provider_factory_impl_android.h" #include "content/browser/renderer_host/render_widget_host_view_android.h" +#include "content/test/mock_gpu_channel_establish_factory.h" #endif #if defined(USE_AURA) || defined(OS_MACOSX) @@ -472,6 +473,7 @@ new NoTransportImageTransportFactory)); #endif #if defined(OS_ANDROID) + ContextProviderFactoryImpl::Initialize(&gpu_channel_factory_); ui::ContextProviderFactory::SetInstance( ContextProviderFactoryImpl::GetInstance()); #endif @@ -505,6 +507,7 @@ #endif #if defined(OS_ANDROID) ui::ContextProviderFactory::SetInstance(nullptr); + ContextProviderFactoryImpl::Terminate(); #endif // Process all pending tasks to avoid leaks. @@ -651,6 +654,10 @@ double last_simulated_event_time_seconds_; double simulated_event_time_delta_seconds_; +#if defined(OS_ANDROID) + MockGpuChannelEstablishFactory gpu_channel_factory_; +#endif + private: SyntheticWebTouchEvent touch_event_;
diff --git a/content/browser/service_worker/service_worker_provider_host.cc b/content/browser/service_worker/service_worker_provider_host.cc index 2045f863..a978ec91 100644 --- a/content/browser/service_worker/service_worker_provider_host.cc +++ b/content/browser/service_worker/service_worker_provider_host.cc
@@ -281,7 +281,9 @@ void ServiceWorkerProviderHost::AddMatchingRegistration( ServiceWorkerRegistration* registration) { - DCHECK( + // TODO(shimazu): Change CHECK to DCHECK when it's confirmed that + // https://crbug.com/634222 has been fixed. + CHECK( ServiceWorkerUtils::ScopeMatches(registration->pattern(), document_url_)); if (!IsContextSecureForServiceWorker()) return;
diff --git a/content/browser/service_worker/service_worker_stream_reader.cc b/content/browser/service_worker/service_worker_stream_reader.cc new file mode 100644 index 0000000..062fe77 --- /dev/null +++ b/content/browser/service_worker/service_worker_stream_reader.cc
@@ -0,0 +1,136 @@ +// Copyright 2016 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. + +#include "content/browser/service_worker/service_worker_stream_reader.h" + +#include "content/browser/resource_context_impl.h" +#include "content/browser/service_worker/service_worker_version.h" +#include "content/browser/streams/stream.h" +#include "content/browser/streams/stream_context.h" +#include "content/browser/streams/stream_registry.h" +#include "net/base/io_buffer.h" + +namespace content { + +ServiceWorkerStreamReader::ServiceWorkerStreamReader( + ServiceWorkerURLRequestJob* owner, + scoped_refptr<ServiceWorkerVersion> streaming_version) + : owner_(owner), + stream_pending_buffer_size_(0), + streaming_version_(streaming_version) { + streaming_version_->AddStreamingURLRequestJob(owner_); +} + +ServiceWorkerStreamReader::~ServiceWorkerStreamReader() { + if (streaming_version_) { + streaming_version_->RemoveStreamingURLRequestJob(owner_); + streaming_version_ = nullptr; + } + if (stream_) { + stream_->RemoveReadObserver(this); + stream_->Abort(); + stream_ = nullptr; + } + if (!waiting_stream_url_.is_empty()) { + StreamRegistry* stream_registry = + GetStreamContextForResourceContext(owner_->resource_context()) + ->registry(); + stream_registry->RemoveRegisterObserver(waiting_stream_url_); + stream_registry->AbortPendingStream(waiting_stream_url_); + } +} + +void ServiceWorkerStreamReader::Start(const GURL& stream_url) { + DCHECK(!stream_); + DCHECK(waiting_stream_url_.is_empty()); + + StreamContext* stream_context = + GetStreamContextForResourceContext(owner_->resource_context()); + stream_ = stream_context->registry()->GetStream(stream_url); + if (!stream_) { + waiting_stream_url_ = stream_url; + // Wait for StreamHostMsg_StartBuilding message from the ServiceWorker. + stream_context->registry()->SetRegisterObserver(waiting_stream_url_, this); + return; + } + stream_->SetReadObserver(this); + owner_->OnResponseStarted(); +} + +int ServiceWorkerStreamReader::ReadRawData(net::IOBuffer* buf, int buf_size) { + DCHECK(stream_); + DCHECK(waiting_stream_url_.is_empty()); + + int bytes_read = 0; + switch (stream_->ReadRawData(buf, buf_size, &bytes_read)) { + case Stream::STREAM_HAS_DATA: + DCHECK_GT(bytes_read, 0); + return bytes_read; + case Stream::STREAM_COMPLETE: + DCHECK_EQ(0, bytes_read); + owner_->RecordResult(ServiceWorkerMetrics::REQUEST_JOB_STREAM_RESPONSE); + return 0; + case Stream::STREAM_EMPTY: + stream_pending_buffer_ = buf; + stream_pending_buffer_size_ = buf_size; + return net::ERR_IO_PENDING; + case Stream::STREAM_ABORTED: + // Handle this as connection reset. + owner_->RecordResult( + ServiceWorkerMetrics::REQUEST_JOB_ERROR_STREAM_ABORTED); + return net::ERR_CONNECTION_RESET; + } + NOTREACHED(); + return net::ERR_FAILED; +} + +void ServiceWorkerStreamReader::OnDataAvailable(Stream* stream) { + // Do nothing if stream_pending_buffer_ is empty, i.e. there's no ReadRawData + // operation waiting for IO completion. + if (!stream_pending_buffer_) + return; + + // stream_pending_buffer_ is set to the IOBuffer instance provided to + // ReadRawData() by URLRequestJob. + + int result = 0; + switch (stream_->ReadRawData(stream_pending_buffer_.get(), + stream_pending_buffer_size_, &result)) { + case Stream::STREAM_HAS_DATA: + DCHECK_GT(result, 0); + break; + case Stream::STREAM_COMPLETE: + // Calling NotifyReadComplete with 0 signals completion. + DCHECK(!result); + owner_->RecordResult(ServiceWorkerMetrics::REQUEST_JOB_STREAM_RESPONSE); + break; + case Stream::STREAM_EMPTY: + NOTREACHED(); + break; + case Stream::STREAM_ABORTED: + // Handle this as connection reset. + result = net::ERR_CONNECTION_RESET; + owner_->RecordResult( + ServiceWorkerMetrics::REQUEST_JOB_ERROR_STREAM_ABORTED); + break; + } + + // Clear the buffers before notifying the read is complete, so that it is + // safe for the observer to read. + stream_pending_buffer_ = nullptr; + stream_pending_buffer_size_ = 0; + owner_->OnReadRawDataComplete(result); +} + +void ServiceWorkerStreamReader::OnStreamRegistered(Stream* stream) { + StreamContext* stream_context = + GetStreamContextForResourceContext(owner_->resource_context()); + stream_context->registry()->RemoveRegisterObserver(waiting_stream_url_); + waiting_stream_url_ = GURL(); + stream_ = stream; + stream_->SetReadObserver(this); + owner_->OnResponseStarted(); +} + +} // namespace content
diff --git a/content/browser/service_worker/service_worker_stream_reader.h b/content/browser/service_worker/service_worker_stream_reader.h new file mode 100644 index 0000000..7d75294 --- /dev/null +++ b/content/browser/service_worker/service_worker_stream_reader.h
@@ -0,0 +1,60 @@ +// Copyright 2016 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. + +#ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_STREAM_READER_H_ +#define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_STREAM_READER_H_ + +#include "content/browser/service_worker/service_worker_url_request_job.h" +#include "content/browser/streams/stream_read_observer.h" +#include "content/browser/streams/stream_register_observer.h" +#include "net/url_request/url_request.h" + +namespace net { +class IOBuffer; +} + +namespace content { + +class ServiceWorkerVersion; + +// Reads a stream response for ServiceWorkerURLRequestJob. +// Owned by ServiceWorkerURLRequestJob. +class ServiceWorkerStreamReader : public StreamReadObserver, + public StreamRegisterObserver { + public: + // |streaming_version| is the ServiceWorkerVersion that must be kept alive + // while the response is being read. + ServiceWorkerStreamReader( + ServiceWorkerURLRequestJob* owner, + scoped_refptr<ServiceWorkerVersion> streaming_version); + ~ServiceWorkerStreamReader() override; + + // Starts reading the stream. owner_->OnResponseStarted will be called when + // the response starts. + void Start(const GURL& stream_url); + + // Same as URLRequestJob::ReadRawData. If ERR_IO_PENDING is returned, + // owner_->OnReadRawDataComplete will be called when the read completes. + int ReadRawData(net::IOBuffer* buf, int buf_size); + + // StreamObserver override: + void OnDataAvailable(Stream* stream) override; + + // StreamRegisterObserver override: + void OnStreamRegistered(Stream* stream) override; + + private: + ServiceWorkerURLRequestJob* owner_; + + scoped_refptr<Stream> stream_; + GURL waiting_stream_url_; + scoped_refptr<net::IOBuffer> stream_pending_buffer_; + int stream_pending_buffer_size_; + + scoped_refptr<ServiceWorkerVersion> streaming_version_; +}; + +} // namespace content + +#endif // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_STREAM_READER_H_
diff --git a/content/browser/service_worker/service_worker_url_request_job.cc b/content/browser/service_worker/service_worker_url_request_job.cc index a8249b0..caf7c0f 100644 --- a/content/browser/service_worker/service_worker_url_request_job.cc +++ b/content/browser/service_worker/service_worker_url_request_job.cc
@@ -26,9 +26,7 @@ #include "content/browser/service_worker/service_worker_fetch_dispatcher.h" #include "content/browser/service_worker/service_worker_provider_host.h" #include "content/browser/service_worker/service_worker_response_info.h" -#include "content/browser/streams/stream.h" -#include "content/browser/streams/stream_context.h" -#include "content/browser/streams/stream_registry.h" +#include "content/browser/service_worker/service_worker_stream_reader.h" #include "content/common/resource_request_body_impl.h" #include "content/common/service_worker/service_worker_types.h" #include "content/common/service_worker/service_worker_utils.h" @@ -218,7 +216,6 @@ client_id_(client_id), blob_storage_context_(blob_storage_context), resource_context_(resource_context), - stream_pending_buffer_size_(0), request_mode_(request_mode), credentials_mode_(credentials_mode), redirect_mode_(redirect_mode), @@ -233,7 +230,7 @@ } ServiceWorkerURLRequestJob::~ServiceWorkerURLRequestJob() { - ClearStream(); + stream_reader_.reset(); blob_construction_waiter_.reset(); if (!ShouldRecordResult()) @@ -278,7 +275,7 @@ void ServiceWorkerURLRequestJob::Kill() { net::URLRequestJob::Kill(); - ClearStream(); + stream_reader_.reset(); fetch_dispatcher_.reset(); blob_reader_.reset(); weak_factory_.InvalidateWeakPtrs(); @@ -338,31 +335,9 @@ int ServiceWorkerURLRequestJob::ReadRawData(net::IOBuffer* buf, int buf_size) { DCHECK(buf); DCHECK_GE(buf_size, 0); - DCHECK(waiting_stream_url_.is_empty()); - if (stream_.get()) { - int bytes_read = 0; - switch (stream_->ReadRawData(buf, buf_size, &bytes_read)) { - case Stream::STREAM_HAS_DATA: - DCHECK_GT(bytes_read, 0); - return bytes_read; - case Stream::STREAM_COMPLETE: - DCHECK_EQ(0, bytes_read); - RecordResult(ServiceWorkerMetrics::REQUEST_JOB_STREAM_RESPONSE); - return 0; - case Stream::STREAM_EMPTY: - stream_pending_buffer_ = buf; - stream_pending_buffer_size_ = buf_size; - return net::ERR_IO_PENDING; - case Stream::STREAM_ABORTED: - // Handle this as connection reset. - RecordResult(ServiceWorkerMetrics::REQUEST_JOB_ERROR_STREAM_ABORTED); - return net::ERR_CONNECTION_RESET; - } - NOTREACHED(); - return net::ERR_FAILED; - } - + if (stream_reader_) + return stream_reader_->ReadRawData(buf, buf_size); if (blob_reader_) return blob_reader_->ReadRawData(buf, buf_size); @@ -394,63 +369,11 @@ } } -// TODO(falken): Refactor Stream specific handling to a separate class. -// Overrides for Stream reading ----------------------------------------------- - -void ServiceWorkerURLRequestJob::OnDataAvailable(Stream* stream) { - // Do nothing if stream_pending_buffer_ is empty, i.e. there's no ReadRawData - // operation waiting for IO completion. - if (!stream_pending_buffer_.get()) - return; - - // stream_pending_buffer_ is set to the IOBuffer instance provided to - // ReadRawData() by URLRequestJob. - - int result = 0; - switch (stream_->ReadRawData(stream_pending_buffer_.get(), - stream_pending_buffer_size_, &result)) { - case Stream::STREAM_HAS_DATA: - DCHECK_GT(result, 0); - break; - case Stream::STREAM_COMPLETE: - // Calling NotifyReadComplete with 0 signals completion. - DCHECK(!result); - RecordResult(ServiceWorkerMetrics::REQUEST_JOB_STREAM_RESPONSE); - break; - case Stream::STREAM_EMPTY: - NOTREACHED(); - break; - case Stream::STREAM_ABORTED: - // Handle this as connection reset. - result = net::ERR_CONNECTION_RESET; - RecordResult(ServiceWorkerMetrics::REQUEST_JOB_ERROR_STREAM_ABORTED); - break; - } - - // Clear the buffers before notifying the read is complete, so that it is - // safe for the observer to read. - stream_pending_buffer_ = nullptr; - stream_pending_buffer_size_ = 0; - ReadRawDataComplete(result); -} - -void ServiceWorkerURLRequestJob::OnStreamRegistered(Stream* stream) { - StreamContext* stream_context = - GetStreamContextForResourceContext(resource_context_); - stream_context->registry()->RemoveRegisterObserver(waiting_stream_url_); - waiting_stream_url_ = GURL(); - stream_ = stream; - stream_->SetReadObserver(this); - CommitResponseHeader(); -} - base::WeakPtr<ServiceWorkerURLRequestJob> ServiceWorkerURLRequestJob::GetWeakPtr() { return weak_factory_.GetWeakPtr(); } -// Misc ----------------------------------------------------------------------- - const net::HttpResponseInfo* ServiceWorkerURLRequestJob::http_info() const { if (!http_response_info_) return nullptr; @@ -730,21 +653,8 @@ DCHECK(response.blob_uuid.empty()); SetResponseBodyType(STREAM); SetResponse(response); - streaming_version_ = version; - streaming_version_->AddStreamingURLRequestJob(this); - StreamContext* stream_context = - GetStreamContextForResourceContext(resource_context_); - stream_ = - stream_context->registry()->GetStream(response.stream_url); - if (!stream_.get()) { - waiting_stream_url_ = response.stream_url; - // Wait for StreamHostMsg_StartBuilding message from the ServiceWorker. - stream_context->registry()->SetRegisterObserver(waiting_stream_url_, - this); - return; - } - stream_->SetReadObserver(this); - CommitResponseHeader(); + stream_reader_.reset(new ServiceWorkerStreamReader(this, version)); + stream_reader_->Start(response.stream_url); return; } @@ -891,24 +801,6 @@ error); } -void ServiceWorkerURLRequestJob::ClearStream() { - if (streaming_version_) { - streaming_version_->RemoveStreamingURLRequestJob(this); - streaming_version_ = nullptr; - } - if (stream_) { - stream_->RemoveReadObserver(this); - stream_->Abort(); - stream_ = nullptr; - } - if (!waiting_stream_url_.is_empty()) { - StreamRegistry* stream_registry = - GetStreamContextForResourceContext(resource_context_)->registry(); - stream_registry->RemoveRegisterObserver(waiting_stream_url_); - stream_registry->AbortPendingStream(waiting_stream_url_); - } -} - void ServiceWorkerURLRequestJob::NotifyHeadersComplete() { OnStartCompleted(); URLRequestJob::NotifyHeadersComplete();
diff --git a/content/browser/service_worker/service_worker_url_request_job.h b/content/browser/service_worker/service_worker_url_request_job.h index dc06696a..278f250 100644 --- a/content/browser/service_worker/service_worker_url_request_job.h +++ b/content/browser/service_worker/service_worker_url_request_job.h
@@ -17,8 +17,6 @@ #include "base/time/time.h" #include "content/browser/service_worker/embedded_worker_status.h" #include "content/browser/service_worker/service_worker_metrics.h" -#include "content/browser/streams/stream_read_observer.h" -#include "content/browser/streams/stream_register_observer.h" #include "content/common/content_export.h" #include "content/common/service_worker/service_worker_status_code.h" #include "content/common/service_worker/service_worker_types.h" @@ -47,16 +45,14 @@ class ResourceContext; class ResourceRequestBodyImpl; class ServiceWorkerBlobReader; +class ServiceWorkerStreamReader; class ServiceWorkerContextCore; class ServiceWorkerFetchDispatcher; class ServiceWorkerProviderHost; class ServiceWorkerVersion; class Stream; -class CONTENT_EXPORT ServiceWorkerURLRequestJob - : public net::URLRequestJob, - public StreamReadObserver, - public StreamRegisterObserver { +class CONTENT_EXPORT ServiceWorkerURLRequestJob : public net::URLRequestJob { public: class CONTENT_EXPORT Delegate { public: @@ -103,6 +99,8 @@ ~ServiceWorkerURLRequestJob() override; + const ResourceContext* resource_context() const { return resource_context_; } + // Sets the response type. // When an in-flight request possibly needs CORS check, use // FallbackToNetworkOrRenderer. This method will decide whether the request @@ -135,14 +133,8 @@ void SetExtraRequestHeaders(const net::HttpRequestHeaders& headers) override; int ReadRawData(net::IOBuffer* buf, int buf_size) override; - // StreamObserver override: - void OnDataAvailable(Stream* stream) override; - - // StreamRegisterObserver override: - void OnStreamRegistered(Stream* stream) override; - //---------------------------------------------------------------------------- - // The following are intended for use by ServiceWorkerBlobReader. + // The following are intended for use by ServiceWorker(Blob|Stream)Reader. void OnResponseStarted(); void OnReadRawDataComplete(int bytes_read); void RecordResult(ServiceWorkerMetrics::URLRequestJobResult result); @@ -220,9 +212,6 @@ void RecordStatusZeroResponseError( blink::WebServiceWorkerResponseError error); - // Releases the resources for streaming. - void ClearStream(); - const net::HttpResponseInfo* http_info() const; // Invoke callbacks before invoking corresponding URLRequestJob methods. @@ -265,11 +254,9 @@ std::string client_id_; base::WeakPtr<storage::BlobStorageContext> blob_storage_context_; const ResourceContext* resource_context_; + // Only one of |blob_reader_| and |stream_reader_| can be non-null. std::unique_ptr<ServiceWorkerBlobReader> blob_reader_; - scoped_refptr<Stream> stream_; - GURL waiting_stream_url_; - scoped_refptr<net::IOBuffer> stream_pending_buffer_; - int stream_pending_buffer_size_; + std::unique_ptr<ServiceWorkerStreamReader> stream_reader_; FetchRequestMode request_mode_; FetchCredentialsMode credentials_mode_; @@ -282,7 +269,6 @@ // using the userdata mechanism. So we have to keep it not to free the blobs. scoped_refptr<ResourceRequestBodyImpl> body_; std::unique_ptr<storage::BlobDataHandle> request_body_blob_data_handle_; - scoped_refptr<ServiceWorkerVersion> streaming_version_; ServiceWorkerFetchType fetch_type_; ResponseBodyType response_body_type_ = UNKNOWN;
diff --git a/content/browser/utility_process_host_impl.cc b/content/browser/utility_process_host_impl.cc index c3752f2..b76e5d5 100644 --- a/content/browser/utility_process_host_impl.cc +++ b/content/browser/utility_process_host_impl.cc
@@ -374,7 +374,7 @@ client_task_runner_->PostTask( FROM_HERE, base::Bind(&UtilityProcessHostClient::OnProcessLaunchFailed, - client_.get(), + client_, error_code)); } @@ -384,7 +384,7 @@ client_task_runner_->PostTask( FROM_HERE, - base::Bind(&UtilityProcessHostClient::OnProcessCrashed, client_.get(), + base::Bind(&UtilityProcessHostClient::OnProcessCrashed, client_, exit_code)); }
diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 8743642c..d03ddbd5 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi
@@ -1413,6 +1413,8 @@ 'browser/service_worker/service_worker_script_cache_map.h', 'browser/service_worker/service_worker_storage.cc', 'browser/service_worker/service_worker_storage.h', + 'browser/service_worker/service_worker_stream_reader.cc', + 'browser/service_worker/service_worker_stream_reader.h', 'browser/service_worker/service_worker_unregister_job.cc', 'browser/service_worker/service_worker_unregister_job.h', 'browser/service_worker/service_worker_url_request_job.cc',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 0235161..3ff4476 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi
@@ -119,6 +119,8 @@ 'test/mock_background_sync_controller.h', 'test/mock_google_streaming_server.cc', 'test/mock_google_streaming_server.h', + 'test/mock_gpu_channel_establish_factory.cc', + 'test/mock_gpu_channel_establish_factory.h', 'test/mock_keyboard.cc', 'test/mock_keyboard.h', 'test/mock_keyboard_driver_win.cc',
diff --git a/content/public/test/test_renderer_host.cc b/content/public/test/test_renderer_host.cc index d385871..44c741cd 100644 --- a/content/public/test/test_renderer_host.cc +++ b/content/public/test/test_renderer_host.cc
@@ -30,6 +30,7 @@ #if defined(OS_ANDROID) #include "content/browser/renderer_host/context_provider_factory_impl_android.h" +#include "content/test/mock_gpu_channel_establish_factory.h" #endif #if defined(OS_WIN) @@ -203,6 +204,8 @@ ImageTransportFactory::InitializeForUnitTests( base::WrapUnique(new NoTransportImageTransportFactory)); #else + gpu_channel_factory_ = base::MakeUnique<MockGpuChannelEstablishFactory>(); + ContextProviderFactoryImpl::Initialize(gpu_channel_factory_.get()); ui::ContextProviderFactory::SetInstance( ContextProviderFactoryImpl::GetInstance()); #endif @@ -272,6 +275,8 @@ ImageTransportFactory::Terminate(); #else ui::ContextProviderFactory::SetInstance(nullptr); + ContextProviderFactoryImpl::Terminate(); + gpu_channel_factory_.reset(); #endif }
diff --git a/content/public/test/test_renderer_host.h b/content/public/test/test_renderer_host.h index 3a645cf5..af258d3 100644 --- a/content/public/test/test_renderer_host.h +++ b/content/public/test/test_renderer_host.h
@@ -36,6 +36,7 @@ class BrowserContext; class ContentBrowserSanityChecker; +class MockGpuChannelEstablishFactory; class MockRenderProcessHost; class MockRenderProcessHostFactory; class NavigationController; @@ -281,6 +282,9 @@ #if defined(USE_AURA) std::unique_ptr<aura::test::AuraTestHelper> aura_test_helper_; #endif +#if defined(OS_ANDROID) + std::unique_ptr<MockGpuChannelEstablishFactory> gpu_channel_factory_; +#endif RenderViewHostTestEnabler rvh_test_enabler_; DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestHarness);
diff --git a/content/renderer/accessibility/render_accessibility_impl.cc b/content/renderer/accessibility/render_accessibility_impl.cc index 1436a86..8b253ccb 100644 --- a/content/renderer/accessibility/render_accessibility_impl.cc +++ b/content/renderer/accessibility/render_accessibility_impl.cc
@@ -78,6 +78,15 @@ ack_pending_(false), reset_token_(0), weak_factory_(this) { + // There's only one AXObjectCache for the root of a local frame tree, + // so if this frame's parent is local we can safely do nothing. + if (render_frame_ && + render_frame_->GetWebFrame() && + render_frame_->GetWebFrame()->parent() && + render_frame_->GetWebFrame()->parent()->isWebLocalFrame()) { + return; + } + WebView* web_view = render_frame_->GetRenderView()->GetWebView(); WebSettings* settings = web_view->settings(); settings->setAccessibilityEnabled(true);
diff --git a/content/renderer/media/webrtc/media_stream_remote_video_source.cc b/content/renderer/media/webrtc/media_stream_remote_video_source.cc index 30c25ba..8f1e075 100644 --- a/content/renderer/media/webrtc/media_stream_remote_video_source.cc +++ b/content/renderer/media/webrtc/media_stream_remote_video_source.cc
@@ -124,10 +124,9 @@ WebRTCToMediaVideoRotation(incoming_frame.rotation())); } } else { - // Note that the GetCopyWithRotationApplied returns a pointer to a - // frame owned by incoming_frame. - buffer = - incoming_frame.GetCopyWithRotationApplied()->video_frame_buffer(); + buffer = webrtc::I420Buffer::Rotate(incoming_frame.video_frame_buffer(), + incoming_frame.rotation()); + gfx::Size size(buffer->width(), buffer->height()); // Make a shallow copy. Both |frame| and |video_frame| will share a single
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc index e28a9f2..a65aa0080 100644 --- a/content/renderer/pepper/pepper_plugin_instance_impl.cc +++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc
@@ -2976,7 +2976,7 @@ original_instance_interface_.reset(instance_interface_.release()); base::Callback<const void*(const char*)> get_plugin_interface_func = - base::Bind(&PluginModule::GetPluginInterface, module_.get()); + base::Bind(&PluginModule::GetPluginInterface, module_); PPP_Instance_Combined* ppp_instance_combined = PPP_Instance_Combined::Create(get_plugin_interface_func); if (!ppp_instance_combined) {
diff --git a/content/test/mock_gpu_channel_establish_factory.cc b/content/test/mock_gpu_channel_establish_factory.cc new file mode 100644 index 0000000..123367e --- /dev/null +++ b/content/test/mock_gpu_channel_establish_factory.cc
@@ -0,0 +1,28 @@ +// Copyright 2011 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. + +#include "content/test/mock_gpu_channel_establish_factory.h" + +namespace content { + +MockGpuChannelEstablishFactory::MockGpuChannelEstablishFactory() = default; + +MockGpuChannelEstablishFactory::~MockGpuChannelEstablishFactory() = default; + +void MockGpuChannelEstablishFactory::EstablishGpuChannel( + const gpu::GpuChannelEstablishedCallback& callback) { + callback.Run(nullptr); +} + +scoped_refptr<gpu::GpuChannelHost> +MockGpuChannelEstablishFactory::EstablishGpuChannelSync() { + return nullptr; +} + +gpu::GpuMemoryBufferManager* +MockGpuChannelEstablishFactory::GetGpuMemoryBufferManager() { + return nullptr; +} + +} // namespace content
diff --git a/content/test/mock_gpu_channel_establish_factory.h b/content/test/mock_gpu_channel_establish_factory.h new file mode 100644 index 0000000..a0d741e --- /dev/null +++ b/content/test/mock_gpu_channel_establish_factory.h
@@ -0,0 +1,26 @@ +// Copyright 2011 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. + +#ifndef CONTENT_TEST_MOCK_GPU_CHANNEL_ESTABLISH_FACTORY_H_ +#define CONTENT_TEST_MOCK_GPU_CHANNEL_ESTABLISH_FACTORY_H_ + +#include "base/macros.h" +#include "gpu/ipc/client/gpu_channel_host.h" + +namespace content { + +class MockGpuChannelEstablishFactory : public gpu::GpuChannelEstablishFactory { + public: + MockGpuChannelEstablishFactory(); + ~MockGpuChannelEstablishFactory() override; + + void EstablishGpuChannel( + const gpu::GpuChannelEstablishedCallback& callback) override; + scoped_refptr<gpu::GpuChannelHost> EstablishGpuChannelSync() override; + gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override; +}; + +} // namespace content + +#endif // CONTENT_TEST_MOCK_GPU_CHANNEL_ESTABLISH_FACTORY_H_
diff --git a/content/test/test_render_view_host.cc b/content/test/test_render_view_host.cc index ec9bea1..7f59729f 100644 --- a/content/test/test_render_view_host.cc +++ b/content/test/test_render_view_host.cc
@@ -33,6 +33,10 @@ #include "ui/compositor/compositor.h" #include "ui/gfx/geometry/rect.h" +#if defined(OS_ANDROID) +#include "content/browser/renderer_host/context_provider_factory_impl_android.h" +#endif + namespace content { void InitNavigateParams(FrameHostMsg_DidCommitProvisionalLoad_Params* params, @@ -63,10 +67,13 @@ is_occluded_(false), did_swap_compositor_frame_(false) { #if defined(OS_ANDROID) - surface_id_allocator_.reset( - new cc::SurfaceIdAllocator(AllocateSurfaceClientId())); - GetSurfaceManager()->RegisterSurfaceClientId( - surface_id_allocator_->client_id()); + // Not all tests initialize or need a context provider factory. + if (ContextProviderFactoryImpl::GetInstance()) { + surface_id_allocator_.reset( + new cc::SurfaceIdAllocator(AllocateSurfaceClientId())); + GetSurfaceManager()->RegisterSurfaceClientId( + surface_id_allocator_->client_id()); + } #else // Not all tests initialize or need an image transport factory. if (ImageTransportFactory::GetInstance()) { @@ -81,9 +88,15 @@ } TestRenderWidgetHostView::~TestRenderWidgetHostView() { - if (GetSurfaceManager()) { - GetSurfaceManager()->InvalidateSurfaceClientId( - surface_id_allocator_->client_id()); + cc::SurfaceManager* manager = nullptr; +#if defined(OS_ANDROID) + if (ContextProviderFactoryImpl::GetInstance()) + manager = GetSurfaceManager(); +#else + manager = GetSurfaceManager(); +#endif + if (manager) { + manager->InvalidateSurfaceClientId(surface_id_allocator_->client_id()); } }
diff --git a/dbus/object_proxy.h b/dbus/object_proxy.h index 5bc4e20..5de39046 100644 --- a/dbus/object_proxy.h +++ b/dbus/object_proxy.h
@@ -137,10 +137,10 @@ // from the method (i.e. calling a method that does not return a value), // EmptyResponseCallback() can be passed to the |callback| parameter. // - // If the method call is successful, a pointer to Response object will - // be passed to the callback. If unsuccessful, the error callback will be - // called and a pointer to ErrorResponse object will be passed to the error - // callback if available, otherwise NULL will be passed. + // If the method call is successful, |callback| will be invoked with a + // Response object. If unsuccessful, |error_callback| will be invoked with an + // ErrorResponse object (if the remote object returned an error) or nullptr + // (if a response was not received at all). // // Must be called in the origin thread. virtual void CallMethodWithErrorCallback(MethodCall* method_call,
diff --git a/device/hid/hid_service_linux.cc b/device/hid/hid_service_linux.cc index 2d878310a..848d1f1 100644 --- a/device/hid/hid_service_linux.cc +++ b/device/hid/hid_service_linux.cc
@@ -254,12 +254,12 @@ // static void HidServiceLinux::OnPathOpenComplete(std::unique_ptr<ConnectParams> params, - dbus::FileDescriptor fd) { + base::ScopedFD fd) { scoped_refptr<base::SingleThreadTaskRunner> file_task_runner = params->file_task_runner; - file_task_runner->PostTask( - FROM_HERE, base::Bind(&HidServiceLinux::ValidateFdOnBlockingThread, - base::Passed(¶ms), base::Passed(&fd))); + params->device_file = base::File(fd.release()); + file_task_runner->PostTask(FROM_HERE, base::Bind(&HidServiceLinux::FinishOpen, + base::Passed(¶ms))); } // static @@ -272,17 +272,6 @@ callback.Run(nullptr); } -// static -void HidServiceLinux::ValidateFdOnBlockingThread( - std::unique_ptr<ConnectParams> params, - dbus::FileDescriptor fd) { - base::ThreadRestrictions::AssertIOAllowed(); - fd.CheckValidity(); - DCHECK(fd.is_valid()); - params->device_file = base::File(fd.TakeValue()); - FinishOpen(std::move(params)); -} - #else // static
diff --git a/device/hid/hid_service_linux.h b/device/hid/hid_service_linux.h index 314a249..7972c80 100644 --- a/device/hid/hid_service_linux.h +++ b/device/hid/hid_service_linux.h
@@ -8,16 +8,13 @@ #include <memory> #include "base/compiler_specific.h" +#include "base/files/scoped_file.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" #include "build/build_config.h" #include "device/hid/hid_device_info.h" #include "device/hid/hid_service.h" -namespace dbus { -class FileDescriptor; -} - namespace device { class HidConnection; @@ -40,13 +37,11 @@ // struct. #if defined(OS_CHROMEOS) static void OnPathOpenComplete(std::unique_ptr<ConnectParams> params, - dbus::FileDescriptor fd); + base::ScopedFD fd); static void OnPathOpenError(const std::string& device_path, const ConnectCallback& callback, const std::string& error_name, const std::string& error_message); - static void ValidateFdOnBlockingThread(std::unique_ptr<ConnectParams> params, - dbus::FileDescriptor fd); #else static void OpenOnBlockingThread(std::unique_ptr<ConnectParams> params); #endif
diff --git a/device/serial/serial_io_handler.cc b/device/serial/serial_io_handler.cc index 118d151..82fa343 100644 --- a/device/serial/serial_io_handler.cc +++ b/device/serial/serial_io_handler.cc
@@ -16,7 +16,6 @@ #if defined(OS_CHROMEOS) #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/permission_broker_client.h" -#include "dbus/file_descriptor.h" // nogncheck #endif // defined(OS_CHROMEOS) namespace device { @@ -61,8 +60,7 @@ FROM_HERE, base::Bind( &chromeos::PermissionBrokerClient::OpenPath, base::Unretained(client), - port, base::Bind(&SerialIoHandler::OnPathOpened, this, - file_thread_task_runner_, task_runner), + port, base::Bind(&SerialIoHandler::OnPathOpened, this, task_runner), base::Bind(&SerialIoHandler::OnPathOpenError, this, task_runner))); #else file_thread_task_runner_->PostTask( @@ -74,12 +72,12 @@ #if defined(OS_CHROMEOS) void SerialIoHandler::OnPathOpened( - scoped_refptr<base::SingleThreadTaskRunner> file_thread_task_runner, scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner, - dbus::FileDescriptor fd) { - file_thread_task_runner->PostTask( - FROM_HERE, base::Bind(&SerialIoHandler::ValidateOpenPort, this, - io_thread_task_runner, base::Passed(&fd))); + base::ScopedFD fd) { + base::File file(fd.release()); + io_thread_task_runner->PostTask( + FROM_HERE, + base::Bind(&SerialIoHandler::FinishOpen, this, base::Passed(&file))); } void SerialIoHandler::OnPathOpenError( @@ -91,20 +89,6 @@ error_name, error_message)); } -void SerialIoHandler::ValidateOpenPort( - scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner, - dbus::FileDescriptor fd) { - base::File file; - fd.CheckValidity(); - if (fd.is_valid()) { - file = base::File(fd.TakeValue()); - } - - io_thread_task_runner->PostTask( - FROM_HERE, - base::Bind(&SerialIoHandler::FinishOpen, this, base::Passed(&file))); -} - void SerialIoHandler::ReportPathOpenError(const std::string& error_name, const std::string& error_message) { DCHECK(CalledOnValidThread());
diff --git a/device/serial/serial_io_handler.h b/device/serial/serial_io_handler.h index 6d94e6fd..ae2f82c8d 100644 --- a/device/serial/serial_io_handler.h +++ b/device/serial/serial_io_handler.h
@@ -20,10 +20,6 @@ #include "device/serial/buffer.h" #include "device/serial/serial.mojom.h" -namespace dbus { -class FileDescriptor; -} - namespace device { // Provides a simplified interface for performing asynchronous I/O on serial @@ -48,9 +44,8 @@ #if defined(OS_CHROMEOS) // Signals that the port has been opened. void OnPathOpened( - scoped_refptr<base::SingleThreadTaskRunner> file_thread_task_runner, scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner, - dbus::FileDescriptor fd); + base::ScopedFD fd); // Signals that the permission broker failed to open the port. void OnPathOpenError( @@ -58,11 +53,6 @@ const std::string& error_name, const std::string& error_message); - // Validates the file descriptor provided by the permission broker. - void ValidateOpenPort( - scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner, - dbus::FileDescriptor fd); - // Reports the open error from the permission broker. void ReportPathOpenError(const std::string& error_name, const std::string& error_message);
diff --git a/device/usb/usb_device_linux.cc b/device/usb/usb_device_linux.cc index 3bc0bf98..8b76ea8a 100644 --- a/device/usb/usb_device_linux.cc +++ b/device/usb/usb_device_linux.cc
@@ -23,7 +23,6 @@ #if defined(OS_CHROMEOS) #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/permission_broker_client.h" -#include "dbus/file_descriptor.h" // nogncheck #endif // defined(OS_CHROMEOS) namespace device { @@ -88,10 +87,13 @@ #if defined(OS_CHROMEOS) void UsbDeviceLinux::OnOpenRequestComplete(const OpenCallback& callback, - dbus::FileDescriptor fd) { - blocking_task_runner_->PostTask( - FROM_HERE, base::Bind(&UsbDeviceLinux::OpenOnBlockingThreadWithFd, this, - base::Passed(&fd), callback)); + base::ScopedFD fd) { + if (!fd.is_valid()) { + USB_LOG(EVENT) << "Did not get valid device handle from permission broker."; + callback.Run(nullptr); + return; + } + Opened(std::move(fd), callback); } void UsbDeviceLinux::OnOpenRequestError(const OpenCallback& callback, @@ -102,20 +104,6 @@ callback.Run(nullptr); } -void UsbDeviceLinux::OpenOnBlockingThreadWithFd(dbus::FileDescriptor fd, - const OpenCallback& callback) { - fd.CheckValidity(); - if (fd.is_valid()) { - base::ScopedFD scoped_fd(fd.TakeValue()); - task_runner_->PostTask(FROM_HERE, - base::Bind(&UsbDeviceLinux::Opened, this, - base::Passed(&scoped_fd), callback)); - } else { - USB_LOG(EVENT) << "Did not get valid device handle from permission broker."; - task_runner_->PostTask(FROM_HERE, base::Bind(callback, nullptr)); - } -} - #else void UsbDeviceLinux::OpenOnBlockingThread(const OpenCallback& callback) {
diff --git a/device/usb/usb_device_linux.h b/device/usb/usb_device_linux.h index c277958..59158786 100644 --- a/device/usb/usb_device_linux.h +++ b/device/usb/usb_device_linux.h
@@ -21,10 +21,6 @@ class SequencedTaskRunner; } -namespace dbus { -class FileDescriptor; -} - namespace device { struct UsbConfigDescriptor; @@ -64,13 +60,10 @@ private: #if defined(OS_CHROMEOS) - void OnOpenRequestComplete(const OpenCallback& callback, - dbus::FileDescriptor fd); + void OnOpenRequestComplete(const OpenCallback& callback, base::ScopedFD fd); void OnOpenRequestError(const OpenCallback& callback, const std::string& error_name, const std::string& error_message); - void OpenOnBlockingThreadWithFd(dbus::FileDescriptor fd, - const OpenCallback& callback); #else void OpenOnBlockingThread(const OpenCallback& callback); #endif // defined(OS_CHROMEOS)
diff --git a/extensions/browser/sandboxed_unpacker_unittest.cc b/extensions/browser/sandboxed_unpacker_unittest.cc index 0e3bf9e..8e6c774 100644 --- a/extensions/browser/sandboxed_unpacker_unittest.cc +++ b/extensions/browser/sandboxed_unpacker_unittest.cc
@@ -115,9 +115,9 @@ std::string fake_public_key; base::Base64Encode(std::string(2048, 'k'), &fake_public_key); base::ThreadTaskRunnerHandle::Get()->PostTask( - FROM_HERE, base::Bind(&SandboxedUnpacker::StartWithDirectory, - sandboxed_unpacker_.get(), fake_id, - fake_public_key, temp_dir.Take())); + FROM_HERE, + base::Bind(&SandboxedUnpacker::StartWithDirectory, sandboxed_unpacker_, + fake_id, fake_public_key, temp_dir.Take())); client_->WaitForUnpack(); }
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index 06aaf3db..f92ac4c 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -2069,6 +2069,9 @@ // equivalent functions reset shared state. void ClearScheduleCALayerState(); + // Helper method to call glClear workaround. + void ClearFramebufferForWorkaround(GLbitfield mask); + bool InitializeCopyTexImageBlitter(const char* function_name); bool InitializeCopyTextureCHROMIUM(const char* function_name); // Generate a member function prototype for each command in an automated and @@ -4142,7 +4145,11 @@ buf = GL_COLOR_ATTACHMENT0; glDrawBuffersARB(1, &buf); } - glClear(backbuffer_needs_clear_bits_); + if (workarounds().gl_clear_broken) { + ClearFramebufferForWorkaround(backbuffer_needs_clear_bits_); + } else { + glClear(backbuffer_needs_clear_bits_); + } if (reset_draw_buffer) { GLenum buf = GL_NONE; glDrawBuffersARB(1, &buf); @@ -6908,16 +6915,11 @@ if (CheckBoundDrawFramebufferValid(func_name)) { ApplyDirtyState(); if (workarounds().gl_clear_broken) { - ScopedGLErrorSuppressor suppressor("GLES2DecoderImpl::ClearWorkaround", - GetErrorState()); if (!BoundFramebufferHasDepthAttachment()) mask &= ~GL_DEPTH_BUFFER_BIT; if (!BoundFramebufferHasStencilAttachment()) mask &= ~GL_STENCIL_BUFFER_BIT; - clear_framebuffer_blit_->ClearFramebuffer( - this, GetBoundReadFramebufferSize(), mask, state_.color_clear_red, - state_.color_clear_green, state_.color_clear_blue, - state_.color_clear_alpha, state_.depth_clear, state_.stencil_clear); + ClearFramebufferForWorkaround(mask); return error::kNoError; } if (mask & GL_COLOR_BUFFER_BIT) { @@ -7192,13 +7194,7 @@ } state_.SetDeviceCapabilityState(GL_SCISSOR_TEST, false); if (workarounds().gl_clear_broken) { - ScopedGLErrorSuppressor suppressor("GLES2DecoderImpl::ClearWorkaround", - GetErrorState()); - clear_framebuffer_blit_->ClearFramebuffer( - this, GetBoundReadFramebufferSize(), clear_bits, - state_.color_clear_red, state_.color_clear_green, - state_.color_clear_blue, state_.color_clear_alpha, state_.depth_clear, - state_.stencil_clear); + ClearFramebufferForWorkaround(clear_bits); } else { glClear(clear_bits); } @@ -17585,6 +17581,15 @@ ca_layer_shared_state_.reset(); } +void GLES2DecoderImpl::ClearFramebufferForWorkaround(GLbitfield mask) { + ScopedGLErrorSuppressor suppressor("GLES2DecoderImpl::ClearWorkaround", + GetErrorState()); + clear_framebuffer_blit_->ClearFramebuffer( + this, GetBoundReadFramebufferSize(), mask, state_.color_clear_red, + state_.color_clear_green, state_.color_clear_blue, + state_.color_clear_alpha, state_.depth_clear, state_.stencil_clear); +} + error::Error GLES2DecoderImpl::HandleBindFragmentInputLocationCHROMIUMBucket( uint32_t immediate_data_size, const void* cmd_data) {
diff --git a/gpu/config/gpu_driver_bug_list_json.cc b/gpu/config/gpu_driver_bug_list_json.cc index 0d59af8..3fb02066 100644 --- a/gpu/config/gpu_driver_bug_list_json.cc +++ b/gpu/config/gpu_driver_bug_list_json.cc
@@ -19,7 +19,7 @@ { "name": "gpu driver bug list", // Please update the version number whenever you change this file. - "version": "8.89", + "version": "8.90", "entries": [ { "id": 1, @@ -1968,8 +1968,26 @@ "features": [ "reset_base_mipmap_level_before_texstorage" ] + }, + { + "id": 182, + "cr_bugs": [638691], + "description": "Frequent hang in glClear on old android versions on Mali-T7xx", + "os": { + "type": "android", + "version": { + "op": "<", + "value": "6.0" + } + }, + "gl_renderer": ".*Mali-T7.*", + "features": [ + "gl_clear_broken" + ] } ] + // Please update the version number at beginning of this file whenever you + // change this file. } ); // LONG_STRING_CONST macro
diff --git a/gpu/ipc/client/gpu_channel_host.cc b/gpu/ipc/client/gpu_channel_host.cc index 876aa253..595f18b 100644 --- a/gpu/ipc/client/gpu_channel_host.cc +++ b/gpu/ipc/client/gpu_channel_host.cc
@@ -208,7 +208,7 @@ io_task_runner->PostTask( FROM_HERE, base::Bind(&GpuChannelHost::MessageFilter::AddRoute, - channel_filter_.get(), route_id, listener, task_runner)); + channel_filter_, route_id, listener, task_runner)); } void GpuChannelHost::RemoveRoute(int route_id) { @@ -216,7 +216,7 @@ factory_->GetIOThreadTaskRunner(); io_task_runner->PostTask( FROM_HERE, base::Bind(&GpuChannelHost::MessageFilter::RemoveRoute, - channel_filter_.get(), route_id)); + channel_filter_, route_id)); } base::SharedMemoryHandle GpuChannelHost::ShareToGpuProcess(
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index 3ce56c8a..b24e2b3 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg
@@ -5,7 +5,7 @@ project_id: "build" url: "https://chromium.googlesource.com/chromium/tools/build.git" branch: "master" - revision: "fa5cf81426f1a18b24af9ba4283e6d598435debe" + revision: "4c3df9ae9e1ccb7f38af583e854a626dece7472b" } deps { project_id: "depot_tools"
diff --git a/ios/chrome/browser/ui/elements/OWNERS b/ios/chrome/browser/ui/elements/OWNERS new file mode 100644 index 0000000..936c0336 --- /dev/null +++ b/ios/chrome/browser/ui/elements/OWNERS
@@ -0,0 +1 @@ +jyquinn@chromium.org
diff --git a/ipc/ipc_channel_proxy.cc b/ipc/ipc_channel_proxy.cc index 2e601f2..b2c4226f 100644 --- a/ipc/ipc_channel_proxy.cc +++ b/ipc/ipc_channel_proxy.cc
@@ -490,13 +490,13 @@ context_->CreateChannel(std::move(factory)); } else { context_->ipc_task_runner()->PostTask( - FROM_HERE, base::Bind(&Context::CreateChannel, context_.get(), + FROM_HERE, base::Bind(&Context::CreateChannel, context_, base::Passed(&factory))); } // complete initialization on the background thread context_->ipc_task_runner()->PostTask( - FROM_HERE, base::Bind(&Context::OnChannelOpened, context_.get())); + FROM_HERE, base::Bind(&Context::OnChannelOpened, context_)); did_init_ = true; OnChannelInit(); @@ -512,7 +512,7 @@ if (context_->ipc_task_runner()) { context_->ipc_task_runner()->PostTask( - FROM_HERE, base::Bind(&Context::OnChannelClosed, context_.get())); + FROM_HERE, base::Bind(&Context::OnChannelClosed, context_)); } } @@ -548,7 +548,7 @@ DCHECK(CalledOnValidThread()); context_->ipc_task_runner()->PostTask( - FROM_HERE, base::Bind(&Context::OnRemoveFilter, context_.get(), + FROM_HERE, base::Bind(&Context::OnRemoveFilter, context_, base::RetainedRef(filter))); } @@ -574,7 +574,7 @@ DCHECK(did_init_); context_->ipc_task_runner()->PostTask( FROM_HERE, base::Bind(&Context::GetRemoteAssociatedInterface, - context_.get(), name, base::Passed(&handle))); + context_, name, base::Passed(&handle))); } void ChannelProxy::ClearIPCTaskRunner() {
diff --git a/ipc/ipc_sync_channel.cc b/ipc/ipc_sync_channel.cc index 8c883ade..a627d42 100644 --- a/ipc/ipc_sync_channel.cc +++ b/ipc/ipc_sync_channel.cc
@@ -373,7 +373,7 @@ // can now unblock the listener thread. ipc_task_runner()->PostTask( FROM_HERE, base::Bind(&ReceivedSyncMsgQueue::DispatchReplies, - received_sync_msgs_.get())); + received_sync_msgs_)); return result; }
diff --git a/jingle/notifier/listener/non_blocking_push_client.cc b/jingle/notifier/listener/non_blocking_push_client.cc index 65cf744..4596657a 100644 --- a/jingle/notifier/listener/non_blocking_push_client.cc +++ b/jingle/notifier/listener/non_blocking_push_client.cc
@@ -161,7 +161,7 @@ delegate_task_runner_->PostTask( FROM_HERE, base::Bind(&NonBlockingPushClient::Core::CreateOnDelegateThread, - core_.get(), create_blocking_push_client_callback)); + core_, create_blocking_push_client_callback)); } NonBlockingPushClient::~NonBlockingPushClient() { @@ -169,7 +169,7 @@ delegate_task_runner_->PostTask( FROM_HERE, base::Bind(&NonBlockingPushClient::Core::DestroyOnDelegateThread, - core_.get())); + core_)); } void NonBlockingPushClient::AddObserver(PushClientObserver* observer) { @@ -188,7 +188,7 @@ delegate_task_runner_->PostTask( FROM_HERE, base::Bind(&NonBlockingPushClient::Core::UpdateSubscriptions, - core_.get(), subscriptions)); + core_, subscriptions)); } void NonBlockingPushClient::UpdateCredentials( @@ -197,7 +197,7 @@ delegate_task_runner_->PostTask( FROM_HERE, base::Bind(&NonBlockingPushClient::Core::UpdateCredentials, - core_.get(), email, token)); + core_, email, token)); } void NonBlockingPushClient::SendNotification( @@ -205,7 +205,7 @@ DCHECK(thread_checker_.CalledOnValidThread()); delegate_task_runner_->PostTask( FROM_HERE, - base::Bind(&NonBlockingPushClient::Core::SendNotification, core_.get(), + base::Bind(&NonBlockingPushClient::Core::SendNotification, core_, notification)); } @@ -213,7 +213,7 @@ DCHECK(thread_checker_.CalledOnValidThread()); delegate_task_runner_->PostTask( FROM_HERE, - base::Bind(&NonBlockingPushClient::Core::SendPing, core_.get())); + base::Bind(&NonBlockingPushClient::Core::SendPing, core_)); } void NonBlockingPushClient::OnNotificationsEnabled() {
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc index df4c37f..5946874 100644 --- a/media/filters/ffmpeg_demuxer.cc +++ b/media/filters/ffmpeg_demuxer.cc
@@ -891,8 +891,11 @@ void FFmpegDemuxer::AbortPendingReads() { DCHECK(task_runner_->BelongsToCurrentThread()); + // If Stop() has been called, then drop this call. + if (!blocking_thread_.IsRunning()) + return; + // This should only be called after the demuxer has been initialized. - DCHECK(blocking_thread_.IsRunning()); DCHECK_GT(streams_.size(), 0u); // Abort all outstanding reads.
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc index beb68a8..3e69f64 100644 --- a/media/filters/ffmpeg_demuxer_unittest.cc +++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -440,6 +440,9 @@ // Ensure blocking thread has completed outstanding work. demuxer_->Stop(); EXPECT_EQ(format_context()->pb->eof_reached, 0); + + // Calling abort after stop should not crash. + demuxer_->AbortPendingReads(); demuxer_.reset(); }
diff --git a/media/midi/BUILD.gn b/media/midi/BUILD.gn index 61ce3a0..f375856 100644 --- a/media/midi/BUILD.gn +++ b/media/midi/BUILD.gn
@@ -137,19 +137,13 @@ } if (is_win) { - deps += [ "//device/usb" ] - if (midi_use_winrt) { sources += [ "midi_manager_winrt.cc", "midi_manager_winrt.h", ] - - # TODO(crbug.com/642602): This adds runtime dependency to libraries that - # may not be available on Windows 7. Should eventually remove this and - # load functions dynamically (as in base::win::IsWindows10TabletMode). - libs += [ "runtimeobject.lib" ] } else { + deps += [ "//device/usb" ] sources += [ "midi_manager_win.cc", "midi_manager_win.h",
diff --git a/media/midi/midi_manager_winrt.cc b/media/midi/midi_manager_winrt.cc index 0cc93adc..b8400e9 100644 --- a/media/midi/midi_manager_winrt.cc +++ b/media/midi/midi_manager_winrt.cc
@@ -15,6 +15,8 @@ #include <unordered_set> #include "base/bind.h" +#include "base/lazy_instance.h" +#include "base/scoped_generic.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/thread_checker.h" #include "base/threading/thread_task_runner_handle.h" @@ -50,17 +52,125 @@ return os; } +// Provides access to functions in combase.dll which may not be available on +// Windows 7. Loads functions dynamically at runtime to prevent library +// dependencies. Use this class through the global LazyInstance +// |g_combase_functions|. +class CombaseFunctions { + public: + CombaseFunctions() = default; + + ~CombaseFunctions() { + if (combase_dll_) + ::FreeLibrary(combase_dll_); + } + + bool LoadFunctions() { + combase_dll_ = ::LoadLibrary(L"combase.dll"); + if (!combase_dll_) + return false; + + get_factory_func_ = reinterpret_cast<decltype(&::RoGetActivationFactory)>( + ::GetProcAddress(combase_dll_, "RoGetActivationFactory")); + if (!get_factory_func_) + return false; + + create_string_func_ = reinterpret_cast<decltype(&::WindowsCreateString)>( + ::GetProcAddress(combase_dll_, "WindowsCreateString")); + if (!create_string_func_) + return false; + + delete_string_func_ = reinterpret_cast<decltype(&::WindowsDeleteString)>( + ::GetProcAddress(combase_dll_, "WindowsDeleteString")); + if (!delete_string_func_) + return false; + + get_string_raw_buffer_func_ = + reinterpret_cast<decltype(&::WindowsGetStringRawBuffer)>( + ::GetProcAddress(combase_dll_, "WindowsGetStringRawBuffer")); + if (!get_string_raw_buffer_func_) + return false; + + return true; + } + + HRESULT RoGetActivationFactory(HSTRING class_id, + const IID& iid, + void** out_factory) { + DCHECK(get_factory_func_); + return get_factory_func_(class_id, iid, out_factory); + } + + HRESULT WindowsCreateString(const base::char16* src, + uint32_t len, + HSTRING* out_hstr) { + DCHECK(create_string_func_); + return create_string_func_(src, len, out_hstr); + } + + HRESULT WindowsDeleteString(HSTRING hstr) { + DCHECK(delete_string_func_); + return delete_string_func_(hstr); + } + + const base::char16* WindowsGetStringRawBuffer(HSTRING hstr, + uint32_t* out_len) { + DCHECK(get_string_raw_buffer_func_); + return get_string_raw_buffer_func_(hstr, out_len); + } + + private: + HMODULE combase_dll_ = nullptr; + + decltype(&::RoGetActivationFactory) get_factory_func_ = nullptr; + decltype(&::WindowsCreateString) create_string_func_ = nullptr; + decltype(&::WindowsDeleteString) delete_string_func_ = nullptr; + decltype(&::WindowsGetStringRawBuffer) get_string_raw_buffer_func_ = nullptr; +}; + +base::LazyInstance<CombaseFunctions> g_combase_functions = + LAZY_INSTANCE_INITIALIZER; + +// Scoped HSTRING class to maintain lifetime of HSTRINGs allocated with +// WindowsCreateString(). +class ScopedHStringTraits { + public: + static HSTRING InvalidValue() { return nullptr; } + + static void Free(HSTRING hstr) { + g_combase_functions.Get().WindowsDeleteString(hstr); + } +}; + +class ScopedHString : public base::ScopedGeneric<HSTRING, ScopedHStringTraits> { + public: + explicit ScopedHString(const base::char16* str) : ScopedGeneric(nullptr) { + HSTRING hstr; + HRESULT hr = g_combase_functions.Get().WindowsCreateString( + str, static_cast<uint32_t>(wcslen(str)), &hstr); + if (FAILED(hr)) + VLOG(1) << "WindowsCreateString failed: " << PrintHr(hr); + else + reset(hstr); + } +}; + // Factory functions that activate and create WinRT components. The caller takes // ownership of the returning ComPtr. template <typename InterfaceType, base::char16 const* runtime_class_id> ScopedComPtr<InterfaceType> WrlStaticsFactory() { ScopedComPtr<InterfaceType> com_ptr; - HRESULT hr = GetActivationFactory( - WRL::Wrappers::HStringReference(runtime_class_id).Get(), - com_ptr.Receive()); + ScopedHString class_id_hstring(runtime_class_id); + if (!class_id_hstring.is_valid()) { + com_ptr = nullptr; + return com_ptr; + } + + HRESULT hr = g_combase_functions.Get().RoGetActivationFactory( + class_id_hstring.get(), __uuidof(InterfaceType), com_ptr.ReceiveVoid()); if (FAILED(hr)) { - VLOG(1) << "GetActivationFactory failed: " << PrintHr(hr); + VLOG(1) << "RoGetActivationFactory failed: " << PrintHr(hr); com_ptr = nullptr; } @@ -78,7 +188,8 @@ // Note: empty HSTRINGs are represent as nullptr, and instantiating // std::string with nullptr (in base::WideToUTF8) is undefined behavior. - const base::char16* buffer = WindowsGetStringRawBuffer(result, nullptr); + const base::char16* buffer = + g_combase_functions.Get().WindowsGetStringRawBuffer(result, nullptr); if (buffer) return base::WideToUTF8(buffer); return std::string(); @@ -375,16 +486,14 @@ port_names_[dev_id] = dev_name; - WRL::Wrappers::HString dev_id_hstring; - HRESULT hr = dev_id_hstring.Set(base::UTF8ToWide(dev_id).c_str()); - if (FAILED(hr)) { - VLOG(1) << "Set failed: " << PrintHr(hr); + ScopedHString dev_id_hstring(base::UTF8ToWide(dev_id).c_str()); + if (!dev_id_hstring.is_valid()) return; - } IAsyncOperation<RuntimeType*>* async_op; - hr = midi_port_statics_->FromIdAsync(dev_id_hstring.Get(), &async_op); + HRESULT hr = + midi_port_statics_->FromIdAsync(dev_id_hstring.get(), &async_op); if (FAILED(hr)) { VLOG(1) << "FromIdAsync failed: " << PrintHr(hr); return; @@ -742,6 +851,13 @@ com_thread_checker_.reset(new base::ThreadChecker); + if (!g_combase_functions.Get().LoadFunctions()) { + VLOG(1) << "Failed loading functions from combase.dll: " + << PrintHr(HRESULT_FROM_WIN32(GetLastError())); + CompleteInitialization(Result::INITIALIZATION_ERROR); + return; + } + port_manager_in_.reset(new MidiInPortManager(this)); port_manager_out_.reset(new MidiOutPortManager(this)); @@ -762,10 +878,15 @@ scheduler_.reset(); - port_manager_in_->StopWatcher(); - port_manager_in_.reset(); - port_manager_out_->StopWatcher(); - port_manager_out_.reset(); + if (port_manager_in_) { + port_manager_in_->StopWatcher(); + port_manager_in_.reset(); + } + + if (port_manager_out_) { + port_manager_out_->StopWatcher(); + port_manager_out_.reset(); + } com_thread_checker_.reset(); }
diff --git a/media/renderers/video_overlay_factory.cc b/media/renderers/video_overlay_factory.cc index c983906..74c014a 100644 --- a/media/renderers/video_overlay_factory.cc +++ b/media/renderers/video_overlay_factory.cc
@@ -16,49 +16,56 @@ class VideoOverlayFactory::Texture { public: explicit Texture(GpuVideoAcceleratorFactories* gpu_factories) - : gpu_factories_(gpu_factories), texture_id_(0), image_id_(0) { + : gpu_factories_(gpu_factories), image_id_(0), texture_id_(0) { DCHECK(gpu_factories_); DCHECK(gpu_factories_->GetTaskRunner()->BelongsToCurrentThread()); std::unique_ptr<GpuVideoAcceleratorFactories::ScopedGLContextLock> lock( gpu_factories_->GetGLContextLock()); - CHECK(lock); - gpu::gles2::GLES2Interface* gl = lock->ContextGL(); + if (lock) { + gpu::gles2::GLES2Interface* gl = lock->ContextGL(); + image_id_ = gl->CreateGpuMemoryBufferImageCHROMIUM( + 1, 1, GL_RGBA, GL_READ_WRITE_CHROMIUM); + if (image_id_) { + gl->GenTextures(1, &texture_id_); + gl->BindTexture(GL_TEXTURE_2D, texture_id_); + gl->BindTexImage2DCHROMIUM(GL_TEXTURE_2D, image_id_); - gl->GenTextures(1, &texture_id_); - gl->BindTexture(GL_TEXTURE_2D, texture_id_); - image_id_ = gl->CreateGpuMemoryBufferImageCHROMIUM(1, 1, GL_RGBA, - GL_READ_WRITE_CHROMIUM); - CHECK(image_id_); - gl->BindTexImage2DCHROMIUM(GL_TEXTURE_2D, image_id_); + gl->GenMailboxCHROMIUM(mailbox_.name); + gl->ProduceTextureDirectCHROMIUM(texture_id_, GL_TEXTURE_2D, + mailbox_.name); - gl->GenMailboxCHROMIUM(mailbox_.name); - gl->ProduceTextureDirectCHROMIUM(texture_id_, GL_TEXTURE_2D, mailbox_.name); - - const GLuint64 fence_sync = gl->InsertFenceSyncCHROMIUM(); - gl->ShallowFlushCHROMIUM(); - gl->GenSyncTokenCHROMIUM(fence_sync, sync_token_.GetData()); + const GLuint64 fence_sync = gl->InsertFenceSyncCHROMIUM(); + gl->ShallowFlushCHROMIUM(); + gl->GenSyncTokenCHROMIUM(fence_sync, sync_token_.GetData()); + } + } } ~Texture() { DCHECK(gpu_factories_->GetTaskRunner()->BelongsToCurrentThread()); - std::unique_ptr<GpuVideoAcceleratorFactories::ScopedGLContextLock> lock( - gpu_factories_->GetGLContextLock()); - CHECK(lock); - gpu::gles2::GLES2Interface* gl = lock->ContextGL(); - gl->BindTexture(GL_TEXTURE_2D, texture_id_); - gl->ReleaseTexImage2DCHROMIUM(GL_TEXTURE_2D, image_id_); - gl->DeleteTextures(1, &texture_id_); - gl->DestroyImageCHROMIUM(image_id_); + if (image_id_) { + std::unique_ptr<GpuVideoAcceleratorFactories::ScopedGLContextLock> lock( + gpu_factories_->GetGLContextLock()); + if (lock) { + gpu::gles2::GLES2Interface* gl = lock->ContextGL(); + gl->BindTexture(GL_TEXTURE_2D, texture_id_); + gl->ReleaseTexImage2DCHROMIUM(GL_TEXTURE_2D, image_id_); + gl->DeleteTextures(1, &texture_id_); + gl->DestroyImageCHROMIUM(image_id_); + } + } } + bool IsValid() const { return image_id_ != 0; } + private: friend class VideoOverlayFactory; GpuVideoAcceleratorFactories* gpu_factories_; - GLuint texture_id_; GLuint image_id_; + GLuint texture_id_; gpu::Mailbox mailbox_; gpu::SyncToken sync_token_; }; @@ -74,21 +81,17 @@ // Frame size empty => video has one dimension = 0. // Dimension 0 case triggers a DCHECK later on in TextureMailbox if we push // through the overlay path. - if (size.IsEmpty() || !gpu_factories_) { + Texture* texture = size.IsEmpty() ? nullptr : GetTexture(); + if (!texture) { DVLOG(1) << "Create black frame " << size.width() << "x" << size.height(); return VideoFrame::CreateBlackFrame(gfx::Size(1, 1)); } - DCHECK(gpu_factories_); - DCHECK(gpu_factories_->GetTaskRunner()->BelongsToCurrentThread()); - - // Lazily create overlay texture. - if (!texture_) - texture_.reset(new Texture(gpu_factories_)); - - DVLOG(1) << "Create video overlay frame: " << size.ToString(); + DCHECK(texture); + DCHECK(texture->IsValid()); + DVLOG(2) << "Create video overlay frame: " << size.ToString(); gpu::MailboxHolder holders[VideoFrame::kMaxPlanes] = {gpu::MailboxHolder( - texture_->mailbox_, texture_->sync_token_, GL_TEXTURE_2D)}; + texture->mailbox_, texture->sync_token_, GL_TEXTURE_2D)}; scoped_refptr<VideoFrame> frame = VideoFrame::WrapNativeTextures( PIXEL_FORMAT_XRGB, holders, VideoFrame::ReleaseMailboxCB(), size, // coded_size @@ -103,4 +106,15 @@ return frame; } +VideoOverlayFactory::Texture* VideoOverlayFactory::GetTexture() { + if (!gpu_factories_) + return nullptr; + + // Lazily create overlay texture. + if (!texture_) + texture_.reset(new Texture(gpu_factories_)); + + return texture_->IsValid() ? texture_.get() : nullptr; +} + } // namespace media
diff --git a/media/renderers/video_overlay_factory.h b/media/renderers/video_overlay_factory.h index 552d59c0..b8cc2c5d 100644 --- a/media/renderers/video_overlay_factory.h +++ b/media/renderers/video_overlay_factory.h
@@ -31,6 +31,8 @@ private: class Texture; + Texture* GetTexture(); + ::media::GpuVideoAcceleratorFactories* gpu_factories_; std::unique_ptr<Texture> texture_;
diff --git a/mojo/public/cpp/bindings/associated_binding.h b/mojo/public/cpp/bindings/associated_binding.h index 66d7f8e6..3f991290 100644 --- a/mojo/public/cpp/bindings/associated_binding.h +++ b/mojo/public/cpp/bindings/associated_binding.h
@@ -19,6 +19,7 @@ #include "mojo/public/cpp/bindings/associated_group_controller.h" #include "mojo/public/cpp/bindings/associated_interface_request.h" #include "mojo/public/cpp/bindings/interface_endpoint_client.h" +#include "mojo/public/cpp/bindings/lib/control_message_proxy.h" #include "mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h" namespace mojo { @@ -103,7 +104,7 @@ endpoint_client_.reset(new InterfaceEndpointClient( std::move(handle), &stub_, base::WrapUnique(new typename Interface::RequestValidator_()), - Interface::HasSyncMethods_, std::move(runner))); + Interface::HasSyncMethods_, std::move(runner), Interface::Version_)); endpoint_client_->set_connection_error_handler( base::Bind(&AssociatedBinding::RunConnectionErrorHandler, base::Unretained(this))); @@ -165,6 +166,14 @@ return endpoint_client_ ? endpoint_client_->associated_group() : nullptr; } + // Sends a message on the underlying message pipe and runs the current + // message loop until its response is received. This can be used in tests to + // verify that no message was sent on a message pipe in response to some + // stimulus. + void FlushForTesting() { + endpoint_client_->control_message_proxy()->FlushForTesting(); + } + private: void RunConnectionErrorHandler() { if (!connection_error_handler_.is_null())
diff --git a/mojo/public/cpp/bindings/associated_interface_ptr.h b/mojo/public/cpp/bindings/associated_interface_ptr.h index 10494ce..e8e455a 100644 --- a/mojo/public/cpp/bindings/associated_interface_ptr.h +++ b/mojo/public/cpp/bindings/associated_interface_ptr.h
@@ -107,6 +107,12 @@ internal_state_.RequireVersion(version); } + // Sends a message on the underlying message pipe and runs the current + // message loop until its response is received. This can be used in tests to + // verify that no message was sent on a message pipe in response to some + // stimulus. + void FlushForTesting() { internal_state_.FlushForTesting(); } + // Closes the associated interface (if any) and returns the pointer to the // unbound state. void reset() {
diff --git a/mojo/public/cpp/bindings/binding.h b/mojo/public/cpp/bindings/binding.h index ab1cab3..d9859b5 100644 --- a/mojo/public/cpp/bindings/binding.h +++ b/mojo/public/cpp/bindings/binding.h
@@ -248,6 +248,12 @@ return internal_state_.associated_group(); } + // Sends a no-op message on the underlying message pipe and runs the current + // message loop until its response is received. This can be used in tests to + // verify that no message was sent on a message pipe in response to some + // stimulus. + void FlushForTesting() { internal_state_.FlushForTesting(); } + // Exposed for testing, should not generally be used. void EnableTestingMode() { internal_state_.EnableTestingMode(); }
diff --git a/mojo/public/cpp/bindings/binding_set.h b/mojo/public/cpp/bindings/binding_set.h index dc66860..69f17cc0 100644 --- a/mojo/public/cpp/bindings/binding_set.h +++ b/mojo/public/cpp/bindings/binding_set.h
@@ -95,6 +95,12 @@ return dispatch_context_; } + void FlushForTesting() { + for (auto& binding : bindings_) { + binding.first->FlushForTesting(); + } + } + private: friend class Entry; @@ -113,6 +119,8 @@ &Entry::OnConnectionError, base::Unretained(this))); } + void FlushForTesting() { binding_.FlushForTesting(); } + private: class DispatchFilter : public MessageReceiver { public:
diff --git a/mojo/public/cpp/bindings/interface_endpoint_client.h b/mojo/public/cpp/bindings/interface_endpoint_client.h index af9347c..e16bcd0a4 100644 --- a/mojo/public/cpp/bindings/interface_endpoint_client.h +++ b/mojo/public/cpp/bindings/interface_endpoint_client.h
@@ -18,6 +18,8 @@ #include "base/single_thread_task_runner.h" #include "base/threading/thread_checker.h" #include "mojo/public/cpp/bindings/filter_chain.h" +#include "mojo/public/cpp/bindings/lib/control_message_handler.h" +#include "mojo/public/cpp/bindings/lib/control_message_proxy.h" #include "mojo/public/cpp/bindings/message.h" #include "mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h" @@ -38,7 +40,8 @@ MessageReceiverWithResponderStatus* receiver, std::unique_ptr<MessageReceiver> payload_validator, bool expect_sync_requests, - scoped_refptr<base::SingleThreadTaskRunner> runner); + scoped_refptr<base::SingleThreadTaskRunner> runner, + uint32_t interface_version); ~InterfaceEndpointClient() override; // Sets the error handler to receive notifications when an error is @@ -89,6 +92,10 @@ bool HandleIncomingMessage(Message* message); void NotifyError(); + internal::ControlMessageProxy* control_message_proxy() { + return &control_message_proxy_; + } + private: // Maps from the id of a response to the MessageReceiver that handles the // response. @@ -147,6 +154,9 @@ scoped_refptr<base::SingleThreadTaskRunner> task_runner_; + internal::ControlMessageProxy control_message_proxy_; + internal::ControlMessageHandler control_message_handler_; + base::ThreadChecker thread_checker_; base::WeakPtrFactory<InterfaceEndpointClient> weak_ptr_factory_;
diff --git a/mojo/public/cpp/bindings/interface_ptr.h b/mojo/public/cpp/bindings/interface_ptr.h index edcb9bf2..1a133fa 100644 --- a/mojo/public/cpp/bindings/interface_ptr.h +++ b/mojo/public/cpp/bindings/interface_ptr.h
@@ -114,6 +114,12 @@ internal_state_.RequireVersion(version); } + // Sends a no-op message on the underlying message pipe and runs the current + // message loop until its response is received. This can be used in tests to + // verify that no message was sent on a message pipe in response to some + // stimulus. + void FlushForTesting() { internal_state_.FlushForTesting(); } + // Closes the bound message pipe (if any) and returns the pointer to the // unbound state. void reset() {
diff --git a/mojo/public/cpp/bindings/lib/associated_interface_ptr_state.h b/mojo/public/cpp/bindings/lib/associated_interface_ptr_state.h index c7f74fbb..30a3c428 100644 --- a/mojo/public/cpp/bindings/lib/associated_interface_ptr_state.h +++ b/mojo/public/cpp/bindings/lib/associated_interface_ptr_state.h
@@ -22,6 +22,7 @@ #include "mojo/public/cpp/bindings/associated_interface_ptr_info.h" #include "mojo/public/cpp/bindings/interface_endpoint_client.h" #include "mojo/public/cpp/bindings/interface_id.h" +#include "mojo/public/cpp/bindings/lib/control_message_handler.h" #include "mojo/public/cpp/bindings/lib/control_message_proxy.h" #include "mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h" #include "mojo/public/cpp/system/message_pipe.h" @@ -52,12 +53,11 @@ } void QueryVersion(const base::Callback<void(uint32_t)>& callback) { - // Do a static cast in case the interface contains methods with the same - // name. It is safe to capture |this| because the callback won't be run - // after this object goes away. - static_cast<ControlMessageProxy*>(proxy_.get()) - ->QueryVersion(base::Bind(&AssociatedInterfacePtrState::OnQueryVersion, - base::Unretained(this), callback)); + // It is safe to capture |this| because the callback won't be run after this + // object goes away. + endpoint_client_->control_message_proxy()->QueryVersion( + base::Bind(&AssociatedInterfacePtrState::OnQueryVersion, + base::Unretained(this), callback)); } void RequireVersion(uint32_t version) { @@ -65,9 +65,11 @@ return; version_ = version; - // Do a static cast in case the interface contains methods with the same - // name. - static_cast<ControlMessageProxy*>(proxy_.get())->RequireVersion(version); + endpoint_client_->control_message_proxy()->RequireVersion(version); + } + + void FlushForTesting() { + endpoint_client_->control_message_proxy()->FlushForTesting(); } void Swap(AssociatedInterfacePtrState* other) { @@ -85,10 +87,12 @@ DCHECK(info.is_valid()); version_ = info.version(); + // The version is only queried from the client so the value passed here + // will not be used. endpoint_client_.reset(new InterfaceEndpointClient( info.PassHandle(), nullptr, base::WrapUnique(new typename Interface::ResponseValidator_()), false, - std::move(runner))); + std::move(runner), 0u)); proxy_.reset(new Proxy(endpoint_client_.get())); proxy_->serialization_context()->group_controller = endpoint_client_->group_controller();
diff --git a/mojo/public/cpp/bindings/lib/binding_state.cc b/mojo/public/cpp/bindings/lib/binding_state.cc index 6beae550..6d92f72 100644 --- a/mojo/public/cpp/bindings/lib/binding_state.cc +++ b/mojo/public/cpp/bindings/lib/binding_state.cc
@@ -4,6 +4,8 @@ #include "mojo/public/cpp/bindings/lib/binding_state.h" +#include "mojo/public/cpp/bindings/lib/control_message_proxy.h" + namespace mojo { namespace internal { @@ -38,6 +40,10 @@ DestroyRouter(); } +void SimpleBindingState::FlushForTesting() { + router_->control_message_proxy()->FlushForTesting(); +} + void SimpleBindingState::EnableTestingMode() { DCHECK(is_bound()); router_->EnableTestingMode(); @@ -49,13 +55,15 @@ const char* interface_name, std::unique_ptr<MessageReceiver> request_validator, bool has_sync_methods, - MessageReceiverWithResponderStatus* stub) { + MessageReceiverWithResponderStatus* stub, + uint32_t interface_version) { FilterChain filters; filters.Append<MessageHeaderValidator>(interface_name); filters.Append(std::move(request_validator)); router_ = new internal::Router(std::move(handle), std::move(filters), - has_sync_methods, std::move(runner)); + has_sync_methods, std::move(runner), + interface_version); router_->set_incoming_receiver(stub); router_->set_connection_error_handler(base::Bind( &SimpleBindingState::RunConnectionErrorHandler, base::Unretained(this))); @@ -113,6 +121,10 @@ connection_error_handler_.Reset(); } +void MultiplexedBindingState::FlushForTesting() { + endpoint_client_->control_message_proxy()->FlushForTesting(); +} + void MultiplexedBindingState::EnableTestingMode() { DCHECK(is_bound()); router_->EnableTestingMode(); @@ -124,7 +136,8 @@ const char* interface_name, std::unique_ptr<MessageReceiver> request_validator, bool has_sync_methods, - MessageReceiverWithResponderStatus* stub) { + MessageReceiverWithResponderStatus* stub, + uint32_t interface_version) { DCHECK(!router_); router_ = new internal::MultiplexRouter(false, std::move(handle), runner); @@ -132,7 +145,8 @@ endpoint_client_.reset(new InterfaceEndpointClient( router_->CreateLocalEndpointHandle(kMasterInterfaceId), stub, - std::move(request_validator), has_sync_methods, std::move(runner))); + std::move(request_validator), has_sync_methods, std::move(runner), + interface_version)); endpoint_client_->set_connection_error_handler( base::Bind(&MultiplexedBindingState::RunConnectionErrorHandler,
diff --git a/mojo/public/cpp/bindings/lib/binding_state.h b/mojo/public/cpp/bindings/lib/binding_state.h index 4fc3580..5eaf9c9 100644 --- a/mojo/public/cpp/bindings/lib/binding_state.h +++ b/mojo/public/cpp/bindings/lib/binding_state.h
@@ -64,6 +64,8 @@ AssociatedGroup* associated_group() { return nullptr; } + void FlushForTesting(); + void EnableTestingMode(); protected: @@ -72,7 +74,8 @@ const char* interface_name, std::unique_ptr<MessageReceiver> request_validator, bool has_sync_methods, - MessageReceiverWithResponderStatus* stub); + MessageReceiverWithResponderStatus* stub, + uint32_t interface_version); void DestroyRouter(); @@ -105,7 +108,7 @@ SimpleBindingState::BindInternal( std::move(handle), runner, Interface::Name_, base::MakeUnique<typename Interface::RequestValidator_>(), - Interface::HasSyncMethods_, &stub_); + Interface::HasSyncMethods_, &stub_, Interface::Version_); } InterfaceRequest<Interface> Unbind() { @@ -159,6 +162,8 @@ return endpoint_client_ ? endpoint_client_->associated_group() : nullptr; } + void FlushForTesting(); + void EnableTestingMode(); protected: @@ -167,7 +172,8 @@ const char* interface_name, std::unique_ptr<MessageReceiver> request_validator, bool has_sync_methods, - MessageReceiverWithResponderStatus* stub); + MessageReceiverWithResponderStatus* stub, + uint32_t interface_version); scoped_refptr<internal::MultiplexRouter> router_; std::unique_ptr<InterfaceEndpointClient> endpoint_client_; @@ -193,7 +199,7 @@ MultiplexedBindingState::BindInternal( std::move(handle), runner, Interface::Name_, base::MakeUnique<typename Interface::RequestValidator_>(), - Interface::HasSyncMethods_, &stub_); + Interface::HasSyncMethods_, &stub_, Interface::Version_); stub_.serialization_context()->group_controller = router_; }
diff --git a/mojo/public/cpp/bindings/lib/control_message_handler.cc b/mojo/public/cpp/bindings/lib/control_message_handler.cc index b9bf7eb..b1124894 100644 --- a/mojo/public/cpp/bindings/lib/control_message_handler.cc +++ b/mojo/public/cpp/bindings/lib/control_message_handler.cc
@@ -11,10 +11,48 @@ #include "base/logging.h" #include "mojo/public/cpp/bindings/lib/message_builder.h" #include "mojo/public/cpp/bindings/lib/serialization.h" +#include "mojo/public/cpp/bindings/lib/validation_util.h" #include "mojo/public/interfaces/bindings/interface_control_messages.mojom.h" namespace mojo { namespace internal { +namespace { + +bool ValidateControlRequestWithResponse(Message* message) { + ValidationContext validation_context( + message->data(), message->data_num_bytes(), message->handles()->size(), + message, "ControlRequestValidator"); + if (!ValidateMessageIsRequestExpectingResponse(message, &validation_context)) + return false; + + switch (message->header()->name) { + case interface_control::kRunMessageId: + return ValidateMessagePayload< + interface_control::internal::RunMessageParams_Data>( + message, &validation_context); + } + return false; +} + +bool ValidateControlRequestWithoutResponse(Message* message) { + ValidationContext validation_context( + message->data(), message->data_num_bytes(), message->handles()->size(), + message, "ControlRequestValidator"); + if (!ValidateMessageIsRequestWithoutResponse(message, &validation_context)) + return false; + + switch (message->header()->name) { + case interface_control::kRunOrClosePipeMessageId: + return ValidateMessageIsRequestWithoutResponse(message, + &validation_context) && + ValidateMessagePayload< + interface_control::internal::RunOrClosePipeMessageParams_Data>( + message, &validation_context); + } + return false; +} + +} // namespace // static bool ControlMessageHandler::IsControlMessage(const Message* message) { @@ -30,6 +68,9 @@ } bool ControlMessageHandler::Accept(Message* message) { + if (!ValidateControlRequestWithoutResponse(message)) + return false; + if (message->header()->name == interface_control::kRunOrClosePipeMessageId) return RunOrClosePipe(message); @@ -40,6 +81,9 @@ bool ControlMessageHandler::AcceptWithResponder( Message* message, MessageReceiverWithStatus* responder) { + if (!ValidateControlRequestWithResponse(message)) + return false; + if (message->header()->name == interface_control::kRunMessageId) return Run(message, responder); @@ -61,6 +105,8 @@ output->set_query_version_result( interface_control::QueryVersionResult::New()); output->get_query_version_result()->version = interface_version_; + } else if (input.is_flush_for_testing()) { + output.reset(); } else { output.reset(); }
diff --git a/mojo/public/cpp/bindings/lib/control_message_proxy.cc b/mojo/public/cpp/bindings/lib/control_message_proxy.cc index 06d9815..9570b5b 100644 --- a/mojo/public/cpp/bindings/lib/control_message_proxy.cc +++ b/mojo/public/cpp/bindings/lib/control_message_proxy.cc
@@ -9,9 +9,12 @@ #include <utility> #include "base/bind.h" +#include "base/callback_helpers.h" #include "base/macros.h" +#include "base/run_loop.h" #include "mojo/public/cpp/bindings/lib/message_builder.h" #include "mojo/public/cpp/bindings/lib/serialization.h" +#include "mojo/public/cpp/bindings/lib/validation_util.h" #include "mojo/public/cpp/bindings/message.h" #include "mojo/public/interfaces/bindings/interface_control_messages.mojom.h" @@ -20,6 +23,22 @@ namespace { +bool ValidateControlResponse(Message* message) { + ValidationContext validation_context( + message->data(), message->data_num_bytes(), message->handles()->size(), + message, "ControlResponseValidator"); + if (!ValidateMessageIsResponse(message, &validation_context)) + return false; + + switch (message->header()->name) { + case interface_control::kRunMessageId: + return ValidateMessagePayload< + interface_control::internal::RunResponseMessageParams_Data>( + message, &validation_context); + } + return false; +} + using RunCallback = base::Callback<void(interface_control::RunResponseMessageParamsPtr)>; @@ -35,6 +54,9 @@ }; bool RunResponseForwardToCallback::Accept(Message* message) { + if (!ValidateControlResponse(message)) + return false; + interface_control::internal::RunResponseMessageParams_Data* params = reinterpret_cast< interface_control::internal::RunResponseMessageParams_Data*>( @@ -95,12 +117,19 @@ callback.Run(version); } +void RunClosure(const base::Closure& callback, + interface_control::RunResponseMessageParamsPtr run_response) { + callback.Run(); +} + } // namespace ControlMessageProxy::ControlMessageProxy(MessageReceiverWithResponder* receiver) : receiver_(receiver) { } +ControlMessageProxy::~ControlMessageProxy() = default; + void ControlMessageProxy::QueryVersion( const base::Callback<void(uint32_t)>& callback) { auto input_ptr = interface_control::RunInput::New(); @@ -117,5 +146,33 @@ SendRunOrClosePipeMessage(receiver_, std::move(input_ptr), &context_); } +void ControlMessageProxy::FlushForTesting() { + if (encountered_error_) + return; + + auto input_ptr = interface_control::RunInput::New(); + input_ptr->set_flush_for_testing(interface_control::FlushForTesting::New()); + base::RunLoop run_loop; + run_loop_quit_closure_ = run_loop.QuitClosure(); + SendRunMessage( + receiver_, std::move(input_ptr), + base::Bind(&RunClosure, + base::Bind(&ControlMessageProxy::RunFlushForTestingClosure, + base::Unretained(this))), + &context_); + run_loop.Run(); +} + +void ControlMessageProxy::RunFlushForTestingClosure() { + DCHECK(!run_loop_quit_closure_.is_null()); + base::ResetAndReturn(&run_loop_quit_closure_).Run(); +} + +void ControlMessageProxy::OnConnectionError() { + encountered_error_ = true; + if (!run_loop_quit_closure_.is_null()) + RunFlushForTestingClosure(); +} + } // namespace internal } // namespace mojo
diff --git a/mojo/public/cpp/bindings/lib/control_message_proxy.h b/mojo/public/cpp/bindings/lib/control_message_proxy.h index 5ec6ddc..c3260d10 100644 --- a/mojo/public/cpp/bindings/lib/control_message_proxy.h +++ b/mojo/public/cpp/bindings/lib/control_message_proxy.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/callback_forward.h" +#include "base/callback.h" #include "base/macros.h" #include "mojo/public/cpp/bindings/lib/serialization_context.h" @@ -22,14 +22,24 @@ public: // Doesn't take ownership of |receiver|. It must outlive this object. explicit ControlMessageProxy(MessageReceiverWithResponder* receiver); + ~ControlMessageProxy(); void QueryVersion(const base::Callback<void(uint32_t)>& callback); void RequireVersion(uint32_t version); - protected: + void FlushForTesting(); + + void OnConnectionError(); + + private: + void RunFlushForTestingClosure(); + // Not owned. MessageReceiverWithResponder* receiver_; SerializationContext context_; + bool encountered_error_ = false; + + base::Closure run_loop_quit_closure_; DISALLOW_COPY_AND_ASSIGN(ControlMessageProxy); };
diff --git a/mojo/public/cpp/bindings/lib/interface_endpoint_client.cc b/mojo/public/cpp/bindings/lib/interface_endpoint_client.cc index a79316c..0f15398 100644 --- a/mojo/public/cpp/bindings/lib/interface_endpoint_client.cc +++ b/mojo/public/cpp/bindings/lib/interface_endpoint_client.cc
@@ -17,6 +17,7 @@ #include "mojo/public/cpp/bindings/associated_group.h" #include "mojo/public/cpp/bindings/associated_group_controller.h" #include "mojo/public/cpp/bindings/interface_endpoint_controller.h" +#include "mojo/public/cpp/bindings/lib/validation_util.h" #include "mojo/public/cpp/bindings/sync_call_restrictions.h" namespace mojo { @@ -134,7 +135,8 @@ MessageReceiverWithResponderStatus* receiver, std::unique_ptr<MessageReceiver> payload_validator, bool expect_sync_requests, - scoped_refptr<base::SingleThreadTaskRunner> runner) + scoped_refptr<base::SingleThreadTaskRunner> runner, + uint32_t interface_version) : handle_(std::move(handle)), incoming_receiver_(receiver), thunk_(this), @@ -142,6 +144,8 @@ next_request_id_(1), encountered_error_(false), task_runner_(std::move(runner)), + control_message_proxy_(this), + control_message_handler_(interface_version), weak_ptr_factory_(this) { DCHECK(handle_.is_valid()); DCHECK(handle_.is_local()); @@ -275,6 +279,8 @@ // longer. async_responders_.clear(); + control_message_proxy_.OnConnectionError(); + if (!error_handler_.is_null()) error_handler_.Run(); } @@ -284,12 +290,14 @@ DCHECK(!encountered_error_); if (message->has_flag(Message::kFlagExpectsResponse)) { - if (!incoming_receiver_) - return false; - MessageReceiverWithStatus* responder = new ResponderThunk(weak_ptr_factory_.GetWeakPtr(), task_runner_); - bool ok = incoming_receiver_->AcceptWithResponder(message, responder); + bool ok = false; + if (mojo::internal::ControlMessageHandler::IsControlMessage(message)) { + ok = control_message_handler_.AcceptWithResponder(message, responder); + } else { + ok = incoming_receiver_->AcceptWithResponder(message, responder); + } if (!ok) delete responder; return ok; @@ -312,8 +320,8 @@ async_responders_.erase(it); return responder->Accept(message); } else { - if (!incoming_receiver_) - return false; + if (mojo::internal::ControlMessageHandler::IsControlMessage(message)) + return control_message_handler_.Accept(message); return incoming_receiver_->Accept(message); }
diff --git a/mojo/public/cpp/bindings/lib/interface_ptr_state.h b/mojo/public/cpp/bindings/lib/interface_ptr_state.h index 37d5b87..c701e5a 100644 --- a/mojo/public/cpp/bindings/lib/interface_ptr_state.h +++ b/mojo/public/cpp/bindings/lib/interface_ptr_state.h
@@ -23,6 +23,7 @@ #include "mojo/public/cpp/bindings/interface_endpoint_client.h" #include "mojo/public/cpp/bindings/interface_id.h" #include "mojo/public/cpp/bindings/interface_ptr_info.h" +#include "mojo/public/cpp/bindings/lib/control_message_handler.h" #include "mojo/public/cpp/bindings/lib/control_message_proxy.h" #include "mojo/public/cpp/bindings/lib/multiplex_router.h" #include "mojo/public/cpp/bindings/lib/router.h" @@ -64,12 +65,10 @@ void QueryVersion(const base::Callback<void(uint32_t)>& callback) { ConfigureProxyIfNecessary(); - // Do a static cast in case the interface contains methods with the same - // name. It is safe to capture |this| because the callback won't be run - // after this object goes away. - static_cast<ControlMessageProxy*>(proxy_)->QueryVersion( - base::Bind(&InterfacePtrState::OnQueryVersion, base::Unretained(this), - callback)); + // It is safe to capture |this| because the callback won't be run after this + // object goes away. + router_->control_message_proxy()->QueryVersion(base::Bind( + &InterfacePtrState::OnQueryVersion, base::Unretained(this), callback)); } void RequireVersion(uint32_t version) { @@ -79,9 +78,12 @@ return; version_ = version; - // Do a static cast in case the interface contains methods with the same - // name. - static_cast<ControlMessageProxy*>(proxy_)->RequireVersion(version); + router_->control_message_proxy()->RequireVersion(version); + } + + void FlushForTesting() { + ConfigureProxyIfNecessary(); + router_->control_message_proxy()->FlushForTesting(); } void Swap(InterfacePtrState* other) { @@ -157,8 +159,10 @@ filters.Append<MessageHeaderValidator>(Interface::Name_); filters.Append<typename Interface::ResponseValidator_>(); + // The version is only queried from the client so the value passed here + // will not be used. router_ = new Router(std::move(handle_), std::move(filters), false, - std::move(runner_)); + std::move(runner_), 0u); proxy_ = new Proxy(router_); } @@ -209,13 +213,10 @@ void QueryVersion(const base::Callback<void(uint32_t)>& callback) { ConfigureProxyIfNecessary(); - - // Do a static cast in case the interface contains methods with the same - // name. It is safe to capture |this| because the callback won't be run - // after this object goes away. - static_cast<ControlMessageProxy*>(proxy_.get())->QueryVersion( - base::Bind(&InterfacePtrState::OnQueryVersion, base::Unretained(this), - callback)); + // It is safe to capture |this| because the callback won't be run after this + // object goes away. + endpoint_client_->control_message_proxy()->QueryVersion(base::Bind( + &InterfacePtrState::OnQueryVersion, base::Unretained(this), callback)); } void RequireVersion(uint32_t version) { @@ -225,9 +226,12 @@ return; version_ = version; - // Do a static cast in case the interface contains methods with the same - // name. - static_cast<ControlMessageProxy*>(proxy_.get())->RequireVersion(version); + endpoint_client_->control_message_proxy()->RequireVersion(version); + } + + void FlushForTesting() { + ConfigureProxyIfNecessary(); + endpoint_client_->control_message_proxy()->FlushForTesting(); } void Swap(InterfacePtrState* other) { @@ -314,7 +318,10 @@ endpoint_client_.reset(new InterfaceEndpointClient( router_->CreateLocalEndpointHandle(kMasterInterfaceId), nullptr, base::WrapUnique(new typename Interface::ResponseValidator_()), false, - std::move(runner_))); + std::move(runner_), + // The version is only queried from the client so the value passed here + // will not be used. + 0u)); proxy_.reset(new Proxy(endpoint_client_.get())); proxy_->serialization_context()->group_controller = endpoint_client_->group_controller();
diff --git a/mojo/public/cpp/bindings/lib/router.cc b/mojo/public/cpp/bindings/lib/router.cc index 5d5db54..2c80368 100644 --- a/mojo/public/cpp/bindings/lib/router.cc +++ b/mojo/public/cpp/bindings/lib/router.cc
@@ -13,6 +13,7 @@ #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/stl_util.h" +#include "mojo/public/cpp/bindings/lib/validation_util.h" #include "mojo/public/cpp/bindings/sync_call_restrictions.h" namespace mojo { @@ -118,7 +119,8 @@ Router::Router(ScopedMessagePipeHandle message_pipe, FilterChain filters, bool expects_sync_requests, - scoped_refptr<base::SingleThreadTaskRunner> runner) + scoped_refptr<base::SingleThreadTaskRunner> runner, + int interface_version) : thunk_(this), filters_(std::move(filters)), connector_(std::move(message_pipe), @@ -129,6 +131,8 @@ testing_mode_(false), pending_task_for_messages_(false), encountered_error_(false), + control_message_proxy_(this), + control_message_handler_(interface_version), weak_factory_(this) { filters_.SetSink(&thunk_); if (expects_sync_requests) @@ -253,12 +257,14 @@ DCHECK(!encountered_error_); if (message->has_flag(Message::kFlagExpectsResponse)) { - if (!incoming_receiver_) - return false; - MessageReceiverWithStatus* responder = new ResponderThunk( weak_factory_.GetWeakPtr(), connector_.task_runner()); - bool ok = incoming_receiver_->AcceptWithResponder(message, responder); + bool ok = false; + if (mojo::internal::ControlMessageHandler::IsControlMessage(message)) { + ok = control_message_handler_.AcceptWithResponder(message, responder); + } else { + ok = incoming_receiver_->AcceptWithResponder(message, responder); + } if (!ok) delete responder; return ok; @@ -286,8 +292,8 @@ async_responders_.erase(it); return responder->Accept(message); } else { - if (!incoming_receiver_) - return false; + if (mojo::internal::ControlMessageHandler::IsControlMessage(message)) + return control_message_handler_.Accept(message); return incoming_receiver_->Accept(message); } @@ -313,6 +319,8 @@ return; } + control_message_proxy_.OnConnectionError(); + encountered_error_ = true; // The callbacks may hold on to resources. There is no need to keep them any
diff --git a/mojo/public/cpp/bindings/lib/router.h b/mojo/public/cpp/bindings/lib/router.h index 17286ae6..751cb26 100644 --- a/mojo/public/cpp/bindings/lib/router.h +++ b/mojo/public/cpp/bindings/lib/router.h
@@ -19,6 +19,8 @@ #include "base/threading/thread_checker.h" #include "mojo/public/cpp/bindings/connector.h" #include "mojo/public/cpp/bindings/filter_chain.h" +#include "mojo/public/cpp/bindings/lib/control_message_handler.h" +#include "mojo/public/cpp/bindings/lib/control_message_proxy.h" #include "mojo/public/cpp/bindings/message.h" namespace mojo { @@ -31,7 +33,8 @@ Router(ScopedMessagePipeHandle message_pipe, FilterChain filters, bool expects_sync_requests, - scoped_refptr<base::SingleThreadTaskRunner> runner); + scoped_refptr<base::SingleThreadTaskRunner> runner, + int interface_version); ~Router() override; // Sets the receiver to handle messages read from the message pipe that do @@ -118,6 +121,10 @@ return !async_responders_.empty() || !sync_responses_.empty(); } + ControlMessageProxy* control_message_proxy() { + return &control_message_proxy_; + } + private: // Maps from the id of a response to the MessageReceiver that handles the // response. @@ -172,6 +179,8 @@ bool pending_task_for_messages_; bool encountered_error_; base::Closure error_handler_; + ControlMessageProxy control_message_proxy_; + ControlMessageHandler control_message_handler_; base::ThreadChecker thread_checker_; base::WeakPtrFactory<Router> weak_factory_; };
diff --git a/mojo/public/cpp/bindings/lib/validation_util.cc b/mojo/public/cpp/bindings/lib/validation_util.cc index 944c654..9675afe 100644 --- a/mojo/public/cpp/bindings/lib/validation_util.cc +++ b/mojo/public/cpp/bindings/lib/validation_util.cc
@@ -100,38 +100,6 @@ return true; } -bool ValidateControlRequest(const Message* message, - ValidationContext* validation_context) { - switch (message->header()->name) { - case interface_control::kRunMessageId: - return ValidateMessageIsRequestExpectingResponse(message, - validation_context) && - ValidateMessagePayload< - interface_control::internal::RunMessageParams_Data>( - message, validation_context); - case interface_control::kRunOrClosePipeMessageId: - return ValidateMessageIsRequestWithoutResponse(message, - validation_context) && - ValidateMessagePayload< - interface_control::internal::RunOrClosePipeMessageParams_Data>( - message, validation_context); - } - return false; -} - -bool ValidateControlResponse(const Message* message, - ValidationContext* validation_context) { - if (!ValidateMessageIsResponse(message, validation_context)) - return false; - switch (message->header()->name) { - case interface_control::kRunMessageId: - return ValidateMessagePayload< - interface_control::internal::RunResponseMessageParams_Data>( - message, validation_context); - } - return false; -} - bool IsHandleOrInterfaceValid(const AssociatedInterface_Data& input) { return IsValidInterfaceId(input.interface_id); }
diff --git a/mojo/public/cpp/bindings/lib/validation_util.h b/mojo/public/cpp/bindings/lib/validation_util.h index 124e9e69..59df79f 100644 --- a/mojo/public/cpp/bindings/lib/validation_util.h +++ b/mojo/public/cpp/bindings/lib/validation_util.h
@@ -78,13 +78,6 @@ return ParamsType::Validate(message->payload(), validation_context); } -// The following methods validate control messages defined in -// interface_control_messages.mojom. -bool ValidateControlRequest(const Message* message, - ValidationContext* validation_context); -bool ValidateControlResponse(const Message* message, - ValidationContext* validation_context); - // The following Validate.*NonNullable() functions validate that the given // |input| is not null/invalid. template <typename T>
diff --git a/mojo/public/cpp/bindings/strong_binding.h b/mojo/public/cpp/bindings/strong_binding.h index 8788479b..0a022240 100644 --- a/mojo/public/cpp/bindings/strong_binding.h +++ b/mojo/public/cpp/bindings/strong_binding.h
@@ -114,6 +114,12 @@ delete binding_.impl(); } + // Sends a message on the underlying message pipe and runs the current + // message loop until its response is received. This can be used in tests to + // verify that no message was sent on a message pipe in response to some + // stimulus. + void FlushForTesting() { binding_.FlushForTesting(); } + private: base::Closure connection_error_handler_; Binding<Interface> binding_;
diff --git a/mojo/public/cpp/bindings/tests/associated_interface_unittest.cc b/mojo/public/cpp/bindings/tests/associated_interface_unittest.cc index b1148c73..fafc73f 100644 --- a/mojo/public/cpp/bindings/tests/associated_interface_unittest.cc +++ b/mojo/public/cpp/bindings/tests/associated_interface_unittest.cc
@@ -22,6 +22,7 @@ #include "mojo/public/cpp/bindings/associated_interface_request.h" #include "mojo/public/cpp/bindings/binding.h" #include "mojo/public/cpp/bindings/lib/multiplex_router.h" +#include "mojo/public/cpp/bindings/strong_binding.h" #include "mojo/public/interfaces/bindings/tests/ping_service.mojom.h" #include "mojo/public/interfaces/bindings/tests/test_associated_interfaces.mojom.h" #include "testing/gtest/include/gtest/gtest.h" @@ -160,6 +161,10 @@ &DoExpectValueSetFlagAndRunClosure, expected_value, flag, closure); } +void Fail() { + FAIL() << "Unexpected connection error"; +} + TEST_F(AssociatedInterfaceTest, InterfacesAtBothEnds) { // Bind to the same pipe two associated interfaces, whose implementation lives // at different ends. Test that the two don't interfere with each other. @@ -740,6 +745,203 @@ } } +TEST_F(AssociatedInterfaceTest, AssociatedPtrFlushForTesting) { + MessagePipe pipe; + scoped_refptr<MultiplexRouter> router0(new MultiplexRouter( + true, std::move(pipe.handle0), base::ThreadTaskRunnerHandle::Get())); + scoped_refptr<MultiplexRouter> router1(new MultiplexRouter( + false, std::move(pipe.handle1), base::ThreadTaskRunnerHandle::Get())); + + AssociatedInterfaceRequest<IntegerSender> request; + IntegerSenderAssociatedPtrInfo ptr_info; + + router0->CreateAssociatedGroup()->CreateAssociatedInterface( + AssociatedGroup::WILL_PASS_PTR, &ptr_info, &request); + ptr_info = EmulatePassingAssociatedPtrInfo(std::move(ptr_info), router1); + + IntegerSenderImpl impl0(std::move(request)); + AssociatedInterfacePtr<IntegerSender> ptr0; + ptr0.Bind(std::move(ptr_info)); + ptr0.set_connection_error_handler(base::Bind(&Fail)); + + bool ptr0_callback_run = false; + ptr0->Echo(123, ExpectValueSetFlagAndRunClosure( + 123, &ptr0_callback_run, base::Bind(&base::DoNothing))); + ptr0.FlushForTesting(); + EXPECT_TRUE(ptr0_callback_run); +} + +void SetBool(bool* value) { + *value = true; +} + +template <typename T> +void SetBoolWithUnusedParameter(bool* value, T unused) { + *value = true; +} + +TEST_F(AssociatedInterfaceTest, AssociatedPtrFlushForTestingWithClosedPeer) { + MessagePipe pipe; + scoped_refptr<MultiplexRouter> router0(new MultiplexRouter( + true, std::move(pipe.handle0), base::ThreadTaskRunnerHandle::Get())); + scoped_refptr<MultiplexRouter> router1(new MultiplexRouter( + false, std::move(pipe.handle1), base::ThreadTaskRunnerHandle::Get())); + + AssociatedInterfaceRequest<IntegerSender> request; + IntegerSenderAssociatedPtrInfo ptr_info; + + router0->CreateAssociatedGroup()->CreateAssociatedInterface( + AssociatedGroup::WILL_PASS_PTR, &ptr_info, &request); + ptr_info = EmulatePassingAssociatedPtrInfo(std::move(ptr_info), router1); + + AssociatedInterfacePtr<IntegerSender> ptr0; + ptr0.Bind(std::move(ptr_info)); + bool called = false; + ptr0.set_connection_error_handler(base::Bind(&SetBool, &called)); + request = nullptr; + + ptr0.FlushForTesting(); + EXPECT_TRUE(called); + ptr0.FlushForTesting(); +} + +TEST_F(AssociatedInterfaceTest, AssociatedBindingFlushForTesting) { + MessagePipe pipe; + scoped_refptr<MultiplexRouter> router0(new MultiplexRouter( + true, std::move(pipe.handle0), base::ThreadTaskRunnerHandle::Get())); + scoped_refptr<MultiplexRouter> router1(new MultiplexRouter( + false, std::move(pipe.handle1), base::ThreadTaskRunnerHandle::Get())); + + AssociatedInterfaceRequest<IntegerSender> request; + IntegerSenderAssociatedPtrInfo ptr_info; + + router0->CreateAssociatedGroup()->CreateAssociatedInterface( + AssociatedGroup::WILL_PASS_PTR, &ptr_info, &request); + ptr_info = EmulatePassingAssociatedPtrInfo(std::move(ptr_info), router1); + + IntegerSenderImpl impl0(std::move(request)); + impl0.set_connection_error_handler(base::Bind(&Fail)); + AssociatedInterfacePtr<IntegerSender> ptr0; + ptr0.Bind(std::move(ptr_info)); + + bool ptr0_callback_run = false; + ptr0->Echo(123, ExpectValueSetFlagAndRunClosure( + 123, &ptr0_callback_run, base::Bind(&base::DoNothing))); + // Because the flush is sent from the binding, it only guarantees that the + // request has been received, not the response. The second flush waits for the + // response to be received. + impl0.binding()->FlushForTesting(); + impl0.binding()->FlushForTesting(); + EXPECT_TRUE(ptr0_callback_run); +} + +TEST_F(AssociatedInterfaceTest, + AssociatedBindingFlushForTestingWithClosedPeer) { + MessagePipe pipe; + scoped_refptr<MultiplexRouter> router0(new MultiplexRouter( + true, std::move(pipe.handle0), base::ThreadTaskRunnerHandle::Get())); + scoped_refptr<MultiplexRouter> router1(new MultiplexRouter( + false, std::move(pipe.handle1), base::ThreadTaskRunnerHandle::Get())); + + AssociatedInterfaceRequest<IntegerSender> request; + { + IntegerSenderAssociatedPtrInfo ptr_info; + + router0->CreateAssociatedGroup()->CreateAssociatedInterface( + AssociatedGroup::WILL_PASS_PTR, &ptr_info, &request); + } + + IntegerSenderImpl impl(std::move(request)); + bool called = false; + impl.set_connection_error_handler(base::Bind(&SetBool, &called)); + impl.binding()->FlushForTesting(); + EXPECT_TRUE(called); + impl.binding()->FlushForTesting(); +} + +TEST_F(AssociatedInterfaceTest, BindingFlushForTesting) { + IntegerSenderConnectionPtr ptr; + IntegerSenderConnectionImpl impl(GetProxy(&ptr)); + bool called = false; + ptr->AsyncGetSender(base::Bind( + &SetBoolWithUnusedParameter<IntegerSenderAssociatedPtrInfo>, &called)); + EXPECT_FALSE(called); + impl.binding()->set_connection_error_handler(base::Bind(&Fail)); + // Because the flush is sent from the binding, it only guarantees that the + // request has been received, not the response. The second flush waits for the + // response to be received. + impl.binding()->FlushForTesting(); + impl.binding()->FlushForTesting(); + EXPECT_TRUE(called); +} + +TEST_F(AssociatedInterfaceTest, BindingFlushForTestingWithClosedPeer) { + IntegerSenderConnectionPtr ptr; + IntegerSenderConnectionImpl impl(GetProxy(&ptr)); + bool called = false; + impl.binding()->set_connection_error_handler(base::Bind(&SetBool, &called)); + ptr.reset(); + EXPECT_FALSE(called); + impl.binding()->FlushForTesting(); + EXPECT_TRUE(called); + impl.binding()->FlushForTesting(); +} + +TEST_F(AssociatedInterfaceTest, StrongBindingFlushForTesting) { + IntegerSenderConnectionPtr ptr; + IntegerSenderConnectionImpl impl(IntegerSenderConnectionRequest{}); + mojo::StrongBinding<IntegerSenderConnection> binding(&impl, GetProxy(&ptr)); + binding.set_connection_error_handler(base::Bind(&Fail)); + bool called = false; + IntegerSenderAssociatedPtr sender_ptr; + ptr->GetSender(GetProxy(&sender_ptr, ptr.associated_group())); + sender_ptr->Echo(1, base::Bind(&SetBoolWithUnusedParameter<int>, &called)); + EXPECT_FALSE(called); + // Because the flush is sent from the binding, it only guarantees that the + // request has been received, not the response. The second flush waits for the + // response to be received. + binding.FlushForTesting(); + binding.FlushForTesting(); + EXPECT_TRUE(called); +} + +TEST_F(AssociatedInterfaceTest, StrongBindingFlushForTestingWithClosedPeer) { + IntegerSenderConnectionPtr ptr; + mojo::StrongBinding<IntegerSenderConnection> binding( + new IntegerSenderConnectionImpl(IntegerSenderConnectionRequest{}), + GetProxy(&ptr)); + bool called = false; + binding.set_connection_error_handler(base::Bind(&SetBool, &called)); + ptr.reset(); + EXPECT_FALSE(called); + binding.FlushForTesting(); + EXPECT_TRUE(called); + binding.FlushForTesting(); +} + +TEST_F(AssociatedInterfaceTest, PtrFlushForTesting) { + IntegerSenderConnectionPtr ptr; + IntegerSenderConnectionImpl impl(GetProxy(&ptr)); + bool called = false; + ptr.set_connection_error_handler(base::Bind(&Fail)); + ptr->AsyncGetSender(base::Bind( + &SetBoolWithUnusedParameter<IntegerSenderAssociatedPtrInfo>, &called)); + EXPECT_FALSE(called); + ptr.FlushForTesting(); + EXPECT_TRUE(called); +} + +TEST_F(AssociatedInterfaceTest, PtrFlushForTestingWithClosedPeer) { + IntegerSenderConnectionPtr ptr; + GetProxy(&ptr); + bool called = false; + ptr.set_connection_error_handler(base::Bind(&SetBool, &called)); + EXPECT_FALSE(called); + ptr.FlushForTesting(); + EXPECT_TRUE(called); + ptr.FlushForTesting(); +} + } // namespace } // namespace test } // namespace mojo
diff --git a/mojo/public/cpp/bindings/tests/binding_unittest.cc b/mojo/public/cpp/bindings/tests/binding_unittest.cc index 069aad2..33398af 100644 --- a/mojo/public/cpp/bindings/tests/binding_unittest.cc +++ b/mojo/public/cpp/bindings/tests/binding_unittest.cc
@@ -64,7 +64,8 @@ const base::Closure& closure, Args... args) { *flag = true; - closure.Run(); + if (!closure.is_null()) + closure.Run(); } template <typename... Args> @@ -385,6 +386,44 @@ } } +void Fail() { + FAIL() << "Unexpected connection error"; +} + +TEST_F(BindingTest, FlushForTesting) { + bool called = false; + sample::ServicePtr ptr; + auto request = GetProxy(&ptr); + ServiceImpl impl; + Binding<sample::Service> binding(&impl, std::move(request)); + binding.set_connection_error_handler(base::Bind(&Fail)); + + ptr->Frobinate(nullptr, sample::Service::BazOptions::REGULAR, nullptr, + SetFlagAndRunClosure<int32_t>(&called)); + EXPECT_FALSE(called); + // Because the flush is sent from the binding, it only guarantees that the + // request has been received, not the response. The second flush waits for the + // response to be received. + binding.FlushForTesting(); + binding.FlushForTesting(); + EXPECT_TRUE(called); +} + +TEST_F(BindingTest, FlushForTestingWithClosedPeer) { + bool called = false; + sample::ServicePtr ptr; + auto request = GetProxy(&ptr); + ServiceImpl impl; + Binding<sample::Service> binding(&impl, std::move(request)); + binding.set_connection_error_handler(SetFlagAndRunClosure(&called)); + ptr.reset(); + + EXPECT_FALSE(called); + binding.FlushForTesting(); + EXPECT_TRUE(called); + binding.FlushForTesting(); +} + // StrongBindingTest ----------------------------------------------------------- using StrongBindingTest = BindingTestBase; @@ -485,5 +524,49 @@ EXPECT_FALSE(binding_error_handler_called); } +TEST_F(StrongBindingTest, FlushForTesting) { + bool called = false; + bool was_deleted = false; + sample::ServicePtr ptr; + auto request = GetProxy(&ptr); + StrongBinding<sample::Service> binding(new ServiceImpl(&was_deleted), + std::move(request)); + binding.set_connection_error_handler(base::Bind(&Fail)); + + ptr->Frobinate(nullptr, sample::Service::BazOptions::REGULAR, nullptr, + SetFlagAndRunClosure<int32_t>(&called)); + EXPECT_FALSE(called); + // Because the flush is sent from the binding, it only guarantees that the + // request has been received, not the response. The second flush waits for the + // response to be received. + binding.FlushForTesting(); + binding.FlushForTesting(); + EXPECT_TRUE(called); + EXPECT_FALSE(was_deleted); + ptr.reset(); + binding.set_connection_error_handler(base::Closure()); + binding.FlushForTesting(); + EXPECT_TRUE(was_deleted); +} + +TEST_F(StrongBindingTest, FlushForTestingWithClosedPeer) { + bool called = false; + bool was_deleted = false; + sample::ServicePtr ptr; + auto request = GetProxy(&ptr); + StrongBinding<sample::Service> binding(new ServiceImpl(&was_deleted), + std::move(request)); + binding.set_connection_error_handler(SetFlagAndRunClosure(&called)); + ptr.reset(); + + EXPECT_FALSE(called); + EXPECT_FALSE(was_deleted); + binding.FlushForTesting(); + EXPECT_TRUE(called); + EXPECT_TRUE(was_deleted); + binding.FlushForTesting(); + EXPECT_TRUE(was_deleted); +} + } // namespace } // mojo
diff --git a/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc b/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc index aff62511..3a172a9 100644 --- a/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc +++ b/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc
@@ -78,6 +78,8 @@ double GetOutput() const { return output_; } + math::CalculatorPtr& GetInterfacePtr() { return calculator_; } + private: void Output(const base::Closure& closure, double output) { output_ = output; @@ -735,6 +737,41 @@ EXPECT_TRUE(called); } +void Fail() { + FAIL() << "Unexpected connection error"; +} + +TEST_F(InterfacePtrTest, FlushForTesting) { + math::CalculatorPtr calc; + MathCalculatorImpl calc_impl(GetProxy(&calc)); + calc.set_connection_error_handler(base::Bind(&Fail)); + + MathCalculatorUI calculator_ui(std::move(calc)); + + calculator_ui.Add(2.0, base::Bind(&base::DoNothing)); + calculator_ui.GetInterfacePtr().FlushForTesting(); + EXPECT_EQ(2.0, calculator_ui.GetOutput()); + + calculator_ui.Multiply(5.0, base::Bind(&base::DoNothing)); + calculator_ui.GetInterfacePtr().FlushForTesting(); + + EXPECT_EQ(10.0, calculator_ui.GetOutput()); +} + +void SetBool(bool* value) { + *value = true; +} + +TEST_F(InterfacePtrTest, FlushForTestingWithClosedPeer) { + math::CalculatorPtr calc; + GetProxy(&calc); + bool called = false; + calc.set_connection_error_handler(base::Bind(&SetBool, &called)); + calc.FlushForTesting(); + EXPECT_TRUE(called); + calc.FlushForTesting(); +} + } // namespace } // namespace test } // namespace mojo
diff --git a/mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc b/mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc index 6bbb17ad..b236d0a7 100644 --- a/mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc +++ b/mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc
@@ -65,11 +65,11 @@ TEST_F(MultiplexRouterTest, BasicRequestResponse) { InterfaceEndpointClient client0(std::move(endpoint0_), nullptr, base::MakeUnique<PassThroughFilter>(), false, - base::ThreadTaskRunnerHandle::Get()); + base::ThreadTaskRunnerHandle::Get(), 0u); ResponseGenerator generator; InterfaceEndpointClient client1(std::move(endpoint1_), &generator, base::MakeUnique<PassThroughFilter>(), false, - base::ThreadTaskRunnerHandle::Get()); + base::ThreadTaskRunnerHandle::Get(), 0u); Message request; AllocRequestMessage(1, "hello", &request); @@ -112,11 +112,11 @@ TEST_F(MultiplexRouterTest, BasicRequestResponse_Synchronous) { InterfaceEndpointClient client0(std::move(endpoint0_), nullptr, base::MakeUnique<PassThroughFilter>(), false, - base::ThreadTaskRunnerHandle::Get()); + base::ThreadTaskRunnerHandle::Get(), 0u); ResponseGenerator generator; InterfaceEndpointClient client1(std::move(endpoint1_), &generator, base::MakeUnique<PassThroughFilter>(), false, - base::ThreadTaskRunnerHandle::Get()); + base::ThreadTaskRunnerHandle::Get(), 0u); Message request; AllocRequestMessage(1, "hello", &request); @@ -153,46 +153,18 @@ std::string(reinterpret_cast<const char*>(response.payload()))); } -TEST_F(MultiplexRouterTest, RequestWithNoReceiver) { - InterfaceEndpointClient client0(std::move(endpoint0_), nullptr, - base::MakeUnique<PassThroughFilter>(), false, - base::ThreadTaskRunnerHandle::Get()); - InterfaceEndpointClient client1(std::move(endpoint1_), nullptr, - base::MakeUnique<PassThroughFilter>(), false, - base::ThreadTaskRunnerHandle::Get()); - - // Without an incoming receiver set on client1, we expect client0 to observe - // an error as a result of sending a message. - - Message request; - AllocRequestMessage(1, "hello", &request); - - MessageQueue message_queue; - base::RunLoop run_loop, run_loop2; - client0.set_connection_error_handler(run_loop.QuitClosure()); - client1.set_connection_error_handler(run_loop2.QuitClosure()); - client0.AcceptWithResponder( - &request, new MessageAccumulator(&message_queue, run_loop.QuitClosure())); - - run_loop.Run(); - run_loop2.Run(); - - EXPECT_TRUE(client0.encountered_error()); - EXPECT_TRUE(client1.encountered_error()); - EXPECT_TRUE(message_queue.IsEmpty()); -} - // Tests MultiplexRouter using the LazyResponseGenerator. The responses will not // be sent until after the requests have been accepted. TEST_F(MultiplexRouterTest, LazyResponses) { - InterfaceEndpointClient client0(std::move(endpoint0_), nullptr, - base::WrapUnique(new PassThroughFilter()), - false, base::ThreadTaskRunnerHandle::Get()); + InterfaceEndpointClient client0( + std::move(endpoint0_), nullptr, base::WrapUnique(new PassThroughFilter()), + false, base::ThreadTaskRunnerHandle::Get(), 0u); base::RunLoop run_loop; LazyResponseGenerator generator(run_loop.QuitClosure()); InterfaceEndpointClient client1(std::move(endpoint1_), &generator, base::WrapUnique(new PassThroughFilter()), - false, base::ThreadTaskRunnerHandle::Get()); + false, base::ThreadTaskRunnerHandle::Get(), + 0u); Message request; AllocRequestMessage(1, "hello", &request); @@ -256,9 +228,9 @@ // both sides still appear to have a valid message pipe handle bound. TEST_F(MultiplexRouterTest, MissingResponses) { base::RunLoop run_loop0, run_loop1; - InterfaceEndpointClient client0(std::move(endpoint0_), nullptr, - base::WrapUnique(new PassThroughFilter()), - false, base::ThreadTaskRunnerHandle::Get()); + InterfaceEndpointClient client0( + std::move(endpoint0_), nullptr, base::WrapUnique(new PassThroughFilter()), + false, base::ThreadTaskRunnerHandle::Get(), 0u); bool error_handler_called0 = false; client0.set_connection_error_handler( base::Bind(&ForwardErrorHandler, &error_handler_called0, @@ -268,7 +240,8 @@ LazyResponseGenerator generator(run_loop3.QuitClosure()); InterfaceEndpointClient client1(std::move(endpoint1_), &generator, base::WrapUnique(new PassThroughFilter()), - false, base::ThreadTaskRunnerHandle::Get()); + false, base::ThreadTaskRunnerHandle::Get(), + 0u); bool error_handler_called1 = false; client1.set_connection_error_handler( base::Bind(&ForwardErrorHandler, &error_handler_called1, @@ -313,12 +286,13 @@ base::RunLoop run_loop; LazyResponseGenerator generator(run_loop.QuitClosure()); { - InterfaceEndpointClient client0(std::move(endpoint0_), nullptr, - base::MakeUnique<PassThroughFilter>(), - false, base::ThreadTaskRunnerHandle::Get()); + InterfaceEndpointClient client0( + std::move(endpoint0_), nullptr, base::MakeUnique<PassThroughFilter>(), + false, base::ThreadTaskRunnerHandle::Get(), 0u); InterfaceEndpointClient client1(std::move(endpoint1_), &generator, base::MakeUnique<PassThroughFilter>(), - false, base::ThreadTaskRunnerHandle::Get()); + false, base::ThreadTaskRunnerHandle::Get(), + 0u); Message request; AllocRequestMessage(1, "hello", &request);
diff --git a/mojo/public/cpp/bindings/tests/router_unittest.cc b/mojo/public/cpp/bindings/tests/router_unittest.cc index bb868b8..d25a54a 100644 --- a/mojo/public/cpp/bindings/tests/router_unittest.cc +++ b/mojo/public/cpp/bindings/tests/router_unittest.cc
@@ -40,9 +40,9 @@ TEST_F(RouterTest, BasicRequestResponse) { internal::Router router0(std::move(handle0_), FilterChain(), false, - base::ThreadTaskRunnerHandle::Get()); + base::ThreadTaskRunnerHandle::Get(), 0u); internal::Router router1(std::move(handle1_), FilterChain(), false, - base::ThreadTaskRunnerHandle::Get()); + base::ThreadTaskRunnerHandle::Get(), 0u); ResponseGenerator generator; router1.set_incoming_receiver(&generator); @@ -86,9 +86,9 @@ TEST_F(RouterTest, BasicRequestResponse_Synchronous) { internal::Router router0(std::move(handle0_), FilterChain(), false, - base::ThreadTaskRunnerHandle::Get()); + base::ThreadTaskRunnerHandle::Get(), 0u); internal::Router router1(std::move(handle1_), FilterChain(), false, - base::ThreadTaskRunnerHandle::Get()); + base::ThreadTaskRunnerHandle::Get(), 0u); ResponseGenerator generator; router1.set_incoming_receiver(&generator); @@ -128,39 +128,13 @@ std::string(reinterpret_cast<const char*>(response.payload()))); } -TEST_F(RouterTest, RequestWithNoReceiver) { - internal::Router router0(std::move(handle0_), FilterChain(), false, - base::ThreadTaskRunnerHandle::Get()); - internal::Router router1(std::move(handle1_), FilterChain(), false, - base::ThreadTaskRunnerHandle::Get()); - - // Without an incoming receiver set on router1, we expect router0 to observe - // an error as a result of sending a message. - - Message request; - AllocRequestMessage(1, "hello", &request); - - MessageQueue message_queue; - base::RunLoop run_loop, run_loop2; - router0.set_connection_error_handler(run_loop.QuitClosure()); - router1.set_connection_error_handler(run_loop2.QuitClosure()); - router0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue)); - - run_loop.Run(); - run_loop2.Run(); - - EXPECT_TRUE(router0.encountered_error()); - EXPECT_TRUE(router1.encountered_error()); - EXPECT_TRUE(message_queue.IsEmpty()); -} - // Tests Router using the LazyResponseGenerator. The responses will not be // sent until after the requests have been accepted. TEST_F(RouterTest, LazyResponses) { internal::Router router0(std::move(handle0_), FilterChain(), false, - base::ThreadTaskRunnerHandle::Get()); + base::ThreadTaskRunnerHandle::Get(), 0u); internal::Router router1(std::move(handle1_), FilterChain(), false, - base::ThreadTaskRunnerHandle::Get()); + base::ThreadTaskRunnerHandle::Get(), 0u); base::RunLoop run_loop; LazyResponseGenerator generator(run_loop.QuitClosure()); @@ -231,14 +205,14 @@ TEST_F(RouterTest, MissingResponses) { base::RunLoop run_loop0, run_loop1; internal::Router router0(std::move(handle0_), FilterChain(), false, - base::ThreadTaskRunnerHandle::Get()); + base::ThreadTaskRunnerHandle::Get(), 0u); bool error_handler_called0 = false; router0.set_connection_error_handler( base::Bind(&ForwardErrorHandler, &error_handler_called0, run_loop0.QuitClosure())); internal::Router router1(std::move(handle1_), FilterChain(), false, - base::ThreadTaskRunnerHandle::Get()); + base::ThreadTaskRunnerHandle::Get(), 0u); bool error_handler_called1 = false; router1.set_connection_error_handler( base::Bind(&ForwardErrorHandler, &error_handler_called1, @@ -288,10 +262,10 @@ base::RunLoop run_loop; LazyResponseGenerator generator(run_loop.QuitClosure()); { - internal::Router router0(std::move(handle0_), FilterChain(), - false, base::ThreadTaskRunnerHandle::Get()); - internal::Router router1(std::move(handle1_), FilterChain(), - false, base::ThreadTaskRunnerHandle::Get()); + internal::Router router0(std::move(handle0_), FilterChain(), false, + base::ThreadTaskRunnerHandle::Get(), 0u); + internal::Router router1(std::move(handle1_), FilterChain(), false, + base::ThreadTaskRunnerHandle::Get(), 0u); router1.set_incoming_receiver(&generator);
diff --git a/mojo/public/interfaces/bindings/interface_control_messages.mojom b/mojo/public/interfaces/bindings/interface_control_messages.mojom index d193351..42b6297 100644 --- a/mojo/public/interfaces/bindings/interface_control_messages.mojom +++ b/mojo/public/interfaces/bindings/interface_control_messages.mojom
@@ -23,6 +23,7 @@ }; union RunInput { QueryVersion query_version; + FlushForTesting flush_for_testing; }; struct RunResponseMessageParams { @@ -39,6 +40,9 @@ uint32 version; }; +struct FlushForTesting { +}; + //////////////////////////////////////////////////////////////////////////////// // RunOrClosePipe@0xFFFFFFFE(RunOrClosePipeInput input); //
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl index fa147259..23908c2 100644 --- a/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl +++ b/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl
@@ -145,7 +145,7 @@ {%- endfor %} {{proxy_name}}::{{proxy_name}}(mojo::MessageReceiverWithResponder* receiver) - : ControlMessageProxy(receiver) { + : receiver_(receiver) { } {#--- Proxy definitions #} @@ -296,8 +296,7 @@ {%- endfor %} {{class_name}}Stub::{{class_name}}Stub() - : sink_(nullptr), - control_message_handler_({{interface.name}}::Version_) { + : sink_(nullptr) { } {{class_name}}Stub::~{{interface.name}}Stub() {} @@ -305,8 +304,6 @@ {#--- Stub definition #} bool {{class_name}}Stub::Accept(mojo::Message* message) { - if (mojo::internal::ControlMessageHandler::IsControlMessage(message)) - return control_message_handler_.Accept(message); {%- if interface.methods %} switch (message->header()->name) { {%- for method in interface.methods %} @@ -337,8 +334,6 @@ bool {{class_name}}Stub::AcceptWithResponder( mojo::Message* message, mojo::MessageReceiverWithStatus* responder) { - if (mojo::internal::ControlMessageHandler::IsControlMessage(message)) - return control_message_handler_.AcceptWithResponder(message, responder); {%- if interface.methods %} switch (message->header()->name) { {%- for method in interface.methods %} @@ -378,16 +373,13 @@ {#--- Request validator definitions #} bool {{class_name}}RequestValidator::Accept(mojo::Message* message) { + if (mojo::internal::ControlMessageHandler::IsControlMessage(message)) + return true; + mojo::internal::ValidationContext validation_context( message->data(), message->data_num_bytes(), message->handles()->size(), message, "{{class_name}} RequestValidator"); - if (mojo::internal::ControlMessageHandler::IsControlMessage(message)) { - if (!mojo::internal::ValidateControlRequest(message, &validation_context)) - return false; - return true; - } - switch (message->header()->name) { {%- for method in interface.methods %} case internal::k{{class_name}}_{{method.name}}_Name: { @@ -424,16 +416,13 @@ {#--- Response validator definitions #} {% if interface|has_callbacks %} bool {{class_name}}ResponseValidator::Accept(mojo::Message* message) { + if (mojo::internal::ControlMessageHandler::IsControlMessage(message)) + return true; + mojo::internal::ValidationContext validation_context( message->data(), message->data_num_bytes(), message->handles()->size(), message, "{{class_name}} ResponseValidator"); - if (mojo::internal::ControlMessageHandler::IsControlMessage(message)) { - if (!mojo::internal::ValidateControlResponse(message, &validation_context)) - return false; - return true; - } - if (!mojo::internal::ValidateMessageIsResponse(message, &validation_context)) return false; switch (message->header()->name) {
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/interface_proxy_declaration.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/interface_proxy_declaration.tmpl index 3dd915a..cfc4ef6 100644 --- a/mojo/public/tools/bindings/generators/cpp_templates/interface_proxy_declaration.tmpl +++ b/mojo/public/tools/bindings/generators/cpp_templates/interface_proxy_declaration.tmpl
@@ -1,7 +1,6 @@ {%- import "interface_macros.tmpl" as interface_macros %} class {{export_attribute}} {{interface.name}}Proxy - : public {{interface.name}}, - public NON_EXPORTED_BASE(mojo::internal::ControlMessageProxy) { + : public {{interface.name}} { public: explicit {{interface.name}}Proxy(mojo::MessageReceiverWithResponder* receiver); @@ -17,5 +16,6 @@ } private: + mojo::MessageReceiverWithResponder* receiver_; mojo::internal::SerializationContext serialization_context_; };
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/interface_stub_declaration.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/interface_stub_declaration.tmpl index e161d027..8f1a45c 100644 --- a/mojo/public/tools/bindings/generators/cpp_templates/interface_stub_declaration.tmpl +++ b/mojo/public/tools/bindings/generators/cpp_templates/interface_stub_declaration.tmpl
@@ -15,5 +15,4 @@ private: {{interface.name}}* sink_; mojo::internal::SerializationContext serialization_context_; - mojo::internal::ControlMessageHandler control_message_handler_; };
diff --git a/net/BUILD.gn b/net/BUILD.gn index 38af571..952e97da 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn
@@ -1935,6 +1935,18 @@ libfuzzer_options = [ "max_len = 2048" ] } +fuzzer_test("net_websocket_deflate_stream_fuzzer") { + sources = [ + "websockets/websocket_deflate_stream_fuzzer.cc", + ] + deps = [ + ":net_fuzzer_test_support", + "//net", + ] + dict = "data/fuzzer_dictionaries/net_websocket_frame_parser_fuzzer.dict" + libfuzzer_options = [ "max_len=512" ] +} + fuzzer_test("net_websocket_frame_parser_fuzzer") { sources = [ "websockets/websocket_frame_parser_fuzzer.cc",
diff --git a/net/base/test_completion_callback_unittest.cc b/net/base/test_completion_callback_unittest.cc index 9a40b240f..a2bc4909 100644 --- a/net/base/test_completion_callback_unittest.cc +++ b/net/base/test_completion_callback_unittest.cc
@@ -112,9 +112,7 @@ // Dispatch to worker thread... if (!base::WorkerPool::PostTask( - FROM_HERE, - base::Bind(&ExampleWorker::DoWork, request_.get()), - true)) { + FROM_HERE, base::Bind(&ExampleWorker::DoWork, request_), true)) { NOTREACHED(); request_ = NULL; return false;
diff --git a/net/cookies/cookie_monster_unittest.cc b/net/cookies/cookie_monster_unittest.cc index 722f4e0..bba8fa40 100644 --- a/net/cookies/cookie_monster_unittest.cc +++ b/net/cookies/cookie_monster_unittest.cc
@@ -2533,7 +2533,7 @@ ASSERT_EQ(0, counter->callback_count()); // Before initialization, FlushStore() should just run the callback. - cm->FlushStore(base::Bind(&CallbackCounter::Callback, counter.get())); + cm->FlushStore(base::Bind(&CallbackCounter::Callback, counter)); base::RunLoop().RunUntilIdle(); ASSERT_EQ(0, store->flush_count()); @@ -2548,7 +2548,7 @@ // After initialization, FlushStore() should delegate to the store. GetAllCookies(cm.get()); // Force init. - cm->FlushStore(base::Bind(&CallbackCounter::Callback, counter.get())); + cm->FlushStore(base::Bind(&CallbackCounter::Callback, counter)); base::RunLoop().RunUntilIdle(); ASSERT_EQ(1, store->flush_count()); @@ -2569,7 +2569,7 @@ ASSERT_EQ(2, counter->callback_count()); - cm->FlushStore(base::Bind(&CallbackCounter::Callback, counter.get())); + cm->FlushStore(base::Bind(&CallbackCounter::Callback, counter)); base::RunLoop().RunUntilIdle(); ASSERT_EQ(3, counter->callback_count());
diff --git a/net/http/http_auth_cache.cc b/net/http/http_auth_cache.cc index 7a3a4e0..9c073bd 100644 --- a/net/http/http_auth_cache.cc +++ b/net/http/http_auth_cache.cc
@@ -252,8 +252,11 @@ return false; } -void HttpAuthCache::Clear() { - entries_.clear(); +void HttpAuthCache::ClearEntriesAddedWithin(base::TimeDelta duration) { + base::TimeTicks begin_time = base::TimeTicks::Now() - duration; + entries_.remove_if([begin_time](const Entry& entry) { + return entry.creation_time_ >= begin_time; + }); } bool HttpAuthCache::UpdateStaleChallenge(const GURL& origin,
diff --git a/net/http/http_auth_cache.h b/net/http/http_auth_cache.h index 9190e42..e620cb0 100644 --- a/net/http/http_auth_cache.h +++ b/net/http/http_auth_cache.h
@@ -27,9 +27,9 @@ // - the last auth handler used (contains realm and authentication scheme) // - the list of paths which used this realm // Entries can be looked up by either (origin, realm, scheme) or (origin, path). -class NET_EXPORT_PRIVATE HttpAuthCache { +class NET_EXPORT HttpAuthCache { public: - class NET_EXPORT_PRIVATE Entry { + class NET_EXPORT Entry { public: Entry(const Entry& other); ~Entry(); @@ -60,6 +60,10 @@ void UpdateStaleChallenge(const std::string& auth_challenge); + void set_creation_time_for_testing(base::TimeTicks creation_time) { + creation_time_ = creation_time; + } + private: friend class HttpAuthCache; FRIEND_TEST_ALL_PREFIXES(HttpAuthCacheTest, AddPath); @@ -162,8 +166,8 @@ HttpAuth::Scheme scheme, const AuthCredentials& credentials); - // Clears the cache. - void Clear(); + // Clears cache entries created within |duration| of base::TimeTicks::Now(). + void ClearEntriesAddedWithin(base::TimeDelta duration); // Updates a stale digest entry on server |origin| for realm |realm| and // scheme |scheme|. The cached auth challenge is replaced with
diff --git a/net/http/http_auth_cache_unittest.cc b/net/http/http_auth_cache_unittest.cc index c0509ce1..6ab67c4c 100644 --- a/net/http/http_auth_cache_unittest.cc +++ b/net/http/http_auth_cache_unittest.cc
@@ -377,6 +377,44 @@ EXPECT_FALSE(NULL == entry); } +TEST(HttpAuthCacheTest, ClearEntriesAddedWithin) { + GURL origin("http://foobar.com"); + + HttpAuthCache cache; + base::TimeTicks old_creation_time = + base::TimeTicks::Now() - base::TimeDelta::FromMinutes(2); + cache + .Add(origin, kRealm1, HttpAuth::AUTH_SCHEME_BASIC, "basic realm=Realm1", + AuthCredentials(kAlice, k123), "/") + ->set_creation_time_for_testing(old_creation_time); + cache + .Add(origin, kRealm2, HttpAuth::AUTH_SCHEME_BASIC, "basic realm=Realm2", + AuthCredentials(kRoot, kWileCoyote), "/") + ->set_creation_time_for_testing(old_creation_time); + + cache.Add(origin, kRealm3, HttpAuth::AUTH_SCHEME_BASIC, "basic realm=Realm3", + AuthCredentials(kAlice2, k1234), "/"); + cache.Add(origin, kRealm4, HttpAuth::AUTH_SCHEME_BASIC, "basic realm=Realm4", + AuthCredentials(kUsername, kPassword), "/"); + // Add path to existing entry. + cache.Add(origin, kRealm2, HttpAuth::AUTH_SCHEME_BASIC, "basic realm=Realm2", + AuthCredentials(kAdmin, kPassword), "/baz/"); + + cache.ClearEntriesAddedWithin(base::TimeDelta::FromMinutes(1)); + + EXPECT_NE(nullptr, + cache.Lookup(origin, kRealm1, HttpAuth::AUTH_SCHEME_BASIC)); + EXPECT_NE(nullptr, + cache.Lookup(origin, kRealm2, HttpAuth::AUTH_SCHEME_BASIC)); + // Creation time is set for a whole entry rather than for a particular path. + // Path added within the requested duration isn't be removed. + EXPECT_NE(nullptr, cache.LookupByPath(origin, "/baz/")); + EXPECT_EQ(nullptr, + cache.Lookup(origin, kRealm3, HttpAuth::AUTH_SCHEME_BASIC)); + EXPECT_EQ(nullptr, + cache.Lookup(origin, kRealm4, HttpAuth::AUTH_SCHEME_BASIC)); +} + TEST(HttpAuthCacheTest, UpdateStaleChallenge) { HttpAuthCache cache; GURL origin("http://foobar2.com");
diff --git a/net/websockets/websocket_deflate_stream_fuzzer.cc b/net/websockets/websocket_deflate_stream_fuzzer.cc new file mode 100644 index 0000000..fc5a150 --- /dev/null +++ b/net/websockets/websocket_deflate_stream_fuzzer.cc
@@ -0,0 +1,103 @@ +// Copyright 2015 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. + +#include <stddef.h> +#include <stdint.h> + +#include <memory> +#include <string> +#include <vector> + +#include "base/logging.h" +#include "base/memory/ptr_util.h" +#include "base/strings/string_piece.h" +#include "base/test/fuzzed_data_provider.h" +#include "net/base/completion_callback.h" +#include "net/base/io_buffer.h" +#include "net/base/net_errors.h" +#include "net/websockets/websocket_deflate_parameters.h" +#include "net/websockets/websocket_deflate_predictor.h" +#include "net/websockets/websocket_deflate_predictor_impl.h" +#include "net/websockets/websocket_deflate_stream.h" +#include "net/websockets/websocket_extension.h" +#include "net/websockets/websocket_frame.h" +#include "net/websockets/websocket_stream.h" + +namespace net { + +namespace { + +class WebSocketFuzzedStream final : public WebSocketStream { + public: + WebSocketFuzzedStream(const uint8_t* data, size_t size) + : fuzzed_data_provider_(data, size) {} + + int ReadFrames(std::vector<std::unique_ptr<WebSocketFrame>>* frames, + const CompletionCallback& callback) override { + if (fuzzed_data_provider_.remaining_bytes() == 0) + return ERR_CONNECTION_CLOSED; + while (fuzzed_data_provider_.remaining_bytes() > 0) + frames->push_back(CreateFrame()); + return OK; + } + + int WriteFrames(std::vector<std::unique_ptr<WebSocketFrame>>* frames, + const CompletionCallback& callback) override { + return ERR_FILE_NOT_FOUND; + } + + void Close() override {} + std::string GetSubProtocol() const override { return std::string(); } + std::string GetExtensions() const override { return std::string(); } + + private: + std::unique_ptr<WebSocketFrame> CreateFrame() { + WebSocketFrameHeader::OpCode opcode = + fuzzed_data_provider_.ConsumeInt32InRange( + WebSocketFrameHeader::kOpCodeContinuation, + WebSocketFrameHeader::kOpCodeControlUnused); + auto frame = base::MakeUnique<WebSocketFrame>(opcode); + // Bad news: ConsumeBool actually consumes a whole byte per call, so do + // something hacky to conserve precious bits. + uint8_t flags = fuzzed_data_provider_.ConsumeUint8(); + frame->header.final = flags & 0x1; + frame->header.reserved1 = (flags >> 1) & 0x1; + frame->header.reserved2 = (flags >> 2) & 0x1; + frame->header.reserved3 = (flags >> 3) & 0x1; + frame->header.masked = (flags >> 4) & 0x1; + uint64_t payload_length = fuzzed_data_provider_.ConsumeInt32InRange(0, 64); + base::StringPiece payload = + fuzzed_data_provider_.ConsumeBytes(payload_length); + frame->data = new WrappedIOBuffer(payload.data()); + frame->header.payload_length = payload.size(); + return frame; + } + + base::FuzzedDataProvider fuzzed_data_provider_; +}; + +void WebSocketDeflateStreamFuzz(const uint8_t* data, size_t size) { + // WebSocketDeflateStream needs to be constructed on each call because it + // has state. + std::string failure_message; + WebSocketDeflateParameters parameters; + parameters.Initialize(WebSocketExtension("permessage-deflate"), + &failure_message); + WebSocketDeflateStream deflate_stream( + base::MakeUnique<WebSocketFuzzedStream>(data, size), parameters, + base::MakeUnique<WebSocketDeflatePredictorImpl>()); + std::vector<std::unique_ptr<net::WebSocketFrame>> frames; + deflate_stream.ReadFrames(&frames, CompletionCallback()); +} + +} // namespace + +} // namespace net + +// Entry point for LibFuzzer. +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { + net::WebSocketDeflateStreamFuzz(data, size); + + return 0; +}
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations index 6e32ff3..f57e9493 100644 --- a/third_party/WebKit/LayoutTests/TestExpectations +++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -467,16 +467,6 @@ crbug.com/441840 imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-polygon-004.html [ Failure ] crbug.com/441840 [ Linux Win ] imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-shape-arguments-000.html [ Failure ] -crbug.com/586413 imported/csswg-test/css-snap-size-1/snap-width-block-in-available-001.html [ Missing ] -crbug.com/586413 imported/csswg-test/css-snap-size-1/snap-width-block-in-fixed-001.html [ Missing ] -crbug.com/586413 imported/csswg-test/css-snap-size-1/snap-width-block-in-max-001.html [ Missing ] -crbug.com/586413 imported/csswg-test/css-snap-size-1/snap-width-inline-in-available-001.html [ Missing ] -crbug.com/586413 imported/csswg-test/css-snap-size-1/snap-width-inline-in-fixed-001.html [ Missing ] -crbug.com/586413 imported/csswg-test/css-snap-size-1/snap-width-inline-in-max-001.html [ Missing ] -crbug.com/586413 imported/csswg-test/css-snap-size-1/snap-width-table-in-available-001.html [ Missing ] -crbug.com/586413 imported/csswg-test/css-snap-size-1/snap-width-table-in-fixed-001.html [ Missing ] -crbug.com/586413 imported/csswg-test/css-snap-size-1/snap-width-table-in-max-001.html [ Missing ] - crbug.com/505151 imported/csswg-test/css-writing-modes-3/abs-pos-non-replaced-icb-vlr-003.xht [ Failure ] crbug.com/505151 imported/csswg-test/css-writing-modes-3/abs-pos-non-replaced-icb-vlr-005.xht [ Failure ] crbug.com/505151 imported/csswg-test/css-writing-modes-3/abs-pos-non-replaced-icb-vlr-011.xht [ Failure ] @@ -556,6 +546,10 @@ crbug.com/492664 imported/csswg-test/css-writing-modes-3/inline-block-alignment-007.xht [ Failure ] crbug.com/492664 imported/csswg-test/css-writing-modes-3/inline-table-alignment-003.xht [ Failure ] crbug.com/492664 imported/csswg-test/css-writing-modes-3/inline-table-alignment-005.xht [ Failure ] +crbug.com/492664 imported/csswg-test/css-writing-modes-3/line-box-height-vlr-021.xht [ Failure ] +crbug.com/492664 imported/csswg-test/css-writing-modes-3/line-box-height-vlr-023.xht [ Failure ] +crbug.com/492664 imported/csswg-test/css-writing-modes-3/ortho-htb-alongside-vrl-floats-006.xht [ Failure ] +crbug.com/492664 imported/csswg-test/css-writing-modes-3/ortho-htb-alongside-vrl-floats-014.xht [ Failure ] crbug.com/492664 imported/csswg-test/css-writing-modes-3/table-column-order-002.xht [ Failure ] crbug.com/492664 imported/csswg-test/css-writing-modes-3/table-column-order-003.xht [ Failure ] crbug.com/492664 imported/csswg-test/css-writing-modes-3/table-column-order-004.xht [ Failure ] @@ -941,14 +935,6 @@ crbug.com/582836 imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-font-face-01.html [ Pass Failure ] crbug.com/582836 imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-font-face-02.html [ Pass Failure ] -crbug.com/553838 imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-01a.html [ Failure ] -crbug.com/553838 imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-01b.html [ Failure ] -crbug.com/553838 imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-02a.html [ Failure ] -crbug.com/553838 imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-02b.html [ Failure ] -crbug.com/553838 imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-03a.html [ Failure ] -crbug.com/553838 imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-03b.html [ Failure ] -crbug.com/553838 imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-04.html [ Failure ] - crbug.com/553838 imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/writing-modes-3/text-combine-upright-break-inside-001a.html [ Failure ] crbug.com/553838 imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/writing-modes-3/text-combine-upright-compression-001.html [ Failure ] crbug.com/553838 imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/writing-modes-3/text-combine-upright-compression-002.html [ Failure ]
diff --git a/third_party/WebKit/LayoutTests/W3CImportExpectations b/third_party/WebKit/LayoutTests/W3CImportExpectations index cbda763..43572bbf1 100644 --- a/third_party/WebKit/LayoutTests/W3CImportExpectations +++ b/third_party/WebKit/LayoutTests/W3CImportExpectations
@@ -9,6 +9,7 @@ # * Change [ Skip ] to [ Pass ] # * Add a leading comment: ## Owners: user@example.com +imported/csswg-test/WOFF2-UserAgent [ Skip ] imported/csswg-test/compositing-1 [ Skip ] imported/csswg-test/css-align-3 [ Skip ] imported/csswg-test/css-animations-1 [ Skip ] @@ -165,6 +166,7 @@ imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/multicol3 [ Skip ] imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/reftest.list [ Skip ] imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/ruby [ Skip ] +imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4 [ Skip ] imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/sync-tests-filter [ Skip ] imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/sync-tests.sh [ Skip ] imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/text-decor-3 [ Skip ]
diff --git a/third_party/WebKit/LayoutTests/editing/inserting/insert_div_text_into_text.html b/third_party/WebKit/LayoutTests/editing/inserting/insert_div_text_into_text.html new file mode 100644 index 0000000..b0edd51 --- /dev/null +++ b/third_party/WebKit/LayoutTests/editing/inserting/insert_div_text_into_text.html
@@ -0,0 +1,19 @@ +<!doctype html> +<script src="../../resources/testharness.js"></script> +<script src="../../resources/testharnessreport.js"></script> +<script src="../assert_selection.js"></script> +<script> +test(() => assert_selection( + [ + '<div contenteditable>', + 'There b|e no line breaks in this sentence.', + '</div>', + ].join(''), + 'insertHTML <div>XYZ</div>', + [ + '<div contenteditable>', + 'There bXYZ|e no line breaks in this sentence.', + '</div>', + ].join('')), + 'insertHTML with DIV to text'); +</script>
diff --git a/third_party/WebKit/LayoutTests/editing/inserting/insert_interchange_newline.html b/third_party/WebKit/LayoutTests/editing/inserting/insert_interchange_newline.html new file mode 100644 index 0000000..14376e59 --- /dev/null +++ b/third_party/WebKit/LayoutTests/editing/inserting/insert_interchange_newline.html
@@ -0,0 +1,31 @@ +<!doctype html> +<script src="../../resources/testharness.js"></script> +<script src="../../resources/testharnessreport.js"></script> +<script src="../assert_selection.js"></script> +<script> +test(() => { + assert_selection( + '<div contenteditable>X|Y</div>', + 'insertHTML <div>foo</div><span><div>bar</div></span><br class="Apple-interchange-newline">', + '<div contenteditable>Xfoo<div>bar</div>|Y</div>', + 'insert an interchange newline into text'); + + assert_selection( + '<div contenteditable><div>f^oo</div>b|ar</div>', + 'insertHTML <div>bar</div>baz<br class="Apple-interchange-newline">', + '<div contenteditable><div>fbar</div>baz<div>|ar</div></div>', + 'insert an interchange newline into multiple blocks'); + + assert_selection( + '<div contenteditable>|</div>', + 'insertHTML foo<div>bar</div><br class="Apple-interchange-newline">', + '<div contenteditable>foo<div>bar</div><div>|<br></div></div>', + 'content ending with an interchange newline'); + + assert_selection( + '<div contenteditable>foo|</div>', + 'insertHTML <br class="Apple-interchange-newline">bar', + '<div contenteditable>foo<div>bar|</div></div>', + 'content starting with an interchange newline'); +}, 'insert an interchange newline'); +</script>
diff --git a/third_party/WebKit/LayoutTests/editing/inserting/insert_to_merge_end.html b/third_party/WebKit/LayoutTests/editing/inserting/insert_to_merge_end.html new file mode 100644 index 0000000..83e773b --- /dev/null +++ b/third_party/WebKit/LayoutTests/editing/inserting/insert_to_merge_end.html
@@ -0,0 +1,53 @@ +<!doctype html> +<script src="../../resources/testharness.js"></script> +<script src="../../resources/testharnessreport.js"></script> +<script src="../assert_selection.js"></script> +<script> +test(() => { + assert_selection( + '<div contenteditable>f|oo</div>', + 'insertHTML <div>bar</div>baz', + '<div contenteditable>fbar<br>baz|oo</div>', + 'insert DIV into text.'); + + assert_selection( + '<div contenteditable><span>f|oo</spane>bar</div>', + 'insertHTML <div>ABC</div>DEF', + [ + '<div contenteditable>', + '<span>f</span>ABC<span><br></span>DEF|<span>oobar</span>', + '</div>', + ].join(''), + 'insert DIV into SPAN'); + + assert_selection( + '<div contenteditable>one t|hree</div>', + 'insertHTML <br class="Apple-interchange-newline"><div>two</div>', + [ + '<div contenteditable>', + 'one t<div>two|hree</div>', + '</div>', + ].join(''), + 'insert DIV with interchange newline'); + + assert_selection( + '<div contenteditable>x|y</div>', + 'insertHTML <div>foo</div><div>bar</div>baz', + [ + '<div contenteditable>', + 'xfoo<div>bar</div>baz|y', + '</div>', + ].join(''), + 'insert multiple DIVs into text'); + + assert_selection( + '<div contenteditable><div>x^</div><div>y it.|</div></div>', + 'insertHTML <div><div>AB</div></div>', + [ + '<div contenteditable>', + '<div>xAB|</div>', + '</div>', + ].join(''), + 'Replace with DIV'); +}); +</script>
diff --git a/third_party/WebKit/LayoutTests/editing/inserting/insert_to_merge_end_borders.html b/third_party/WebKit/LayoutTests/editing/inserting/insert_to_merge_end_borders.html new file mode 100644 index 0000000..2e0aa996 --- /dev/null +++ b/third_party/WebKit/LayoutTests/editing/inserting/insert_to_merge_end_borders.html
@@ -0,0 +1,25 @@ +<!doctype html> +<script src="../../resources/testharness.js"></script> +<script src="../../resources/testharnessreport.js"></script> +<script src="../assert_selection.js"></script> +<script> +test(() => assert_selection( + [ + '<div contenteditable>', + 'First p^aragraph', + '<div style="border: 1px solid red;">', + 'This |text should be surrounded by a red border.', + '</div>', + '</div>', + ].join(''), + 'insertHTML ABC<div style="border: 1px solid blue;">DEF</div>', + [ + '<div contenteditable>', + 'First pABC', + '<div style="border: 1px solid red;">', + 'DEF|text should be surrounded by a red border.', + '</div>', + '</div>', + ].join('')), + 'Merge the last pargraph of incoming fragment into end'); +</script>
diff --git a/third_party/WebKit/LayoutTests/editing/inserting/insert_to_merge_end_list.html b/third_party/WebKit/LayoutTests/editing/inserting/insert_to_merge_end_list.html new file mode 100644 index 0000000..291cfc17 --- /dev/null +++ b/third_party/WebKit/LayoutTests/editing/inserting/insert_to_merge_end_list.html
@@ -0,0 +1,27 @@ +<!doctype html> +<script src="../../resources/testharness.js"></script> +<script src="../../resources/testharnessreport.js"></script> +<script src="../assert_selection.js"></script> +<script> +test(() => { + assert_selection( + '<div contenteditable>x|y</div>', + 'insertHTML <ul><li><div>one</div></li></ul>', + '<div contenteditable>x<ul><li><div>one|</div></li></ul>y</div>', + 'insert list into text'); + + assert_selection( + [ + '<div contenteditable>', + '<ul><li><div>Item |1</div></li></ul>', + '</div>', + ].join(''), + 'insertHTML <div>foo</div><div>bar</div>', + [ + '<div contenteditable>', + '<ul><li><div>Item foo</div><div>bar|</div></li><li><div>1</div></li></ul>', + '</div>', + ].join(''), + 'insert list into list'); +}); +</script>
diff --git a/third_party/WebKit/LayoutTests/editing/inserting/insert_to_merge_end_table.html b/third_party/WebKit/LayoutTests/editing/inserting/insert_to_merge_end_table.html new file mode 100644 index 0000000..9dc01eac --- /dev/null +++ b/third_party/WebKit/LayoutTests/editing/inserting/insert_to_merge_end_table.html
@@ -0,0 +1,34 @@ +<!doctype html> +<script src="../../resources/testharness.js"></script> +<script src="../../resources/testharnessreport.js"></script> +<script src="../assert_selection.js"></script> +<script> +test(() => { + assert_selection( + '<div contenteditable>x|y</div>', + 'insertHTML <table><tr><td>1</td><td>2</td></tr></table>', + [ + '<div contenteditable>', + 'x<table><tbody><tr><td>1</td><td>2|</td></tr></tbody></table>y', + '</div>', + ].join(''), + 'insert table into text'); + + assert_selection( + [ + '<div contenteditable>', + '<table><tr><td><div>Item |1</div></td><td>Item 2</td></tr></table>', + '</div>', + ].join(''), + 'insertHTML <div>foo</div><div>bar</div>', + [ + '<div contenteditable>', + '<table><tbody><tr>', + '<td><div>Item foo</div><div>bar|1</div></td>', + '<td>Item 2</td>', + '</tr></tbody></table>', + '</div>', + ].join(''), + 'insert DIV into table'); +}); +</script>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/4076267-2.html b/third_party/WebKit/LayoutTests/editing/pasteboard/4076267-2.html deleted file mode 100644 index 1f2bba0..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/4076267-2.html +++ /dev/null
@@ -1,39 +0,0 @@ -<html> -<head> - -<link rel=stylesheet href="../editingStyle.css" type="text/css"> -<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script> - -<script> - -function editingTest() { - extendSelectionForwardByLineCommand(); - moveSelectionForwardByCharacterCommand(); - moveSelectionBackwardByCharacterCommand(); - extendSelectionBackwardByLineCommand(); - copyCommand(); - deleteCommand(); - pasteAndMatchStyleCommand(); - -} - -</script> - -<title>Pasting plain text loses leading/trailing whitespace</title> -</head> -<body> - -<p>This tests to see if trailing spaces are lost during a copy/paste</p> - -<hr> - -<div contenteditable id="root" style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space;"> -<div id="test" class="editing">there should be a single trailing space between the '.' and the last character in this sentence .</div> -</div> - -<script> -runEditingTest(); -</script> - -</body> -</html>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/4076267-3.html b/third_party/WebKit/LayoutTests/editing/pasteboard/4076267-3.html deleted file mode 100644 index 5d6811c..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/4076267-3.html +++ /dev/null
@@ -1,42 +0,0 @@ -<html> -<head> - -<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script> - -<script> - -function editingTest() { - for(i = 1; i <= 10; i++) { - typeCharacterCommand('x'); - for(j = 1; j <= i; j++) - typeCharacterCommand(' '); - typeCharacterCommand('x'); - for(k = 1; k <= i; k++) - extendSelectionBackwardByCharacterCommand(); - extendSelectionBackwardByCharacterCommand(); - extendSelectionBackwardByCharacterCommand(); - copyCommand(); - deleteCommand(); - pasteAndMatchStyleCommand(); - typeCharacterCommand('\n'); - } -} - -</script> - -<title>Pasting plain text with varying amounts of whitespace</title> -</head> -<body> - -<p>This tests to see if spaces are lost during a copy/paste</p> - -<hr> - -<div id="test" contenteditable="true"><br></div> - -<script> -runEditingTest(); -</script> - -</body> -</html>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/4076267.html b/third_party/WebKit/LayoutTests/editing/pasteboard/4076267.html deleted file mode 100644 index 6fa1585db..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/4076267.html +++ /dev/null
@@ -1,36 +0,0 @@ -<html> -<head> - -<script src=../editing.js language="JavaScript" type="text/JavaScript"></script> - -<script> - -function editingTest() { - moveSelectionForwardByCharacterCommand(); - extendSelectionForwardByLineCommand(); - copyCommand(); - deleteCommand(); - deleteCommand(); - pasteAndMatchStyleCommand(); -} - -</script> - -<title>Pasting plain text loses leading/trailing whitespace</title> -</head> -<body> - -<p>This tests to see if leading spaces are lost during a copy/paste</p> - -<hr> - -<div contenteditable id="root" style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space;"> -<div id="test" class="editing">. this text should have a single leading space before it</div> -</div> - -<script> -runEditingTest(); -</script> - -</body> -</html>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/cut-text-001.html b/third_party/WebKit/LayoutTests/editing/pasteboard/cut-text-001.html index e49b766..1d0c8f8 100644 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/cut-text-001.html +++ b/third_party/WebKit/LayoutTests/editing/pasteboard/cut-text-001.html
@@ -1,37 +1,15 @@ -<html> -<head> - -<style> -.editing { - border: 2px solid red; - padding: 12px; - font-size: 24px; -} -</style> -<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script> - +<!doctype html> +<script src="../../resources/testharness.js"></script> +<script src="../../resources/testharnessreport.js"></script> +<script src="../assert_selection.js"></script> <script> - -function editingTest() { - for (i = 0; i < 4; i++) - moveSelectionForwardByCharacterCommand(); - for (i = 0; i < 3; i++) - extendSelectionForwardByCharacterCommand(); - cutCommand(); -} - + test(() => assert_selection( + '<div contenteditable>foo ^bar| baz</div>', + selection => { + assert_not_equals(window.internals, undefined, + 'This test requires window.internals to access clipboard'); + selection.document.execCommand('cut'); + }, + '<div contenteditable>foo |\u{00A0}baz</div>'), + 'cut command'); </script> - -<title>Editing Test</title> -</head> -<body> -<div contenteditable id="root" class="editing"> -<span id="test">foo bar baz</span> -</div> - -<script> -runEditingTest(); -</script> - -</body> -</html>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/insert-div-text-into-text-expected.txt b/third_party/WebKit/LayoutTests/editing/pasteboard/insert-div-text-into-text-expected.txt deleted file mode 100644 index da4b1664..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/insert-div-text-into-text-expected.txt +++ /dev/null
@@ -1,8 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -This tests inserting a text wrapped in a div inside a text node. -| "There should<#selection-caret> be no line breaks in this sentence."
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/insert-div-text-into-text.html b/third_party/WebKit/LayoutTests/editing/pasteboard/insert-div-text-into-text.html deleted file mode 100644 index 0b38ed898..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/insert-div-text-into-text.html +++ /dev/null
@@ -1,26 +0,0 @@ -<!DOCTYPE> -<html> -<body> -<div id="test" contenteditable="true">There be no line breaks in this sentence.</div> -<script src="../../resources/dump-as-markup.js"></script> -<script> - -if (window.testRunner) - testRunner.dumpEditingCallbacks(); -if (window.internals) - internals.settings.setEditingBehavior('mac'); - -Markup.description('This tests inserting a text wrapped in a div inside a text node.'); - -var sel = window.getSelection(); -var e = document.getElementById("test").firstChild; - -sel.collapse(e, 0); -sel.modify("move", "forward", "word"); -sel.modify("move", "forward", "character"); -document.execCommand("InsertHTML", false, "<div>should</div>"); - -Markup.dump('test'); -</script> -</body> -</html>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/interchange-newline-1-expected.txt b/third_party/WebKit/LayoutTests/editing/pasteboard/interchange-newline-1-expected.txt deleted file mode 100644 index 66bd66c..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/interchange-newline-1-expected.txt +++ /dev/null
@@ -1,11 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -There is an interchange newline at the end of the incoming fragment. "bar" and "x" should be in separate paragraphs -The paragraph "bar" is inside a div wrapped in a span, and the old paste code that handled interchange newlines did not handle this case. -| "xfoo" -| <div> -| "bar" -| "<#selection-caret>x"
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/interchange-newline-1.html b/third_party/WebKit/LayoutTests/editing/pasteboard/interchange-newline-1.html deleted file mode 100644 index 900bfd5..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/interchange-newline-1.html +++ /dev/null
@@ -1,24 +0,0 @@ -<!DOCTYPE html> -<html> -<body> -<div id="test" contenteditable="true">xx</div> -<script src="../../resources/dump-as-markup.js"></script> -<script> -if (window.testRunner) - testRunner.dumpEditingCallbacks(); - -Markup.description('There is an interchange newline at the end of the incoming fragment. "bar" and "x" should be in separate paragraphs\n' -+ 'The paragraph "bar" is inside a div wrapped in a span, and the old paste code that handled interchange newlines did not handle this case.'); - -var s = window.getSelection(); -var e = document.getElementById("test"); - -s.collapse(e, 0); -s.modify("move", "forward", "character"); -document.execCommand("InsertHTML", false, "<div>foo</div><span><div>bar</div></span><br class='Apple-interchange-newline'>"); - -Markup.dump('test'); - -</script> -</body> -</html>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/interchange-newline-2-expected.txt b/third_party/WebKit/LayoutTests/editing/pasteboard/interchange-newline-2-expected.txt deleted file mode 100644 index 6a70be7..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/interchange-newline-2-expected.txt +++ /dev/null
@@ -1,13 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -This demonstrates a bug in interchange newline handling during paste. -The selection being pasted into contain multiple blocks, which breaks the old code in paste that handled interchange newlines. -| <div> -| "fbar" -| "baz" -| <div> -| "<#selection-caret>ar"
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/interchange-newline-2.html b/third_party/WebKit/LayoutTests/editing/pasteboard/interchange-newline-2.html deleted file mode 100644 index 2d3d15a..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/interchange-newline-2.html +++ /dev/null
@@ -1,24 +0,0 @@ -<!DOCTYPE html> -<html> -<body> -<div id="test" contenteditable="true"><div>foo</div>bar</div> -<script src="../../resources/dump-as-markup.js"></script> -<script> -if (window.testRunner) - testRunner.dumpEditingCallbacks(); - -Markup.description('This demonstrates a bug in interchange newline handling during paste.\n' -+ 'The selection being pasted into contain multiple blocks, which breaks the old code in paste that handled interchange newlines.') - -var s = window.getSelection(); -var e = document.getElementById("test"); - -s.collapse(e, 0); -s.modify("move", "forward", "character"); -s.modify("extend", "forward", "line"); -document.execCommand("InsertHTML", false, "<div>bar</div>baz<br class='Apple-interchange-newline'>"); - -Markup.dump('test'); -</script> -</body> -</html>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/interchange-newline-3-expected.txt b/third_party/WebKit/LayoutTests/editing/pasteboard/interchange-newline-3-expected.txt deleted file mode 100644 index d4d4e4c..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/interchange-newline-3-expected.txt +++ /dev/null
@@ -1,25 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -This demonstrates a bug in interchange newline handling during paste. -There is an interchange newline at the end of the incoming fragment and so the caret should end up on an empty line. -The editable region is followed by non-editable content, which breaks the old code in paste that handled interchange newlines. -| " -" -| <div> -| contenteditable="true" -| id="test" -| "foo" -| <div> -| "bar" -| <div> -| <#selection-caret> -| <br> -| " -This is non-editable content. - -" -| <script> -| " -runTest(); -"
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/interchange-newline-3.html b/third_party/WebKit/LayoutTests/editing/pasteboard/interchange-newline-3.html deleted file mode 100644 index ccf443e..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/interchange-newline-3.html +++ /dev/null
@@ -1,34 +0,0 @@ -<!DOCTYPE html> -<html> -<head> -<script src="../../resources/dump-as-markup.js"></script> -<script> - -if (window.testRunner) - testRunner.dumpEditingCallbacks(); - -function runTest() { - Markup.description('This demonstrates a bug in interchange newline handling during paste.\n' - + 'There is an interchange newline at the end of the incoming fragment and so the caret should end up on an empty line.\n' - + 'The editable region is followed by non-editable content, which breaks the old code in paste that handled interchange newlines.'); - - var s = window.getSelection(); - var e = document.getElementById("test"); - - s.collapse(e, 0); - document.execCommand("InsertHTML", false, "foo<div>bar</div><br class='Apple-interchange-newline'>"); - - Markup.dump(document.body); -} - -</script> -</head> -<body> -<div id="test" contenteditable="true"></div> -This is non-editable content. - -<script> -runTest(); -</script> -</body> -</html>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/interchange-newline-4-expected.txt b/third_party/WebKit/LayoutTests/editing/pasteboard/interchange-newline-4-expected.txt deleted file mode 100644 index 5b6f2265..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/interchange-newline-4-expected.txt +++ /dev/null
@@ -1,22 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -This tests for a bug where pasted content starting with an interchange newline would end up -outside of the editable region where it was pasted. You should see 'foo\nbar' below. -| " -" -| <div> -| contenteditable="true" -| id="test" -| "foo" -| <div> -| "bar<#selection-caret>" -| <br> -| " -non-editable -" -| <script> -| " -runTest(); -"
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/interchange-newline-4.html b/third_party/WebKit/LayoutTests/editing/pasteboard/interchange-newline-4.html deleted file mode 100644 index 352c252..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/interchange-newline-4.html +++ /dev/null
@@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html> -<head> -<script src="../../resources/dump-as-markup.js"></script> -<script> - -if (window.testRunner) - testRunner.dumpEditingCallbacks(); - -function runTest() { - Markup.description("This tests for a bug where pasted content starting with an interchange newline would end up\n" - + "outside of the editable region where it was pasted. You should see 'foo\\nbar' below."); - - var sel = window.getSelection(); - var e = document.getElementById("test"); - - sel.collapse(e, 0); - sel.modify("move", "forward", "word"); - document.execCommand("InsertHTML", false, "<br class='Apple-interchange-newline'>bar"); - - Markup.dump(document.body); -} - -</script> -</head> -<body> -<div id="test" contenteditable="true">foo</div> -non-editable -<script> -runTest(); -</script> -</body> -</html>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/line-feed-between-br-and-b-should-not-reorder-pasted-content-expected.txt b/third_party/WebKit/LayoutTests/editing/pasteboard/line-feed-between-br-and-b-should-not-reorder-pasted-content-expected.txt deleted file mode 100644 index 8e383a7..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/line-feed-between-br-and-b-should-not-reorder-pasted-content-expected.txt +++ /dev/null
@@ -1,65 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -Tests: -Bug fix for <rdar://problem/4035648> REGRESSION (Mail): line feed in source HTML file causes bad copy/paste behavior -In particular, the line feed that appears between br and b elements should not reorder the content in createMarkup. -Expected Results: -Should see the text self-documenting itself correctly: -bold -plain - - -Before cut: -| " -" -| <div> -| class="editing" -| id="test" -| " -" -| <#selection-anchor> -| <br> -| " -" -| <b> -| "bold" -| <br> -| " -" -| " -plain<#selection-focus> -" -| " -" - -After cut: -| " -" -| <div> -| class="editing" -| id="test" -| <#selection-caret> -| <br> -| " -" - -After paste: -| " -" -| <div> -| class="editing" -| id="test" -| <br> -| <b> -| "bold" -| <br> -| "plain<#selection-caret>" -| <br> -| " -"
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/line-feed-between-br-and-b-should-not-reorder-pasted-content.html b/third_party/WebKit/LayoutTests/editing/pasteboard/line-feed-between-br-and-b-should-not-reorder-pasted-content.html index e2e6fabb..f9b5c8ef 100644 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/line-feed-between-br-and-b-should-not-reorder-pasted-content.html +++ b/third_party/WebKit/LayoutTests/editing/pasteboard/line-feed-between-br-and-b-should-not-reorder-pasted-content.html
@@ -1,77 +1,41 @@ -<!DOCTYPE html> -<html> -<head> - -<style> -.editing { - border: 2px solid red; - font-size: 24px; -} -.explanation { - border: 2px solid blue; - padding: 12px; - font-size: 24px; - margin-bottom: 24px; -} -.scenario { margin-bottom: 16px;} -.scenario:first-line { font-weight: bold; margin-bottom: 16px;} -.expected-results:first-line { font-weight: bold } -</style> -<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script> -<script src="../../resources/dump-as-markup.js"></script> +<!doctype html> +<script src="../../resources/testharness.js"></script> +<script src="../../resources/testharnessreport.js"></script> +<script src="../assert_selection.js"></script> <script> +test(() => { + assert_not_equals(window.internals, undefined, + 'This test requires window.internals to access clipboard'); -function editingTest() { - for (i = 0; i < 3; i++) - extendSelectionForwardByLineCommand(); + assert_selection( + [ + '<div contenteditable>', + '<div>^<br><b>bold<br></b>plain|</div>', + '</div>', + ].join(''), + 'cut', + [ + '<div contenteditable>', + '|<br>', + '</div>', + ].join(''), + 'cut'); - Markup.description(document.querySelector('.explanation').innerText); - - Markup.dump('root', 'Before cut'); - cutCommand(); - Markup.dump('root', 'After cut'); - - pasteCommand(); - Markup.dump('root', 'After paste'); -} - + assert_selection( + [ + '<div contenteditable>', + '<div>^<br><b>bold<br></b>plain|</div>', + '</div>', + ].join(''), + selection => { + selection.document.execCommand('cut'); + selection.document.execCommand('paste'); + }, + [ + '<div contenteditable>', + '<br><b>bold<br></b>plain|', + '</div>', + ].join(''), + 'cut and paste'); +}); </script> - -<title>Editing Test</title> -</head> -<body> - -<div class="explanation"> -<div class="scenario"> -Tests: -<br> -Bug fix for <a href="rdar://problem/4035648"><rdar://problem/4035648></a> REGRESSION (Mail): line feed in source HTML file causes bad copy/paste behavior -<br> -In particular, the line feed that appears between br and b elements should not reorder the content in createMarkup. -</div> -<div class="expected-results"> -Expected Results: -<br> -Should see the text self-documenting itself correctly: -<BR> -<B>bold<BR> -</B> -plain -</div> -</div> - -<div contenteditable id="root" style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space;"> -<div id="test" class="editing"> -<BR> -<B>bold<BR> -</B> -plain -</div> -</div> - -<script> -runEditingTest(); -</script> - -</body> -</html>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-1-expected.txt b/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-1-expected.txt deleted file mode 100644 index b5916fc..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-1-expected.txt +++ /dev/null
@@ -1,10 +0,0 @@ -This tests the last paragraph in the pasted fragment is merged with the content after the insertion position. -"baz" and "oo" should be in the same paragraph below. -| <span> -| "f" -| "bar" -| <span> -| <br> -| "baz<#selection-caret>" -| <span> -| "oo"
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-1.html b/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-1.html deleted file mode 100644 index d50c656c..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-1.html +++ /dev/null
@@ -1,22 +0,0 @@ -<!DOCTYPE html> -<html> -<body> -<div id="test" contenteditable="true"><span>foo</span></div> - -<script src="../editing.js"></script> -<script src="../../resources/dump-as-markup.js"></script> -<script> -var s = window.getSelection(); -var e = document.getElementById("test"); - -e.focus(); -moveSelectionForwardByCharacterCommand(); -insertHTMLCommand("<div>bar</div>baz"); - -Markup.description('This tests the last paragraph in the pasted fragment is merged with the content after the insertion position.\n' -+ '"baz" and "oo" should be in the same paragraph below.'); -Markup.dump('test'); - -</script> -</body> -</html>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-2-expected.txt b/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-2-expected.txt deleted file mode 100644 index 2bec9e0..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-2-expected.txt +++ /dev/null
@@ -1,16 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -This tests the last paragraph in the pasted fragment is merged with the content after the insertion position -"baz" and "oobar" should be in the same paragraph below -| <span> -| "f" -| "bar" -| <span> -| <br> -| "baz<#selection-caret>" -| <span> -| "oo" -| "bar"
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-2.html b/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-2.html deleted file mode 100644 index a6eeb7c..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-2.html +++ /dev/null
@@ -1,25 +0,0 @@ -<!DOCTYPE html> -<html> -<body> -<div id="test" contenteditable="true"><span>foo</span>bar</div> - -<script src="../editing.js"></script> -<script src="../../resources/dump-as-markup.js"></script> -<script> -if (window.testRunner) - testRunner.dumpEditingCallbacks(); - -Markup.description('This tests the last paragraph in the pasted fragment is merged with the content after the insertion position\n' -+ '"baz" and "oobar" should be in the same paragraph below'); - -var s = window.getSelection(); -var e = document.getElementById("test"); - -e.focus(); -moveSelectionForwardByCharacterCommand(); -insertHTMLCommand("<div>bar</div>baz"); - -Markup.dump('test'); -</script> -</body> -</html>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-3-expected.txt b/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-3-expected.txt deleted file mode 100644 index 1c2ba9d..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-3-expected.txt +++ /dev/null
@@ -1,11 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -The last paragraph of the incoming fragment should be in the same paragraph as 'three'. -| "one " -| <div> -| "two<#selection-caret>three"
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-3.html b/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-3.html deleted file mode 100644 index a802379..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-3.html +++ /dev/null
@@ -1,28 +0,0 @@ -<!DOCTYPE html> -<html> -<body> -<div id="test" contenteditable="true">one three</div> - -<script src="../../resources/dump-as-markup.js"></script> -<script> -if (window.testRunner) - testRunner.dumpEditingCallbacks(); -if (window.internals) - internals.settings.setEditingBehavior("mac"); - -Markup.description("The last paragraph of the incoming fragment should be in the same paragraph as 'three'."); - -var s = window.getSelection(); -var e = document.getElementById("test"); - -s.collapse(e, 0); -s.modify("move", "forward", "word"); -s.modify("move", "forward", "character"); - -document.execCommand("InsertHTML", false , "<br class='Apple-interchange-newline'><div>two</div>"); - -Markup.dump('test'); - -</script> -</body> -</html>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-4-expected.txt b/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-4-expected.txt deleted file mode 100644 index afe4c2f..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-4-expected.txt +++ /dev/null
@@ -1,13 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -Tests for a case where paste's end merge was failing. You should see xfoo -bar -bazx. -| "xfoo" -| <div> -| "bar" -| "baz<#selection-caret>" -| "x"
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-4.html b/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-4.html deleted file mode 100644 index 1e42b13c..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-4.html +++ /dev/null
@@ -1,25 +0,0 @@ -<!DOCTYPE html> -<html> -<body> -<div id="test" contenteditable="true">xx</div> - -<script src="../editing.js"></script> -<script src="../../resources/dump-as-markup.js"></script> -<script> -if (window.testRunner) - testRunner.dumpEditingCallbacks(); - -Markup.description("Tests for a case where paste's end merge was failing. You should see xfoo\nbar\nbazx."); - -var e = document.getElementById("test"); -var s = window.getSelection(); - -s.collapse(e, 0); -moveSelectionForwardByCharacterCommand(); -insertHTMLCommand("<div>foo</div><div>bar</div>baz"); - -Markup.dump('test'); - -</script> -</body> -</html>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-5-expected.txt b/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-5-expected.txt deleted file mode 100644 index b2bd2f5e..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-5-expected.txt +++ /dev/null
@@ -1,13 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -Pasting a paragraph or less into a selection that spans multiple blocks should insert content into the block containing the start of the selection. -| <div> -| style="border: 1px solid red;" -| "This text should have a red border around<#selection-caret> it."
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-5.html b/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-5.html deleted file mode 100644 index a19cec2..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-5.html +++ /dev/null
@@ -1,31 +0,0 @@ -<!DOCTYPE html> -<html> -<body> -<div id="test" contenteditable="true"><div style="border: 1px solid red;">This x</div><div style="border: 1px solid blue;">x it.</div></div> - -<script src="../../resources/dump-as-markup.js"></script> -<script> -if (window.testRunner) - testRunner.dumpEditingCallbacks(); -if (window.internals) - internals.settings.setEditingBehavior("mac"); - -Markup.description('Pasting a paragraph or less into a selection that spans multiple blocks should insert content into the block containing the start of the selection.'); - -var s = window.getSelection(); -var e = document.getElementById("test"); - -s.collapse(e, 0); - -s.modify("move", "forward", "word"); -s.modify("move", "forward", "character"); -s.modify("extend", "forward", "word"); -s.modify("extend", "forward", "word"); - -document.execCommand("InsertHTML", false, "<div><div>text should have a red border around</div></div>"); - -Markup.dump('test'); - -</script> -</body> -</html>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-borders.html b/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-borders.html deleted file mode 100644 index 2d84fec..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-borders.html +++ /dev/null
@@ -1,25 +0,0 @@ -<script> -if (window.testRunner) - testRunner.dumpEditingCallbacks(); -</script> -<p>This is a test for the merge that paste does of the last paragraph of the incoming fragment with content after the end of the selection being pasted into. A fragment that ends in with paragraph surrounded by a blue border is pasted into a selection ending in a paragraph surrounded by a red border. The red border should win.</p><p><b>The second paragraph should be surrounded by a red border before and after the test.</b></p> - -<div id="test" contenteditable="true">First paragraph<div style="border: 1px solid red;">This text should be surrounded by a red border.</div></div> - -<script type="text/javascript" src="../editing.js"></script> -<script> -if (window.internals) - internals.settings.setEditingBehavior('mac'); -var s = window.getSelection(); -var e = document.getElementById("test"); - -s.collapse(e, 0); -// Move to the last word in the first paragraph -moveSelectionForwardByWordCommand(); -moveSelectionForwardByCharacterCommand(); -// Select from here to the end of the first word of the next paragraph. -extendSelectionForwardByWordCommand(); -extendSelectionForwardByWordCommand(); - -insertHTMLCommand("paragraph<div style='border: 1px solid blue;'>This</div>"); -</script>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-list-2-expected.txt b/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-list-2-expected.txt deleted file mode 100644 index b78af75..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-list-2-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -This tests pasting text ('foo\nbar') into a list item. The last bit of content in the incoming fragment should be merged with the paragraph after the position being pasted into. - -Before insertion: -| <ul> -| <li> -| <div> -| "Item 1" - -After insertion: -| <ul> -| <li> -| <div> -| "Item foo" -| <div> -| "bar<#selection-caret>" -| <li> -| <div> -| "1"
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-list-2.html b/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-list-2.html deleted file mode 100644 index 30613d2..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-list-2.html +++ /dev/null
@@ -1,23 +0,0 @@ -<!DOCTYPE html> -<html> -<body> -<p>This tests pasting text ('foo\nbar') into a list item. The last bit of content in the incoming fragment should be merged with the paragraph after the position being pasted into.</p> -<div id="test2" contenteditable="true"><ul><li><div>Item 1</div></li></ul></div> -<script src="../../resources/dump-as-markup.js"></script> -<script src="../editing.js"></script> -<script> -var e = document.getElementById("test2"); -var s = window.getSelection(); - -Markup.description(document.querySelector('p').textContent); -Markup.dump(e, 'Before insertion'); - -setSelectionCommand(e, 0, e, 0); -for (var i = 0; i < 5; ++i) - moveSelectionForwardByCharacterCommand(); -insertHTMLCommand("<div>foo</div><div>bar</div>"); - -Markup.dump(e, 'After insertion'); -</script> -</body> -</html>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-list-expected.txt b/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-list-expected.txt deleted file mode 100644 index a7dd631..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-list-expected.txt +++ /dev/null
@@ -1,17 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -This tests pasting a list ('Item 1') into a position that would normally result in an end merge. - -Before insertion: -| "xx" - -After insertion: -| "x" -| <ul> -| <li> -| <div> -| "Item 1<#selection-caret>" -| "x"
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-list.html b/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-list.html deleted file mode 100644 index 5da2ac7..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-list.html +++ /dev/null
@@ -1,25 +0,0 @@ -<!DOCTYPE html> -<html> -<body> -<p>This tests pasting a list ('Item 1') into a position that would normally result in an end merge.</p> -<div id="test1" contenteditable="true">xx</div> -<script src="../../resources/dump-as-markup.js"></script> -<script src="../editing.js"></script> -<script> -if (window.testRunner) - testRunner.dumpEditingCallbacks(); - -var e = document.getElementById("test1"); -var s = window.getSelection(); - -Markup.description(document.querySelector('p').textContent); -Markup.dump(e, 'Before insertion'); - -setSelectionCommand(e, 0, e, 0); -moveSelectionForwardByCharacterCommand(); -insertHTMLCommand("<ul><li><div>Item 1</div></li></ul>"); - -Markup.dump(e, 'After insertion'); -</script> -</body> -</html>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-table-2-expected.txt b/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-table-2-expected.txt deleted file mode 100644 index caf58bc..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-table-2-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -This tests pasting text into a table cell. The last bit of content in the incoming fragment should be merged with the paragraph after the position being pasted into. - -Before insertion: -| <tbody> -| <tr> -| <td> -| <div> -| id="test2" -| "Item 1" -| <td> -| "Item 2" - -After insertion: -| <tbody> -| <tr> -| <td> -| <div> -| id="test2" -| "Itemfoo" -| <div> -| id="test2" -| "bar<#selection-caret> 1" -| <td> -| "Item 2"
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-table-2.html b/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-table-2.html deleted file mode 100644 index e995364c..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-table-2.html +++ /dev/null
@@ -1,25 +0,0 @@ -<!DOCTYPE html> -<html> -<body> -<p>This tests pasting text into a table cell. The last bit of content in the incoming fragment should be merged with the paragraph after the position being pasted into.</p> -<div contenteditable="true"><table border='1'><tr><td><div id="test2">Item 1</div></td><td>Item 2</td></tr></table></div> -<script src="../../resources/dump-as-markup.js"></script> -<script src="../editing.js"></script> -<script> -if (window.testRunner) - testRunner.dumpEditingCallbacks(); - -var e = document.getElementById("test2"); -var s = window.getSelection(); - -Markup.description(document.querySelector('p').textContent); -Markup.dump(document.querySelector('table'), 'Before insertion'); - -setSelectionCommand(e, 0, e, 0); -moveSelectionForwardByWordCommand(); -insertHTMLCommand("<div>foo</div><div>bar</div>"); - -Markup.dump(document.querySelector('table'), 'After insertion'); -</script> -</body> -</html>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-table-expected.txt b/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-table-expected.txt deleted file mode 100644 index fcb004b..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-table-expected.txt +++ /dev/null
@@ -1,21 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -This tests pasting a table into a position that would normally result in an end merge. - -Before insertion: -| "xx" - -After insertion: -| "x" -| <table> -| border="1" -| <tbody> -| <tr> -| <td> -| "1" -| <td> -| "2<#selection-caret>" -| "x"
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-table.html b/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-table.html deleted file mode 100644 index 9f458cb..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/merge-end-table.html +++ /dev/null
@@ -1,25 +0,0 @@ -<!DOCTYPE html> -<html> -<body> -<p>This tests pasting a table into a position that would normally result in an end merge.</p> -<div id="test1" contenteditable="true">xx</div> -<script src="../../resources/dump-as-markup.js"></script> -<script src="../editing.js"></script> -<script> -if (window.testRunner) - testRunner.dumpEditingCallbacks(); - -var e = document.getElementById("test1"); -var s = window.getSelection(); - -Markup.description(document.querySelector('p').textContent); -Markup.dump(e, 'Before insertion'); - -setSelectionCommand(e, 0, e, 0); -moveSelectionForwardByCharacterCommand(); -insertHTMLCommand("<table border='1'><tr><td>1</td><td>2</td></tr></table>"); - -Markup.dump(e, 'After insertion'); -</script> -</body> -</html>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/paste-line-endings-006.html b/third_party/WebKit/LayoutTests/editing/pasteboard/paste-line-endings-006.html deleted file mode 100644 index 7483b6f2..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/paste-line-endings-006.html +++ /dev/null
@@ -1,64 +0,0 @@ -<html> -<head> - -<style> -.editing { - border: 2px solid red; - font-size: 24px; -} -.explanation { - border: 2px solid blue; - padding: 12px; - font-size: 24px; - margin-bottom: 24px; -} -.scenario { margin-bottom: 16px;} -.scenario:first-line { font-weight: bold; margin-bottom: 16px;} -.expected-results:first-line { font-weight: bold } -</style> -<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script> - -<script> - -function editingTest() { - for (i = 0; i < 8; i++) - moveSelectionForwardByCharacterCommand(); - for (i = 0; i < 2; i++) - extendSelectionForwardByCharacterCommand(); - copyCommand(); - pasteCommand(); -} - -</script> - -<title>Editing Test</title> -</head> -<body> - -<div class="explanation"> -<div class="scenario"> -Tests: -<br> -Fix for this bug: -<a href="rdar://problem/4045513"><rdar://problem/4045513></a> Copying and pasting selection starting at end of paragraph can incorrectly remove line break -</div> -<div class="expected-results"> -Expected Results: -<br> -Should see two lines of text below, self-documenting themselves as "line one" and "line two". The insertion point must -be after the first character ("l") of "line two". -</div> -</div> - -<div contenteditable id="root" style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space;"> -<div id="test" class="editing"> -line one<br>line two -</div> -</div> - -<script> -runEditingTest(); -</script> - -</body> -</html>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/paste-line-endings-007.html b/third_party/WebKit/LayoutTests/editing/pasteboard/paste-line-endings-007.html deleted file mode 100644 index f2bf3cd6..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/paste-line-endings-007.html +++ /dev/null
@@ -1,64 +0,0 @@ -<html> -<head> - -<style> -.editing { - border: 2px solid red; - font-size: 24px; -} -.explanation { - border: 2px solid blue; - padding: 12px; - font-size: 24px; - margin-bottom: 24px; -} -.scenario { margin-bottom: 16px;} -.scenario:first-line { font-weight: bold; margin-bottom: 16px;} -.expected-results:first-line { font-weight: bold } -</style> -<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script> - -<script> - -function editingTest() { - for (i = 0; i < 8; i++) - moveSelectionForwardByCharacterCommand(); - for (i = 0; i < 2; i++) - extendSelectionForwardByCharacterCommand(); - copyCommand(); - pasteCommand(); -} - -</script> - -<title>Editing Test</title> -</head> -<body> - -<div class="explanation"> -<div class="scenario"> -Tests: -<br> -Fix for this bug: -<a href="rdar://problem/4045513"><rdar://problem/4045513></a> Copying and pasting selection starting at end of paragraph can incorrectly remove line break -</div> -<div class="expected-results"> -Expected Results: -<br> -Should see two lines of text below, self-documenting themselves as "line one" and "line two". The insertion point must -be after the first character ("l") of "line two". -</div> -</div> - -<div contenteditable id="root" style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space;"> -<div id="test" class="editing"> -line one<div>line two</div> -</div> -</div> - -<script> -runEditingTest(); -</script> - -</body> -</html>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/paste-line-endings-008.html b/third_party/WebKit/LayoutTests/editing/pasteboard/paste-line-endings-008.html deleted file mode 100644 index 843f8e8..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/paste-line-endings-008.html +++ /dev/null
@@ -1,64 +0,0 @@ -<html> -<head> - -<style> -.editing { - border: 2px solid red; - font-size: 24px; -} -.explanation { - border: 2px solid blue; - padding: 12px; - font-size: 24px; - margin-bottom: 24px; -} -.scenario { margin-bottom: 16px;} -.scenario:first-line { font-weight: bold; margin-bottom: 16px;} -.expected-results:first-line { font-weight: bold } -</style> -<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script> - -<script> - -function editingTest() { - for (i = 0; i < 8; i++) - moveSelectionForwardByCharacterCommand(); - for (i = 0; i < 2; i++) - extendSelectionForwardByCharacterCommand(); - copyCommand(); - pasteCommand(); -} - -</script> - -<title>Editing Test</title> -</head> -<body> - -<div class="explanation"> -<div class="scenario"> -Tests: -<br> -Fix for this bug: -<a href="rdar://problem/4045513"><rdar://problem/4045513></a> Copying and pasting selection starting at end of paragraph can incorrectly remove line break -</div> -<div class="expected-results"> -Expected Results: -<br> -Should see two lines of text below, self-documenting themselves as "line one" and "line two". The insertion point must -be after the first character ("l") of "line two". -</div> -</div> - -<div contenteditable id="root" style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space;"> -<div id="test" class="editing"> -<div>line one</div><div>line two</div> -</div> -</div> - -<script> -runEditingTest(); -</script> - -</body> -</html>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/paste-line-endings-009.html b/third_party/WebKit/LayoutTests/editing/pasteboard/paste-line-endings-009.html deleted file mode 100644 index feb0242..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/paste-line-endings-009.html +++ /dev/null
@@ -1,64 +0,0 @@ -<html> -<head> - -<style> -.editing { - border: 2px solid red; - font-size: 24px; -} -.explanation { - border: 2px solid blue; - padding: 12px; - font-size: 24px; - margin-bottom: 24px; -} -.scenario { margin-bottom: 16px;} -.scenario:first-line { font-weight: bold; margin-bottom: 16px;} -.expected-results:first-line { font-weight: bold } -</style> -<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script> - -<script> - -function editingTest() { - for (i = 0; i < 8; i++) - moveSelectionForwardByCharacterCommand(); - for (i = 0; i < 2; i++) - extendSelectionForwardByCharacterCommand(); - copyCommand(); - pasteCommand(); -} - -</script> - -<title>Editing Test</title> -</head> -<body> - -<div class="explanation"> -<div class="scenario"> -Tests: -<br> -Fix for this bug: -<a href="rdar://problem/4045513"><rdar://problem/4045513></a> Copying and pasting selection starting at end of paragraph can incorrectly remove line break -</div> -<div class="expected-results"> -Expected Results: -<br> -Should see two lines of text below, self-documenting themselves as "line one" and "line two". The insertion point must -be after the first character ("l") of "line two". -</div> -</div> - -<div contenteditable id="root" style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space;"> -<div id="test" class="editing"> -<div>line one<div>line two</div></div> -</div> -</div> - -<script> -runEditingTest(); -</script> - -</body> -</html>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/paste-line-endings-010.html b/third_party/WebKit/LayoutTests/editing/pasteboard/paste-line-endings-010.html deleted file mode 100644 index cbaf20c..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/paste-line-endings-010.html +++ /dev/null
@@ -1,64 +0,0 @@ -<html> -<head> - -<style> -.editing { - border: 2px solid red; - font-size: 24px; -} -.explanation { - border: 2px solid blue; - padding: 12px; - font-size: 24px; - margin-bottom: 24px; -} -.scenario { margin-bottom: 16px;} -.scenario:first-line { font-weight: bold; margin-bottom: 16px;} -.expected-results:first-line { font-weight: bold } -</style> -<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script> - -<script> - -function editingTest() { - for (i = 0; i < 8; i++) - moveSelectionForwardByCharacterCommand(); - for (i = 0; i < 2; i++) - extendSelectionForwardByCharacterCommand(); - copyCommand(); - pasteCommand(); -} - -</script> - -<title>Editing Test</title> -</head> -<body> - -<div class="explanation"> -<div class="scenario"> -Tests: -<br> -Fix for this bug: -<a href="rdar://problem/4045513"><rdar://problem/4045513></a> Copying and pasting selection starting at end of paragraph can incorrectly remove line break -</div> -<div class="expected-results"> -Expected Results: -<br> -Should see two lines of text below, self-documenting themselves as "line one" and "line two". The insertion point must -be after the first character ("l") of "line two". -</div> -</div> - -<div contenteditable id="root" style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space;"> -<div id="test" class="editing"> -<div><div>line one</div>line two</div> -</div> -</div> - -<script> -runEditingTest(); -</script> - -</body> -</html>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/paste-match-style-001.html b/third_party/WebKit/LayoutTests/editing/pasteboard/paste-match-style-001.html deleted file mode 100644 index acd5178..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/paste-match-style-001.html +++ /dev/null
@@ -1,63 +0,0 @@ -<html> -<head> - -<style> -.editing { - border: 2px solid red; - font-size: 24px; -} -.explanation { - border: 2px solid blue; - padding: 12px; - font-size: 24px; - margin-bottom: 24px; -} -.scenario { margin-bottom: 16px;} -.scenario:first-line { font-weight: bold; margin-bottom: 16px;} -.expected-results:first-line { font-weight: bold } -</style> -<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script> - -<script> - -function editingTest() { - extendSelectionForwardByLineCommand(); - cutCommand(); - boldCommand(); - typeCharacterCommand("a") - pasteAndMatchStyleCommand(); -} - -</script> - -<title>Editing Test</title> -</head> -<body> - -<div class="explanation"> -<div class="scenario"> -Tests: -<br> -Pasting and matching style. -</div> -<div class="expected-results"> -Expected Results: -<br> -The pasted letter should match the style of the preexisting bold letter. Should see this content in the red box below: -<BR> -<b>ab</b> -</div> -</div> - -<div contenteditable id="root" style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space;"> -<div id="test" class="editing"> -b -</div> -</div> - -<script> -runEditingTest(); -</script> - -</body> -</html>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/paste-match-style-002.html b/third_party/WebKit/LayoutTests/editing/pasteboard/paste-match-style-002.html deleted file mode 100644 index f4b27cd..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/paste-match-style-002.html +++ /dev/null
@@ -1,62 +0,0 @@ -<html> -<head> - -<style> -.editing { - border: 2px solid red; - font-size: 24px; -} -.explanation { - border: 2px solid blue; - padding: 12px; - font-size: 24px; - margin-bottom: 24px; -} -.scenario { margin-bottom: 16px;} -.scenario:first-line { font-weight: bold; margin-bottom: 16px;} -.expected-results:first-line { font-weight: bold } -</style> -<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script> - -<script> - -function editingTest() { - extendSelectionForwardByLineCommand(); - cutCommand(); - boldCommand(); - pasteAndMatchStyleCommand(); -} - -</script> - -<title>Editing Test</title> -</head> -<body> - -<div class="explanation"> -<div class="scenario"> -Tests: -<br> -Pasting and matching style when there is nothing typed, but the typing style is set to bold. This test was created after fixing <A HREF="rdar://problem/3976872">3976872</A>. -</div> -<div class="expected-results"> -Expected Results: -<br> -The pasted word should match the current typing style. In this case, the typing style is set to bold. Should see this content in the red box below: -<BR> -<b>hello</b> -</div> -</div> - -<div contenteditable id="root" style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space;"> -<div id="test" class="editing"> -hello -</div> -</div> - -<script> -runEditingTest(); -</script> - -</body> -</html>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/paste-table-003-expected.txt b/third_party/WebKit/LayoutTests/editing/pasteboard/paste-table-003-expected.txt deleted file mode 100644 index 6f110514..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/paste-table-003-expected.txt +++ /dev/null
@@ -1,13 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -This tests pasting a table to replace some text. It demonstrates two bugs: 1) selecting a table without also selecting the line break after programmatically is impossible when its followed by a div because of the way DOM positions are mapped to visible positions, 2) pasting content that ends in a table places the caret in the last table cell instead of after the table, so the interchange newline is placed in the last table cell and not after the table. - -one two -one two - -execCopyCommand: <table id="test"> <tbody><tr><td>one</td><td>two</td></tr></tbody></table> <div id="target">replaceme</div> -execPasteCommand: <table id="test"> <tbody><tr><td>one</td><td>two</td></tr></tbody></table> <div id="target"><table id="test"><tbody><tr><td>one</td><td>two<br><br></td></tr></tbody></table></div>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/paste-table-003.html b/third_party/WebKit/LayoutTests/editing/pasteboard/paste-table-003.html index 38233ab..aabf899 100644 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/paste-table-003.html +++ b/third_party/WebKit/LayoutTests/editing/pasteboard/paste-table-003.html
@@ -1,48 +1,34 @@ -<html> -<head> - -<style> -.editing { - border: 2px solid red; - font-size: 24px; -} -.explanation { - border: 2px solid blue; - padding: 12px; - font-size: 24px; - margin-bottom: 24px; -} -.scenario { margin-bottom: 16px;} -.scenario:first-line { font-weight: bold; margin-bottom: 16px;} -.expected-results:first-line { font-weight: bold } -</style> -<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script> - +<!doctype html> +<script src="../../resources/testharness.js"></script> +<script src="../../resources/testharnessreport.js"></script> +<script src="../assert_selection.js"></script> <script> -function editingTest() { - var t = document.getElementById("test"); - setSelectionCommand(t, 0, t, t.childNodes.length); - copyCommand(); - - var e = document.getElementById("target"); - setSelectionCommand(e, 0, e, 1); - pasteCommand(); -} +test(() => { + assert_not_equals(window.internals, undefined, + 'This test requires window.internals to access clipboard'); + assert_selection( + [ + '<div contenteditable>', + '^<table><tbody><tr><td>one</td><td>two</td></tr></tbody></table>|', + '<div id="target">replaceme</div>', + '</div>', + ].join(''), + selection => { + selection.document.execCommand('copy'); + const target = selection.document.getElementById('target'); + selection.collapse(target, 0); + selection.extend(target, 1); + selection.document.execCommand('paste'); + }, + [ + '<div contenteditable>', + '<table><tbody><tr><td>one</td><td>two</td></tr></tbody></table>', + '<div id="target">', + '<table><tbody><tr><td>one</td><td>two<br>|<br></td></tr></tbody></table>', + '</div>', + '</div>', + ].join(''), + 'Paste TABLE to replace text'); +}, 'Paste TABLE'); </script> - -<title>Editing Test</title> -</head> -<body> -<p>This tests pasting a table to replace some text. <b>It demonstrates two bugs: 1) selecting a table without also selecting the line break after programmatically is impossible when its followed by a div because of the way DOM positions are mapped to visible positions, 2) pasting content that ends in a table places the caret in the last table cell instead of after the table, so the interchange newline is placed in the last table cell and not after the table.</b></p> -<div id="root" contenteditable> -<table id="test"> -<tbody><tr><td>one</td><td>two</td></tr></tbody></table> -<div id="target">replaceme</div> -</div> -<script> -runDumpAsTextEditingTest(true); -</script> - -</body> -</html>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/paste-text-018-expected.txt b/third_party/WebKit/LayoutTests/editing/pasteboard/paste-text-018-expected.txt deleted file mode 100644 index cfdd7b3..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/paste-text-018-expected.txt +++ /dev/null
@@ -1,53 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification - - -Tests: - -Fix for this bug: -<rdar://problem/4039676> REGRESSION (Mail): in reply, on pasted text (without trailing newline) is eaten when pasted above date - - -Expected Results: - -Should see two lines of text below, self-documenting themselves as "line one" and "line two". - - - -After copy: -| " -" -| <div> -| class="editing" -| id="test" -| <#selection-caret> -| <br> -| "line two -" -| " -" - -After paste: -| " -" -| <div> -| class="editing" -| id="test" -| "line one<#selection-caret>" -| <br> -| "line two -" -| " -"
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/paste-text-018.html b/third_party/WebKit/LayoutTests/editing/pasteboard/paste-text-018.html deleted file mode 100644 index 221eb108..0000000 --- a/third_party/WebKit/LayoutTests/editing/pasteboard/paste-text-018.html +++ /dev/null
@@ -1,58 +0,0 @@ -<html> -<head> -<style> -.editing { - border: 2px solid red; - font-size: 24px; -} -.explanation { - border: 2px solid blue; - padding: 12px; - font-size: 24px; - margin-bottom: 24px; -} -.scenario { margin-bottom: 16px;} -.scenario:first-line { font-weight: bold; margin-bottom: 16px;} -.expected-results:first-line { font-weight: bold } -</style> -<script src="../editing.js"></script> -<script src="../../resources/dump-as-markup.js"></script> -<title>Editing Test</title> -</head> -<body> -<div class="explanation"> -<div class="scenario"> -Tests: -<br> -Fix for this bug: -<a href="rdar://problem/4039676"><rdar://problem/4039676></a> REGRESSION (Mail): in reply, <cr> on pasted text (without trailing newline) is eaten when pasted above date -</div> -<div class="expected-results"> -Expected Results: -<br> -Should see two lines of text below, self-documenting themselves as "line one" and "line two". -</div> -</div> - -<div contenteditable id="root" style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space;"> -<div id="test" class="editing"> -line one<br>line two -</div> -</div> -<script> - -Markup.description(document.getElementsByClassName('explanation')[0].textContent); - -function editingTest() { - for (i = 0; i < 8; i++) - extendSelectionForwardByCharacterCommand(); - cutCommand(); - Markup.dump('root', 'After copy'); - pasteCommand(); - Markup.dump('root', 'After paste'); -} - -runEditingTest(); -</script> -</body> -</html>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/paste_before_placeholder.html b/third_party/WebKit/LayoutTests/editing/pasteboard/paste_before_placeholder.html new file mode 100644 index 0000000..dbbe72b0 --- /dev/null +++ b/third_party/WebKit/LayoutTests/editing/pasteboard/paste_before_placeholder.html
@@ -0,0 +1,19 @@ +<!doctype html> +<script src="../../resources/testharness.js"></script> +<script src="../../resources/testharnessreport.js"></script> +<script src="../assert_selection.js"></script> +<script> +test(() => { + assert_not_equals(window.internals, undefined, + 'This test requires window.internals to access clipboard'); + + assert_selection( + '<div contenteditable>^one|<br>two</div>', + selection => { + selection.document.execCommand('cut'); + selection.document.execCommand('paste'); + }, + '<div contenteditable>one|<br>two</div>', + 'Paste before placeholder'); +}); +</script>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/paste_line_endings.html b/third_party/WebKit/LayoutTests/editing/pasteboard/paste_line_endings.html new file mode 100644 index 0000000..d2c1e8c --- /dev/null +++ b/third_party/WebKit/LayoutTests/editing/pasteboard/paste_line_endings.html
@@ -0,0 +1,97 @@ +<!doctype html> +<script src="../../resources/testharness.js"></script> +<script src="../../resources/testharnessreport.js"></script> +<script src="../assert_selection.js"></script> +<script> +test(() => { + assert_not_equals(window.internals, undefined, + 'This test requires window.internals to access clipboard'); + + // TODO(yosin): We should consoliate "paste-line-endings-00[1-5].html" here. + + assert_selection( + [ + '<div contenteditable>', + '<div>line one^<br>l|ine two</div>', + '</div>', + ].join(''), + selection => { + selection.document.execCommand('copy'); + selection.document.execCommand('paste'); + }, + [ + '<div contenteditable>', + '<div>line one<br>l|ine two</div>', + '</div>', + ].join(''), + '6 Paste with BR'); + + assert_selection( + [ + '<div contenteditable>', + 'line one^<div>l|ine two</div>', + '</div>', + ].join(''), + selection => { + selection.document.execCommand('copy'); + selection.document.execCommand('paste'); + }, + [ + '<div contenteditable>', + 'line one<div>l|ine two</div>', + '</div>', + ].join(''), + '7 Paste with DIV'); + + assert_selection( + [ + '<div contenteditable>', + '<div>line one^</div><div>l|ine two</div>', + '</div>', + ].join(''), + selection => { + selection.document.execCommand('copy'); + selection.document.execCommand('paste'); + }, + [ + '<div contenteditable>', + '<div>line one</div><div>l|ine two</div>', + '</div>', + ].join(''), + '8 Paste into crossing DIV'); + + assert_selection( + [ + '<div contenteditable>', + '<div>line one^<div>l|ine two</div></div>', + '</div>', + ].join(''), + selection => { + selection.document.execCommand('copy'); + selection.document.execCommand('paste'); + }, + [ + '<div contenteditable>', + 'line one<br><div>l|ine two<br></div>', + '</div>', + ].join(''), + '9 Paste into nested DIV'); + + assert_selection( + [ + '<div contenteditable>', + '<div><div>line one^</div>l|ine two</div>', + '</div>', + ].join(''), + selection => { + selection.document.execCommand('copy'); + selection.document.execCommand('paste'); + }, + [ + '<div contenteditable>', + '<div><div>line one</div>l|ine two</div>', + '</div>', + ].join(''), + '10 Paste inside DIV'); +}, 'Copying and pasting selection starting at end of paragraph'); +</script>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/paste_match_style.html b/third_party/WebKit/LayoutTests/editing/pasteboard/paste_match_style.html new file mode 100644 index 0000000..4677992d --- /dev/null +++ b/third_party/WebKit/LayoutTests/editing/pasteboard/paste_match_style.html
@@ -0,0 +1,31 @@ +<!doctype html> +<script src="../../resources/testharness.js"></script> +<script src="../../resources/testharnessreport.js"></script> +<script src="../assert_selection.js"></script> +<script> +test(() => { + assert_not_equals(window.internals, undefined, + 'This test requires window.internals to access clipboard'); + + assert_selection( + '<div contenteditable>^b|</div>', + selection => { + selection.document.execCommand('cut'); + selection.document.execCommand('bold'); + selection.document.execCommand('insertText', false, 'a'); + selection.document.execCommand('pasteAndMatchStyle'); + }, + '<div contenteditable><b>ab|</b></div>', + 'Paste a letter into B'); + + assert_selection( + '<div contenteditable>^abc|</div>', + selection => { + selection.document.execCommand('cut'); + selection.document.execCommand('bold'); + selection.document.execCommand('pasteAndMatchStyle'); + }, + '<div contenteditable><b>abc|</b></div>', + 'Paste a word into B'); +}, 'Pasting and matching style when there is nothing typed, but the typing style is set to bold.'); +</script>
diff --git a/third_party/WebKit/LayoutTests/editing/pasteboard/paste_with_spaces.html b/third_party/WebKit/LayoutTests/editing/pasteboard/paste_with_spaces.html new file mode 100644 index 0000000..d8c3643 --- /dev/null +++ b/third_party/WebKit/LayoutTests/editing/pasteboard/paste_with_spaces.html
@@ -0,0 +1,53 @@ +<!doctype html> +<script src="../../resources/testharness.js"></script> +<script src="../../resources/testharnessreport.js"></script> +<script src="../assert_selection.js"></script> +<script> +function cutAndPaste(selection) +{ + selection.document.execCommand('copy'); + selection.document.execCommand('delete'); + selection.document.execCommand('pasteAndMatchStyle'); +} + +test(() => { + assert_not_equals(window.internals, undefined, + 'This test requires window.internals to access clipboard'); + + assert_selection( + '<div contenteditable>.^ foo|</div>', + cutAndPaste, + '<div contenteditable>.\u{00A0}foo|</div>', + 'Paste with leading space.'); + + assert_selection( + '<div contenteditable>^foo |.</div>', + cutAndPaste, + '<div contenteditable>foo\u{00A0}|.</div>', + 'Paste with trailing space.'); + + assert_selection( + '<div contenteditable>|x y^</div>', + cutAndPaste, + '<div contenteditable>x y|</div>', + 'One space'); + + assert_selection( + '<div contenteditable>|x \u{00A0}y^</div>', + cutAndPaste, + '<div contenteditable>x \u{00A0}y|</div>', + 'Two spaces'); + + assert_selection( + '<div contenteditable>|x \u{00A0} y^</div>', + cutAndPaste, + '<div contenteditable>x \u{00A0} y|</div>', + 'Three spaces'); + + assert_selection( + '<div contenteditable>|x \u{00A0} \u{00A0}y^</div>', + cutAndPaste, + '<div contenteditable>x \u{00A0} \u{00A0}y|</div>', + 'Four spaces'); +}, 'paste with spaces:'); +</script>
diff --git a/third_party/WebKit/LayoutTests/http/tests/htmlimports/cors-same-origin-expected.txt b/third_party/WebKit/LayoutTests/http/tests/htmlimports/cors-same-origin-expected.txt index c747fa2..bc7f9468 100644 --- a/third_party/WebKit/LayoutTests/http/tests/htmlimports/cors-same-origin-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/htmlimports/cors-same-origin-expected.txt
@@ -1,4 +1,4 @@ -CONSOLE ERROR: Access to Imported resource at 'http://localhost:8080/htmlimports/resources/resources/hello.html?1' from origin 'http://localhost:8080' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. The response had HTTP status code 404. +CONSOLE ERROR: Access to Imported resource at 'http://localhost:8080/htmlimports/resources/resources/hello.html?1' from origin 'http://127.0.0.1:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. The response had HTTP status code 404. PASS basic.import.querySelector('h1').innerHTML is "Hello, CORS!" PASS nested.import.querySelector('#sameOriginNoCors').import is null PASS nested.import.querySelector('#sameOriginCors').import.querySelector('h1').innerHTML is "Hello, CORS!"
diff --git a/third_party/WebKit/LayoutTests/http/tests/htmlimports/cross-origin-expected.txt b/third_party/WebKit/LayoutTests/http/tests/htmlimports/cross-origin-expected.txt index 9e192b0..67255ef 100644 --- a/third_party/WebKit/LayoutTests/http/tests/htmlimports/cross-origin-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/htmlimports/cross-origin-expected.txt
@@ -1,4 +1,4 @@ -CONSOLE ERROR: Access to Imported resource at 'http://localhost:8080/htmlimports/resources/hello.html' from origin 'http://localhost:8080' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. +CONSOLE ERROR: Access to Imported resource at 'http://localhost:8080/htmlimports/resources/hello.html' from origin 'http://127.0.0.1:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. PASS target.import is null PASS successfullyParsed is true
diff --git a/third_party/WebKit/LayoutTests/http/tests/htmlimports/import-script-block-crossorigin-dynamic-expected.txt b/third_party/WebKit/LayoutTests/http/tests/htmlimports/import-script-block-crossorigin-dynamic-expected.txt index 740a676..ede990a 100644 --- a/third_party/WebKit/LayoutTests/http/tests/htmlimports/import-script-block-crossorigin-dynamic-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/htmlimports/import-script-block-crossorigin-dynamic-expected.txt
@@ -1,5 +1,5 @@ -CONSOLE ERROR: Access to Script at 'http://127.0.0.1:8000/htmlimports/resources/external-script.js' from origin 'http://127.0.0.1:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://localhost:8000' is therefore not allowed access. -CONSOLE ERROR: Access to Script at 'http://127.0.0.1:8000/htmlimports/resources/cors-js.cgi' from origin 'http://127.0.0.1:8000' has been blocked by CORS policy: The 'Access-Control-Allow-Origin' header has a value 'http://127.0.0.1:8000' that is not equal to the supplied origin. Origin 'http://localhost:8000' is therefore not allowed access. +CONSOLE ERROR: Access to Script at 'http://127.0.0.1:8000/htmlimports/resources/external-script.js' from origin 'http://localhost:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://localhost:8000' is therefore not allowed access. +CONSOLE ERROR: Access to Script at 'http://127.0.0.1:8000/htmlimports/resources/cors-js.cgi' from origin 'http://localhost:8000' has been blocked by CORS policy: The 'Access-Control-Allow-Origin' header has a value 'http://127.0.0.1:8000' that is not equal to the supplied origin. Origin 'http://localhost:8000' is therefore not allowed access. This test ensures that crossorigin-marked script elements are blocked properly On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/img-crossorigin-no-credentials-prompt-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/img-crossorigin-no-credentials-prompt-expected.txt index e1c0766..52bf82e 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/img-crossorigin-no-credentials-prompt-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/security/img-crossorigin-no-credentials-prompt-expected.txt
@@ -1,5 +1,5 @@ -CONSOLE ERROR: Access to Image at 'http://localhost:8000/security/resources/img-basic-auth.php?uid=41532' from origin 'http://localhost:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. The response had HTTP status code 401. -CONSOLE ERROR: Access to Image at 'http://localhost:8000/security/resources/img-basic-auth.php?uid=41533' from origin 'http://localhost:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. The response had HTTP status code 401. +CONSOLE ERROR: Access to Image at 'http://localhost:8000/security/resources/img-basic-auth.php?uid=41532' from origin 'http://127.0.0.1:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. The response had HTTP status code 401. +CONSOLE ERROR: Access to Image at 'http://localhost:8000/security/resources/img-basic-auth.php?uid=41533' from origin 'http://127.0.0.1:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. The response had HTTP status code 401. No credentials should be prompted for on seeing a 401 for <img crossorigin>. PASS Non-CORS image resource failed to load
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/img-crossorigin-redirect-anonymous-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/img-crossorigin-redirect-anonymous-expected.txt index b61faf9..6a8564c0 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/img-crossorigin-redirect-anonymous-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/security/img-crossorigin-redirect-anonymous-expected.txt
@@ -1,4 +1,4 @@ -CONSOLE ERROR: Access to Image at 'http://localhost:8000/security/resources/abe.png' from origin 'http://localhost:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. +CONSOLE ERROR: Access to Image at 'http://localhost:8000/security/resources/abe.png' from origin 'http://127.0.0.1:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. CONSOLE ERROR: Redirect from 'http://localhost:8000/security/resources/cors-redirect.php?mode=anonymous&url=http://localhost:8000/security/resources/abe-allow-credentials.php' has been blocked by CORS policy: A wildcard '*' cannot be used in the 'Access-Control-Allow-Origin' header when the credentials flag is true. Origin 'http://127.0.0.1:8000' is therefore not allowed access. CONSOLE ERROR: Redirect from 'http://localhost:8000/security/resources/cors-redirect.php?mode=anonymous&url=http://127.0.0.1:8000/security/resources/abe-allow-credentials.php' has been blocked by CORS policy: A wildcard '*' cannot be used in the 'Access-Control-Allow-Origin' header when the credentials flag is true. Origin 'http://127.0.0.1:8000' is therefore not allowed access. Testing the handling of CORS-enabled fetch in the presence of 'anonymous' redirects.
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/img-crossorigin-redirect-credentials-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/img-crossorigin-redirect-credentials-expected.txt index a8b66c3..d408427 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/img-crossorigin-redirect-credentials-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/security/img-crossorigin-redirect-credentials-expected.txt
@@ -1,7 +1,7 @@ -CONSOLE ERROR: Access to Image at 'http://localhost:8000/security/resources/abe.png' from origin 'http://localhost:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. -CONSOLE ERROR: Access to Image at 'http://127.0.0.1:8080/security/resources/abe-allow-credentials.php' from origin 'http://127.0.0.1:8080' has been blocked by CORS policy: The 'Access-Control-Allow-Origin' header has a value 'http://127.0.0.1:8000' that is not equal to the supplied origin. Origin 'null' is therefore not allowed access. -CONSOLE ERROR: Access to Image at 'http://localhost:8000/security/resources/abe-allow-star.php' from origin 'http://localhost:8000' has been blocked by CORS policy: A wildcard '*' cannot be used in the 'Access-Control-Allow-Origin' header when the credentials flag is true. Origin 'http://127.0.0.1:8000' is therefore not allowed access. -CONSOLE ERROR: Access to Image at 'http://127.0.0.1:8000/security/resources/abe-allow-star.php' from origin 'http://127.0.0.1:8000' has been blocked by CORS policy: A wildcard '*' cannot be used in the 'Access-Control-Allow-Origin' header when the credentials flag is true. Origin 'null' is therefore not allowed access. +CONSOLE ERROR: Access to Image at 'http://localhost:8000/security/resources/abe.png' from origin 'http://127.0.0.1:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. +CONSOLE ERROR: Access to Image at 'http://127.0.0.1:8080/security/resources/abe-allow-credentials.php' from origin 'null' has been blocked by CORS policy: The 'Access-Control-Allow-Origin' header has a value 'http://127.0.0.1:8000' that is not equal to the supplied origin. Origin 'null' is therefore not allowed access. +CONSOLE ERROR: Access to Image at 'http://localhost:8000/security/resources/abe-allow-star.php' from origin 'http://127.0.0.1:8000' has been blocked by CORS policy: A wildcard '*' cannot be used in the 'Access-Control-Allow-Origin' header when the credentials flag is true. Origin 'http://127.0.0.1:8000' is therefore not allowed access. +CONSOLE ERROR: Access to Image at 'http://127.0.0.1:8000/security/resources/abe-allow-star.php' from origin 'null' has been blocked by CORS policy: A wildcard '*' cannot be used in the 'Access-Control-Allow-Origin' header when the credentials flag is true. Origin 'null' is therefore not allowed access. Testing the handling of CORS-enabled fetch in the presence of 'credentialled' redirects. On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/img-with-failed-cors-check-fails-to-load-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/img-with-failed-cors-check-fails-to-load-expected.txt index b37763db..deb333d 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/img-with-failed-cors-check-fails-to-load-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/security/img-with-failed-cors-check-fails-to-load-expected.txt
@@ -1,3 +1,3 @@ -CONSOLE ERROR: Access to Image at 'http://localhost:8080/security/resources/red200x100.png' from origin 'http://localhost:8080' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. +CONSOLE ERROR: Access to Image at 'http://localhost:8080/security/resources/red200x100.png' from origin 'http://127.0.0.1:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. ALERT: PASS: The error event was called. This test passes if the image below does not load.
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/link-crossorigin-stylesheet-reinserted-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/link-crossorigin-stylesheet-reinserted-expected.txt index 0367e1e..2de567d 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/link-crossorigin-stylesheet-reinserted-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/security/link-crossorigin-stylesheet-reinserted-expected.txt
@@ -1,4 +1,4 @@ -CONSOLE ERROR: Access to CSS stylesheet at 'http://127.0.0.1:8080/resources/slow-script.pl?delay=100' from origin 'http://127.0.0.1:8080' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. +CONSOLE ERROR: Access to CSS stylesheet at 'http://127.0.0.1:8080/resources/slow-script.pl?delay=100' from origin 'http://127.0.0.1:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. Test that re-inserting a CORS-loading stylesheet is correctly handled. On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/link-crossorigin-stylesheet-use-credentials-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/link-crossorigin-stylesheet-use-credentials-expected.txt index 9a2d07f..1ef5e84 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/link-crossorigin-stylesheet-use-credentials-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/security/link-crossorigin-stylesheet-use-credentials-expected.txt
@@ -1,5 +1,5 @@ -CONSOLE ERROR: Access to CSS stylesheet at 'http://localhost:8080/security/resources/green-background-allow-star.php?1' from origin 'http://localhost:8080' has been blocked by CORS policy: A wildcard '*' cannot be used in the 'Access-Control-Allow-Origin' header when the credentials flag is true. Origin 'http://127.0.0.1:8000' is therefore not allowed access. -CONSOLE ERROR: Access to CSS stylesheet at 'http://localhost:8080/security/resources/green-background-allow-star.php?2' from origin 'http://localhost:8080' has been blocked by CORS policy: A wildcard '*' cannot be used in the 'Access-Control-Allow-Origin' header when the credentials flag is true. Origin 'http://127.0.0.1:8000' is therefore not allowed access. +CONSOLE ERROR: Access to CSS stylesheet at 'http://localhost:8080/security/resources/green-background-allow-star.php?1' from origin 'http://127.0.0.1:8000' has been blocked by CORS policy: A wildcard '*' cannot be used in the 'Access-Control-Allow-Origin' header when the credentials flag is true. Origin 'http://127.0.0.1:8000' is therefore not allowed access. +CONSOLE ERROR: Access to CSS stylesheet at 'http://localhost:8080/security/resources/green-background-allow-star.php?2' from origin 'http://127.0.0.1:8000' has been blocked by CORS policy: A wildcard '*' cannot be used in the 'Access-Control-Allow-Origin' header when the credentials flag is true. Origin 'http://127.0.0.1:8000' is therefore not allowed access. Test that a linked stylesheet with a crossorigin=use-credentials attributes loads expected CORS enabled resources. On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/preload-script-crossorigin-fails-cross-origin-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/preload-script-crossorigin-fails-cross-origin-expected.txt index 8bcaa00..82aa13a5 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/preload-script-crossorigin-fails-cross-origin-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/security/preload-script-crossorigin-fails-cross-origin-expected.txt
@@ -1,4 +1,4 @@ -CONSOLE ERROR: Access to Script at 'http://localhost:8000/security/resources/cors-script.php?delay=100&cors=false&value=FAIL' from origin 'http://localhost:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. +CONSOLE ERROR: Access to Script at 'http://localhost:8000/security/resources/cors-script.php?delay=100&cors=false&value=FAIL' from origin 'http://127.0.0.1:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. Preload of script with CORS failure only shows one error On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/script-crossorigin-fails-cross-origin-2-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/script-crossorigin-fails-cross-origin-2-expected.txt index c48c71d..f189924a 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/script-crossorigin-fails-cross-origin-2-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/security/script-crossorigin-fails-cross-origin-2-expected.txt
@@ -1,4 +1,4 @@ -CONSOLE ERROR: Access to Script at 'http://localhost:8000/security/resources/cors-script.php?cors=false&value=FAIL' from origin 'http://localhost:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. +CONSOLE ERROR: Access to Script at 'http://localhost:8000/security/resources/cors-script.php?cors=false&value=FAIL' from origin 'http://127.0.0.1:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. In an XHTML document, test that a script element with a crossorigin attribute does not load a cross-origin script when the resource sharing check fails on the response. PASS
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/script-crossorigin-fails-cross-origin-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/script-crossorigin-fails-cross-origin-expected.txt index 5793b13..a564194 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/script-crossorigin-fails-cross-origin-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/security/script-crossorigin-fails-cross-origin-expected.txt
@@ -1,4 +1,4 @@ -CONSOLE ERROR: Access to Script at 'http://localhost:8000/security/resources/cors-script.php?cors=false&value=FAIL' from origin 'http://localhost:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. +CONSOLE ERROR: Access to Script at 'http://localhost:8000/security/resources/cors-script.php?cors=false&value=FAIL' from origin 'http://127.0.0.1:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. Test that a script element with a crossorigin attribute does not load a cross-origin script when the resource sharing check fails on the response. PASS
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/script-crossorigin-loads-correctly-credentials-2-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/script-crossorigin-loads-correctly-credentials-2-expected.txt index b6b1747f0..1170d344 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/script-crossorigin-loads-correctly-credentials-2-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/security/script-crossorigin-loads-correctly-credentials-2-expected.txt
@@ -1,4 +1,4 @@ -CONSOLE ERROR: Access to Script at 'http://localhost:8000/security/resources/cors-script.php?cors=false&credentials=true&value=FAIL' from origin 'http://localhost:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. +CONSOLE ERROR: Access to Script at 'http://localhost:8000/security/resources/cors-script.php?cors=false&credentials=true&value=FAIL' from origin 'http://127.0.0.1:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. This test passes if the inserted script fails to load due to CORS. PASS (expected error reported)
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/script-crossorigin-redirect-anonymous-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/script-crossorigin-redirect-anonymous-expected.txt index 6d71bb5..12a3706 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/script-crossorigin-redirect-anonymous-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/security/script-crossorigin-redirect-anonymous-expected.txt
@@ -1,4 +1,4 @@ -CONSOLE ERROR: Access to Script at 'http://localhost:8000/security/resources/localScript.js' from origin 'http://localhost:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. +CONSOLE ERROR: Access to Script at 'http://localhost:8000/security/resources/localScript.js' from origin 'http://127.0.0.1:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. CONSOLE ERROR: Redirect from 'http://localhost:8000/security/resources/cors-redirect.php?mode=anonymous&url=http://localhost:8000/security/resources/script-allow-credentials.php' has been blocked by CORS policy: A wildcard '*' cannot be used in the 'Access-Control-Allow-Origin' header when the credentials flag is true. Origin 'http://127.0.0.1:8000' is therefore not allowed access. CONSOLE ERROR: Redirect from 'http://localhost:8000/security/resources/cors-redirect.php?mode=anonymous&url=http://127.0.0.1:8000/security/resources/script-allow-credentials.php' has been blocked by CORS policy: A wildcard '*' cannot be used in the 'Access-Control-Allow-Origin' header when the credentials flag is true. Origin 'http://127.0.0.1:8000' is therefore not allowed access. Testing the handling of CORS-enabled script fetch in the presence of 'anonymous' redirects.
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/script-crossorigin-redirect-credentials-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/script-crossorigin-redirect-credentials-expected.txt index 4811450d..9ad8121 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/script-crossorigin-redirect-credentials-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/security/script-crossorigin-redirect-credentials-expected.txt
@@ -1,7 +1,7 @@ -CONSOLE ERROR: Access to Script at 'http://localhost:8000/security/resources/localScript.js' from origin 'http://localhost:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. -CONSOLE ERROR: Access to Script at 'http://127.0.0.1:8000/security/resources/script-allow-credentials.php' from origin 'http://127.0.0.1:8000' has been blocked by CORS policy: The 'Access-Control-Allow-Origin' header has a value 'http://127.0.0.1:8000' that is not equal to the supplied origin. Origin 'null' is therefore not allowed access. -CONSOLE ERROR: Access to Script at 'http://localhost:8000/security/resources/script-allow-star.php' from origin 'http://localhost:8000' has been blocked by CORS policy: A wildcard '*' cannot be used in the 'Access-Control-Allow-Origin' header when the credentials flag is true. Origin 'http://127.0.0.1:8000' is therefore not allowed access. -CONSOLE ERROR: Access to Script at 'http://127.0.0.1:8000/security/resources/script-allow-star.php' from origin 'http://127.0.0.1:8000' has been blocked by CORS policy: A wildcard '*' cannot be used in the 'Access-Control-Allow-Origin' header when the credentials flag is true. Origin 'null' is therefore not allowed access. +CONSOLE ERROR: Access to Script at 'http://localhost:8000/security/resources/localScript.js' from origin 'http://127.0.0.1:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. +CONSOLE ERROR: Access to Script at 'http://127.0.0.1:8000/security/resources/script-allow-credentials.php' from origin 'null' has been blocked by CORS policy: The 'Access-Control-Allow-Origin' header has a value 'http://127.0.0.1:8000' that is not equal to the supplied origin. Origin 'null' is therefore not allowed access. +CONSOLE ERROR: Access to Script at 'http://localhost:8000/security/resources/script-allow-star.php' from origin 'http://127.0.0.1:8000' has been blocked by CORS policy: A wildcard '*' cannot be used in the 'Access-Control-Allow-Origin' header when the credentials flag is true. Origin 'http://127.0.0.1:8000' is therefore not allowed access. +CONSOLE ERROR: Access to Script at 'http://127.0.0.1:8000/security/resources/script-allow-star.php' from origin 'null' has been blocked by CORS policy: A wildcard '*' cannot be used in the 'Access-Control-Allow-Origin' header when the credentials flag is true. Origin 'null' is therefore not allowed access. Testing the handling of CORS-enabled script fetch in the presence of 'credentialled' redirects. On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/script-onerror-crossorigin-no-cors-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/script-onerror-crossorigin-no-cors-expected.txt index cab2ba5..5b40877 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/script-onerror-crossorigin-no-cors-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/security/script-onerror-crossorigin-no-cors-expected.txt
@@ -1,4 +1,4 @@ -CONSOLE ERROR: Access to Script at 'http://localhost:8000/security/resources/cors-script.php?fail=true&cors=false' from origin 'http://localhost:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. +CONSOLE ERROR: Access to Script at 'http://localhost:8000/security/resources/cors-script.php?fail=true&cors=false' from origin 'http://127.0.0.1:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. The test passes if 'window.onerror' is not invoked on a script loaded with a 'crossorigin' attribute, but delivered without valid CORS headers. On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/script-with-failed-cors-check-fails-to-load-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/script-with-failed-cors-check-fails-to-load-expected.txt index d2455e1..4b3e10415 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/script-with-failed-cors-check-fails-to-load-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/security/script-with-failed-cors-check-fails-to-load-expected.txt
@@ -1,4 +1,4 @@ -CONSOLE ERROR: Access to Script at 'http://localhost:8080/security/resources/alert-fail.js' from origin 'http://localhost:8080' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. +CONSOLE ERROR: Access to Script at 'http://localhost:8080/security/resources/alert-fail.js' from origin 'http://127.0.0.1:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. This test passes if the script does not load. PASS
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/subresourceIntegrity/subresource-integrity-script-no-cors-bad-integrity-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/subresourceIntegrity/subresource-integrity-script-no-cors-bad-integrity-expected.txt index 5bf2ab1..695e3185 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/subresourceIntegrity/subresource-integrity-script-no-cors-bad-integrity-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/security/subresourceIntegrity/subresource-integrity-script-no-cors-bad-integrity-expected.txt
@@ -1,4 +1,4 @@ -CONSOLE ERROR: Access to Script at 'http://localhost:8000/security/resources/cors-script.php?cors=false&value=ran2' from origin 'http://localhost:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. +CONSOLE ERROR: Access to Script at 'http://localhost:8000/security/resources/cors-script.php?cors=false&value=ran2' from origin 'http://127.0.0.1:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. This is a testharness.js-based test. PASS SRI on cross origin CORS disabled script, with bad integrity Harness: the test ran to completion.
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/text-track-crossorigin-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/text-track-crossorigin-expected.txt index 2c03ae6..8baa52e 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/text-track-crossorigin-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/security/text-track-crossorigin-expected.txt
@@ -1,5 +1,5 @@ CONSOLE ERROR: Text track from origin 'http://localhost:8000' has been blocked from loading: Not at same origin as the document, and parent of track element does not have a 'crossorigin' attribute. Origin 'http://127.0.0.1:8000' is therefore not allowed access. -CONSOLE ERROR: Access to Text track at 'http://localhost:8000/security/resources/captions-with-access-control-headers.php?count=0' from origin 'http://localhost:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. +CONSOLE ERROR: Access to Text track at 'http://localhost:8000/security/resources/captions-with-access-control-headers.php?count=0' from origin 'http://127.0.0.1:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. Tests loading cross-domain <track>. Loading without Access-Control-Allow-Origin header, no "crossorigin" attribute on <video>
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/video-poster-cross-origin-crash-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/video-poster-cross-origin-crash-expected.txt index 76a4a8e..450f57f8 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/video-poster-cross-origin-crash-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/security/video-poster-cross-origin-crash-expected.txt
@@ -1,2 +1,2 @@ -CONSOLE ERROR: Access to Image at 'http://localhost:8080/misc/resources/compass.jpg' from origin 'http://localhost:8080' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. +CONSOLE ERROR: Access to Image at 'http://localhost:8080/misc/resources/compass.jpg' from origin 'http://127.0.0.1:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. >>>
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/video-poster-cross-origin-crash2-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/video-poster-cross-origin-crash2-expected.txt index 38e85860..f1bf486 100644 --- a/third_party/WebKit/LayoutTests/http/tests/security/video-poster-cross-origin-crash2-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/security/video-poster-cross-origin-crash2-expected.txt
@@ -1,4 +1,4 @@ -CONSOLE ERROR: Access to Image at 'http://localhost:8080/nonesuch.png' from origin 'http://localhost:8080' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. The response had HTTP status code 404. +CONSOLE ERROR: Access to Image at 'http://localhost:8080/nonesuch.png' from origin 'http://127.0.0.1:8000' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://127.0.0.1:8000' is therefore not allowed access. The response had HTTP status code 404. Test passes if it doesn't crash.
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/README.md b/third_party/WebKit/LayoutTests/imported/csswg-test/README.md index 41e833d..a26af8a 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/README.md +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/README.md
@@ -23,6 +23,83 @@ has adopted the GitHub pull request process, no new files should be landed here. The subdirectories here are named by test author or contributing organization. +Running the Tests +----------------- + +The tests are designed to be run from your local computer. The test +environment requires Python 2.7+ (but not Python 3.x). You will also +need a copy of OpenSSL. Users on Windows should read the +[Windows Notes](#windows-notes) section below. + +To get the tests running, you need to set up the test domains in your +[`hosts` file](http://en.wikipedia.org/wiki/Hosts_%28file%29%23Location_in_the_file_system). The +following entries are required: + +``` +127.0.0.1 csswg.test +127.0.0.1 www.csswg.test +127.0.0.1 www1.csswg.test +127.0.0.1 www2.csswg.test +127.0.0.1 xn--n8j6ds53lwwkrqhv28a.csswg.test +127.0.0.1 xn--lve-6lad.csswg.test +0.0.0.0 nonexistent-origin.csswg.test +``` + +Because csswg-test uses git submodules, you must ensure that +these are up to date. In the root of your checkout, run: + +``` +git submodule update --init --recursive +``` + +The test environment can then be started using + + ./serve + +This will start HTTP servers on two ports and a websockets server on +one port. By default one web server starts on port 8000 and the other +ports are randomly-chosen free ports. Tests must be loaded from the +*first* HTTP server in the output. To change the ports, copy the +`config.default.json` file to `config.json` and edit the new file, +replacing the part that reads: + +``` +"http": [8000, "auto"] +``` + +to some port of your choice e.g. + +``` +"http": [1234, "auto"] +``` + +If you installed OpenSSL in such a way that running `openssl` at a +command line doesn't work, you also need to adjust the path to the +OpenSSL binary. This can be done by adding a section to `config.json` +like: + +``` +"ssl": {"openssl": {"binary": "/path/to/openssl"}} +``` +Windows Notes +------------- + +Running wptserve with SSL enabled on Windows typically requires +installing an OpenSSL distribution. +[Shining Light](http://slproweb.com/products/Win32OpenSSL.html) +provide a convenient installer that is known to work, but requires a +little extra setup. + +After installation ensure that the path to OpenSSL is on your `%Path%` +environment variable. + +Then set the path to the default OpenSSL configuration file (usually +something like `C:\OpenSSL-Win32\bin\openssl.cfg` in the server +configuration. To do this copy `config.default.json` in the +web-platform-tests root to `config.json`. Then edit the JSON so that +the key `ssl/openssl/base_conf_path` has a value that is the path to +the OpenSSL config file. + Linking Your Tests to Specifications -----------------------------------
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/config.default.json b/third_party/WebKit/LayoutTests/imported/csswg-test/config.default.json new file mode 100644 index 0000000..e3e6a28 --- /dev/null +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/config.default.json
@@ -0,0 +1,26 @@ +{"host": "csswg.test", + "doc_root": null, + "ws_doc_root": null, + "external_host": null, + "ports":{"http":[8000, "auto"], + "https":[8443], + "ws":["auto"], + "wss":["auto"]}, + "check_subdomains": true, + "log_level":"debug", + "bind_hostname": true, + "ssl": {"type": "openssl", + "encrypt_after_connect": false, + "openssl": { + "openssl_binary": "openssl", + "base_path": "_certs", + "force_regenerate": false, + "base_conf_path": null + }, + "pregenerated": { + "host_key_path": null, + "host_cert_path": null + }, + "none": {} + } +}
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/css-box-justify-content-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/css-box-justify-content-expected.html index 0532b34..e837747 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/css-box-justify-content-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/css-box-justify-content-expected.html
@@ -1,6 +1,6 @@ <!DOCTYPE html> <title>flexbox |css-box-justify-content</title> -<link rel="author" href="ava656094@gmail.com" title="xiaoxia"> +<link rel="author" href="mailto:ava656094@gmail.com" title="xiaoxia"> <style> #flexbox { background: green;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/css-box-justify-content.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/css-box-justify-content.html index 65202d8b..06223d5a 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/css-box-justify-content.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/css-box-justify-content.html
@@ -1,6 +1,6 @@ <!DOCTYPE html> <title>flexbox |css-box-justify-content</title> -<link rel="author" href="ava656094@gmail.com" title="xiaoxia"> +<link rel="author" href="mailto:ava656094@gmail.com" title="xiaoxia"> <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#propdef-justify-content"> <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#propdef-flex-flow"> <link rel="match" href="reference/css-box-justify-content-ref.html">
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-001.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-001.html index a1a5370..f75026d 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-001.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-001.html
@@ -1,8 +1,8 @@ <!DOCTYPE html> <meta charset="utf-8"> <title>CSS Flexbox Test: flex-basis - positive number</title> -<link rel="author" href="Intel" title="http://www.intel.com"> -<link rel="author" href="Intel" title="mailto:shiyoux.tan@intel.com"> +<link rel="author" title="Intel" href="http://www.intel.com"> +<link rel="author" title="Intel" href="mailto:shiyoux.tan@intel.com"> <link rel="help" title="7.3.3. The 'flex-basis' property" href="http://www.w3.org/TR/css-flexbox-1/#propdef-flex-basis"> <link rel="match" href="../reference/ref-filled-green-100px-square.xht"> <meta name="flags" content="">
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-002.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-002.html index 3d24ab95..f19dc5d 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-002.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-002.html
@@ -1,8 +1,8 @@ <!DOCTYPE html> <meta charset="utf-8"> <title>CSS Flexbox Test: flex-basis - positive number</title> -<link rel="author" href="Intel" title="http://www.intel.com"> -<link rel="author" href="Intel" title="mailto:shiyoux.tan@intel.com"> +<link rel="author" title="Intel" href="http://www.intel.com"> +<link rel="author" title="Intel" href="mailto:shiyoux.tan@intel.com"> <link rel="help" title="7.3.3. The 'flex-basis' property" href="http://www.w3.org/TR/css-flexbox-1/#propdef-flex-basis"> <link rel="match" href="../reference/ref-filled-green-100px-square.xht"> <meta name="flags" content="">
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-003.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-003.html index cc788fca..0d0813f2 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-003.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-003.html
@@ -1,8 +1,8 @@ <!DOCTYPE html> <meta charset="utf-8"> <title>CSS Flexbox Test: flex-basis - negative number(width not specified)</title> -<link rel="author" href="Intel" title="http://www.intel.com"> -<link rel="author" href="Intel" title="mailto:shiyoux.tan@intel.com"> +<link rel="author" title="Intel" href="http://www.intel.com"> +<link rel="author" title="Intel" href="mailto:shiyoux.tan@intel.com"> <link rel="help" title="7.3.3. The 'flex-basis' property" href="http://www.w3.org/TR/css-flexbox-1/#propdef-flex-basis"> <link rel="match" href="../reference/ref-filled-green-100px-square.xht"> <meta name="flags" content="">
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-004.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-004.html index 8d73a52b..a1d59943 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-004.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-004.html
@@ -1,8 +1,8 @@ <!DOCTYPE html> <meta charset="utf-8"> <title>CSS Flexbox Test: flex-basis - negative number(width specified)</title> -<link rel="author" href="Intel" title="http://www.intel.com"> -<link rel="author" href="Intel" title="mailto:shiyoux.tan@intel.com"> +<link rel="author" title="Intel" href="http://www.intel.com"> +<link rel="author" title="Intel" href="mailto:shiyoux.tan@intel.com"> <link rel="help" title="7.3.3. The 'flex-basis' property" href="http://www.w3.org/TR/css-flexbox-1/#propdef-flex-basis"> <link rel="match" href="../reference/ref-filled-green-100px-square.xht"> <meta name="flags" content="">
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-005.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-005.html index 6da0f954..214f5745 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-005.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-005.html
@@ -1,8 +1,8 @@ <!DOCTYPE html> <meta charset="utf-8"> <title>CSS Flexbox Test: flex-basis - 0</title> -<link rel="author" href="Intel" title="http://www.intel.com"> -<link rel="author" href="Intel" title="mailto:shiyoux.tan@intel.com"> +<link rel="author" title="Intel" href="http://www.intel.com"> +<link rel="author" title="Intel" href="mailto:shiyoux.tan@intel.com"> <link rel="help" title="7.3.3. The 'flex-basis' property" href="http://www.w3.org/TR/css-flexbox-1/#propdef-flex-basis"> <link rel="match" href="../reference/ref-filled-green-100px-square.xht"> <meta name="flags" content="">
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-006.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-006.html index a0c6bc3..edf2f1d 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-006.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-006.html
@@ -1,8 +1,8 @@ <!DOCTYPE html> <meta charset="utf-8"> <title>CSS Flexbox Test: flex-basis - 0%</title> -<link rel="author" href="Intel" title="http://www.intel.com"> -<link rel="author" href="Intel" title="mailto:shiyoux.tan@intel.com"> +<link rel="author" title="Intel" href="http://www.intel.com"> +<link rel="author" title="Intel" href="mailto:shiyoux.tan@intel.com"> <link rel="help" title="7.3.3. The 'flex-basis' property" href="http://www.w3.org/TR/css-flexbox-1/#propdef-flex-basis"> <link rel="match" href="../reference/ref-filled-green-100px-square.xht"> <meta name="flags" content="">
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-007.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-007.html index 6429837..ee8c3cf 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-007.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-007.html
@@ -1,8 +1,8 @@ <!DOCTYPE html> <meta charset="utf-8"> <title>CSS Flexbox Test: flex-basis - auto</title> -<link rel="author" href="Intel" title="http://www.intel.com"> -<link rel="author" href="Intel" title="mailto:shiyoux.tan@intel.com"> +<link rel="author" title="Intel" href="http://www.intel.com"> +<link rel="author" title="Intel" href="mailto:shiyoux.tan@intel.com"> <link rel="help" title="7.3.3. The 'flex-basis' property" href="http://www.w3.org/TR/css-flexbox-1/#propdef-flex-basis"> <link rel="match" href="../reference/ref-filled-green-100px-square.xht"> <meta name="flags" content="">
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-008.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-008.html index 63c0948..4f19ac0 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-008.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-basis-008.html
@@ -1,8 +1,8 @@ <!DOCTYPE html> <meta charset="utf-8"> <title>CSS Flexbox Test: flex-basis - 50%</title> -<link rel="author" href="Intel" title="http://www.intel.com"> -<link rel="author" href="Intel" title="mailto:shiyoux.tan@intel.com"> +<link rel="author" title="Intel" href="http://www.intel.com"> +<link rel="author" title="Intel" href="mailto:shiyoux.tan@intel.com"> <link rel="help" title="7.3.3. The 'flex-basis' property" href="http://www.w3.org/TR/css-flexbox-1/#propdef-flex-basis"> <link rel="match" href="../reference/ref-filled-green-100px-square.xht"> <meta name="flags" content="">
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-flexitem-childmargin.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-flexitem-childmargin.html index 6ca50071..6dcb9a6 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-flexitem-childmargin.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-flexitem-childmargin.html
@@ -2,7 +2,7 @@ <html> <head> <title>flex item child margin</title> - <link rel="author" title="shaofeic" href="csf178@gmail.com" /> + <link rel="author" title="shaofeic" href="mailto:csf178@gmail.com" /> <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-items"> <link rel="match" href="reference/flex-flexitem-childmargin-ref.html"> <meta name="flags" content="" />
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-flexitem-percentage-prescation.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-flexitem-percentage-prescation.html index 2087943..6fc1081 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-flexitem-percentage-prescation.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flex-flexitem-percentage-prescation.html
@@ -2,7 +2,7 @@ <html> <head> <title>flex item size prescation</title> - <link rel="author" title="shaofeic" href="csf178@gmail.com" /> + <link rel="author" title="shaofeic" href="mailto:csf178@gmail.com" /> <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-items"> <link rel="match" href="reference/flex-flexitem-percentage-prescation-ref.html"> <meta name="flags" content="" />
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/order/order-with-row-reverse-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/order/order-with-row-reverse-expected.html index 9350802..c45b612 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/order/order-with-row-reverse-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/order/order-with-row-reverse-expected.html
@@ -2,8 +2,8 @@ <html> <head> <title>CSS Test Reference: flex container layout lowest order with row-reverse direction</title> - <link rel="author" title="tmtysk" href="tmtysk@gmail.com"> - <link rel="reviewer" title="Tab Atkins, Jr." href="jackalmage@gmail.com"> + <link rel="author" title="tmtysk" href="mailto:tmtysk@gmail.com"> + <link rel="reviewer" title="Tab Atkins, Jr." href="mailto:jackalmage@gmail.com"> <style> #leftmost { float: right;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/order/order-with-row-reverse.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/order/order-with-row-reverse.html index a6a3b33..f4e6722 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/order/order-with-row-reverse.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/order/order-with-row-reverse.html
@@ -2,8 +2,8 @@ <html> <head> <title>CSS Test: flex container layout lowest order with row-reverse direction</title> - <link rel="author" title="tmtysk" href="tmtysk@gmail.com"> - <link rel="reviewer" title="Tab Atkins, Jr." href="jackalmage@gmail.com"> + <link rel="author" title="tmtysk" href="mailto:tmtysk@gmail.com"> + <link rel="reviewer" title="Tab Atkins, Jr." href="mailto:jackalmage@gmail.com"> <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#propdef-order"> <meta name="flags" content=""> <link rel="match" href="order-with-row-reverse-ref.html">
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside-invalid-circle-000.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside-invalid-circle-000.html index 15938ee..db55364 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside-invalid-circle-000.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside-invalid-circle-000.html
@@ -2,7 +2,7 @@ <head> <meta charset="utf-8"> <title>CSS Shapes Tests: Circle - invalid 2 args</title> - <link rel="author" title="biqing" href="biqing.kwok@qq.com"> + <link rel="author" title="biqing" href="mailto:biqing.kwok@qq.com"> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#supported-basic-shapes"> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#funcdef-circle"> <script src="/resources/testharness.js"></script> @@ -32,4 +32,4 @@ </script> </body> -</html> \ No newline at end of file +</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside-invalid-circle-001.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside-invalid-circle-001.html index b695ad60..bf4f500 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside-invalid-circle-001.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside-invalid-circle-001.html
@@ -2,7 +2,7 @@ <head> <meta charset="utf-8"> <title>CSS Shapes Tests: Circle - invalid r values</title> - <link rel="author" title="biqing" href="biqing.kwok@qq.com"> + <link rel="author" title="biqing" href="mailto:biqing.kwok@qq.com"> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#supported-basic-shapes"> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#funcdef-circle"> <script src="/resources/testharness.js"></script> @@ -44,4 +44,4 @@ </script> </body> -</html> \ No newline at end of file +</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-001-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-001-expected.html index 3659034..3c652d1 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-001-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-001-expected.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Reference File</title> - <link rel="author" title="Bear Travis" href="betravis@adobe.com"/> + <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com"/> <style type="text/css"> .container { width: 200px;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-001.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-001.html index 79e91a8..6042c80 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-001.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-001.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Test: Left float with linear gradient</title> - <link rel="author" title="Bear Travis" href="betravis@adobe.com"/> + <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="match" href="reference/shape-outside-linear-gradient-001-ref.html"/>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-002-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-002-expected.html index 96a8067f..ffbbe6e 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-002-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-002-expected.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Reference File</title> - <link rel="author" title="Bear Travis" href="betravis@adobe.com"/> + <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com"/> <style type="text/css"> .container { width: 200px;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-002.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-002.html index cf2cda3..cb91fad 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-002.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-002.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Test: Right float with linear gradient</title> - <link rel="author" title="Bear Travis" href="betravis@adobe.com"/> + <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="match" href="reference/shape-outside-linear-gradient-002-ref.html"/>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-003-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-003-expected.html index 96a8067f..ffbbe6e 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-003-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-003-expected.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Reference File</title> - <link rel="author" title="Bear Travis" href="betravis@adobe.com"/> + <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com"/> <style type="text/css"> .container { width: 200px;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-003.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-003.html index 8351535..9b7bf21 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-003.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-003.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Test: Right float with linear gradient</title> - <link rel="author" title="Bear Travis" href="betravis@adobe.com"/> + <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin-property"/>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001.html index 6fab7fb..16dba7e 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001.html
@@ -2,9 +2,14 @@ <html> <head> <title>CSS Test: Left float with radial gradient</title> - <link rel="author" title="Bear Travis" href="betravis@adobe.com"/> + <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="../../supported-shapes/support/rounded-rectangle.js"></script> + <script src="../../supported-shapes/support/subpixel-utils.js"></script> + <script src="../../supported-shapes/support/test-utils.js"></script> <meta name="flags" content="ahem dom"/> <meta name="assert" content="This test verifies that shape-outside respects a simple radial gradient."/> @@ -48,11 +53,6 @@ x<br/> </div> <div id="log"></div> - <script src="/resources/testharness.js"></script> - <script src="/resources/testharnessreport.js"></script> - <script src="../../supported-shapes/support/rounded-rectangle.js"></script> - <script src="../../supported-shapes/support/subpixel-utils.js"></script> - <script src="../../supported-shapes/support/test-utils.js"></script> <script> verifyTextPoints({ roundedRect: {x: 0, y: 10, width: 100, height: 100, rx: 50, ry: 50},
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002.html index 3c3b4b2..54034c1b 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002.html
@@ -2,10 +2,15 @@ <html> <head> <title>CSS Test: Left float with radial gradient and percentage shape margin</title> - <link rel="author" title="Bear Travis" href="betravis@adobe.com"/> + <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin-property"/> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="../../supported-shapes/support/rounded-rectangle.js"></script> + <script src="../../supported-shapes/support/subpixel-utils.js"></script> + <script src="../../supported-shapes/support/test-utils.js"></script> <meta name="flags" content="ahem dom"/> <meta name="assert" content="This test verifies that shape-outside respects a simple radial gradient when a percentage margin @@ -51,11 +56,6 @@ x<br/> </div> <div id="log"></div> - <script src="/resources/testharness.js"></script> - <script src="/resources/testharnessreport.js"></script> - <script src="../../supported-shapes/support/rounded-rectangle.js"></script> - <script src="../../supported-shapes/support/subpixel-utils.js"></script> - <script src="../../supported-shapes/support/test-utils.js"></script> <script> verifyTextPoints({ roundedRect: {x: 0, y: 10, width: 100, height: 100, rx: 50, ry: 50},
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003.html index 5cbb9e30..c97826c 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003.html
@@ -2,11 +2,16 @@ <html> <head> <title>CSS Test: Left float with radial gradient shape, shape margin, and shape-image-threshold</title> - <link rel="author" title="Bear Travis" href="betravis@adobe.com"/> + <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin-property"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-image-threshold-property"/> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="../../supported-shapes/support/rounded-rectangle.js"></script> + <script src="../../supported-shapes/support/subpixel-utils.js"></script> + <script src="../../supported-shapes/support/test-utils.js"></script> <meta name="flags" content="ahem dom"/> <meta name="assert" content="This test verifies that shape-outside respects a simple radial gradient when a shape margin @@ -53,11 +58,6 @@ x<br/> </div> <div id="log"></div> - <script src="/resources/testharness.js"></script> - <script src="/resources/testharnessreport.js"></script> - <script src="../../supported-shapes/support/rounded-rectangle.js"></script> - <script src="../../supported-shapes/support/subpixel-utils.js"></script> - <script src="../../supported-shapes/support/test-utils.js"></script> <script> verifyTextPoints({ roundedRect: {x: 0, y: 10, width: 100, height: 100, rx: 50, ry: 50},
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004.html index 67d5908..5b28aa5 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004.html
@@ -2,10 +2,15 @@ <html> <head> <title>CSS Test: Left float with radial gradient shape, shape margin, and shape-image-threshold</title> - <link rel="author" title="Bear Travis" href="betravis@adobe.com"/> + <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-image-threshold-property"/> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="../../supported-shapes/support/rounded-rectangle.js"></script> + <script src="../../supported-shapes/support/subpixel-utils.js"></script> + <script src="../../supported-shapes/support/test-utils.js"></script> <meta name="flags" content="ahem dom"/> <meta name="assert" content="This test verifies that shape-outside respects a simple radial gradient on a right float when @@ -52,11 +57,6 @@ x<br/> </div> <div id="log"></div> - <script src="/resources/testharness.js"></script> - <script src="/resources/testharnessreport.js"></script> - <script src="../../supported-shapes/support/rounded-rectangle.js"></script> - <script src="../../supported-shapes/support/subpixel-utils.js"></script> - <script src="../../supported-shapes/support/test-utils.js"></script> <script> verifyTextPoints({ roundedRect: {x: 100, y: 10, width: 100, height: 100, rx: 50, ry: 50},
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-000-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-000-expected.html index 0c1a016..240b258 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-000-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-000-expected.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Reference File</title> - <link rel="author" title="Bem Jones-Bey" href="bjonesbe@adobe.com"/> + <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com"/> <style type="text/css"> .container { width: 100px;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-000.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-000.html index 6fc43a5..53ef88d 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-000.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-000.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Test: Image shape on a left float</title> - <link rel="author" title="Bem Jones-Bey" href="bjonesbe@adobe.com"/> + <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="match" href="reference/shape-image-000-ref.html"/>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-001-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-001-expected.html index 25f634f..7eb1d2d 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-001-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-001-expected.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Reference File</title> - <link rel="author" title="Bem Jones-Bey" href="bjonesbe@adobe.com"/> + <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com"/> <style type="text/css"> .container { width: 150px;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-001.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-001.html index 791a305..8273030 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-001.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-001.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Test: Image shape on a left float</title> - <link rel="author" title="Bem Jones-Bey" href="bjonesbe@adobe.com"/> + <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="match" href="reference/shape-image-001-ref.html"/>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-002-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-002-expected.html index 6f9a3c44..6386fb3 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-002-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-002-expected.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Reference File</title> - <link rel="author" title="Bem Jones-Bey" href="bjonesbe@adobe.com"/> + <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com"/> <style type="text/css"> .container { width: 100px;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-002.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-002.html index 4e6956b..ee2dd75 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-002.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-002.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Test: Image shape on a left float</title> - <link rel="author" title="Bem Jones-Bey" href="bjonesbe@adobe.com"/> + <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="match" href="reference/shape-image-002-ref.html"/>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-003-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-003-expected.html index 6f9a3c44..6386fb3 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-003-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-003-expected.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Reference File</title> - <link rel="author" title="Bem Jones-Bey" href="bjonesbe@adobe.com"/> + <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com"/> <style type="text/css"> .container { width: 100px;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-003.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-003.html index 5286461..85d252d 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-003.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-003.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Test: Image shape on a left float</title> - <link rel="author" title="Bem Jones-Bey" href="bjonesbe@adobe.com"/> + <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="match" href="reference/shape-image-002-ref.html"/>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-004-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-004-expected.html index 0c1a016..240b258 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-004-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-004-expected.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Reference File</title> - <link rel="author" title="Bem Jones-Bey" href="bjonesbe@adobe.com"/> + <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com"/> <style type="text/css"> .container { width: 100px;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-004.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-004.html index 95cae2e..5d31593 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-004.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-004.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Test: Image shape on a left float</title> - <link rel="author" title="Bem Jones-Bey" href="bjonesbe@adobe.com"/> + <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="match" href="reference/shape-image-000-ref.html"/>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-005-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-005-expected.html index 6f9a3c44..6386fb3 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-005-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-005-expected.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Reference File</title> - <link rel="author" title="Bem Jones-Bey" href="bjonesbe@adobe.com"/> + <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com"/> <style type="text/css"> .container { width: 100px;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-005.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-005.html index c635d8a2..2c642c02 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-005.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-005.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Test: Image shape on a left float</title> - <link rel="author" title="Bem Jones-Bey" href="bjonesbe@adobe.com"/> + <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="match" href="reference/shape-image-002-ref.html"/>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-006-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-006-expected.html index d7ff373b..bd27c91 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-006-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-006-expected.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Reference File</title> - <link rel="author" title="Rebecca Hauck" href="rhauck@adobe.com"/> + <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com"/> <style type="text/css"> body { margin: 0;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-006.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-006.html index 99436617b..9b435e3 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-006.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-006.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Test: left float, url(png), real image + shape-margin (px)</title> - <link rel="author" title="Rebecca Hauck" href="rhauck@adobe.com"/> + <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin-property"/>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-007-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-007-expected.html index 1049a10..80e47e4 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-007-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-007-expected.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Reference File</title> - <link rel="author" title="Rebecca Hauck" href="rhauck@adobe.com"/> + <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com"/> <style type="text/css"> body { margin: 0;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-007.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-007.html index bb67d79..727170f 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-007.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-007.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Test: left float, url(svg), real image + shape-margin (px)</title> - <link rel="author" title="Rebecca Hauck" href="rhauck@adobe.com"/> + <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin-property"/>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-008-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-008-expected.html index c8f1a4a..fbe9caf9 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-008-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-008-expected.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Reference File</title> - <link rel="author" title="Rebecca Hauck" href="rhauck@adobe.com"/> + <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com"/> <style type="text/css"> body { margin: 0; @@ -45,4 +45,4 @@ <div class="blue line-left"></div> <div class="blue line-right"></div> </body> -</html> \ No newline at end of file +</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-008.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-008.html index c98fddb..95668871 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-008.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-008.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Test: left float, url(jpg), data uri + shape-margin (%)</title> - <link rel="author" title="Rebecca Hauck" href="rhauck@adobe.com"/> + <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin-property"/>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-009-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-009-expected.html index d7ff373b..bd27c91 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-009-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-009-expected.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Reference File</title> - <link rel="author" title="Rebecca Hauck" href="rhauck@adobe.com"/> + <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com"/> <style type="text/css"> body { margin: 0;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-009.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-009.html index b7ed2d5c..ef524a5 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-009.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-009.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Test: left float, url(png), real image 70% + shape-image-threshold + shape-margin (px)</title> - <link rel="author" title="Rebecca Hauck" href="rhauck@adobe.com"/> + <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin-property"/> @@ -75,4 +75,4 @@ <div class="blue right-line"></div> <div class="failure"></div> </body> -</html> \ No newline at end of file +</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-010-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-010-expected.html index d7ff373b..bd27c91 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-010-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-010-expected.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Reference File</title> - <link rel="author" title="Rebecca Hauck" href="rhauck@adobe.com"/> + <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com"/> <style type="text/css"> body { margin: 0;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-010.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-010.html index bd06085..aedab213 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-010.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-010.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Test: left float, url(png), data uri + shape-image-threshold + shape-margin (%)</title> - <link rel="author" title="Rebecca Hauck" href="rhauck@adobe.com"/> + <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin-property"/>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-011-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-011-expected.html index 1049a10..80e47e4 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-011-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-011-expected.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Reference File</title> - <link rel="author" title="Rebecca Hauck" href="rhauck@adobe.com"/> + <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com"/> <style type="text/css"> body { margin: 0;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-011.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-011.html index 5e3010f9b..03c71fba 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-011.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-011.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Test: left float, url(svg), real image + shape-image-threshold + shape-margin (px)</title> - <link rel="author" title="Rebecca Hauck" href="rhauck@adobe.com"/> + <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin-property"/> @@ -75,4 +75,4 @@ <div class="blue right-line"></div> <div class="failure"></div> </body> -</html> \ No newline at end of file +</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-012-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-012-expected.html index c139277..488ade1 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-012-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-012-expected.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Reference File</title> - <link rel="author" title="Zoltan Horvath" href="zoltan@adobe.com"/> + <link rel="author" title="Zoltan Horvath" href="mailto:zoltan@adobe.com"/> <style type="text/css"> .container { position: absolute;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-012.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-012.html index e092f3a..4bd4786 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-012.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-012.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Test: Wrapping content around right floating actual jpg image</title> - <link rel="author" title="Zoltan Horvath" href="zoltan@adobe.com"/> + <link rel="author" title="Zoltan Horvath" href="mailto:zoltan@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="match" href="reference/shape-image-012-ref.html"/>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-013-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-013-expected.html index 8224fea8..2b6e239 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-013-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-013-expected.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Reference File</title> - <link rel="author" title="Bem Jones-Bey" href="bjonesbe@adobe.com"/> + <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com"/> <style type="text/css"> .container { width: 150px;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-013.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-013.html index e9bbac25..5222ee7 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-013.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-013.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Test: Wrapping content around shape given by a right floating png</title> - <link rel="author" title="Zoltan Horvath" href="zoltan@adobe.com"/> + <link rel="author" title="Zoltan Horvath" href="mailto:zoltan@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="match" href="reference/shape-image-013-ref.html"/>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-014-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-014-expected.html index 6f9a3c44..6386fb3 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-014-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-014-expected.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Reference File</title> - <link rel="author" title="Bem Jones-Bey" href="bjonesbe@adobe.com"/> + <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com"/> <style type="text/css"> .container { width: 100px;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-014.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-014.html index 4c9f3d2b..81796923 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-014.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-014.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Test: Wrapping content around shape given by a right floating svg file</title> - <link rel="author" title="Zoltan Horvath" href="zoltan@adobe.com"/> + <link rel="author" title="Zoltan Horvath" href="mailto:zoltan@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="match" href="reference/shape-image-002-ref.html"/>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-015-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-015-expected.html index 8224fea8..2b6e239 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-015-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-015-expected.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Reference File</title> - <link rel="author" title="Bem Jones-Bey" href="bjonesbe@adobe.com"/> + <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com"/> <style type="text/css"> .container { width: 150px;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-015.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-015.html index 21e4f46b..ac64dda 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-015.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-015.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Test: Image shape on a right float</title> - <link rel="author" title="Zoltan Horvath" href="zoltan@adobe.com"/> + <link rel="author" title="Zoltan Horvath" href="mailto:zoltan@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="match" href="reference/shape-image-013-ref.html"/>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-016-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-016-expected.html index 8224fea8..2b6e239 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-016-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-016-expected.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Reference File</title> - <link rel="author" title="Bem Jones-Bey" href="bjonesbe@adobe.com"/> + <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com"/> <style type="text/css"> .container { width: 150px;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-016.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-016.html index dbf6bf5f..08dc887 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-016.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-016.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Test: Image shape on a right float</title> - <link rel="author" title="Zoltan Horvath" href="zoltan@adobe.com"/> + <link rel="author" title="Zoltan Horvath" href="mailto:zoltan@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="match" href="reference/shape-image-013-ref.html"/>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-017-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-017-expected.html index 6f9a3c44..6386fb3 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-017-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-017-expected.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Reference File</title> - <link rel="author" title="Bem Jones-Bey" href="bjonesbe@adobe.com"/> + <link rel="author" title="Bem Jones-Bey" href="mailto:bjonesbe@adobe.com"/> <style type="text/css"> .container { width: 100px;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-017.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-017.html index bd06083..868d1cf8 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-017.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-017.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Test: Image shape on a right float</title> - <link rel="author" title="Zoltan Horvath" href="zoltan@adobe.com"/> + <link rel="author" title="Zoltan Horvath" href="mailto:zoltan@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="match" href="reference/shape-image-002-ref.html"/>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-018-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-018-expected.html index 7c80c52..9823ce0 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-018-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-018-expected.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Reference File</title> - <link rel="author" title="Hans Muller" href="hmuller@adobe.com"/> + <link rel="author" title="Hans Muller" href="mailto:hmuller@adobe.com"/> <style type="text/css"> #container { position: relative;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-018.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-018.html index 520bbcae..bccefcba 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-018.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-018.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Test: right float, url(jpg), real image + shape-margin (%)</title> - <link rel="author" title="Hans Muller" href="hmuller@adobe.com"/> + <link rel="author" title="Hans Muller" href="mailto:hmuller@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="match" href="reference/shape-image-018-ref.html"/>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-019-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-019-expected.html index c99c614..24b2260 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-019-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-019-expected.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Reference File</title> - <link rel="author" title="Hans Muller" href="hmuller@adobe.com"/> + <link rel="author" title="Hans Muller" href="mailto:hmuller@adobe.com"/> <style type="text/css"> #container { position: relative;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-019.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-019.html index 3eed3065..e32cc23 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-019.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-019.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Test: right float, url(png), data uri + shape-margin (px)</title> - <link rel="author" title="Hans Muller" href="hmuller@adobe.com"/> + <link rel="author" title="Hans Muller" href="mailto:hmuller@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="match" href="reference/shape-image-019-ref.html"/>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-020-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-020-expected.html index df2a416..6caf046 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-020-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-020-expected.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Reference File</title> - <link rel="author" title="Hans Muller" href="hmuller@adobe.com"/> + <link rel="author" title="Hans Muller" href="mailto:hmuller@adobe.com"/> <style type="text/css"> #container { position: relative;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-020.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-020.html index 5f4a4afc..8dd8100 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-020.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-020.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Test: right float, url(svg), data uri + shape-margin (%)</title> - <link rel="author" title="Hans Muller" href="hmuller@adobe.com"/> + <link rel="author" title="Hans Muller" href="mailto:hmuller@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="match" href="reference/shape-image-020-ref.html"/>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-021-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-021-expected.html index c8546a8..0166aa90 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-021-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-021-expected.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Reference File</title> - <link rel="author" title="Hans Muller" href="hmuller@adobe.com"/> + <link rel="author" title="Hans Muller" href="mailto:hmuller@adobe.com"/> <style type="text/css"> #container { position: relative;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-021.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-021.html index f0c5580c..1fea2096 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-021.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-021.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Test: right float, url(png), real image + shape-image-threshold + shape-margin (%)</title> - <link rel="author" title="Hans Muller" href="hmuller@adobe.com"/> + <link rel="author" title="Hans Muller" href="mailto:hmuller@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="match" href="reference/shape-image-021-ref.html"/>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-022-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-022-expected.html index f20d9c62..8d827f9 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-022-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-022-expected.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Reference File</title> - <link rel="author" title="Hans Muller" href="hmuller@adobe.com"/> + <link rel="author" title="Hans Muller" href="mailto:hmuller@adobe.com"/> <style type="text/css"> #container { position: relative;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-022.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-022.html index 2e30590..59b83fd 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-022.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-022.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Test: right float, url(gif), real image + shape-image-threshold + shape-margin (px)</title> - <link rel="author" title="Hans Muller" href="hmuller@adobe.com"/> + <link rel="author" title="Hans Muller" href="mailto:hmuller@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="match" href="reference/shape-image-022-ref.html"/>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-023-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-023-expected.html index df2a416..6caf046 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-023-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-023-expected.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Reference File</title> - <link rel="author" title="Hans Muller" href="hmuller@adobe.com"/> + <link rel="author" title="Hans Muller" href="mailto:hmuller@adobe.com"/> <style type="text/css"> #container { position: relative;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-023.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-023.html index 20f5c3c..836a853 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-023.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-023.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Test: right float, url(svg), data uri + shape-image-threshold + shape-margin (%)</title> - <link rel="author" title="Hans Muller" href="hmuller@adobe.com"/> + <link rel="author" title="Hans Muller" href="mailto:hmuller@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="match" href="reference/shape-image-023-ref.html"/>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-024-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-024-expected.html index 255d56c..f326e851 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-024-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-024-expected.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Reference File</title> - <link rel="author" title="Rebecca Hauck" href="rhauck@adobe.com"/> + <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com"/> <style type="text/css"> body { margin: 0;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-024.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-024.html index c646ec6..5bd3f4d 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-024.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-024.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Test: shape-outside from img element with different size than the image file</title> - <link rel="author" title="Rebecca Hauck" href="rhauck@adobe.com"/> + <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="match" href="reference/shape-image-024-ref.html"/>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-025-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-025-expected.html index 066deca..0060369e 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-025-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-025-expected.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Reference File</title> - <link rel="author" title="Rebecca Hauck" href="rhauck@adobe.com"/> + <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com"/> <style type="text/css"> body { margin: 0; @@ -32,4 +32,4 @@ <div class="green"></div> <div class="blue"></div> </body> -</html> \ No newline at end of file +</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-025.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-025.html index a2d9d2d..d5189ac 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-025.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-025.html
@@ -2,7 +2,7 @@ <html> <head> <title>CSS Test: shape-outside from first frame of animated gif</title> - <link rel="author" title="Rebecca Hauck" href="rhauck@adobe.com"/> + <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/> <link rel="match" href="reference/shape-image-025-ref.html"/>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-baseline-001-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-baseline-001-expected.html index d5f8c03..0bb3137 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-baseline-001-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-baseline-001-expected.html
@@ -1,6 +1,6 @@ <!DOCTYPE html> <title>CSS Snap Size: snap-height baseline</title> -<link rel="author" title="Koji Ishii" href="kojiishi@gmail.com"> +<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com"> <style> div { font-family: Ahem;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-baseline-001.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-baseline-001.html index 97d90f3..75d50dc 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-baseline-001.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-baseline-001.html
@@ -1,6 +1,6 @@ <!DOCTYPE html> <title>CSS Snap Size: snap-height baseline</title> -<link rel="author" title="Koji Ishii" href="kojiishi@gmail.com"> +<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com"> <link rel="help" href="https://drafts.csswg.org/css-snap-size/#snap-height"> <link rel="match" href="reference/snap-height-baseline-001.html"> <meta name="assert" content="This test asserts the snap-height property rounds up line box height and set the baseline position.">
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-center-001-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-center-001-expected.html index 143ab64..7ab6834 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-center-001-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-center-001-expected.html
@@ -1,6 +1,6 @@ <!DOCTYPE html> <title>CSS Snap Size: snap-height center</title> -<link rel="author" title="Koji Ishii" href="kojiishi@gmail.com"> +<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com"> <style> div { font-family: Ahem;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-center-001.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-center-001.html index 2fce531..aacd63cc 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-center-001.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-center-001.html
@@ -1,6 +1,6 @@ <!DOCTYPE html> <title>CSS Snap Size: snap-height center</title> -<link rel="author" title="Koji Ishii" href="kojiishi@gmail.com"> +<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com"> <link rel="help" href="https://drafts.csswg.org/css-snap-size/#snap-height"> <link rel="match" href="reference/snap-height-center-001.html"> <meta name="assert" content="This test asserts the snap-height property rounds up line box height.">
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-dynamic-001.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-dynamic-001.html index 6fd3de3..5dfffcc0 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-dynamic-001.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-dynamic-001.html
@@ -1,6 +1,6 @@ <!DOCTYPE html> <title>CSS Snap Size: snap-height dynamic change</title> -<link rel="author" title="Koji Ishii" href="kojiishi@gmail.com"> +<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com"> <link rel="help" href="https://drafts.csswg.org/css-snap-size/#snap-height"> <meta name="assert" content="This test asserts changing the snap-height property takes effects."> <meta name="flags" content="dom">
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-parsing-001.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-parsing-001.html index 72602cd..501749944 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-parsing-001.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-parsing-001.html
@@ -1,6 +1,6 @@ <!DOCTYPE html> <title>CSS Snap Size: parsing snap-height</title> -<link rel="author" title="Koji Ishii" href="kojiishi@gmail.com"> +<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com"> <link rel="help" href="https://drafts.csswg.org/css-snap-size/#snap-height"> <meta name="assert" content="This test asserts the parsing and getComputedStyle works correctly for the snap-height property."> <meta name="flags" content="dom">
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-block-in-available-001.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-block-in-available-001.html deleted file mode 100644 index c2a1b2df..0000000 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-block-in-available-001.html +++ /dev/null
@@ -1,60 +0,0 @@ -<!DOCTYPE html> -<title>CSS Snap Size: snap-width</title> -<link rel="help" href="https://drafts.csswg.org/css-snap-size/#snap-width"> -<link rel="match" href="reference/snap-width--001.html"> -<meta name="assert" content="This test asserts the snap-width property rounds down the box width."> -<meta name="flags" content="ahem"> -<link rel="author" title="Koji Ishii" href="kojiishi@gmail.com"> -<style> -.container { - font-family: Ahem; - font-size: 32px; - line-height: 1; -} -.container > div { - margin: .5em 0; -} -.border > div { - border-left: .4em transparent solid; - border-right: .4em transparent solid; -} -.padding > div { - padding: 0 .4em; -} - -.container { width: 20.5em; } -.container.border, .container.padding { width: 21.3em; } -.container.border.padding { width: 22.1em; } -.test { - snap-width: 1em; - text-align: right; -} -.ref { - white-space: pre; /* make sure the line does not wrap */ - width: 20em; -} -</style> -<body> -<p class="instructions">Test passes if each pair of boxes are the same, - including how they look, widths, and horizontal positions. - -<div class="container"> - <div class="test"><div>XXXXXXXXXX XXXXXXXXX</div></div> - <div class="ref"><div>XXXXXXXXXX XXXXXXXXX</div></div> -</div> - -<div class="border container"> - <div class="test"><div>XXXXXXXXXX XXXXXXXXX</div></div> - <div class="ref"><div>XXXXXXXXXX XXXXXXXXX</div></div> -</div> - -<div class="padding container"> - <div class="test"><div>XXXXXXXXXX XXXXXXXXX</div></div> - <div class="ref"><div>XXXXXXXXXX XXXXXXXXX</div></div> -</div> - -<div class="border padding container"> - <div class="test"><div>XXXXXXXXXX XXXXXXXXX</div></div> - <div class="ref"><div>XXXXXXXXXX XXXXXXXXX</div></div> -</div> -</body>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-block-in-fixed-001.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-block-in-fixed-001.html deleted file mode 100644 index dbe0abd5..0000000 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-block-in-fixed-001.html +++ /dev/null
@@ -1,58 +0,0 @@ -<!DOCTYPE html> -<title>CSS Snap Size: snap-width</title> -<link rel="help" href="https://drafts.csswg.org/css-snap-size/#snap-width"> -<link rel="match" href="reference/snap-width--001.html"> -<meta name="assert" content="This test asserts the snap-width property rounds down the box width."> -<meta name="flags" content="ahem"> -<link rel="author" title="Koji Ishii" href="kojiishi@gmail.com"> -<style> -.container { - font-family: Ahem; - font-size: 32px; - line-height: 1; -} -.container > div { - margin: .5em 0; -} -.border > div { - border-left: .4em transparent solid; - border-right: .4em transparent solid; -} -.padding > div { - padding: 0 .4em; -} - -.test { - snap-width: 1em; - text-align: right; - width: 20.5em; -} -.ref { - white-space: pre; /* make sure the line does not wrap */ - width: 20em; -} -</style> -<body> -<p class="instructions">Test passes if each pair of boxes are the same, - including how they look, widths, and horizontal positions. - -<div class="container"> - <div class="test"><div>XXXXXXXXXX XXXXXXXXX</div></div> - <div class="ref"><div>XXXXXXXXXX XXXXXXXXX</div></div> -</div> - -<div class="border container"> - <div class="test"><div>XXXXXXXXXX XXXXXXXXX</div></div> - <div class="ref"><div>XXXXXXXXXX XXXXXXXXX</div></div> -</div> - -<div class="padding container"> - <div class="test"><div>XXXXXXXXXX XXXXXXXXX</div></div> - <div class="ref"><div>XXXXXXXXXX XXXXXXXXX</div></div> -</div> - -<div class="border padding container"> - <div class="test"><div>XXXXXXXXXX XXXXXXXXX</div></div> - <div class="ref"><div>XXXXXXXXXX XXXXXXXXX</div></div> -</div> -</body>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-block-in-max-001.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-block-in-max-001.html deleted file mode 100644 index 2ba6d0a2..0000000 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-block-in-max-001.html +++ /dev/null
@@ -1,58 +0,0 @@ -<!DOCTYPE html> -<title>CSS Snap Size: snap-width</title> -<link rel="help" href="https://drafts.csswg.org/css-snap-size/#snap-width"> -<link rel="match" href="reference/snap-width--001.html"> -<meta name="assert" content="This test asserts the snap-width property rounds down the box width."> -<meta name="flags" content="ahem"> -<link rel="author" title="Koji Ishii" href="kojiishi@gmail.com"> -<style> -.container { - font-family: Ahem; - font-size: 32px; - line-height: 1; -} -.container > div { - margin: .5em 0; -} -.border > div { - border-left: .4em transparent solid; - border-right: .4em transparent solid; -} -.padding > div { - padding: 0 .4em; -} - -.test { - snap-width: 1em; - text-align: right; - max-width: 20.5em; -} -.ref { - white-space: pre; /* make sure the line does not wrap */ - width: 20em; -} -</style> -<body> -<p class="instructions">Test passes if each pair of boxes are the same, - including how they look, widths, and horizontal positions. - -<div class="container"> - <div class="test"><div>XXXXXXXXXX XXXXXXXXX</div></div> - <div class="ref"><div>XXXXXXXXXX XXXXXXXXX</div></div> -</div> - -<div class="border container"> - <div class="test"><div>XXXXXXXXXX XXXXXXXXX</div></div> - <div class="ref"><div>XXXXXXXXXX XXXXXXXXX</div></div> -</div> - -<div class="padding container"> - <div class="test"><div>XXXXXXXXXX XXXXXXXXX</div></div> - <div class="ref"><div>XXXXXXXXXX XXXXXXXXX</div></div> -</div> - -<div class="border padding container"> - <div class="test"><div>XXXXXXXXXX XXXXXXXXX</div></div> - <div class="ref"><div>XXXXXXXXXX XXXXXXXXX</div></div> -</div> -</body>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-inline-in-available-001.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-inline-in-available-001.html deleted file mode 100644 index 1e328bf..0000000 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-inline-in-available-001.html +++ /dev/null
@@ -1,60 +0,0 @@ -<!DOCTYPE html> -<title>CSS Snap Size: snap-width</title> -<link rel="help" href="https://drafts.csswg.org/css-snap-size/#snap-width"> -<link rel="match" href="reference/snap-width--001.html"> -<meta name="assert" content="This test asserts the snap-width property rounds down the box width."> -<meta name="flags" content="ahem"> -<link rel="author" title="Koji Ishii" href="kojiishi@gmail.com"> -<style> -.container { - font-family: Ahem; - font-size: 32px; - line-height: 1; -} -.container > div { - margin: .5em 0; -} -.border > div { - border-left: .4em transparent solid; - border-right: .4em transparent solid; -} -.padding > div { - padding: 0 .4em; -} - -.container { width: 20.5em; } -.container.border, .container.padding { width: 21.3em; } -.container.border.padding { width: 22.1em; } -.test { - snap-width: 1em; - text-align: right; -} -.ref { - white-space: pre; /* make sure the line does not wrap */ - width: 20em; -} -</style> -<body> -<p class="instructions">Test passes if each pair of boxes are the same, - including how they look, widths, and horizontal positions. - -<div class="container"> - <div class="test">XXXXXXXXXX XXXXXXXXX</div> - <div class="ref">XXXXXXXXXX XXXXXXXXX</div> -</div> - -<div class="border container"> - <div class="test">XXXXXXXXXX XXXXXXXXX</div> - <div class="ref">XXXXXXXXXX XXXXXXXXX</div> -</div> - -<div class="padding container"> - <div class="test">XXXXXXXXXX XXXXXXXXX</div> - <div class="ref">XXXXXXXXXX XXXXXXXXX</div> -</div> - -<div class="border padding container"> - <div class="test">XXXXXXXXXX XXXXXXXXX</div> - <div class="ref">XXXXXXXXXX XXXXXXXXX</div> -</div> -</body>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-inline-in-fixed-001.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-inline-in-fixed-001.html deleted file mode 100644 index 7b08cbe..0000000 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-inline-in-fixed-001.html +++ /dev/null
@@ -1,58 +0,0 @@ -<!DOCTYPE html> -<title>CSS Snap Size: snap-width</title> -<link rel="help" href="https://drafts.csswg.org/css-snap-size/#snap-width"> -<link rel="match" href="reference/snap-width--001.html"> -<meta name="assert" content="This test asserts the snap-width property rounds down the box width."> -<meta name="flags" content="ahem"> -<link rel="author" title="Koji Ishii" href="kojiishi@gmail.com"> -<style> -.container { - font-family: Ahem; - font-size: 32px; - line-height: 1; -} -.container > div { - margin: .5em 0; -} -.border > div { - border-left: .4em transparent solid; - border-right: .4em transparent solid; -} -.padding > div { - padding: 0 .4em; -} - -.test { - snap-width: 1em; - text-align: right; - width: 20.5em; -} -.ref { - white-space: pre; /* make sure the line does not wrap */ - width: 20em; -} -</style> -<body> -<p class="instructions">Test passes if each pair of boxes are the same, - including how they look, widths, and horizontal positions. - -<div class="container"> - <div class="test">XXXXXXXXXX XXXXXXXXX</div> - <div class="ref">XXXXXXXXXX XXXXXXXXX</div> -</div> - -<div class="border container"> - <div class="test">XXXXXXXXXX XXXXXXXXX</div> - <div class="ref">XXXXXXXXXX XXXXXXXXX</div> -</div> - -<div class="padding container"> - <div class="test">XXXXXXXXXX XXXXXXXXX</div> - <div class="ref">XXXXXXXXXX XXXXXXXXX</div> -</div> - -<div class="border padding container"> - <div class="test">XXXXXXXXXX XXXXXXXXX</div> - <div class="ref">XXXXXXXXXX XXXXXXXXX</div> -</div> -</body>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-inline-in-max-001.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-inline-in-max-001.html deleted file mode 100644 index c11d96e..0000000 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-inline-in-max-001.html +++ /dev/null
@@ -1,58 +0,0 @@ -<!DOCTYPE html> -<title>CSS Snap Size: snap-width</title> -<link rel="help" href="https://drafts.csswg.org/css-snap-size/#snap-width"> -<link rel="match" href="reference/snap-width--001.html"> -<meta name="assert" content="This test asserts the snap-width property rounds down the box width."> -<meta name="flags" content="ahem"> -<link rel="author" title="Koji Ishii" href="kojiishi@gmail.com"> -<style> -.container { - font-family: Ahem; - font-size: 32px; - line-height: 1; -} -.container > div { - margin: .5em 0; -} -.border > div { - border-left: .4em transparent solid; - border-right: .4em transparent solid; -} -.padding > div { - padding: 0 .4em; -} - -.test { - snap-width: 1em; - text-align: right; - max-width: 20.5em; -} -.ref { - white-space: pre; /* make sure the line does not wrap */ - width: 20em; -} -</style> -<body> -<p class="instructions">Test passes if each pair of boxes are the same, - including how they look, widths, and horizontal positions. - -<div class="container"> - <div class="test">XXXXXXXXXX XXXXXXXXX</div> - <div class="ref">XXXXXXXXXX XXXXXXXXX</div> -</div> - -<div class="border container"> - <div class="test">XXXXXXXXXX XXXXXXXXX</div> - <div class="ref">XXXXXXXXXX XXXXXXXXX</div> -</div> - -<div class="padding container"> - <div class="test">XXXXXXXXXX XXXXXXXXX</div> - <div class="ref">XXXXXXXXXX XXXXXXXXX</div> -</div> - -<div class="border padding container"> - <div class="test">XXXXXXXXXX XXXXXXXXX</div> - <div class="ref">XXXXXXXXXX XXXXXXXXX</div> -</div> -</body>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-parsing-001-expected.txt b/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-parsing-001-expected.txt deleted file mode 100644 index 1866465..0000000 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-parsing-001-expected.txt +++ /dev/null
@@ -1,13 +0,0 @@ -This is a testharness.js-based test. -FAIL initial value assert_equals: expected (string) "0px" but got (undefined) undefined -FAIL snap-width: 20px assert_equals: expected (string) "20px" but got (undefined) undefined -FAIL snap-width should not inherit assert_equals: expected (string) "0px" but got (undefined) undefined -FAIL snap-width: inherit assert_equals: expected (string) "20px" but got (undefined) undefined -FAIL snap-width: 20px; snap-width: initial assert_equals: expected (string) "0px" but got (undefined) undefined -FAIL snap-width: 20px; snap-width: 0 assert_equals: expected (string) "0px" but got (undefined) undefined -FAIL snap-width: 20px; snap-width: 1 assert_equals: expected (string) "20px" but got (undefined) undefined -FAIL snap-width: 20px; snap-width: -1px assert_equals: expected (string) "20px" but got (undefined) undefined -FAIL snap-width: 20px; snap-width: 10% assert_equals: expected (string) "20px" but got (undefined) undefined -FAIL Computed value must be the absolute length Cannot read property 'slice' of undefined -Harness: the test ran to completion. -
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-parsing-001.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-parsing-001.html deleted file mode 100644 index f358bed..0000000 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-parsing-001.html +++ /dev/null
@@ -1,40 +0,0 @@ -<!DOCTYPE html> -<title>CSS Snap Size: parsing snap-width</title> -<link rel="author" title="Koji Ishii" href="kojiishi@gmail.com"> -<link rel="help" href="https://drafts.csswg.org/css-snap-size/#snap-width"> -<meta name="assert" content="This test asserts the parsing and getComputedStyle works correctly for the snap-width property."> -<meta name="flags" content="dom"> -<script src="/resources/testharness.js"></script> -<script src="/resources/testharnessreport.js"></script> - -<div data-expected="0px" title="initial value"></div> - -<div style="snap-width: 20px" data-expected="20px"> - <div data-expected="0px" title="snap-width should not inherit"></div> - <div style="snap-width: inherit" data-expected="20px"></div> -</div> - -<div style="snap-width: 20px; snap-width: initial" data-expected="0px"></div> - -<!-- "0" is a valid length even without units --> -<div style="snap-width: 20px; snap-width: 0" data-expected="0px"></div> - -<!-- These are invalid and thus its preceding declarations should remain --> -<div style="snap-width: 20px; snap-width: 1" data-expected="20px"></div> -<div style="snap-width: 20px; snap-width: -1px" data-expected="20px"></div> -<div style="snap-width: 20px; snap-width: 10%" data-expected="20px"></div> - -<div id="pt" style="snap-width: 40pt"></div> - -<script> -Array.prototype.forEach.call(document.querySelectorAll("[data-expected]"), function (element) { - test(function () { - var actual = getComputedStyle(element).snapWidth; - assert_equals(actual, element.dataset.expected); - }, element.title || element.getAttribute("style")); -}); - -test(function () { - assert_equals(getComputedStyle(document.getElementById("pt")).snapWidth.slice(-2), "px"); -}, "Computed value must be the absolute length"); -</script>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-table-in-available-001.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-table-in-available-001.html deleted file mode 100644 index 23e93a9..0000000 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-table-in-available-001.html +++ /dev/null
@@ -1,62 +0,0 @@ -<!DOCTYPE html> -<title>CSS Snap Size: snap-width</title> -<link rel="help" href="https://drafts.csswg.org/css-snap-size/#snap-width"> -<link rel="match" href="reference/snap-width--001.html"> -<meta name="assert" content="This test asserts the snap-width property rounds down the box width."> -<meta name="flags" content="ahem"> -<link rel="author" title="Koji Ishii" href="kojiishi@gmail.com"> -<style> -.container { - font-family: Ahem; - font-size: 32px; - line-height: 1; -} -.container > div { - margin: .5em 0; -} -.border > div { - border-left: .4em transparent solid; - border-right: .4em transparent solid; -} -.padding > div { - padding: 0 .4em; -} - -.container { width: 20.5em; } -.container.border, .container.padding { width: 21.3em; } -.container.border.padding { width: 22.1em; } -.test { - snap-width: 1em; - text-align: right; -} -table { border-spacing: 0; } -td { padding: 0; } -.ref { - white-space: pre; /* make sure the line does not wrap */ - width: 20em; -} -</style> -<body> -<p class="instructions">Test passes if each pair of boxes are the same, - including how they look, widths, and horizontal positions. - -<div class="container"> - <div class="test"><table width="100%"><tr><td>XXXXXXXXXX XXXXXXXXX</td></tr></table></div> - <div class="ref"><table width="100%"><tr><td>XXXXXXXXXX XXXXXXXXX</td></tr></table></div> -</div> - -<div class="border container"> - <div class="test"><table width="100%"><tr><td>XXXXXXXXXX XXXXXXXXX</td></tr></table></div> - <div class="ref"><table width="100%"><tr><td>XXXXXXXXXX XXXXXXXXX</td></tr></table></div> -</div> - -<div class="padding container"> - <div class="test"><table width="100%"><tr><td>XXXXXXXXXX XXXXXXXXX</td></tr></table></div> - <div class="ref"><table width="100%"><tr><td>XXXXXXXXXX XXXXXXXXX</td></tr></table></div> -</div> - -<div class="border padding container"> - <div class="test"><table width="100%"><tr><td>XXXXXXXXXX XXXXXXXXX</td></tr></table></div> - <div class="ref"><table width="100%"><tr><td>XXXXXXXXXX XXXXXXXXX</td></tr></table></div> -</div> -</body>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-table-in-fixed-001.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-table-in-fixed-001.html deleted file mode 100644 index 0ebb3db..0000000 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-table-in-fixed-001.html +++ /dev/null
@@ -1,60 +0,0 @@ -<!DOCTYPE html> -<title>CSS Snap Size: snap-width</title> -<link rel="help" href="https://drafts.csswg.org/css-snap-size/#snap-width"> -<link rel="match" href="reference/snap-width--001.html"> -<meta name="assert" content="This test asserts the snap-width property rounds down the box width."> -<meta name="flags" content="ahem"> -<link rel="author" title="Koji Ishii" href="kojiishi@gmail.com"> -<style> -.container { - font-family: Ahem; - font-size: 32px; - line-height: 1; -} -.container > div { - margin: .5em 0; -} -.border > div { - border-left: .4em transparent solid; - border-right: .4em transparent solid; -} -.padding > div { - padding: 0 .4em; -} - -.test { - snap-width: 1em; - text-align: right; - width: 20.5em; -} -table { border-spacing: 0; } -td { padding: 0; } -.ref { - white-space: pre; /* make sure the line does not wrap */ - width: 20em; -} -</style> -<body> -<p class="instructions">Test passes if each pair of boxes are the same, - including how they look, widths, and horizontal positions. - -<div class="container"> - <div class="test"><table width="100%"><tr><td>XXXXXXXXXX XXXXXXXXX</td></tr></table></div> - <div class="ref"><table width="100%"><tr><td>XXXXXXXXXX XXXXXXXXX</td></tr></table></div> -</div> - -<div class="border container"> - <div class="test"><table width="100%"><tr><td>XXXXXXXXXX XXXXXXXXX</td></tr></table></div> - <div class="ref"><table width="100%"><tr><td>XXXXXXXXXX XXXXXXXXX</td></tr></table></div> -</div> - -<div class="padding container"> - <div class="test"><table width="100%"><tr><td>XXXXXXXXXX XXXXXXXXX</td></tr></table></div> - <div class="ref"><table width="100%"><tr><td>XXXXXXXXXX XXXXXXXXX</td></tr></table></div> -</div> - -<div class="border padding container"> - <div class="test"><table width="100%"><tr><td>XXXXXXXXXX XXXXXXXXX</td></tr></table></div> - <div class="ref"><table width="100%"><tr><td>XXXXXXXXXX XXXXXXXXX</td></tr></table></div> -</div> -</body>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-table-in-max-001.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-table-in-max-001.html deleted file mode 100644 index 29905ef..0000000 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-width-table-in-max-001.html +++ /dev/null
@@ -1,60 +0,0 @@ -<!DOCTYPE html> -<title>CSS Snap Size: snap-width</title> -<link rel="help" href="https://drafts.csswg.org/css-snap-size/#snap-width"> -<link rel="match" href="reference/snap-width--001.html"> -<meta name="assert" content="This test asserts the snap-width property rounds down the box width."> -<meta name="flags" content="ahem"> -<link rel="author" title="Koji Ishii" href="kojiishi@gmail.com"> -<style> -.container { - font-family: Ahem; - font-size: 32px; - line-height: 1; -} -.container > div { - margin: .5em 0; -} -.border > div { - border-left: .4em transparent solid; - border-right: .4em transparent solid; -} -.padding > div { - padding: 0 .4em; -} - -.test { - snap-width: 1em; - text-align: right; - max-width: 20.5em; -} -table { border-spacing: 0; } -td { padding: 0; } -.ref { - white-space: pre; /* make sure the line does not wrap */ - width: 20em; -} -</style> -<body> -<p class="instructions">Test passes if each pair of boxes are the same, - including how they look, widths, and horizontal positions. - -<div class="container"> - <div class="test"><table width="100%"><tr><td>XXXXXXXXXX XXXXXXXXX</td></tr></table></div> - <div class="ref"><table width="100%"><tr><td>XXXXXXXXXX XXXXXXXXX</td></tr></table></div> -</div> - -<div class="border container"> - <div class="test"><table width="100%"><tr><td>XXXXXXXXXX XXXXXXXXX</td></tr></table></div> - <div class="ref"><table width="100%"><tr><td>XXXXXXXXXX XXXXXXXXX</td></tr></table></div> -</div> - -<div class="padding container"> - <div class="test"><table width="100%"><tr><td>XXXXXXXXXX XXXXXXXXX</td></tr></table></div> - <div class="ref"><table width="100%"><tr><td>XXXXXXXXXX XXXXXXXXX</td></tr></table></div> -</div> - -<div class="border padding container"> - <div class="test"><table width="100%"><tr><td>XXXXXXXXXX XXXXXXXXX</td></tr></table></div> - <div class="ref"><table width="100%"><tr><td>XXXXXXXXXX XXXXXXXXX</td></tr></table></div> -</div> -</body>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-text-3/overflow-wrap/overflow-wrap-break-word-fit-content-001-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-text-3/overflow-wrap/overflow-wrap-break-word-fit-content-001-expected.html index eeec844..30787e2 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-text-3/overflow-wrap/overflow-wrap-break-word-fit-content-001-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-text-3/overflow-wrap/overflow-wrap-break-word-fit-content-001-expected.html
@@ -1,7 +1,7 @@ <!DOCTYPE html> <meta charset="utf-8"> <title>CSS Text Test: overflow-wrap: break-word with fit-content</title> -<link rel="author" title="Koji Ishii" href="kojiishi@gmail.com"> +<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com"> <style> .test { display: inline-block;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-text-3/overflow-wrap/overflow-wrap-break-word-fit-content-001.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-text-3/overflow-wrap/overflow-wrap-break-word-fit-content-001.html index ef7116f..bce6c68 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-text-3/overflow-wrap/overflow-wrap-break-word-fit-content-001.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-text-3/overflow-wrap/overflow-wrap-break-word-fit-content-001.html
@@ -1,7 +1,7 @@ <!DOCTYPE html> <meta charset="utf-8"> <title>CSS Text Test: overflow-wrap: break-word with fit-content</title> -<link rel="author" title="Koji Ishii" href="kojiishi@gmail.com"> +<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com"> <link rel="help" title="6.2. Overflow Wrapping: the 'word-wrap'/'overflow-wrap' property" href="http://www.w3.org/TR/css-text-3/#overflow-wrap"> <meta name="flags" content=""> <link rel="match" href="reference/overflow-wrap-break-word-fit-content-001.html">
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-021-expected.xht b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-021-expected.xht new file mode 100644 index 0000000..1b6f5ab --- /dev/null +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-021-expected.xht
@@ -0,0 +1,41 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml"> + + <head> + + <title>CSS Reftest Reference</title> + + <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> + + <meta content="" name="flags" /> + + <style type="text/css"><![CDATA[ + body + { + margin-left: 32px; + } + + div + { + border: blue solid 2px; + font-size: 32px; + margin: 1em; + writing-mode: vertical-rl; + } + ]]></style> + + </head> + + <body> + + <p>Test passes if there are 3 identical blue rectangles with "123456" rotated 90 degrees clockwise. The size of each blue rectangles must be identical and the three "123456" numbers must be enclosed by the three blue borders.</p> + + <div>123456</div> + + <div>123456</div> + + <div>123456</div> + + </body> +</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-021.xht b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-021.xht new file mode 100644 index 0000000..e4eca61fd --- /dev/null +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-021.xht
@@ -0,0 +1,77 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml"> + + <head> + + <title>CSS Writing Modes Test: line box height and border on non-replaced inline box (complex)</title> + + <!-- + Test inspired by + http://mxr.mozilla.org/mozilla-central/source/layout/reftests/writing-mode/1130907-intrinsic-sizing-2.html + --> + + <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> + <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" /> + <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" title="10.8.1 Leading and half-leading" /> + <link rel="match" href="line-box-height-vlr-021-ref.xht" /> + + <meta content="" name="flags" /> + <meta content="This test checks that a line box height does not increase because an inline non-replaced box has a border. In this test, the '34' inline box and the '56' inline box should be lined up with its inline '12' sibling. The line box height, enclosed by the blue border should not grow to accomodate transparent 'border-left' of inline box and transparent 'border-right' of inline box." name="assert" /> + <meta name="DC.date.created" content="2015-07-22T09:54:03+11:00" scheme= + "W3CDTF" /> + <meta name="DC.date.modified" content="2016-07-22T09:54:03+11:00" scheme= + "W3CDTF" /> + + <style type="text/css"><![CDATA[ + body + { + margin-left: 32px; + } + + div.vlr, div#reference + { + border: blue solid 2px; + font-size: 32px; + margin: 1em; + } + + div.vlr + { + writing-mode: vertical-lr; + } + + span.brdr-left + { + border-left: 1.5em solid transparent; + } + + span.brdr-right + { + border-right: 1.5em solid transparent; + } + + div#reference + { + writing-mode: vertical-rl; + } + ]]></style> + + </head> + + <body> + + <p>Test passes if there are 3 identical blue rectangles with "123456" rotated 90 degrees clockwise. The size of each blue rectangles must be identical and the three "123456" numbers must be enclosed by the three blue borders.</p> + + <div class="vlr"> + <div>12<span class="brdr-left">34</span>56</div> + </div> + + <div class="vlr"> + <div>12<span class="brdr-right">34</span>56</div> + </div> + + <div id="reference">123456</div> + + </body> +</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-023-expected.xht b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-023-expected.xht new file mode 100644 index 0000000..91797c3 --- /dev/null +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-023-expected.xht
@@ -0,0 +1,42 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml"> + + <head> + + <title>CSS Reftest Reference</title> + + <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> + + <meta content="" name="flags" /> + + <style type="text/css"><![CDATA[ + body + { + margin-left: 32px; + } + + div + { + border: blue solid 2px; + float: left; + font-size: 32px; + margin: 1em; + writing-mode: vertical-rl; + } + ]]></style> + + </head> + + <body> + + <p>Test passes if there are 3 identical blue rectangles with "123456" rotated 90 degrees clockwise. The size of each blue rectangles must be identical and the three "123456" numbers must be enclosed by the three blue borders.</p> + + <div>123456</div> + + <div>123456</div> + + <div>123456</div> + + </body> +</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-023.xht b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-023.xht new file mode 100644 index 0000000..50e6784 --- /dev/null +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-023.xht
@@ -0,0 +1,76 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml"> + + <head> + + <title>CSS Writing Modes Test: line box height and border on non-replaced inline box (complex)</title> + + <!-- + Test inspired by + http://mxr.mozilla.org/mozilla-central/source/layout/reftests/writing-mode/1130907-intrinsic-sizing-2.html + --> + + <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> + <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" /> + <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" title="10.8.1 Leading and half-leading" /> + <link rel="match" href="line-box-height-vlr-023-ref.xht" /> + + <meta content="" name="flags" /> + <meta content="This test checks that a line box height does not increase because an inline non-replaced box has a border. In this test, the '34' inline box and the '56' inline box should be lined up with its inline '12' sibling. The line box height, enclosed by the blue border should not grow to accomodate transparent 'border-left' of inline box and transparent 'border-right' of inline box." name="assert" /> + <meta name="DC.date.created" content="2015-07-22T09:54:03+11:00" scheme="W3CDTF" /> + <meta name="DC.date.modified" content="2016-07-22T09:54:03+11:00" scheme="W3CDTF" /> + + <style type="text/css"><![CDATA[ + body + { + margin-left: 32px; + } + + div.vlr, div#reference + { + border: blue solid 2px; + float: left; + font-size: 32px; + margin: 1em; + } + + div.vlr + { + writing-mode: vertical-lr; + } + + span.brdr-left + { + border-left: 1.5em solid transparent; + } + + span.brdr-right + { + border-right: 1.5em solid transparent; + } + + div#reference + { + writing-mode: vertical-rl; + } + ]]></style> + + </head> + + <body> + + <p>Test passes if there are 3 identical blue rectangles with "123456" rotated 90 degrees clockwise. The size of each blue rectangles must be identical and the three "123456" numbers must be enclosed by the three blue borders.</p> + + <div class="vlr"> + <div>12<span class="brdr-left">34</span>56</div> + </div> + + <div class="vlr"> + <div>12<span class="brdr-right">34</span>56</div> + </div> + + <div id="reference">123456</div> + + </body> +</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/ortho-htb-alongside-vrl-floats-002-expected.xht b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/ortho-htb-alongside-vrl-floats-002-expected.xht new file mode 100644 index 0000000..bd5b1c13 --- /dev/null +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/ortho-htb-alongside-vrl-floats-002-expected.xht
@@ -0,0 +1,121 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml"> + + <head> + + <title>CSS Reftest Reference</title> + + <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> + + <meta content="image" name="flags" /> + + <style type="text/css"><![CDATA[ + html + { + height: 100%; + } + + /* + minimum used height of the document root element is 176px; + less than 176px will make the reference file no longer reliable. + + 36px : img#pass-fail-conditions-sentence's intrinsic height + + + 4px : descender space below baseline + ========= + 40px : 1st table (height: 25%) + multiplied by + 4 + ========= + 160px : height of the 3 tables + + + 8px : body's margin-top + + + 8px : body's margin-bottom + ========= + 176px + */ + + body + { + height: calc(100% - 16px); + } + + table + { + border-spacing: 0px; + margin: 0px; + table-layout: fixed; + width: 100%; + } + + td + { + padding: 0px; + vertical-align: top; + } + + table#first-table-top + { + height: 25%; + } + + table#second-table-middle + { + height: 25%; + } + + table#third-table-bottom + { + height: 50%; + } + ]]></style> + </head> + + <body> + + <table id="first-table-top"> + + <col></col><col width="100"></col><col width="100"></col><col width="324"></col> + + <tr> + <td></td> + <td style="background-color: olive;"> </td> + <td style="background-color: blue;"> </td> + <td style="padding-left: 16px; padding-right: 8px;"><img id="pass-fail-conditions-sentence" src="support/ortho-htb-alongside-vrl-floats-002-exp-res.png" alt="Image download support must be enabled" /> + <!-- + The image says: + Test passes if the orange rectangle + is below the blue rectangle. + --></td> + </tr> + + </table> + + + + <table id="second-table-middle"> + + <col></col><col width="100"></col><col width="100"></col><col width="324"></col> + + <tr> + <td></td><td style="background-color: olive;"> </td><td style="background-color: orange;"> </td><td></td> + </tr> + + </table> + + + + <table id="third-table-bottom"> + + <col></col><col width="100"></col><col width="100"></col><col width="324"></col> + + <tr> + <td></td><td></td><td style="background-color: orange;"> </td><td></td> + </tr> + + </table> + + </body> +</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/ortho-htb-alongside-vrl-floats-002.xht b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/ortho-htb-alongside-vrl-floats-002.xht new file mode 100644 index 0000000..561cc46 --- /dev/null +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/ortho-htb-alongside-vrl-floats-002.xht
@@ -0,0 +1,98 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml"> + + <head> + + <title>CSS Writing Modes Test: positioning of an orthogonal (horizontal-tb) block alongside vertical-rl floats</title> + + <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> + <link rel="bookmark" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1283721" title="Bug 1283721: Incorrect positioning of orthogonal (horizontal-tb) block alongside vertical-rl floats" /> + <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" /> + <link rel="match" href="ortho-htb-alongside-vrl-floats-002-ref.xht" /> + + <!-- + The 'horizontal-tb' equivalent of this test is + http://www.gtalbot.org/BugzillaSection/Bug1283721-ortho-htb-alongside-vrl-floats-006htb.html + --> + + <meta content="image" name="flags" /> + <meta content="This test checks that non-positioned block boxes created after the float box flow vertically as if the float did not exist. In this test, the orange block box, which creates a new block formatting context, should flow next to the earliest float that offers sufficient (logical width) space." name="assert" /> + <meta name="DC.date.created" content="2016-07-04T09:54:03+11:00" scheme="W3CDTF" /> + <meta name="DC.date.modified" content="2016-07-21T09:54:03+11:00" scheme="W3CDTF" /> + + <style type="text/css"><![CDATA[ + html + { + writing-mode: vertical-rl; + } + + /* + minimum used height of the document root element is 176px; + less than 176px will make the reference file no longer reliable. + + 36px : image intrinsic height + + + 4px : descender space below baseline + ========= + 40px : 1st table with 'height: 25%' + multiplied by + 4 + ========= + 160px : height of the 3 tables + + + 8px : body's margin-top + + + 8px : body's margin-bottom + ========= + 176px + */ + + div + { + width: 100px; + } + + div#first-blue-float + { + background-color: blue; + float: left; + height: 25%; + } + + div#second-olive-float-with-clear + { + background-color: olive; + clear: left; + float: left; + height: 50%; + } + + div#orange-horiz-tb + { + background-color: orange; + height: 75%; + writing-mode: horizontal-tb; + } + ]]></style> + + </head> + + <body> + + <p><img src="support/ortho-htb-alongside-vrl-floats-002-exp-res.png" width="300" height="36" alt="Image download support must be enabled" /></p> + + <!-- + The image says: + Test passes if the orange rectangle + is below the blue rectangle. + --> + + <div id="first-blue-float"> </div> + + <div id="second-olive-float-with-clear"> </div> + + <div id="orange-horiz-tb"> </div> + + </body> +</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/ortho-htb-alongside-vrl-floats-006-expected.xht b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/ortho-htb-alongside-vrl-floats-006-expected.xht new file mode 100644 index 0000000..984d846 --- /dev/null +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/ortho-htb-alongside-vrl-floats-006-expected.xht
@@ -0,0 +1,121 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml"> + + <head> + + <title>CSS Reftest Reference</title> + + <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> + + <meta content="image" name="flags" /> + + <style type="text/css"><![CDATA[ + html + { + height: 100%; + } + + /* + minimum used height of the document root element is 176px; + less than 176px will make the reference file no longer reliable. + + 36px : img#pass-fail-conditions-sentence's intrinsic height + + + 4px : descender space below baseline + ========= + 40px : 1st table (height: 25%) + multiplied by + 4 + ========= + 160px : height of the 3 tables + + + 8px : body's margin-top + + + 8px : body's margin-bottom + ========= + 176px + */ + + body + { + height: calc(100% - 16px); + } + + table + { + border-spacing: 0px; + height: 25%; + margin: 0px; + table-layout: fixed; + width: 100%; + } + + td + { + padding: 0px; + vertical-align: top; + } + ]]></style> + </head> + + <body> + + <table id="first-table-top"> + + <col></col><col width="100"></col><col width="100"></col><col width="100"></col><col width="100"></col><col width="324"></col> + + <tr> + <td></td> + <td style="background-color: fuchsia;"> </td> + <td style="background-color: olive;"> </td> + <td style="background-color: blue;"> </td> + <td style="background-color: fuchsia;"> </td> + <td style="padding-left: 16px; padding-right: 8px;"><img id="pass-fail-conditions-sentence" src="support/ortho-htb-alongside-vrl-floats-002-exp-res.png" alt="Image download support must be enabled" /> + <!-- + The image says: + Test passes if the orange rectangle + is below the blue rectangle. + --></td> + </tr> + + </table> + + + + <table id="second-table-middle"> + + <col></col><col width="100"></col><col width="100"></col><col width="100"></col><col width="100"></col><col width="324"></col> + + <tr> + <td></td><td style="background-color: fuchsia;"></td><td style="background-color: olive;"> </td><td style="background-color: orange;"> </td><td style="background-color: fuchsia;"> </td><td></td> + </tr> + + </table> + + + + <table id="third-table-middle"> + + <col></col><col width="100"></col><col width="100"></col><col width="100"></col><col width="100"></col><col width="324"></col> + + <tr> + <td></td><td style="background-color: fuchsia;"></td><td></td><td style="background-color: orange;"> </td><td style="background-color: fuchsia;"> </td><td></td> + </tr> + + </table> + + + + <table id="fourth-table-bottom"> + + <col></col><col width="100"></col><col width="100"></col><col width="100"></col><col width="100"></col><col width="324"></col> + + <tr> + <td></td><td></td><td></td><td></td><td></td> + </tr> + + </table> + + </body> +</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/ortho-htb-alongside-vrl-floats-006.xht b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/ortho-htb-alongside-vrl-floats-006.xht new file mode 100644 index 0000000..5f1ae73c --- /dev/null +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/ortho-htb-alongside-vrl-floats-006.xht
@@ -0,0 +1,97 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml"> + + <head> + + <title>CSS Writing Modes Test: positioning of an orthogonal (horizontal-tb) block alongside vertical-rl floats</title> + + <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> + <link rel="bookmark" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1283721" title="Bug 1283721: Incorrect positioning of orthogonal (horizontal-tb) block alongside vertical-rl floats" /> + <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" /> + <link rel="match" href="ortho-htb-alongside-vrl-floats-006-ref.xht" /> + + <!-- + The 'horizontal-tb' equivalent of this test is + http://www.gtalbot.org/BugzillaSection/Bug1283721-new-block-form-ctxt-alongside-floats-005.html + --> + + <meta content="image" name="flags" /> + <meta content="This test checks that non-positioned block boxes created after the float box flow vertically as if the float did not exist. In this test, the orange block box, which creates a new block formatting context, should flow next to the earliest float that offers sufficient (logical width) space: in this test, this is the blue rectangle." name="assert" /> + <meta name="DC.date.created" content="2016-07-04T09:54:03+11:00" scheme="W3CDTF" /> + <meta name="DC.date.modified" content="2016-07-21T09:54:03+11:00" scheme="W3CDTF" /> + + <style type="text/css"><![CDATA[ + html + { + writing-mode: vertical-rl; + } + + div + { + width: 100px; + } + + div#tall-fuchsia-float + { + background-color: fuchsia; + float: left; + height: 75%; + } + + div#second-blue-float + { + background-color: blue; + clear: left; + float: left; + height: 25%; + } + + div#third-olive-float-with-clear + { + background-color: olive; + clear: left; + float: left; + height: 50%; + } + + div#fourth-fuchsia-float-with-clear + { + background-color: fuchsia; + clear: left; + float: left; + height: 75%; + } + + div#orange-horiz-tb + { + background-color: orange; + height: 50%; + writing-mode: horizontal-tb; + } + ]]></style> + + </head> + + <body> + + <p><img src="support/ortho-htb-alongside-vrl-floats-002-exp-res.png" width="300" height="36" alt="Image download support must be enabled" /></p> + + <!-- + The image says: + Test passes if the orange rectangle + is below the blue rectangle. + --> + + <div id="tall-fuchsia-float"> </div> + + <div id="second-blue-float"> </div> + + <div id="third-olive-float-with-clear"> </div> + + <div id="fourth-fuchsia-float-with-clear"> </div> + + <div id="orange-horiz-tb"> </div> + + </body> +</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/ortho-htb-alongside-vrl-floats-010-expected.xht b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/ortho-htb-alongside-vrl-floats-010-expected.xht new file mode 100644 index 0000000..ac17988 --- /dev/null +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/ortho-htb-alongside-vrl-floats-010-expected.xht
@@ -0,0 +1,128 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml"> + + <head> + + <title>CSS Reftest Reference</title> + + <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> + + <meta content="image" name="flags" /> + + <style type="text/css"><![CDATA[ + html + { + height: 100%; + } + + /* + minimum used height of the document root element is 176px; + less than 176px will make the reference file no longer reliable. + + 36px : img#pass-fail-conditions-sentence's intrinsic height + + + 4px : descender space below baseline + ========= + 40px : 1st table (height: 25%) + multiplied by + 4 + ========= + 160px : height of the 3 tables + + + 8px : body's margin-top + + + 8px : body's margin-bottom + ========= + 176px + */ + + body + { + height: calc(100% - 16px); + } + + table + { + border-spacing: 0px; + height: 25%; + margin: 0px; + table-layout: fixed; + width: 100%; + } + + td + { + padding: 0px; + vertical-align: top; + } + ]]></style> + </head> + + <body> + + <table id="first-table-top"> + + <col></col><col width="100"></col><col width="100"></col><col width="100"></col><col width="324"></col> + + <tr> + <td></td> + <td style="background-color: fuchsia;"> </td> + <td style="background-color: olive;"> </td> + <td style="background-color: blue;"> </td> + <td style="padding-left: 16px; padding-right: 8px;"><img id="pass-fail-conditions-sentence" src="support/ortho-htb-alongside-vrl-floats-002-exp-res.png" alt="Image download support must be enabled" /> + <!-- + The image says: + Test passes if the orange rectangle + is below the blue rectangle. + --></td> + </tr> + + </table> + + + + <table id="second-table-middle"> + + <col></col><col width="100"></col><col width="100"></col><col width="100"></col><col width="324"></col> + + <tr> + <td></td> + <td style="background-color: fuchsia;"></td> + <td style="background-color: olive;"> </td> + <td style="background-color: orange;"> </td> + <td></td> + </tr> + + </table> + + + + <table id="third-table-middle"> + + <col></col><col width="100"></col><col width="100"></col><col width="100"></col><col width="324"></col> + + <tr> + <td></td> + <td style="background-color: fuchsia;"></td> + <td></td> + <td style="background-color: orange;"> </td> + <td></td> + </tr> + + </table> + + + + <table id="fourth-table-bottom"> + + <col></col><col width="100"></col><col width="100"></col><col width="100"></col><col width="324"></col> + + <tr> + <td></td><td></td><td></td><td></td> + </tr> + + </table> + + </body> +</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/ortho-htb-alongside-vrl-floats-010.xht b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/ortho-htb-alongside-vrl-floats-010.xht new file mode 100644 index 0000000..195e988 --- /dev/null +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/ortho-htb-alongside-vrl-floats-010.xht
@@ -0,0 +1,88 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml"> + + <head> + + <title>CSS Writing Modes Test: positioning of an orthogonal (horizontal-tb) block alongside vertical-rl floats</title> + + <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> + <link rel="bookmark" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1283721" title="Bug 1283721: Incorrect positioning of orthogonal (horizontal-tb) block alongside vertical-rl floats" /> + <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" /> + <link rel="match" href="ortho-htb-alongside-vrl-floats-010-ref.xht" /> + + <!-- + The 'horizontal-tb' equivalent of this test is + http://www.gtalbot.org/BugzillaSection/Bug1283721-new-block-form-ctxt-alongside-floats-004.html + --> + + <meta content="image" name="flags" /> + <meta content="This test checks that non-positioned block boxes created after the float box flow vertically as if the float did not exist. In this test, the orange block box, which creates a new block formatting context, should flow next to the earliest float that offers sufficient (logical width) space: in this test, this is the blue rectangle." name="assert" /> + <meta name="DC.date.created" content="2016-07-04T09:54:03+11:00" scheme="W3CDTF" /> + <meta name="DC.date.modified" content="2016-07-21T09:54:03+11:00" scheme="W3CDTF" /> + + <style type="text/css"><![CDATA[ + html + { + writing-mode: vertical-rl; + } + + div + { + width: 100px; + } + + div#first-blue-float + { + background-color: blue; + clear: left; + float: left; + height: 25%; + } + + div#second-olive-float-with-clear + { + background-color: olive; + clear: left; + float: left; + height: 50%; + } + + div#third-fuchsia-float-with-clear + { + background-color: fuchsia; + clear: left; + float: left; + height: 75%; + } + + div#orange-horiz-tb + { + background-color: orange; + height: 50%; + writing-mode: horizontal-tb; + } + ]]></style> + + </head> + + <body> + + <p><img src="support/ortho-htb-alongside-vrl-floats-002-exp-res.png" width="300" height="36" alt="Image download support must be enabled" /></p> + + <!-- + The image says: + Test passes if the orange rectangle + is below the blue rectangle. + --> + + <div id="first-blue-float"> </div> + + <div id="second-olive-float-with-clear"> </div> + + <div id="third-fuchsia-float-with-clear"> </div> + + <div id="orange-horiz-tb"> </div> + + </body> +</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/ortho-htb-alongside-vrl-floats-014-expected.xht b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/ortho-htb-alongside-vrl-floats-014-expected.xht new file mode 100644 index 0000000..28f0e333 --- /dev/null +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/ortho-htb-alongside-vrl-floats-014-expected.xht
@@ -0,0 +1,121 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml"> + + <head> + + <title>CSS Reftest Reference</title> + + <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> + + <meta content="image" name="flags" /> + + <style type="text/css"><![CDATA[ + html + { + height: 100%; + } + + /* + minimum used height of the document root element is 176px; + less than 176px will make the reference file no longer reliable. + + 36px : img#pass-fail-conditions-sentence's intrinsic height + + + 4px : descender space below baseline + ========= + 40px : 1st table (height: 25%) + multiplied by + 4 + ========= + 160px : height of the 3 tables + + + 8px : body's margin-top + + + 8px : body's margin-bottom + ========= + 176px + */ + + body + { + height: calc(100% - 16px); + } + + table + { + border-spacing: 0px; + margin: 0px; + table-layout: fixed; + width: 100%; + } + + td + { + padding: 0px; + vertical-align: top; + } + + table#first-table-top + { + height: 25%; + } + + table#second-table-middle + { + height: 25%; + } + + table#third-table-bottom + { + height: 50%; + } + ]]></style> + </head> + + <body> + + <table id="first-table-top"> + + <col></col><col width="100"></col><col width="100"></col><col width="324"></col> + + <tr> + <td></td> + <td style="background-color: blue;"> </td> + <td style="background-color: olive;"> </td> + <td style="padding-left: 16px; padding-right: 8px;"><img id="pass-fail-conditions-sentence" src="support/ortho-htb-alongside-vrl-floats-002-exp-res.png" alt="Image download support must be enabled" /> + <!-- + The image says: + Test passes if the orange rectangle + is below the blue rectangle. + --></td> + </tr> + + </table> + + + + <table id="second-table-middle"> + + <col></col><col width="100"></col><col width="100"></col><col width="324"></col> + + <tr> + <td></td><td style="background-color: orange;"> </td><td style="background-color: olive;"> </td><td></td> + </tr> + + </table> + + + + <table id="third-table-bottom"> + + <col></col><col width="100"></col><col width="100"></col><col width="324"></col> + + <tr> + <td></td><td style="background-color: orange;"> </td><td></td><td></td> + </tr> + + </table> + + </body> +</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/ortho-htb-alongside-vrl-floats-014.xht b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/ortho-htb-alongside-vrl-floats-014.xht new file mode 100644 index 0000000..141a2db --- /dev/null +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/ortho-htb-alongside-vrl-floats-014.xht
@@ -0,0 +1,98 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml"> + + <head> + + <title>CSS Writing Modes Test: positioning of an orthogonal (horizontal-tb) block alongside vertical-rl floats</title> + + <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> + <link rel="bookmark" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1283721" title="Bug 1283721: Incorrect positioning of orthogonal (horizontal-tb) block alongside vertical-rl floats" /> + <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" /> + <link rel="match" href="ortho-htb-alongside-vrl-floats-014-ref.xht" /> + + <!-- + The 'horizontal-tb' equivalent of this test is + http://www.gtalbot.org/BugzillaSection/Bug1283721-ortho-htb-alongside-vrl-floats-007htb.html + --> + + <meta content="image" name="flags" /> + <meta content="This test checks that non-positioned block boxes created after the float box flow vertically as if the float did not exist. In this test, the orange block box, which creates a new block formatting context, should flow next to the earliest float that offers sufficient (logical width) space." name="assert" /> + <meta name="DC.date.created" content="2016-07-04T09:54:03+11:00" scheme="W3CDTF" /> + <meta name="DC.date.modified" content="2016-07-21T09:54:03+11:00" scheme="W3CDTF" /> + + <style type="text/css"><![CDATA[ + html + { + writing-mode: vertical-rl; + } + + /* + minimum used height of the document root element is 176px; + less than 176px will make the reference file no longer reliable. + + 36px : image intrinsic height + + + 4px : descender space below baseline + ========= + 40px : 1st table with 'height: 25%' + multiplied by + 4 + ========= + 160px : height of the 3 tables + + + 8px : body's margin-top + + + 8px : body's margin-bottom + ========= + 176px + */ + + div + { + width: 100px; + } + + div#first-blue-float + { + background-color: olive; + float: left; + height: 50%; + } + + div#second-olive-float-with-clear + { + background-color: blue; + clear: left; + float: left; + height: 25%; + } + + div#orange-horiz-tb + { + background-color: orange; + height: 75%; + writing-mode: horizontal-tb; + } + ]]></style> + + </head> + + <body> + + <p><img src="support/ortho-htb-alongside-vrl-floats-002-exp-res.png" width="300" height="36" alt="Image download support must be enabled" /></p> + + <!-- + The image says: + Test passes if the orange rectangle + is below the blue rectangle. + --> + + <div id="first-blue-float"> </div> + + <div id="second-olive-float-with-clear"> </div> + + <div id="orange-horiz-tb"> </div> + + </body> +</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/support/ortho-htb-alongside-vrl-floats-002-exp-res.png b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/support/ortho-htb-alongside-vrl-floats-002-exp-res.png new file mode 100644 index 0000000..54d35eb --- /dev/null +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/support/ortho-htb-alongside-vrl-floats-002-exp-res.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/text-combine-upright-layout-rules-001-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/text-combine-upright-layout-rules-001-expected.html index 29c77c7..31ea73eb 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/text-combine-upright-layout-rules-001-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/text-combine-upright-layout-rules-001-expected.html
@@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>CSS Writing Modes: Layout rules of text-combine-upright</title> <link rel="author" title="Masataka Yakura" href="https://google.com/+MasatakaYakura"> -<link rel="author" title="Koji Ishii" href="kojiishi@gmail.com"> +<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com"> <meta name="flags" content="ahem"> <style> #container {
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/text-combine-upright-layout-rules-001.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/text-combine-upright-layout-rules-001.html index c021a69..85251d77 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/text-combine-upright-layout-rules-001.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/text-combine-upright-layout-rules-001.html
@@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>CSS Writing Modes: Layout rules of text-combine-upright</title> <link rel="author" title="Masataka Yakura" href="https://google.com/+MasatakaYakura"> -<link rel="author" title="Koji Ishii" href="kojiishi@gmail.com"> +<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com"> <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#text-combine-layout"> <link rel="match" href="reference/text-combine-upright-layout-rules-001-ref.html"> <meta name="assert" content="Anything outside the 1em-composition does not affect layout.">
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/text-combine-upright-line-breaking-rules-001-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/text-combine-upright-line-breaking-rules-001-expected.html index c2f2c5b..3d238b2 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/text-combine-upright-line-breaking-rules-001-expected.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/text-combine-upright-line-breaking-rules-001-expected.html
@@ -3,8 +3,8 @@ <head> <meta charset="utf-8"> <title>CSS Writing Modes: line-breaking-rules</title> -<link rel="author" title="Shinsuke Matsuki" href="shinsuke.matsuki@access-company.com"> -<link rel="author" title="Koji Ishii" href="kojiishi@gmail.com"> +<link rel="author" title="Shinsuke Matsuki" href="mailto:shinsuke.matsuki@access-company.com"> +<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com"> <style> .vrl { border:solid;
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/text-combine-upright-line-breaking-rules-001.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/text-combine-upright-line-breaking-rules-001.html index 52f48fb9..af7e727 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/text-combine-upright-line-breaking-rules-001.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/text-combine-upright-line-breaking-rules-001.html
@@ -3,8 +3,8 @@ <head> <meta charset="utf-8"> <title>CSS Writing Modes: line-breaking-rules</title> -<link rel="author" title="Shinsuke Matsuki" href="shinsuke.matsuki@access-company.com"> -<link rel="author" title="Koji Ishii" href="kojiishi@gmail.com"> +<link rel="author" title="Shinsuke Matsuki" href="mailto:shinsuke.matsuki@access-company.com"> +<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com"> <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#text-combine-upright"> <link rel="match" href="reference/text-combine-upright-line-breaking-rules-001.html"> <meta name="assert" content="The bracket should be combined with following characters.">
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/text-orientation-parsing-001.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/text-orientation-parsing-001.html index cd23ff6..9da7dd33 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/text-orientation-parsing-001.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/text-orientation-parsing-001.html
@@ -1,6 +1,6 @@ <!DOCTYPE html> <title>CSS Writing Modes: parsing text-orientation</title> -<link rel="author" title="Koji Ishii" href="kojiishi@gmail.com"> +<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com"> <link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#text-orientation"> <meta name="assert" content="This test asserts the parser and getComputedStyle works correctly for the text-orientation property."> <meta name="flags" content="dom">
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/text-orientation-parsing-sideways-right-001.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/text-orientation-parsing-sideways-right-001.html index 4212da4..848c581 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/text-orientation-parsing-sideways-right-001.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/text-orientation-parsing-sideways-right-001.html
@@ -1,6 +1,6 @@ <!DOCTYPE html> <title>CSS Writing Modes: parsing text-orientation</title> -<link rel="author" title="Koji Ishii" href="kojiishi@gmail.com"> +<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com"> <link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#text-orientation"> <meta name="assert" content="This test asserts the parser and getComputedStyle works correctly for the text-orientation property."> <meta name="flags" content="dom may">
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/unicode-bidi-parsing-001.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/unicode-bidi-parsing-001.html index a07c206..2672873 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/unicode-bidi-parsing-001.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/unicode-bidi-parsing-001.html
@@ -1,6 +1,6 @@ <!DOCTYPE html> <title>CSS Writing Modes: parsing unicode-bidi: normal, embed, bidi-override</title> -<link rel="author" title="Koji Ishii" href="kojiishi@gmail.com"> +<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com"> <link rel="help" href="https://drafts.csswg.org/css2/visuren.html#direction"> <link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#unicode-bidi"> <meta name="assert" content="This test asserts the parser and getComputedStyle works correctly for the unicode-bidi: normal, embed, bidi-override.">
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/unicode-bidi-parsing-002.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/unicode-bidi-parsing-002.html index d8aa6c9..2136d79 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/unicode-bidi-parsing-002.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/unicode-bidi-parsing-002.html
@@ -1,6 +1,6 @@ <!DOCTYPE html> <title>CSS Writing Modes: parsing unicode-bidi: isolate, isolate-override, plaintext</title> -<link rel="author" title="Koji Ishii" href="kojiishi@gmail.com"> +<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com"> <link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#unicode-bidi"> <meta name="assert" content="This test asserts the parser and getComputedStyle works correctly for the unicode-bidi: isolate, isolate-override, plaintext."> <meta name="flags" content="dom">
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/writing-mode-parsing-001.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/writing-mode-parsing-001.html index e0a7d8c..02d4bc84 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/writing-mode-parsing-001.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/writing-mode-parsing-001.html
@@ -1,6 +1,6 @@ <!DOCTYPE html> <title>CSS Writing Modes: parsing writing-mode</title> -<link rel="author" title="Koji Ishii" href="kojiishi@gmail.com"> +<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com"> <link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#block-flow"> <meta name="assert" content="This test asserts the parser and getComputedStyle works correctly for the writing-mode property."> <meta name="flags" content="dom">
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/writing-mode-parsing-svg1-001.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/writing-mode-parsing-svg1-001.html index c18a1942..c78d21d 100644 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/writing-mode-parsing-svg1-001.html +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/writing-mode-parsing-svg1-001.html
@@ -1,6 +1,6 @@ <!DOCTYPE html> <title>CSS Writing Modes: parsing SVG 1.1 writing-mode values</title> -<link rel="author" title="Koji Ishii" href="kojiishi@gmail.com"> +<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com"> <link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#svg-writing-mode"> <meta name="assert" content="This test asserts the parser and getComputedStyle works correctly for the SVG 1.1 writing-mode values."> <meta name="flags" content="dom svg may">
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/serve b/third_party/WebKit/LayoutTests/imported/csswg-test/serve new file mode 100755 index 0000000..51761b0 --- /dev/null +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/serve
@@ -0,0 +1,5 @@ +#!/usr/bin/env python +import serve + +if __name__ == "__main__": + serve.main()
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/serve.py b/third_party/WebKit/LayoutTests/imported/csswg-test/serve.py new file mode 100644 index 0000000..f99620b --- /dev/null +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/serve.py
@@ -0,0 +1,4 @@ +from wpt_tools.serve import serve + +def main(): + serve.main()
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-1-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-1-expected.html new file mode 100644 index 0000000..602c027 --- /dev/null +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-1-expected.html
@@ -0,0 +1,26 @@ +<!doctype html> +<!-- + Any copyright is dedicated to the Public Domain. + http://creativecommons.org/publicdomain/zero/1.0/ +--> +<meta charset="utf-8"> +<title>CSS Test Reference</title> +<link rel="author" title="Emilio Cobos Álvarez" href="mailto:ecoal95@gmail.com"> +<style> +.container { + display: block; + background: gray; + max-height: 200px; +} +.panel { + background: lightblue; + width: 150px; + height: 200px; + border: 1px solid purple; + box-sizing: border-box; +} +</style> +<div class="container"> + <div class="panel"> + </div> +</div>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-1.html b/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-1.html new file mode 100644 index 0000000..f97d5c57 --- /dev/null +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-1.html
@@ -0,0 +1,32 @@ +<!doctype html> +<!-- + Any copyright is dedicated to the Public Domain. + http://creativecommons.org/publicdomain/zero/1.0/ +--> +<meta charset="utf-8"> +<title>CSS Test: Single-line flex containers should clamp their line's height to the container's computed min and max cross-size.</title> +<link rel="author" title="Emilio Cobos Álvarez" href="mailto:ecoal95@gmail.com"> +<link rel="match" href="flexbox-single-line-clamp-1-ref.html"> +<link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#algo-cross-line"> +<style> +.container { + display: flex; + background: gray; + max-height: 200px; +} +.panel { + background: lightblue; + width: 150px; + border: 1px solid purple; + box-sizing: border-box; +} +.tall-child { + width: 50px; + height: 400px; +} +</style> +<div class="container"> + <div class="panel"> + <div class="tall-child"></div> + </div> +</div>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-2-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-2-expected.html new file mode 100644 index 0000000..fda5fa7c --- /dev/null +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-2-expected.html
@@ -0,0 +1,26 @@ +<!doctype html> +<!-- + Any copyright is dedicated to the Public Domain. + http://creativecommons.org/publicdomain/zero/1.0/ +--> +<meta charset="utf-8"> +<title>CSS Test Reference</title> +<link rel="author" title="Emilio Cobos Álvarez" href="mailto:ecoal95@gmail.com"> +<style> +.container { + background: gray; + height: 500px; + width: 250px; +} +.panel { + background: lightblue; + border: 1px solid purple; + height: 100px; +} +</style> +<div class="container"> + <div class="panel"> + </div> + <div class="panel"> + </div> +</div>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-2.html b/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-2.html new file mode 100644 index 0000000..be9e50b --- /dev/null +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-2.html
@@ -0,0 +1,39 @@ +<!doctype html> +<!-- + Any copyright is dedicated to the Public Domain. + http://creativecommons.org/publicdomain/zero/1.0/ +--> +<meta charset="utf-8"> +<title>CSS Test: Single-line flex containers should clamp their line's height to the container's computed min and max cross-size.</title> +<link rel="author" title="Emilio Cobos Álvarez" href="mailto:ecoal95@gmail.com"> +<link rel="match" href="flexbox-single-line-clamp-2-ref.html"> +<link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#algo-cross-line"> +<style> +.container { + display: flex; + background: gray; + height: 500px; + flex-direction: column; + max-width: 250px; +} +.panel { + background: lightblue; + border: 1px solid purple; +} +.small-box { + width: 100px; + height: 100px; +} +.big-box { + width: 500px; + height: 100px; +} +</style> +<div class="container"> + <div class="panel"> + <div class="small-box"></div> + </div> + <div class="panel"> + <div class="big-box"></div> + </div> +</div>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-3-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-3-expected.html new file mode 100644 index 0000000..02f7eaa --- /dev/null +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-3-expected.html
@@ -0,0 +1,30 @@ +<!doctype html> +<!-- + Any copyright is dedicated to the Public Domain. + http://creativecommons.org/publicdomain/zero/1.0/ +--> +<meta charset="utf-8"> +<title>CSS Test Reference</title> +<link rel="author" title="Emilio Cobos Álvarez" href="mailto:ecoal95@gmail.com"> +<style> +.container { + background: gray; + height: 80px; +} +.panel { + background: lightblue; + width: 150px; + height: 80px; +} +.contents { + height: 10px; + width: 10px; + background: purple; +} +</style> +</head> +<div class="container"> + <div class="panel"> + <div class="contents"></div> + </div> +</div>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-3.html b/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-3.html new file mode 100644 index 0000000..f3afbd4 --- /dev/null +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-3.html
@@ -0,0 +1,38 @@ +<!doctype html> +<!-- + Any copyright is dedicated to the Public Domain. + http://creativecommons.org/publicdomain/zero/1.0/ +--> +<meta charset="utf-8"> +<title>CSS Test: Single-line flex containers should clamp their line's height to the container's computed min and max cross-size.</title> +<link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"> +<link rel="match" href="flexbox-single-line-clamp-3-ref.html"> +<link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#algo-cross-line"> +<style> +.container { + display: flex; + background: gray; + min-height: 80px; + + /* Don't let (default) align-content:stretch save us + by stretching the line to fit the container! The point + here is that the line should already be clamped to the + container's min-height. */ + align-content: flex-start; +} +.panel { + background: lightblue; + width: 150px; +} +.contents { + height: 10px; + width: 10px; + background: purple; +} +</style> +</head> +<div class="container"> + <div class="panel"> + <div class="contents"></div> + </div> +</div>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-01a-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-01a-expected.html deleted file mode 100644 index 8bce730d..0000000 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-01a-expected.html +++ /dev/null
@@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <meta charset="UTF-8"> - <title>dir() selector reference</title> - <link rel="author" title="Astley Chen" href="aschen@mozilla.com"> - <link rel="author" title="Mozilla" href="https://www.mozilla.org"> - <style> - div { text-align: left; } - .blue { color: blue; direction: ltr; } - .lime { color: lime; direction: rtl; } - </style> - </head> - <body> - <div class="blue">This element has default direction.</div> - <div class="blue">This element is ltr.</div> - <div class="lime">This element is rtl.</div> - <div class="blue"> - <div>This element should inherit ltr.</div> - <div class="blue">This element is ltr.</div> - <div class="lime">This element is rtl.</div> - <div class="blue">Every word in this element should inherit ltr.</div> - </div> - <div class="lime"> - <div>This element should inherit rtl.</div> - <div class="blue">This element is ltr.</div> - <div class="lime">This element is rtl.</div> - <div class="lime">Every word in this element should inherit rtl.</div> - </div> - <div class="blue">This element has an invalid dir attribute and - should have default direction.</div> - </body> -</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-01a.html b/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-01a.html deleted file mode 100644 index 5823df6..0000000 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-01a.html +++ /dev/null
@@ -1,37 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <meta charset="utf-8"> - <title>CSS Test: :dir() selector</title> - <link rel="author" title="Astley Chen" href="aschen@mozilla.com"> - <link rel="author" title="Mozilla" href="https://www.mozilla.org"> - <link rel="help" href="https://drafts.csswg.org/selectors-4/#the-dir-pseudo"> - <meta name="assert" content="Test checks :dir() basic functions with valid and invalid values."> - <link rel="match" href="dir-style-01-ref.html"> - <style> - div { text-align: left; } - :dir(ltr) { color: blue } - :dir(rtl) { color: lime } - :dir(foopy) { color: red } - </style> - </head> - <body> - <div>This element has default direction.</div> - <div dir="ltr">This element is ltr.</div> - <div dir="rtl">This element is rtl.</div> - <div dir="ltr"> - <div>This element should inherit ltr.</div> - <div dir="ltr">This element is ltr.</div> - <div dir="rtl">This element is rtl.</div> - <div><span>Every <span>word <span>in <span>this <span>element <span>should <span>inherit <span>ltr</span></span></span></span></span></span></span></span>.</div> - </div> - <div dir="rtl"> - <div>This element should inherit rtl.</div> - <div dir="ltr">This element is ltr.</div> - <div dir="rtl">This element is rtl.</div> - <div><span>Every <span>word <span>in <span>this <span>element <span>should <span>inherit <span>rtl</span></span></span></span></span></span></span></span>.</div> - </div> - <div dir="foopy">This element has an invalid dir attribute and - should have default direction.</div> - </body> -</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-01b-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-01b-expected.html deleted file mode 100644 index 8bce730d..0000000 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-01b-expected.html +++ /dev/null
@@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <meta charset="UTF-8"> - <title>dir() selector reference</title> - <link rel="author" title="Astley Chen" href="aschen@mozilla.com"> - <link rel="author" title="Mozilla" href="https://www.mozilla.org"> - <style> - div { text-align: left; } - .blue { color: blue; direction: ltr; } - .lime { color: lime; direction: rtl; } - </style> - </head> - <body> - <div class="blue">This element has default direction.</div> - <div class="blue">This element is ltr.</div> - <div class="lime">This element is rtl.</div> - <div class="blue"> - <div>This element should inherit ltr.</div> - <div class="blue">This element is ltr.</div> - <div class="lime">This element is rtl.</div> - <div class="blue">Every word in this element should inherit ltr.</div> - </div> - <div class="lime"> - <div>This element should inherit rtl.</div> - <div class="blue">This element is ltr.</div> - <div class="lime">This element is rtl.</div> - <div class="lime">Every word in this element should inherit rtl.</div> - </div> - <div class="blue">This element has an invalid dir attribute and - should have default direction.</div> - </body> -</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-01b.html b/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-01b.html deleted file mode 100644 index fd62553..0000000 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-01b.html +++ /dev/null
@@ -1,54 +0,0 @@ -<!DOCTYPE html> -<html class="reftest-wait"> - <head> - <meta charset="UTF-8"> - <title>CSS Test: :dir() selector</title> - <link rel="author" title="Astley Chen" href="aschen@mozilla.com"> - <link rel="author" title="Mozilla" href="https://www.mozilla.org"> - <link rel="help" href="https://drafts.csswg.org/selectors-4/#the-dir-pseudo"> - <meta name="assert" content="Test checks :dir() basic functions after dynamic directionality change on elements."> - <link rel="match" href="dir-style-01-ref.html"> - <style> - div { text-align: left; } - :dir(ltr) { color: blue } - :dir(rtl) { color: lime } - :dir(foopy) { color: red } - </style> - <script> - function switchDir() - { - divs = document.getElementsByTagName("div"); - divs[0].offsetWidth; // ensure it's a dynamic change - for (var i = 0; i < divs.length; ++i) { - theDiv = divs[i]; - if (theDiv.dir == "ltr") { - theDiv.dir = "rtl"; - } else if (theDiv.dir == "rtl") { - theDiv.dir = "ltr"; - } - } - - document.documentElement.removeAttribute("class"); - } - </script> - </head> - <body onload="switchDir()"> - <div>This element has default direction.</div> - <div dir="rtl">This element is ltr.</div> - <div dir="ltr">This element is rtl.</div> - <div dir="rtl"> - <div>This element should inherit ltr.</div> - <div dir="rtl">This element is ltr.</div> - <div dir="ltr">This element is rtl.</div> - <div><span>Every <span>word <span>in <span>this <span>element <span>should <span>inherit <span>ltr</span></span></span></span></span></span></span></span>.</div> - </div> - <div dir="ltr"> - <div>This element should inherit rtl.</div> - <div dir="rtl">This element is ltr.</div> - <div dir="ltr">This element is rtl.</div> - <div><span>Every <span>word <span>in <span>this <span>element <span>should <span>inherit <span>rtl</span></span></span></span></span></span></span></span>.</div> - </div> - <div dir="foopy">This element has an invalid dir attribute and - should have default direction.</div> - </body> -</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-02a-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-02a-expected.html deleted file mode 100644 index 049fbba3..0000000 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-02a-expected.html +++ /dev/null
@@ -1,31 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <meta charset="UTF-8"> - <title>dir() selector reference</title> - <link rel="author" title="Astley Chen" href="aschen@mozilla.com"> - <link rel="author" title="Mozilla" href="https://www.mozilla.org"> - <style> - div { text-align: left; } - .blue { color: blue; direction: ltr; } - .lime { color: lime; direction: rtl; } - </style> - </head> - <body> - <div class="lime">This element has default direction.</div> - <div class="blue">This element is ltr.</div> - <div class="lime">This element is rtl.</div> - <div class="blue"> - <div>This element should inherit ltr.</div> - <div class="blue">This element is ltr.</div> - <div class="lime">This element is rtl.</div> - </div> - <div class="lime"> - <div>This element should inherit rtl.</div> - <div class="blue">This element is ltr.</div> - <div class="lime">This element is rtl.</div> - </div> - <div class="lime">This element has an invalid dir attribute and - should have default direction.</div> - </body> -</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-02a.html b/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-02a.html deleted file mode 100644 index c61495da..0000000 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-02a.html +++ /dev/null
@@ -1,35 +0,0 @@ -<!DOCTYPE html> -<html dir="rtl"> - <head> - <meta charset="UTF-8"> - <title>CSS Test: :dir() selector</title> - <link rel="author" title="Astley Chen" href="aschen@mozilla.com"> - <link rel="author" title="Mozilla" href="https://www.mozilla.org"> - <link rel="help" href="https://drafts.csswg.org/selectors-4/#the-dir-pseudo"> - <meta name="assert" content="Test checks :dir() basic functions when default document directionality is rtl."> - <link rel="match" href="dir-style-02-ref.html"> - <style> - div { text-align: left; } - :dir(ltr) { color: blue } - :dir(rtl) { color: lime } - :dir(foopy) { color: red } - </style> - </head> - <body> - <div>This element has default direction.</div> - <div dir="ltr">This element is ltr.</div> - <div dir="rtl">This element is rtl.</div> - <div dir="ltr"> - <div>This element should inherit ltr.</div> - <div dir="ltr">This element is ltr.</div> - <div dir="rtl">This element is rtl.</div> - </div> - <div dir="rtl"> - <div>This element should inherit rtl.</div> - <div dir="ltr">This element is ltr.</div> - <div dir="rtl">This element is rtl.</div> - </div> - <div dir="foopy">This element has an invalid dir attribute and - should have default direction.</div> - </body> -</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-02b-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-02b-expected.html deleted file mode 100644 index 049fbba3..0000000 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-02b-expected.html +++ /dev/null
@@ -1,31 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <meta charset="UTF-8"> - <title>dir() selector reference</title> - <link rel="author" title="Astley Chen" href="aschen@mozilla.com"> - <link rel="author" title="Mozilla" href="https://www.mozilla.org"> - <style> - div { text-align: left; } - .blue { color: blue; direction: ltr; } - .lime { color: lime; direction: rtl; } - </style> - </head> - <body> - <div class="lime">This element has default direction.</div> - <div class="blue">This element is ltr.</div> - <div class="lime">This element is rtl.</div> - <div class="blue"> - <div>This element should inherit ltr.</div> - <div class="blue">This element is ltr.</div> - <div class="lime">This element is rtl.</div> - </div> - <div class="lime"> - <div>This element should inherit rtl.</div> - <div class="blue">This element is ltr.</div> - <div class="lime">This element is rtl.</div> - </div> - <div class="lime">This element has an invalid dir attribute and - should have default direction.</div> - </body> -</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-02b.html b/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-02b.html deleted file mode 100644 index 44fdbaf..0000000 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-02b.html +++ /dev/null
@@ -1,46 +0,0 @@ -<!DOCTYPE html> -<html class="reftest-wait"> - <head> - <meta charset="UTF-8"> - <title>CSS Test: :dir() selector</title> - <link rel="author" title="Astley Chen" href="aschen@mozilla.com"> - <link rel="author" title="Mozilla" href="https://www.mozilla.org"> - <link rel="help" href="https://drafts.csswg.org/selectors-4/#the-dir-pseudo"> - <meta name="assert" content="Test checks :dir() basic functions when document directionality is dynamically changed from ltr to rtl."> - <link rel="match" href="dir-style-02-ref.html"> - <style> - div { text-align: left; } - :dir(ltr) { color: blue } - :dir(rtl) { color: lime } - :dir(foopy) { color: red } - </style> - <script> - function switchDir() - { - // ensure it's a dynamic change - document.documentElement.getBoundingClientRect(); - - document.dir = "rtl"; - - document.documentElement.removeAttribute("class"); - } - </script> - </head> - <body onload="switchDir()"> - <div>This element has default direction.</div> - <div dir="ltr">This element is ltr.</div> - <div dir="rtl">This element is rtl.</div> - <div dir="ltr"> - <div>This element should inherit ltr.</div> - <div dir="ltr">This element is ltr.</div> - <div dir="rtl">This element is rtl.</div> - </div> - <div dir="rtl"> - <div>This element should inherit rtl.</div> - <div dir="ltr">This element is ltr.</div> - <div dir="rtl">This element is rtl.</div> - </div> - <div dir="foopy">This element has an invalid dir attribute and - should have default direction.</div> - </body> -</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-03a-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-03a-expected.html deleted file mode 100644 index f66dffe..0000000 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-03a-expected.html +++ /dev/null
@@ -1,18 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <meta charset="UTF-8"> - <title>dir() selector reference</title> - <link rel="author" title="Astley Chen" href="aschen@mozilla.com"> - <link rel="author" title="Mozilla" href="https://www.mozilla.org"> - <style> - div { text-align: left; } - .ltr { color: blue; direction: ltr } - .rtl { color: lime; direction: rtl } - </style> - </head> - <body> - <div class="rtl">This element is rtl.</div> - <div class="ltr">This element has default direction.</div> - </body> -</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-03a.html b/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-03a.html deleted file mode 100644 index df90d29..0000000 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-03a.html +++ /dev/null
@@ -1,20 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <meta charset="UTF-8"> - <title>CSS Test: :dir() selector</title> - <link rel="author" title="Astley Chen" href="aschen@mozilla.com"> - <link rel="author" title="Mozilla" href="https://www.mozilla.org"> - <link rel="help" href="https://drafts.csswg.org/selectors-4/#the-dir-pseudo"> - <meta name="assert" content="Test checks if :dir() can work with other selectors correctly."> - <link rel="match" href="dir-style-03-ref.html"> - <style> - div { color: lime; text-align: left; } - :not(:dir(ltr)) + div { color: blue; } - </style> - </head> - <body> - <div dir="rtl">This element is rtl.</div> - <div>This element has default direction.</div> - </body> -</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-03b-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-03b-expected.html deleted file mode 100644 index f66dffe..0000000 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-03b-expected.html +++ /dev/null
@@ -1,18 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <meta charset="UTF-8"> - <title>dir() selector reference</title> - <link rel="author" title="Astley Chen" href="aschen@mozilla.com"> - <link rel="author" title="Mozilla" href="https://www.mozilla.org"> - <style> - div { text-align: left; } - .ltr { color: blue; direction: ltr } - .rtl { color: lime; direction: rtl } - </style> - </head> - <body> - <div class="rtl">This element is rtl.</div> - <div class="ltr">This element has default direction.</div> - </body> -</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-03b.html b/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-03b.html deleted file mode 100644 index f6d417f..0000000 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-03b.html +++ /dev/null
@@ -1,34 +0,0 @@ -<!DOCTYPE html> -<html class="reftest-wait"> - <head> - <meta charset="UTF-8"> - <title>CSS Test: :dir() selector</title> - <link rel="author" title="Astley Chen" href="aschen@mozilla.com"> - <link rel="author" title="Mozilla" href="https://www.mozilla.org"> - <link rel="help" href="https://drafts.csswg.org/selectors-4/#the-dir-pseudo"> - <meta name="assert" content="Test checks if :dir() can work with other selectors correctly after a dynamic directionality change on specified divs."> - <link rel="match" href="dir-style-03-ref.html"> - <style> - div { color: lime; text-align: left; } - :not(:dir(ltr)) + div { color: blue } - </style> - <script> - function switchDir() - { - theDiv = document.getElementById("div"); - theDiv.offsetWidth; // ensure it's a dynamic change - if (theDiv.dir == "ltr") { - theDiv.dir = "rtl"; - } else if (theDiv.dir == "rtl") { - theDiv.dir = "ltr"; - } - - document.documentElement.removeAttribute("class"); - } - </script> - </head> - <body onload="switchDir()"> - <div id="div" dir="ltr">This element is rtl.</div> - <div>This element has default direction.</div> - </body> -</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-04-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-04-expected.html deleted file mode 100644 index 4dadad8..0000000 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-04-expected.html +++ /dev/null
@@ -1,24 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <meta charset="UTF-8"> - <title>dir() selector reference</title> - <link rel="author" title="Astley Chen" href="aschen@mozilla.com"> - <link rel="author" title="Mozilla" href="https://www.mozilla.org"> - <style> - div { text-align: left; } - .ltr { direction: ltr; color: blue; } - .rtl { direction: rtl; color: lime; } - </style> - </head> - <body> - <div class="ltr">This element is ltr. <span>This span should - inherit dir from the parent. <span>This span should inherit dir - from the grandparent.</span></span> - </div> - <div class="rtl">This element is rtl. <span>This span should - inherit dir from the parent. <span>This span should inherit dir - from the grandparent.</span></span> - </div> - </body> -</html>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-04.html b/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-04.html deleted file mode 100644 index 7fcaa34..0000000 --- a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/selectors4/dir-style-04.html +++ /dev/null
@@ -1,41 +0,0 @@ -<!DOCTYPE html> -<html class="reftest-wait"> - <head> - <meta charset="UTF-8"> - <title>CSS Test: :dir() selector</title> - <link rel="author" title="Astley Chen" href="aschen@mozilla.com"> - <link rel="author" title="Mozilla" href="https://www.mozilla.org"> - <link rel="help" href="https://drafts.csswg.org/selectors-4/#the-dir-pseudo"> - <meta name="assert" content="Test checks :dir() basic functions on runtime added elements."> - <link rel="match" href="dir-style-04-ref.html"> - <style> - :dir(ltr) { color: blue } - :dir(rtl) { color: lime } - div { text-align: left; } - </style> - <script> - function appendChildren(e) - { - // ensure it's a dynamic change - document.documentElement.getBoundingClientRect(); - - var x = document.createElement("span"); - x.innerHTML = "This span should inherit dir from the parent. "; - - var y = document.createElement("span"); - y.innerHTML = "This span should inherit dir from the grandparent."; - - var div = document.getElementById(e); - - x.appendChild(y); - div.appendChild(x); - - document.documentElement.removeAttribute("class"); - } - </script> - </head> - <body onload="appendChildren('d1');appendChildren('d2');"> - <div id="d1" dir="ltr">This element is ltr. </div> - <div id="d2" dir="rtl">This element is rtl. </div> - </body> -</html>
diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/4076267-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/4076267-2-expected.png deleted file mode 100644 index 2a01c28..0000000 --- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/4076267-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/4076267-2-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/4076267-2-expected.txt deleted file mode 100644 index d205ef3..0000000 --- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/4076267-2-expected.txt +++ /dev/null
@@ -1,24 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 365x19 - text run at (0,0) width 365: "This tests to see if trailing spaces are lost during a copy/paste" - LayoutBlockFlow {HR} at (0,36) size 784x2 [border: (1px inset #EEEEEE)] - LayoutBlockFlow {DIV} at (0,46) size 784x28 [border: (2px solid #FFAAAA)] - LayoutBlockFlow {DIV} at (2,2) size 780x24 [border: (2px solid #AAAAFF)] - LayoutText {#text} at (2,2) size 547x19 - text run at (2,2) width 547: "there should be a single trailing space between the '.' and the last character in this sentence ." -caret: position 96 of child 0 {#text} of child 1 {DIV} of child 5 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/4076267-3-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/4076267-3-expected.png deleted file mode 100644 index 9d114bb7..0000000 --- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/4076267-3-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/4076267-3-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/4076267-3-expected.txt deleted file mode 100644 index ee4b24d2..0000000 --- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/4076267-3-expected.txt +++ /dev/null
@@ -1,389 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 322x19 - text run at (0,0) width 322: "This tests to see if spaces are lost during a copy/paste" - LayoutBlockFlow {HR} at (0,36) size 784x2 [border: (1px inset #EEEEEE)] - LayoutBlockFlow {DIV} at (0,46) size 784x220 - LayoutBlockFlow (anonymous) at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 18x19 - text run at (0,0) width 18: "x x" - LayoutBlockFlow {DIV} at (0,20) size 784x20 - LayoutText {#text} at (0,0) size 22x19 - text run at (0,0) width 22: "x x" - LayoutBlockFlow {DIV} at (0,40) size 784x20 - LayoutText {#text} at (0,0) size 26x19 - text run at (0,0) width 26: "x x" - LayoutBlockFlow {DIV} at (0,60) size 784x20 - LayoutText {#text} at (0,0) size 30x19 - text run at (0,0) width 30: "x x" - LayoutBlockFlow {DIV} at (0,80) size 784x20 - LayoutText {#text} at (0,0) size 34x19 - text run at (0,0) width 34: "x x" - LayoutBlockFlow {DIV} at (0,100) size 784x20 - LayoutText {#text} at (0,0) size 38x19 - text run at (0,0) width 38: "x x" - LayoutBlockFlow {DIV} at (0,120) size 784x20 - LayoutText {#text} at (0,0) size 42x19 - text run at (0,0) width 42: "x x" - LayoutBlockFlow {DIV} at (0,140) size 784x20 - LayoutText {#text} at (0,0) size 46x19 - text run at (0,0) width 46: "x x" - LayoutBlockFlow {DIV} at (0,160) size 784x20 - LayoutText {#text} at (0,0) size 50x19 - text run at (0,0) width 50: "x x" - LayoutBlockFlow {DIV} at (0,180) size 784x20 - LayoutText {#text} at (0,0) size 54x19 - text run at (0,0) width 54: "x x" - LayoutBlockFlow {DIV} at (0,200) size 784x20 - LayoutBR {BR} at (0,0) size 0x19 -caret: position 0 of child 0 {BR} of child 10 {DIV} of child 5 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/4076267-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/4076267-expected.png deleted file mode 100644 index 314cdaf..0000000 --- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/4076267-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/4076267-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/4076267-expected.txt deleted file mode 100644 index 896211b6..0000000 --- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/4076267-expected.txt +++ /dev/null
@@ -1,25 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 368x19 - text run at (0,0) width 368: "This tests to see if leading spaces are lost during a copy/paste" - LayoutBlockFlow {HR} at (0,36) size 784x2 [border: (1px inset #EEEEEE)] - LayoutBlockFlow {DIV} at (0,46) size 784x20 - LayoutBlockFlow {DIV} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 312x19 - text run at (0,0) width 312: " this text should have a single leading space before it" -caret: position 55 of child 0 {#text} of child 1 {DIV} of child 5 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/cut-text-001-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/cut-text-001-expected.png deleted file mode 100644 index c0641fe..0000000 --- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/cut-text-001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/cut-text-001-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/cut-text-001-expected.txt deleted file mode 100644 index 3f1e8e0..0000000 --- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/cut-text-001-expected.txt +++ /dev/null
@@ -1,22 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)] - LayoutInline {SPAN} at (0,0) size 77x27 - LayoutText {#text} at (14,14) size 77x27 - text run at (14,14) width 77: "foo baz" - LayoutText {#text} at (0,0) size 0x0 -caret: position 4 of child 0 {#text} of child 1 {SPAN} of child 1 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/interchange-newline-2-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/interchange-newline-2-expected.txt deleted file mode 100644 index 24e50d79..0000000 --- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/interchange-newline-2-expected.txt +++ /dev/null
@@ -1,12 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -This demonstrates a bug in interchange newline handling during paste. -The selection being pasted into contain multiple blocks, which breaks the old code in paste that handled interchange newlines. -| <div> -| "fbar" -| "baz" -| <div> -| "<#selection-caret>bar"
diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/merge-end-borders-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/merge-end-borders-expected.png deleted file mode 100644 index a8ba9c1..0000000 --- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/merge-end-borders-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/merge-end-borders-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/merge-end-borders-expected.txt deleted file mode 100644 index 6c641c1..0000000 --- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/merge-end-borders-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {P} at (0,0) size 784x60 - LayoutText {#text} at (0,0) size 781x59 - text run at (0,0) width 781: "This is a test for the merge that paste does of the last paragraph of the incoming fragment with content after the end of the selection" - text run at (0,20) width 110: "being pasted into. " - text run at (110,20) width 627: "A fragment that ends in with paragraph surrounded by a blue border is pasted into a selection ending in a" - text run at (0,40) width 240: "paragraph surrounded by a red border. " - text run at (239,40) width 165: "The red border should win." - LayoutBlockFlow {P} at (0,76) size 784x20 - LayoutInline {B} at (0,0) size 569x19 - LayoutText {#text} at (0,0) size 569x19 - text run at (0,0) width 569: "The second paragraph should be surrounded by a red border before and after the test." - LayoutBlockFlow {DIV} at (0,112) size 784x42 - LayoutBlockFlow (anonymous) at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 92x19 - text run at (0,0) width 92: "First paragraph" - LayoutBlockFlow {DIV} at (0,20) size 784x22 [border: (1px solid #FF0000)] - LayoutText {#text} at (1,1) size 288x19 - text run at (1,1) width 288: "This text should be surrounded by a red border." -caret: position 4 of child 0 {#text} of child 1 {DIV} of child 3 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-006-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-006-expected.png deleted file mode 100644 index c32b948..0000000 --- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-006-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-006-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-006-expected.txt deleted file mode 100644 index a356c78..0000000 --- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-006-expected.txt +++ /dev/null
@@ -1,50 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {DIV} at (0,0) size 784x238 [border: (2px solid #0000FF)] - LayoutBlockFlow {DIV} at (14,14) size 756x83 - LayoutText {#text} at (0,0) size 64x26 - text run at (0,0) width 64: "Tests: " - LayoutBR {BR} at (0,0) size 0x0 - LayoutText {#text} at (0,27) size 158x27 - text run at (0,27) width 158: "Fix for this bug: " - LayoutInline {A} at (0,0) size 257x27 [color=#0000EE] - LayoutText {#text} at (158,27) size 257x27 - text run at (158,27) width 257: "<rdar://problem/4045513>" - LayoutText {#text} at (415,27) size 708x55 - text run at (415,27) width 293: " Copying and pasting selection" - text run at (0,55) width 593: "starting at end of paragraph can incorrectly remove line break" - LayoutBlockFlow {DIV} at (14,113) size 756x111 - LayoutText {#text} at (0,0) size 189x26 - text run at (0,0) width 189: "Expected Results: " - LayoutBR {BR} at (189,21) size 0x0 - LayoutText {#text} at (0,27) size 745x83 - text run at (0,27) width 745: "Should see two lines of text below, self-documenting themselves as \"line one\"" - text run at (0,55) width 713: "and \"line two\". The insertion point must be after the first character (\"l\") of" - text run at (0,83) width 103: "\"line two\"." - LayoutBlockFlow {DIV} at (0,262) size 784x60 - LayoutBlockFlow {DIV} at (0,0) size 784x60 [border: (2px solid #FF0000)] - LayoutText {#text} at (2,2) size 76x27 - text run at (2,2) width 76: "line one" - LayoutBR {BR} at (78,23) size 0x0 - LayoutText {#text} at (2,30) size 6x27 - text run at (2,30) width 6: "l" - LayoutText {#text} at (8,30) size 71x27 - text run at (8,30) width 71: "ine two" -caret: position 1 of child 2 {#text} of child 1 {DIV} of child 3 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-007-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-007-expected.png deleted file mode 100644 index ae4f704..0000000 --- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-007-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-007-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-007-expected.txt deleted file mode 100644 index df10b64..0000000 --- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-007-expected.txt +++ /dev/null
@@ -1,50 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {DIV} at (0,0) size 784x238 [border: (2px solid #0000FF)] - LayoutBlockFlow {DIV} at (14,14) size 756x83 - LayoutText {#text} at (0,0) size 64x26 - text run at (0,0) width 64: "Tests: " - LayoutBR {BR} at (0,0) size 0x0 - LayoutText {#text} at (0,27) size 158x27 - text run at (0,27) width 158: "Fix for this bug: " - LayoutInline {A} at (0,0) size 257x27 [color=#0000EE] - LayoutText {#text} at (158,27) size 257x27 - text run at (158,27) width 257: "<rdar://problem/4045513>" - LayoutText {#text} at (415,27) size 708x55 - text run at (415,27) width 293: " Copying and pasting selection" - text run at (0,55) width 593: "starting at end of paragraph can incorrectly remove line break" - LayoutBlockFlow {DIV} at (14,113) size 756x111 - LayoutText {#text} at (0,0) size 189x26 - text run at (0,0) width 189: "Expected Results: " - LayoutBR {BR} at (189,21) size 0x0 - LayoutText {#text} at (0,27) size 745x83 - text run at (0,27) width 745: "Should see two lines of text below, self-documenting themselves as \"line one\"" - text run at (0,55) width 713: "and \"line two\". The insertion point must be after the first character (\"l\") of" - text run at (0,83) width 103: "\"line two\"." - LayoutBlockFlow {DIV} at (0,262) size 784x60 - LayoutBlockFlow {DIV} at (0,0) size 784x60 [border: (2px solid #FF0000)] - LayoutBlockFlow (anonymous) at (2,2) size 780x28 - LayoutText {#text} at (0,0) size 76x27 - text run at (0,0) width 76: "line one" - LayoutBR {BR} at (76,21) size 0x0 - LayoutBlockFlow {DIV} at (2,30) size 780x28 - LayoutText {#text} at (0,0) size 77x27 - text run at (0,0) width 77: "line two" -caret: position 1 of child 0 {#text} of child 2 {DIV} of child 1 {DIV} of child 3 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-008-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-008-expected.png deleted file mode 100644 index ae4f704..0000000 --- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-008-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-008-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-008-expected.txt deleted file mode 100644 index 39a5e1f..0000000 --- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-008-expected.txt +++ /dev/null
@@ -1,49 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {DIV} at (0,0) size 784x238 [border: (2px solid #0000FF)] - LayoutBlockFlow {DIV} at (14,14) size 756x83 - LayoutText {#text} at (0,0) size 64x26 - text run at (0,0) width 64: "Tests: " - LayoutBR {BR} at (0,0) size 0x0 - LayoutText {#text} at (0,27) size 158x27 - text run at (0,27) width 158: "Fix for this bug: " - LayoutInline {A} at (0,0) size 257x27 [color=#0000EE] - LayoutText {#text} at (158,27) size 257x27 - text run at (158,27) width 257: "<rdar://problem/4045513>" - LayoutText {#text} at (415,27) size 708x55 - text run at (415,27) width 293: " Copying and pasting selection" - text run at (0,55) width 593: "starting at end of paragraph can incorrectly remove line break" - LayoutBlockFlow {DIV} at (14,113) size 756x111 - LayoutText {#text} at (0,0) size 189x26 - text run at (0,0) width 189: "Expected Results: " - LayoutBR {BR} at (189,21) size 0x0 - LayoutText {#text} at (0,27) size 745x83 - text run at (0,27) width 745: "Should see two lines of text below, self-documenting themselves as \"line one\"" - text run at (0,55) width 713: "and \"line two\". The insertion point must be after the first character (\"l\") of" - text run at (0,83) width 103: "\"line two\"." - LayoutBlockFlow {DIV} at (0,262) size 784x60 - LayoutBlockFlow {DIV} at (0,0) size 784x60 [border: (2px solid #FF0000)] - LayoutBlockFlow {DIV} at (2,2) size 780x28 - LayoutText {#text} at (0,0) size 76x27 - text run at (0,0) width 76: "line one" - LayoutBlockFlow {DIV} at (2,30) size 780x28 - LayoutText {#text} at (0,0) size 77x27 - text run at (0,0) width 77: "line two" -caret: position 1 of child 0 {#text} of child 2 {DIV} of child 1 {DIV} of child 3 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-009-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-009-expected.png deleted file mode 100644 index ae4f704..0000000 --- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-009-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-009-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-009-expected.txt deleted file mode 100644 index 10163be..0000000 --- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-009-expected.txt +++ /dev/null
@@ -1,51 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {DIV} at (0,0) size 784x238 [border: (2px solid #0000FF)] - LayoutBlockFlow {DIV} at (14,14) size 756x83 - LayoutText {#text} at (0,0) size 64x26 - text run at (0,0) width 64: "Tests: " - LayoutBR {BR} at (0,0) size 0x0 - LayoutText {#text} at (0,27) size 158x27 - text run at (0,27) width 158: "Fix for this bug: " - LayoutInline {A} at (0,0) size 257x27 [color=#0000EE] - LayoutText {#text} at (158,27) size 257x27 - text run at (158,27) width 257: "<rdar://problem/4045513>" - LayoutText {#text} at (415,27) size 708x55 - text run at (415,27) width 293: " Copying and pasting selection" - text run at (0,55) width 593: "starting at end of paragraph can incorrectly remove line break" - LayoutBlockFlow {DIV} at (14,113) size 756x111 - LayoutText {#text} at (0,0) size 189x26 - text run at (0,0) width 189: "Expected Results: " - LayoutBR {BR} at (189,21) size 0x0 - LayoutText {#text} at (0,27) size 745x83 - text run at (0,27) width 745: "Should see two lines of text below, self-documenting themselves as \"line one\"" - text run at (0,55) width 713: "and \"line two\". The insertion point must be after the first character (\"l\") of" - text run at (0,83) width 103: "\"line two\"." - LayoutBlockFlow {DIV} at (0,262) size 784x60 - LayoutBlockFlow {DIV} at (0,0) size 784x60 [border: (2px solid #FF0000)] - LayoutBlockFlow {DIV} at (2,2) size 780x56 - LayoutBlockFlow (anonymous) at (0,0) size 780x28 - LayoutText {#text} at (0,0) size 76x27 - text run at (0,0) width 76: "line one" - LayoutBR {BR} at (76,21) size 0x0 - LayoutBlockFlow {DIV} at (0,28) size 780x28 - LayoutText {#text} at (0,0) size 77x27 - text run at (0,0) width 77: "line two" -caret: position 1 of child 0 {#text} of child 2 {DIV} of child 1 {DIV} of child 1 {DIV} of child 3 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-010-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-010-expected.png deleted file mode 100644 index ae4f704..0000000 --- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-010-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-010-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-010-expected.txt deleted file mode 100644 index dc57ea04..0000000 --- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-line-endings-010-expected.txt +++ /dev/null
@@ -1,50 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {DIV} at (0,0) size 784x238 [border: (2px solid #0000FF)] - LayoutBlockFlow {DIV} at (14,14) size 756x83 - LayoutText {#text} at (0,0) size 64x26 - text run at (0,0) width 64: "Tests: " - LayoutBR {BR} at (0,0) size 0x0 - LayoutText {#text} at (0,27) size 158x27 - text run at (0,27) width 158: "Fix for this bug: " - LayoutInline {A} at (0,0) size 257x27 [color=#0000EE] - LayoutText {#text} at (158,27) size 257x27 - text run at (158,27) width 257: "<rdar://problem/4045513>" - LayoutText {#text} at (415,27) size 708x55 - text run at (415,27) width 293: " Copying and pasting selection" - text run at (0,55) width 593: "starting at end of paragraph can incorrectly remove line break" - LayoutBlockFlow {DIV} at (14,113) size 756x111 - LayoutText {#text} at (0,0) size 189x26 - text run at (0,0) width 189: "Expected Results: " - LayoutBR {BR} at (189,21) size 0x0 - LayoutText {#text} at (0,27) size 745x83 - text run at (0,27) width 745: "Should see two lines of text below, self-documenting themselves as \"line one\"" - text run at (0,55) width 713: "and \"line two\". The insertion point must be after the first character (\"l\") of" - text run at (0,83) width 103: "\"line two\"." - LayoutBlockFlow {DIV} at (0,262) size 784x60 - LayoutBlockFlow {DIV} at (0,0) size 784x60 [border: (2px solid #FF0000)] - LayoutBlockFlow {DIV} at (2,2) size 780x56 - LayoutBlockFlow {DIV} at (0,0) size 780x28 - LayoutText {#text} at (0,0) size 76x27 - text run at (0,0) width 76: "line one" - LayoutBlockFlow (anonymous) at (0,28) size 780x28 - LayoutText {#text} at (0,0) size 77x27 - text run at (0,0) width 77: "line two" -caret: position 1 of child 1 {#text} of child 1 {DIV} of child 1 {DIV} of child 3 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-match-style-001-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-match-style-001-expected.png deleted file mode 100644 index dd9c266..0000000 --- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-match-style-001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-match-style-001-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-match-style-001-expected.txt deleted file mode 100644 index 335bb8d..0000000 --- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-match-style-001-expected.txt +++ /dev/null
@@ -1,39 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {DIV} at (0,0) size 784x209 [border: (2px solid #0000FF)] - LayoutBlockFlow {DIV} at (14,14) size 756x55 - LayoutText {#text} at (0,0) size 64x26 - text run at (0,0) width 64: "Tests: " - LayoutBR {BR} at (0,0) size 0x0 - LayoutText {#text} at (0,27) size 262x27 - text run at (0,27) width 262: "Pasting and matching style." - LayoutBlockFlow {DIV} at (14,85) size 756x110 - LayoutText {#text} at (0,0) size 189x26 - text run at (0,0) width 189: "Expected Results: " - LayoutBR {BR} at (189,21) size 0x0 - LayoutText {#text} at (0,27) size 736x55 - text run at (0,27) width 736: "The pasted letter should match the style of the preexisting bold letter. Should" - text run at (0,55) width 364: "see this content in the red box below: " - LayoutBR {BR} at (364,76) size 0x0 - LayoutInline {B} at (0,0) size 25x26 - LayoutText {#text} at (0,83) size 25x26 - text run at (0,83) width 25: "ab" - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,233) size 784x31 - LayoutBlockFlow {DIV} at (0,0) size 784x31 [border: (2px solid #FF0000)] - LayoutInline {B} at (0,0) size 25x26 - LayoutText {#text} at (2,2) size 25x26 - text run at (2,2) width 25: "ab" -caret: position 2 of child 0 {#text} of child 0 {B} of child 1 {DIV} of child 3 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-match-style-002-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-match-style-002-expected.png deleted file mode 100644 index 3bdb0d7..0000000 --- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-match-style-002-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-match-style-002-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-match-style-002-expected.txt deleted file mode 100644 index 11c153ea..0000000 --- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/paste-match-style-002-expected.txt +++ /dev/null
@@ -1,43 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {DIV} at (0,0) size 784x237 [border: (2px solid #0000FF)] - LayoutBlockFlow {DIV} at (14,14) size 756x83 - LayoutText {#text} at (0,0) size 64x26 - text run at (0,0) width 64: "Tests: " - LayoutBR {BR} at (0,0) size 0x0 - LayoutText {#text} at (0,27) size 745x55 - text run at (0,27) width 745: "Pasting and matching style when there is nothing typed, but the typing style is" - text run at (0,55) width 431: "set to bold. This test was created after fixing " - LayoutInline {A} at (0,0) size 84x27 [color=#0000EE] - LayoutText {#text} at (431,55) size 84x27 - text run at (431,55) width 84: "3976872" - LayoutText {#text} at (515,55) size 6x27 - text run at (515,55) width 6: "." - LayoutBlockFlow {DIV} at (14,113) size 756x110 - LayoutText {#text} at (0,0) size 189x26 - text run at (0,0) width 189: "Expected Results: " - LayoutBR {BR} at (189,21) size 0x0 - LayoutText {#text} at (0,27) size 750x55 - text run at (0,27) width 750: "The pasted word should match the current typing style. In this case, the typing" - text run at (0,55) width 620: "style is set to bold. Should see this content in the red box below: " - LayoutBR {BR} at (620,76) size 0x0 - LayoutInline {B} at (0,0) size 50x26 - LayoutText {#text} at (0,83) size 50x26 - text run at (0,83) width 50: "hello" - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,261) size 784x31 - LayoutBlockFlow {DIV} at (0,0) size 784x31 [border: (2px solid #FF0000)] - LayoutInline {B} at (0,0) size 50x26 - LayoutText {#text} at (2,2) size 50x26 - text run at (2,2) width 50: "hello" -caret: position 5 of child 0 {#text} of child 0 {B} of child 1 {DIV} of child 3 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4076267-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4076267-2-expected.png deleted file mode 100644 index 9ba0cc5..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4076267-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4076267-2-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4076267-2-expected.txt deleted file mode 100644 index de8ee767..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4076267-2-expected.txt +++ /dev/null
@@ -1,24 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 392x18 - text run at (0,0) width 392: "This tests to see if trailing spaces are lost during a copy/paste" - LayoutBlockFlow {HR} at (0,34) size 784x2 [border: (1px inset #EEEEEE)] - LayoutBlockFlow {DIV} at (0,44) size 784x26 [border: (2px solid #FFAAAA)] - LayoutBlockFlow {DIV} at (2,2) size 780x22 [border: (2px solid #AAAAFF)] - LayoutText {#text} at (2,2) size 586x18 - text run at (2,2) width 586: "there should be a single trailing space between the '.' and the last character in this sentence ." -caret: position 96 of child 0 {#text} of child 1 {DIV} of child 5 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4076267-3-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4076267-3-expected.png deleted file mode 100644 index 6925276..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4076267-3-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4076267-3-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4076267-3-expected.txt deleted file mode 100644 index 6e7c00c..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4076267-3-expected.txt +++ /dev/null
@@ -1,389 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 342x18 - text run at (0,0) width 342: "This tests to see if spaces are lost during a copy/paste" - LayoutBlockFlow {HR} at (0,34) size 784x2 [border: (1px inset #EEEEEE)] - LayoutBlockFlow {DIV} at (0,44) size 784x198 - LayoutBlockFlow (anonymous) at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 20x18 - text run at (0,0) width 20: "x x" - LayoutBlockFlow {DIV} at (0,18) size 784x18 - LayoutText {#text} at (0,0) size 24x18 - text run at (0,0) width 24: "x x" - LayoutBlockFlow {DIV} at (0,36) size 784x18 - LayoutText {#text} at (0,0) size 28x18 - text run at (0,0) width 28: "x x" - LayoutBlockFlow {DIV} at (0,54) size 784x18 - LayoutText {#text} at (0,0) size 32x18 - text run at (0,0) width 32: "x x" - LayoutBlockFlow {DIV} at (0,72) size 784x18 - LayoutText {#text} at (0,0) size 36x18 - text run at (0,0) width 36: "x x" - LayoutBlockFlow {DIV} at (0,90) size 784x18 - LayoutText {#text} at (0,0) size 40x18 - text run at (0,0) width 40: "x x" - LayoutBlockFlow {DIV} at (0,108) size 784x18 - LayoutText {#text} at (0,0) size 44x18 - text run at (0,0) width 44: "x x" - LayoutBlockFlow {DIV} at (0,126) size 784x18 - LayoutText {#text} at (0,0) size 48x18 - text run at (0,0) width 48: "x x" - LayoutBlockFlow {DIV} at (0,144) size 784x18 - LayoutText {#text} at (0,0) size 52x18 - text run at (0,0) width 52: "x x" - LayoutBlockFlow {DIV} at (0,162) size 784x18 - LayoutText {#text} at (0,0) size 56x18 - text run at (0,0) width 56: "x x" - LayoutBlockFlow {DIV} at (0,180) size 784x18 - LayoutBR {BR} at (0,0) size 0x18 -caret: position 0 of child 0 {BR} of child 10 {DIV} of child 5 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4076267-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4076267-expected.png deleted file mode 100644 index 95a42cd..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4076267-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4076267-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4076267-expected.txt deleted file mode 100644 index 143cc0c..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4076267-expected.txt +++ /dev/null
@@ -1,25 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 393x18 - text run at (0,0) width 393: "This tests to see if leading spaces are lost during a copy/paste" - LayoutBlockFlow {HR} at (0,34) size 784x2 [border: (1px inset #EEEEEE)] - LayoutBlockFlow {DIV} at (0,44) size 784x18 - LayoutBlockFlow {DIV} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 338x18 - text run at (0,0) width 338: " this text should have a single leading space before it" -caret: position 55 of child 0 {#text} of child 1 {DIV} of child 5 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/cut-text-001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/cut-text-001-expected.png deleted file mode 100644 index bc869322..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/cut-text-001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/cut-text-001-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/cut-text-001-expected.txt deleted file mode 100644 index 5f27f286..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/cut-text-001-expected.txt +++ /dev/null
@@ -1,22 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)] - LayoutInline {SPAN} at (0,0) size 78x28 - LayoutText {#text} at (14,14) size 78x28 - text run at (14,14) width 78: "foo baz" - LayoutText {#text} at (0,0) size 0x0 -caret: position 4 of child 0 {#text} of child 1 {SPAN} of child 1 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/merge-end-borders-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/merge-end-borders-expected.png deleted file mode 100644 index ceea06b..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/merge-end-borders-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/merge-end-borders-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/merge-end-borders-expected.txt deleted file mode 100644 index fcf976c..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/merge-end-borders-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {P} at (0,0) size 784x54 - LayoutText {#text} at (0,0) size 780x54 - text run at (0,0) width 780: "This is a test for the merge that paste does of the last paragraph of the incoming fragment with content after the end of the" - text run at (0,18) width 179: "selection being pasted into. " - text run at (178,18) width 597: "A fragment that ends in with paragraph surrounded by a blue border is pasted into a selection" - text run at (0,36) width 324: "ending in a paragraph surrounded by a red border. " - text run at (323,36) width 175: "The red border should win." - LayoutBlockFlow {P} at (0,70) size 784x18 - LayoutInline {B} at (0,0) size 589x18 - LayoutText {#text} at (0,0) size 589x18 - text run at (0,0) width 589: "The second paragraph should be surrounded by a red border before and after the test." - LayoutBlockFlow {DIV} at (0,104) size 784x38 - LayoutBlockFlow (anonymous) at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 98x18 - text run at (0,0) width 98: "First paragraph" - LayoutBlockFlow {DIV} at (0,18) size 784x20 [border: (1px solid #FF0000)] - LayoutText {#text} at (1,1) size 303x18 - text run at (1,1) width 303: "This text should be surrounded by a red border." -caret: position 4 of child 0 {#text} of child 1 {DIV} of child 3 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-006-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-006-expected.png deleted file mode 100644 index ac829f6..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-006-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-006-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-006-expected.txt deleted file mode 100644 index 06e43e9..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-006-expected.txt +++ /dev/null
@@ -1,50 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {DIV} at (0,0) size 784x240 [border: (2px solid #0000FF)] - LayoutBlockFlow {DIV} at (14,14) size 756x84 - LayoutText {#text} at (0,0) size 66x28 - text run at (0,0) width 66: "Tests: " - LayoutBR {BR} at (0,0) size 0x0 - LayoutText {#text} at (0,28) size 162x28 - text run at (0,28) width 162: "Fix for this bug: " - LayoutInline {A} at (0,0) size 257x28 [color=#0000EE] - LayoutText {#text} at (161,28) size 257x28 - text run at (161,28) width 257: "<rdar://problem/4045513>" - LayoutText {#text} at (417,28) size 714x56 - text run at (417,28) width 297: " Copying and pasting selection" - text run at (0,56) width 593: "starting at end of paragraph can incorrectly remove line break" - LayoutBlockFlow {DIV} at (14,114) size 756x112 - LayoutText {#text} at (0,0) size 190x28 - text run at (0,0) width 190: "Expected Results: " - LayoutBR {BR} at (189,22) size 1x0 - LayoutText {#text} at (0,28) size 750x84 - text run at (0,28) width 750: "Should see two lines of text below, self-documenting themselves as \"line one\"" - text run at (0,56) width 711: "and \"line two\". The insertion point must be after the first character (\"l\") of" - text run at (0,84) width 104: "\"line two\"." - LayoutBlockFlow {DIV} at (0,264) size 784x60 - LayoutBlockFlow {DIV} at (0,0) size 784x60 [border: (2px solid #FF0000)] - LayoutText {#text} at (2,2) size 77x28 - text run at (2,2) width 77: "line one" - LayoutBR {BR} at (78,24) size 1x0 - LayoutText {#text} at (2,30) size 7x28 - text run at (2,30) width 7: "l" - LayoutText {#text} at (8,30) size 72x28 - text run at (8,30) width 72: "ine two" -caret: position 1 of child 2 {#text} of child 1 {DIV} of child 3 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-007-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-007-expected.png deleted file mode 100644 index c1f7f11..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-007-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-007-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-007-expected.txt deleted file mode 100644 index 1dc43e77..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-007-expected.txt +++ /dev/null
@@ -1,50 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {DIV} at (0,0) size 784x240 [border: (2px solid #0000FF)] - LayoutBlockFlow {DIV} at (14,14) size 756x84 - LayoutText {#text} at (0,0) size 66x28 - text run at (0,0) width 66: "Tests: " - LayoutBR {BR} at (0,0) size 0x0 - LayoutText {#text} at (0,28) size 162x28 - text run at (0,28) width 162: "Fix for this bug: " - LayoutInline {A} at (0,0) size 257x28 [color=#0000EE] - LayoutText {#text} at (161,28) size 257x28 - text run at (161,28) width 257: "<rdar://problem/4045513>" - LayoutText {#text} at (417,28) size 714x56 - text run at (417,28) width 297: " Copying and pasting selection" - text run at (0,56) width 593: "starting at end of paragraph can incorrectly remove line break" - LayoutBlockFlow {DIV} at (14,114) size 756x112 - LayoutText {#text} at (0,0) size 190x28 - text run at (0,0) width 190: "Expected Results: " - LayoutBR {BR} at (189,22) size 1x0 - LayoutText {#text} at (0,28) size 750x84 - text run at (0,28) width 750: "Should see two lines of text below, self-documenting themselves as \"line one\"" - text run at (0,56) width 711: "and \"line two\". The insertion point must be after the first character (\"l\") of" - text run at (0,84) width 104: "\"line two\"." - LayoutBlockFlow {DIV} at (0,264) size 784x60 - LayoutBlockFlow {DIV} at (0,0) size 784x60 [border: (2px solid #FF0000)] - LayoutBlockFlow (anonymous) at (2,2) size 780x28 - LayoutText {#text} at (0,0) size 77x28 - text run at (0,0) width 77: "line one" - LayoutBR {BR} at (76,22) size 1x0 - LayoutBlockFlow {DIV} at (2,30) size 780x28 - LayoutText {#text} at (0,0) size 78x28 - text run at (0,0) width 78: "line two" -caret: position 1 of child 0 {#text} of child 2 {DIV} of child 1 {DIV} of child 3 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-008-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-008-expected.png deleted file mode 100644 index c1f7f11..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-008-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-008-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-008-expected.txt deleted file mode 100644 index 75b9990..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-008-expected.txt +++ /dev/null
@@ -1,49 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {DIV} at (0,0) size 784x240 [border: (2px solid #0000FF)] - LayoutBlockFlow {DIV} at (14,14) size 756x84 - LayoutText {#text} at (0,0) size 66x28 - text run at (0,0) width 66: "Tests: " - LayoutBR {BR} at (0,0) size 0x0 - LayoutText {#text} at (0,28) size 162x28 - text run at (0,28) width 162: "Fix for this bug: " - LayoutInline {A} at (0,0) size 257x28 [color=#0000EE] - LayoutText {#text} at (161,28) size 257x28 - text run at (161,28) width 257: "<rdar://problem/4045513>" - LayoutText {#text} at (417,28) size 714x56 - text run at (417,28) width 297: " Copying and pasting selection" - text run at (0,56) width 593: "starting at end of paragraph can incorrectly remove line break" - LayoutBlockFlow {DIV} at (14,114) size 756x112 - LayoutText {#text} at (0,0) size 190x28 - text run at (0,0) width 190: "Expected Results: " - LayoutBR {BR} at (189,22) size 1x0 - LayoutText {#text} at (0,28) size 750x84 - text run at (0,28) width 750: "Should see two lines of text below, self-documenting themselves as \"line one\"" - text run at (0,56) width 711: "and \"line two\". The insertion point must be after the first character (\"l\") of" - text run at (0,84) width 104: "\"line two\"." - LayoutBlockFlow {DIV} at (0,264) size 784x60 - LayoutBlockFlow {DIV} at (0,0) size 784x60 [border: (2px solid #FF0000)] - LayoutBlockFlow {DIV} at (2,2) size 780x28 - LayoutText {#text} at (0,0) size 77x28 - text run at (0,0) width 77: "line one" - LayoutBlockFlow {DIV} at (2,30) size 780x28 - LayoutText {#text} at (0,0) size 78x28 - text run at (0,0) width 78: "line two" -caret: position 1 of child 0 {#text} of child 2 {DIV} of child 1 {DIV} of child 3 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-009-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-009-expected.png deleted file mode 100644 index c1f7f11..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-009-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-009-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-009-expected.txt deleted file mode 100644 index a287007..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-009-expected.txt +++ /dev/null
@@ -1,51 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {DIV} at (0,0) size 784x240 [border: (2px solid #0000FF)] - LayoutBlockFlow {DIV} at (14,14) size 756x84 - LayoutText {#text} at (0,0) size 66x28 - text run at (0,0) width 66: "Tests: " - LayoutBR {BR} at (0,0) size 0x0 - LayoutText {#text} at (0,28) size 162x28 - text run at (0,28) width 162: "Fix for this bug: " - LayoutInline {A} at (0,0) size 257x28 [color=#0000EE] - LayoutText {#text} at (161,28) size 257x28 - text run at (161,28) width 257: "<rdar://problem/4045513>" - LayoutText {#text} at (417,28) size 714x56 - text run at (417,28) width 297: " Copying and pasting selection" - text run at (0,56) width 593: "starting at end of paragraph can incorrectly remove line break" - LayoutBlockFlow {DIV} at (14,114) size 756x112 - LayoutText {#text} at (0,0) size 190x28 - text run at (0,0) width 190: "Expected Results: " - LayoutBR {BR} at (189,22) size 1x0 - LayoutText {#text} at (0,28) size 750x84 - text run at (0,28) width 750: "Should see two lines of text below, self-documenting themselves as \"line one\"" - text run at (0,56) width 711: "and \"line two\". The insertion point must be after the first character (\"l\") of" - text run at (0,84) width 104: "\"line two\"." - LayoutBlockFlow {DIV} at (0,264) size 784x60 - LayoutBlockFlow {DIV} at (0,0) size 784x60 [border: (2px solid #FF0000)] - LayoutBlockFlow {DIV} at (2,2) size 780x56 - LayoutBlockFlow (anonymous) at (0,0) size 780x28 - LayoutText {#text} at (0,0) size 77x28 - text run at (0,0) width 77: "line one" - LayoutBR {BR} at (76,22) size 1x0 - LayoutBlockFlow {DIV} at (0,28) size 780x28 - LayoutText {#text} at (0,0) size 78x28 - text run at (0,0) width 78: "line two" -caret: position 1 of child 0 {#text} of child 2 {DIV} of child 1 {DIV} of child 1 {DIV} of child 3 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-010-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-010-expected.png deleted file mode 100644 index c1f7f11..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-010-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-010-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-010-expected.txt deleted file mode 100644 index 8dee074..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-010-expected.txt +++ /dev/null
@@ -1,50 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {DIV} at (0,0) size 784x240 [border: (2px solid #0000FF)] - LayoutBlockFlow {DIV} at (14,14) size 756x84 - LayoutText {#text} at (0,0) size 66x28 - text run at (0,0) width 66: "Tests: " - LayoutBR {BR} at (0,0) size 0x0 - LayoutText {#text} at (0,28) size 162x28 - text run at (0,28) width 162: "Fix for this bug: " - LayoutInline {A} at (0,0) size 257x28 [color=#0000EE] - LayoutText {#text} at (161,28) size 257x28 - text run at (161,28) width 257: "<rdar://problem/4045513>" - LayoutText {#text} at (417,28) size 714x56 - text run at (417,28) width 297: " Copying and pasting selection" - text run at (0,56) width 593: "starting at end of paragraph can incorrectly remove line break" - LayoutBlockFlow {DIV} at (14,114) size 756x112 - LayoutText {#text} at (0,0) size 190x28 - text run at (0,0) width 190: "Expected Results: " - LayoutBR {BR} at (189,22) size 1x0 - LayoutText {#text} at (0,28) size 750x84 - text run at (0,28) width 750: "Should see two lines of text below, self-documenting themselves as \"line one\"" - text run at (0,56) width 711: "and \"line two\". The insertion point must be after the first character (\"l\") of" - text run at (0,84) width 104: "\"line two\"." - LayoutBlockFlow {DIV} at (0,264) size 784x60 - LayoutBlockFlow {DIV} at (0,0) size 784x60 [border: (2px solid #FF0000)] - LayoutBlockFlow {DIV} at (2,2) size 780x56 - LayoutBlockFlow {DIV} at (0,0) size 780x28 - LayoutText {#text} at (0,0) size 77x28 - text run at (0,0) width 77: "line one" - LayoutBlockFlow (anonymous) at (0,28) size 780x28 - LayoutText {#text} at (0,0) size 78x28 - text run at (0,0) width 78: "line two" -caret: position 1 of child 1 {#text} of child 1 {DIV} of child 1 {DIV} of child 3 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-match-style-001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-match-style-001-expected.png deleted file mode 100644 index a689a77d..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-match-style-001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-match-style-001-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-match-style-001-expected.txt deleted file mode 100644 index 643150c..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-match-style-001-expected.txt +++ /dev/null
@@ -1,39 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {DIV} at (0,0) size 784x212 [border: (2px solid #0000FF)] - LayoutBlockFlow {DIV} at (14,14) size 756x56 - LayoutText {#text} at (0,0) size 66x28 - text run at (0,0) width 66: "Tests: " - LayoutBR {BR} at (0,0) size 0x0 - LayoutText {#text} at (0,28) size 264x28 - text run at (0,28) width 264: "Pasting and matching style." - LayoutBlockFlow {DIV} at (14,86) size 756x112 - LayoutText {#text} at (0,0) size 190x28 - text run at (0,0) width 190: "Expected Results: " - LayoutBR {BR} at (189,22) size 1x0 - LayoutText {#text} at (0,28) size 738x56 - text run at (0,28) width 738: "The pasted letter should match the style of the preexisting bold letter. Should" - text run at (0,56) width 364: "see this content in the red box below: " - LayoutBR {BR} at (363,78) size 1x0 - LayoutInline {B} at (0,0) size 26x28 - LayoutText {#text} at (0,84) size 26x28 - text run at (0,84) width 26: "ab" - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,236) size 784x32 - LayoutBlockFlow {DIV} at (0,0) size 784x32 [border: (2px solid #FF0000)] - LayoutInline {B} at (0,0) size 26x28 - LayoutText {#text} at (2,2) size 26x28 - text run at (2,2) width 26: "ab" -caret: position 2 of child 0 {#text} of child 0 {B} of child 1 {DIV} of child 3 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-match-style-002-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-match-style-002-expected.png deleted file mode 100644 index d174aba..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-match-style-002-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-match-style-002-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-match-style-002-expected.txt deleted file mode 100644 index ab0143e..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-match-style-002-expected.txt +++ /dev/null
@@ -1,43 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {DIV} at (0,0) size 784x240 [border: (2px solid #0000FF)] - LayoutBlockFlow {DIV} at (14,14) size 756x84 - LayoutText {#text} at (0,0) size 66x28 - text run at (0,0) width 66: "Tests: " - LayoutBR {BR} at (0,0) size 0x0 - LayoutText {#text} at (0,28) size 750x56 - text run at (0,28) width 750: "Pasting and matching style when there is nothing typed, but the typing style is" - text run at (0,56) width 431: "set to bold. This test was created after fixing " - LayoutInline {A} at (0,0) size 85x28 [color=#0000EE] - LayoutText {#text} at (430,56) size 85x28 - text run at (430,56) width 85: "3976872" - LayoutText {#text} at (514,56) size 7x28 - text run at (514,56) width 7: "." - LayoutBlockFlow {DIV} at (14,114) size 756x112 - LayoutText {#text} at (0,0) size 190x28 - text run at (0,0) width 190: "Expected Results: " - LayoutBR {BR} at (189,22) size 1x0 - LayoutText {#text} at (0,28) size 752x56 - text run at (0,28) width 752: "The pasted word should match the current typing style. In this case, the typing" - text run at (0,56) width 624: "style is set to bold. Should see this content in the red box below: " - LayoutBR {BR} at (623,78) size 1x0 - LayoutInline {B} at (0,0) size 50x28 - LayoutText {#text} at (0,84) size 50x28 - text run at (0,84) width 50: "hello" - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,264) size 784x32 - LayoutBlockFlow {DIV} at (0,0) size 784x32 [border: (2px solid #FF0000)] - LayoutInline {B} at (0,0) size 50x28 - LayoutText {#text} at (2,2) size 50x28 - text run at (2,2) width 50: "hello" -caret: position 5 of child 0 {#text} of child 0 {B} of child 1 {DIV} of child 3 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-text-018-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-text-018-expected.png deleted file mode 100644 index 8e8971c4..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-text-018-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/4076267-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/4076267-2-expected.png deleted file mode 100644 index adefe54..0000000 --- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/4076267-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/4076267-2-expected.txt b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/4076267-2-expected.txt deleted file mode 100644 index 446fdec..0000000 --- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/4076267-2-expected.txt +++ /dev/null
@@ -1,24 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 392x17 - text run at (0,0) width 392: "This tests to see if trailing spaces are lost during a copy/paste" - LayoutBlockFlow {HR} at (0,34) size 784x2 [border: (1px inset #EEEEEE)] - LayoutBlockFlow {DIV} at (0,44) size 784x26 [border: (2px solid #FFAAAA)] - LayoutBlockFlow {DIV} at (2,2) size 780x22 [border: (2px solid #AAAAFF)] - LayoutText {#text} at (2,2) size 586x17 - text run at (2,2) width 586: "there should be a single trailing space between the '.' and the last character in this sentence ." -caret: position 96 of child 0 {#text} of child 1 {DIV} of child 5 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/4076267-3-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/4076267-3-expected.png deleted file mode 100644 index 7010037..0000000 --- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/4076267-3-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/4076267-3-expected.txt b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/4076267-3-expected.txt deleted file mode 100644 index 93ad9bd..0000000 --- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/4076267-3-expected.txt +++ /dev/null
@@ -1,389 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 342x17 - text run at (0,0) width 342: "This tests to see if spaces are lost during a copy/paste" - LayoutBlockFlow {HR} at (0,34) size 784x2 [border: (1px inset #EEEEEE)] - LayoutBlockFlow {DIV} at (0,44) size 784x198 - LayoutBlockFlow (anonymous) at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 20x17 - text run at (0,0) width 20: "x x" - LayoutBlockFlow {DIV} at (0,18) size 784x18 - LayoutText {#text} at (0,0) size 24x17 - text run at (0,0) width 24: "x x" - LayoutBlockFlow {DIV} at (0,36) size 784x18 - LayoutText {#text} at (0,0) size 28x17 - text run at (0,0) width 28: "x x" - LayoutBlockFlow {DIV} at (0,54) size 784x18 - LayoutText {#text} at (0,0) size 32x17 - text run at (0,0) width 32: "x x" - LayoutBlockFlow {DIV} at (0,72) size 784x18 - LayoutText {#text} at (0,0) size 36x17 - text run at (0,0) width 36: "x x" - LayoutBlockFlow {DIV} at (0,90) size 784x18 - LayoutText {#text} at (0,0) size 40x17 - text run at (0,0) width 40: "x x" - LayoutBlockFlow {DIV} at (0,108) size 784x18 - LayoutText {#text} at (0,0) size 44x17 - text run at (0,0) width 44: "x x" - LayoutBlockFlow {DIV} at (0,126) size 784x18 - LayoutText {#text} at (0,0) size 48x17 - text run at (0,0) width 48: "x x" - LayoutBlockFlow {DIV} at (0,144) size 784x18 - LayoutText {#text} at (0,0) size 52x17 - text run at (0,0) width 52: "x x" - LayoutBlockFlow {DIV} at (0,162) size 784x18 - LayoutText {#text} at (0,0) size 56x17 - text run at (0,0) width 56: "x x" - LayoutBlockFlow {DIV} at (0,180) size 784x18 - LayoutBR {BR} at (0,0) size 0x17 -caret: position 0 of child 0 {BR} of child 10 {DIV} of child 5 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/4076267-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/4076267-expected.png deleted file mode 100644 index 45e08e8..0000000 --- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/4076267-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/4076267-expected.txt b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/4076267-expected.txt deleted file mode 100644 index da2f7a04..0000000 --- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/4076267-expected.txt +++ /dev/null
@@ -1,25 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 393x17 - text run at (0,0) width 393: "This tests to see if leading spaces are lost during a copy/paste" - LayoutBlockFlow {HR} at (0,34) size 784x2 [border: (1px inset #EEEEEE)] - LayoutBlockFlow {DIV} at (0,44) size 784x18 - LayoutBlockFlow {DIV} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 338x17 - text run at (0,0) width 338: " this text should have a single leading space before it" -caret: position 55 of child 0 {#text} of child 1 {DIV} of child 5 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/cut-text-001-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/cut-text-001-expected.png deleted file mode 100644 index 77c5e558b..0000000 --- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/cut-text-001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/cut-text-001-expected.txt b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/cut-text-001-expected.txt deleted file mode 100644 index 0960c97..0000000 --- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/cut-text-001-expected.txt +++ /dev/null
@@ -1,22 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {DIV} at (0,0) size 784x55 [border: (2px solid #FF0000)] - LayoutInline {SPAN} at (0,0) size 78x26 - LayoutText {#text} at (14,14) size 78x26 - text run at (14,14) width 78: "foo baz" - LayoutText {#text} at (0,0) size 0x0 -caret: position 4 of child 0 {#text} of child 1 {SPAN} of child 1 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/interchange-newline-2-expected.txt b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/interchange-newline-2-expected.txt deleted file mode 100644 index 6a70be7..0000000 --- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/interchange-newline-2-expected.txt +++ /dev/null
@@ -1,13 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -This demonstrates a bug in interchange newline handling during paste. -The selection being pasted into contain multiple blocks, which breaks the old code in paste that handled interchange newlines. -| <div> -| "fbar" -| "baz" -| <div> -| "<#selection-caret>ar"
diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/merge-end-borders-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/merge-end-borders-expected.png deleted file mode 100644 index 07aefa93..0000000 --- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/merge-end-borders-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/merge-end-borders-expected.txt b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/merge-end-borders-expected.txt deleted file mode 100644 index 80d10cef..0000000 --- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/merge-end-borders-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {P} at (0,0) size 784x54 - LayoutText {#text} at (0,0) size 779x53 - text run at (0,0) width 779: "This is a test for the merge that paste does of the last paragraph of the incoming fragment with content after the end of the" - text run at (0,18) width 179: "selection being pasted into. " - text run at (178,18) width 597: "A fragment that ends in with paragraph surrounded by a blue border is pasted into a selection" - text run at (0,36) width 324: "ending in a paragraph surrounded by a red border. " - text run at (323,36) width 175: "The red border should win." - LayoutBlockFlow {P} at (0,70) size 784x18 - LayoutInline {B} at (0,0) size 589x17 - LayoutText {#text} at (0,0) size 589x17 - text run at (0,0) width 589: "The second paragraph should be surrounded by a red border before and after the test." - LayoutBlockFlow {DIV} at (0,104) size 784x38 - LayoutBlockFlow (anonymous) at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 98x17 - text run at (0,0) width 98: "First paragraph" - LayoutBlockFlow {DIV} at (0,18) size 784x20 [border: (1px solid #FF0000)] - LayoutText {#text} at (1,1) size 303x17 - text run at (1,1) width 303: "This text should be surrounded by a red border." -caret: position 4 of child 0 {#text} of child 1 {DIV} of child 3 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/merge-end-table-2-expected.txt b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/merge-end-table-2-expected.txt deleted file mode 100644 index 5c798ef1..0000000 --- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/merge-end-table-2-expected.txt +++ /dev/null
@@ -1,30 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -This tests pasting text into a table cell. The last bit of content in the incoming fragment should be merged with the paragraph after the position being pasted into. - -Before insertion: -| <tbody> -| <tr> -| <td> -| <div> -| id="test2" -| "Item 1" -| <td> -| "Item 2" - -After insertion: -| <tbody> -| <tr> -| <td> -| <div> -| id="test2" -| "Item foo" -| <div> -| id="test2" -| "bar<#selection-caret>1" -| <td> -| "Item 2"
diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-006-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-006-expected.png deleted file mode 100644 index 1016fbd..0000000 --- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-006-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-006-expected.txt b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-006-expected.txt deleted file mode 100644 index 5cacf1e..0000000 --- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-006-expected.txt +++ /dev/null
@@ -1,50 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {DIV} at (0,0) size 784x233 [border: (2px solid #0000FF)] - LayoutBlockFlow {DIV} at (14,14) size 756x81 - LayoutText {#text} at (0,0) size 66x26 - text run at (0,0) width 66: "Tests: " - LayoutBR {BR} at (0,0) size 0x0 - LayoutText {#text} at (0,27) size 162x26 - text run at (0,27) width 162: "Fix for this bug: " - LayoutInline {A} at (0,0) size 257x26 [color=#0000EE] - LayoutText {#text} at (161,27) size 257x26 - text run at (161,27) width 257: "<rdar://problem/4045513>" - LayoutText {#text} at (417,27) size 714x53 - text run at (417,27) width 297: " Copying and pasting selection" - text run at (0,54) width 593: "starting at end of paragraph can incorrectly remove line break" - LayoutBlockFlow {DIV} at (14,111) size 756x108 - LayoutText {#text} at (0,0) size 190x26 - text run at (0,0) width 190: "Expected Results: " - LayoutBR {BR} at (189,21) size 1x0 - LayoutText {#text} at (0,27) size 750x80 - text run at (0,27) width 750: "Should see two lines of text below, self-documenting themselves as \"line one\"" - text run at (0,54) width 713: "and \"line two\". The insertion point must be after the first character (\"l\") of" - text run at (0,81) width 104: "\"line two\"." - LayoutBlockFlow {DIV} at (0,257) size 784x58 - LayoutBlockFlow {DIV} at (0,0) size 784x58 [border: (2px solid #FF0000)] - LayoutText {#text} at (2,2) size 77x26 - text run at (2,2) width 77: "line one" - LayoutBR {BR} at (78,23) size 1x0 - LayoutText {#text} at (2,29) size 7x26 - text run at (2,29) width 7: "l" - LayoutText {#text} at (8,29) size 72x26 - text run at (8,29) width 72: "ine two" -caret: position 1 of child 2 {#text} of child 1 {DIV} of child 3 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-007-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-007-expected.png deleted file mode 100644 index 61b6036..0000000 --- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-007-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-007-expected.txt b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-007-expected.txt deleted file mode 100644 index fc1b4457..0000000 --- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-007-expected.txt +++ /dev/null
@@ -1,50 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {DIV} at (0,0) size 784x233 [border: (2px solid #0000FF)] - LayoutBlockFlow {DIV} at (14,14) size 756x81 - LayoutText {#text} at (0,0) size 66x26 - text run at (0,0) width 66: "Tests: " - LayoutBR {BR} at (0,0) size 0x0 - LayoutText {#text} at (0,27) size 162x26 - text run at (0,27) width 162: "Fix for this bug: " - LayoutInline {A} at (0,0) size 257x26 [color=#0000EE] - LayoutText {#text} at (161,27) size 257x26 - text run at (161,27) width 257: "<rdar://problem/4045513>" - LayoutText {#text} at (417,27) size 714x53 - text run at (417,27) width 297: " Copying and pasting selection" - text run at (0,54) width 593: "starting at end of paragraph can incorrectly remove line break" - LayoutBlockFlow {DIV} at (14,111) size 756x108 - LayoutText {#text} at (0,0) size 190x26 - text run at (0,0) width 190: "Expected Results: " - LayoutBR {BR} at (189,21) size 1x0 - LayoutText {#text} at (0,27) size 750x80 - text run at (0,27) width 750: "Should see two lines of text below, self-documenting themselves as \"line one\"" - text run at (0,54) width 713: "and \"line two\". The insertion point must be after the first character (\"l\") of" - text run at (0,81) width 104: "\"line two\"." - LayoutBlockFlow {DIV} at (0,257) size 784x58 - LayoutBlockFlow {DIV} at (0,0) size 784x58 [border: (2px solid #FF0000)] - LayoutBlockFlow (anonymous) at (2,2) size 780x27 - LayoutText {#text} at (0,0) size 77x26 - text run at (0,0) width 77: "line one" - LayoutBR {BR} at (76,21) size 1x0 - LayoutBlockFlow {DIV} at (2,29) size 780x27 - LayoutText {#text} at (0,0) size 78x26 - text run at (0,0) width 78: "line two" -caret: position 1 of child 0 {#text} of child 2 {DIV} of child 1 {DIV} of child 3 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-008-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-008-expected.png deleted file mode 100644 index 61b6036..0000000 --- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-008-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-008-expected.txt b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-008-expected.txt deleted file mode 100644 index 6803ab9..0000000 --- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-008-expected.txt +++ /dev/null
@@ -1,49 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {DIV} at (0,0) size 784x233 [border: (2px solid #0000FF)] - LayoutBlockFlow {DIV} at (14,14) size 756x81 - LayoutText {#text} at (0,0) size 66x26 - text run at (0,0) width 66: "Tests: " - LayoutBR {BR} at (0,0) size 0x0 - LayoutText {#text} at (0,27) size 162x26 - text run at (0,27) width 162: "Fix for this bug: " - LayoutInline {A} at (0,0) size 257x26 [color=#0000EE] - LayoutText {#text} at (161,27) size 257x26 - text run at (161,27) width 257: "<rdar://problem/4045513>" - LayoutText {#text} at (417,27) size 714x53 - text run at (417,27) width 297: " Copying and pasting selection" - text run at (0,54) width 593: "starting at end of paragraph can incorrectly remove line break" - LayoutBlockFlow {DIV} at (14,111) size 756x108 - LayoutText {#text} at (0,0) size 190x26 - text run at (0,0) width 190: "Expected Results: " - LayoutBR {BR} at (189,21) size 1x0 - LayoutText {#text} at (0,27) size 750x80 - text run at (0,27) width 750: "Should see two lines of text below, self-documenting themselves as \"line one\"" - text run at (0,54) width 713: "and \"line two\". The insertion point must be after the first character (\"l\") of" - text run at (0,81) width 104: "\"line two\"." - LayoutBlockFlow {DIV} at (0,257) size 784x58 - LayoutBlockFlow {DIV} at (0,0) size 784x58 [border: (2px solid #FF0000)] - LayoutBlockFlow {DIV} at (2,2) size 780x27 - LayoutText {#text} at (0,0) size 77x26 - text run at (0,0) width 77: "line one" - LayoutBlockFlow {DIV} at (2,29) size 780x27 - LayoutText {#text} at (0,0) size 78x26 - text run at (0,0) width 78: "line two" -caret: position 1 of child 0 {#text} of child 2 {DIV} of child 1 {DIV} of child 3 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-009-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-009-expected.png deleted file mode 100644 index 61b6036..0000000 --- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-009-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-009-expected.txt b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-009-expected.txt deleted file mode 100644 index 944bfe5..0000000 --- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-009-expected.txt +++ /dev/null
@@ -1,51 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {DIV} at (0,0) size 784x233 [border: (2px solid #0000FF)] - LayoutBlockFlow {DIV} at (14,14) size 756x81 - LayoutText {#text} at (0,0) size 66x26 - text run at (0,0) width 66: "Tests: " - LayoutBR {BR} at (0,0) size 0x0 - LayoutText {#text} at (0,27) size 162x26 - text run at (0,27) width 162: "Fix for this bug: " - LayoutInline {A} at (0,0) size 257x26 [color=#0000EE] - LayoutText {#text} at (161,27) size 257x26 - text run at (161,27) width 257: "<rdar://problem/4045513>" - LayoutText {#text} at (417,27) size 714x53 - text run at (417,27) width 297: " Copying and pasting selection" - text run at (0,54) width 593: "starting at end of paragraph can incorrectly remove line break" - LayoutBlockFlow {DIV} at (14,111) size 756x108 - LayoutText {#text} at (0,0) size 190x26 - text run at (0,0) width 190: "Expected Results: " - LayoutBR {BR} at (189,21) size 1x0 - LayoutText {#text} at (0,27) size 750x80 - text run at (0,27) width 750: "Should see two lines of text below, self-documenting themselves as \"line one\"" - text run at (0,54) width 713: "and \"line two\". The insertion point must be after the first character (\"l\") of" - text run at (0,81) width 104: "\"line two\"." - LayoutBlockFlow {DIV} at (0,257) size 784x58 - LayoutBlockFlow {DIV} at (0,0) size 784x58 [border: (2px solid #FF0000)] - LayoutBlockFlow {DIV} at (2,2) size 780x54 - LayoutBlockFlow (anonymous) at (0,0) size 780x27 - LayoutText {#text} at (0,0) size 77x26 - text run at (0,0) width 77: "line one" - LayoutBR {BR} at (76,21) size 1x0 - LayoutBlockFlow {DIV} at (0,27) size 780x27 - LayoutText {#text} at (0,0) size 78x26 - text run at (0,0) width 78: "line two" -caret: position 1 of child 0 {#text} of child 2 {DIV} of child 1 {DIV} of child 1 {DIV} of child 3 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-010-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-010-expected.png deleted file mode 100644 index 61b6036..0000000 --- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-010-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-010-expected.txt b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-010-expected.txt deleted file mode 100644 index 8054be3..0000000 --- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-line-endings-010-expected.txt +++ /dev/null
@@ -1,50 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {DIV} at (0,0) size 784x233 [border: (2px solid #0000FF)] - LayoutBlockFlow {DIV} at (14,14) size 756x81 - LayoutText {#text} at (0,0) size 66x26 - text run at (0,0) width 66: "Tests: " - LayoutBR {BR} at (0,0) size 0x0 - LayoutText {#text} at (0,27) size 162x26 - text run at (0,27) width 162: "Fix for this bug: " - LayoutInline {A} at (0,0) size 257x26 [color=#0000EE] - LayoutText {#text} at (161,27) size 257x26 - text run at (161,27) width 257: "<rdar://problem/4045513>" - LayoutText {#text} at (417,27) size 714x53 - text run at (417,27) width 297: " Copying and pasting selection" - text run at (0,54) width 593: "starting at end of paragraph can incorrectly remove line break" - LayoutBlockFlow {DIV} at (14,111) size 756x108 - LayoutText {#text} at (0,0) size 190x26 - text run at (0,0) width 190: "Expected Results: " - LayoutBR {BR} at (189,21) size 1x0 - LayoutText {#text} at (0,27) size 750x80 - text run at (0,27) width 750: "Should see two lines of text below, self-documenting themselves as \"line one\"" - text run at (0,54) width 713: "and \"line two\". The insertion point must be after the first character (\"l\") of" - text run at (0,81) width 104: "\"line two\"." - LayoutBlockFlow {DIV} at (0,257) size 784x58 - LayoutBlockFlow {DIV} at (0,0) size 784x58 [border: (2px solid #FF0000)] - LayoutBlockFlow {DIV} at (2,2) size 780x54 - LayoutBlockFlow {DIV} at (0,0) size 780x27 - LayoutText {#text} at (0,0) size 77x26 - text run at (0,0) width 77: "line one" - LayoutBlockFlow (anonymous) at (0,27) size 780x27 - LayoutText {#text} at (0,0) size 78x26 - text run at (0,0) width 78: "line two" -caret: position 1 of child 1 {#text} of child 1 {DIV} of child 1 {DIV} of child 3 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-match-style-001-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-match-style-001-expected.png deleted file mode 100644 index c9cc859..0000000 --- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-match-style-001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-match-style-001-expected.txt b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-match-style-001-expected.txt deleted file mode 100644 index a21441bd..0000000 --- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-match-style-001-expected.txt +++ /dev/null
@@ -1,39 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {DIV} at (0,0) size 784x206 [border: (2px solid #0000FF)] - LayoutBlockFlow {DIV} at (14,14) size 756x54 - LayoutText {#text} at (0,0) size 66x26 - text run at (0,0) width 66: "Tests: " - LayoutBR {BR} at (0,0) size 0x0 - LayoutText {#text} at (0,27) size 264x26 - text run at (0,27) width 264: "Pasting and matching style." - LayoutBlockFlow {DIV} at (14,84) size 756x108 - LayoutText {#text} at (0,0) size 190x26 - text run at (0,0) width 190: "Expected Results: " - LayoutBR {BR} at (189,21) size 1x0 - LayoutText {#text} at (0,27) size 738x53 - text run at (0,27) width 738: "The pasted letter should match the style of the preexisting bold letter. Should" - text run at (0,54) width 364: "see this content in the red box below: " - LayoutBR {BR} at (363,75) size 1x0 - LayoutInline {B} at (0,0) size 26x26 - LayoutText {#text} at (0,81) size 26x26 - text run at (0,81) width 26: "ab" - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,230) size 784x31 - LayoutBlockFlow {DIV} at (0,0) size 784x31 [border: (2px solid #FF0000)] - LayoutInline {B} at (0,0) size 26x26 - LayoutText {#text} at (2,2) size 26x26 - text run at (2,2) width 26: "ab" -caret: position 2 of child 0 {#text} of child 0 {B} of child 1 {DIV} of child 3 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-match-style-002-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-match-style-002-expected.png deleted file mode 100644 index 931b6af..0000000 --- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-match-style-002-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-match-style-002-expected.txt b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-match-style-002-expected.txt deleted file mode 100644 index edd8fbe..0000000 --- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/paste-match-style-002-expected.txt +++ /dev/null
@@ -1,43 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {DIV} at (0,0) size 784x233 [border: (2px solid #0000FF)] - LayoutBlockFlow {DIV} at (14,14) size 756x81 - LayoutText {#text} at (0,0) size 66x26 - text run at (0,0) width 66: "Tests: " - LayoutBR {BR} at (0,0) size 0x0 - LayoutText {#text} at (0,27) size 750x53 - text run at (0,27) width 750: "Pasting and matching style when there is nothing typed, but the typing style is" - text run at (0,54) width 432: "set to bold. This test was created after fixing " - LayoutInline {A} at (0,0) size 85x26 [color=#0000EE] - LayoutText {#text} at (431,54) size 85x26 - text run at (431,54) width 85: "3976872" - LayoutText {#text} at (515,54) size 7x26 - text run at (515,54) width 7: "." - LayoutBlockFlow {DIV} at (14,111) size 756x108 - LayoutText {#text} at (0,0) size 190x26 - text run at (0,0) width 190: "Expected Results: " - LayoutBR {BR} at (189,21) size 1x0 - LayoutText {#text} at (0,27) size 752x53 - text run at (0,27) width 752: "The pasted word should match the current typing style. In this case, the typing" - text run at (0,54) width 624: "style is set to bold. Should see this content in the red box below: " - LayoutBR {BR} at (623,75) size 1x0 - LayoutInline {B} at (0,0) size 50x26 - LayoutText {#text} at (0,81) size 50x26 - text run at (0,81) width 50: "hello" - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,257) size 784x31 - LayoutBlockFlow {DIV} at (0,0) size 784x31 [border: (2px solid #FF0000)] - LayoutInline {B} at (0,0) size 50x26 - LayoutText {#text} at (2,2) size 50x26 - text run at (2,2) width 50: "hello" -caret: position 5 of child 0 {#text} of child 0 {B} of child 1 {DIV} of child 3 {DIV} of body
diff --git a/third_party/WebKit/LayoutTests/svg/custom/use-nested-symbol-viewport-expected.html b/third_party/WebKit/LayoutTests/svg/custom/use-nested-symbol-viewport-expected.html new file mode 100644 index 0000000..f718ea6 --- /dev/null +++ b/third_party/WebKit/LayoutTests/svg/custom/use-nested-symbol-viewport-expected.html
@@ -0,0 +1,2 @@ +<!DOCTYPE html> +<div style="width: 100px; height: 100px; background-color: green"></div>
diff --git a/third_party/WebKit/LayoutTests/svg/custom/use-nested-symbol-viewport.html b/third_party/WebKit/LayoutTests/svg/custom/use-nested-symbol-viewport.html new file mode 100644 index 0000000..ad96e24e --- /dev/null +++ b/third_party/WebKit/LayoutTests/svg/custom/use-nested-symbol-viewport.html
@@ -0,0 +1,12 @@ +<!DOCTYPE html> +<svg width="200" height="100"> + <rect width="100" height="100" fill="red"/> + <symbol id="inner"> + <rect width="100" height="100"/> + </symbol> + <symbol id="outer"> + <rect x="50%" width="100" height="100" fill="red"/> + <use xlink:href="#inner" x="50%" fill="green"/> + </symbol> + <use xlink:href="#outer" transform="translate(-100, 0)"/> +</svg>
diff --git a/third_party/WebKit/Source/core/core.gypi b/third_party/WebKit/Source/core/core.gypi index 49a56d7..250de9ae 100644 --- a/third_party/WebKit/Source/core/core.gypi +++ b/third_party/WebKit/Source/core/core.gypi
@@ -551,8 +551,6 @@ 'layout/ng/ng_box.h', 'layout/ng/ng_constraint_space.cc', 'layout/ng/ng_constraint_space.h', - 'layout/ng/ng_derived_constraint_space.cc', - 'layout/ng/ng_derived_constraint_space.h', 'layout/ng/ng_direction.cc', 'layout/ng/ng_direction.h', 'layout/ng/ng_physical_constraint_space.cc',
diff --git a/third_party/WebKit/Source/core/css/parser/CSSSelectorParser.cpp b/third_party/WebKit/Source/core/css/parser/CSSSelectorParser.cpp index 3812e28f3..21a7115 100644 --- a/third_party/WebKit/Source/core/css/parser/CSSSelectorParser.cpp +++ b/third_party/WebKit/Source/core/css/parser/CSSSelectorParser.cpp
@@ -481,9 +481,9 @@ std::unique_ptr<CSSParserSelector> selector = CSSParserSelector::create(); selector->setMatch(colons == 1 ? CSSSelector::PseudoClass : CSSSelector::PseudoElement); - String value = token.value().toString(); + AtomicString value = token.value().toAtomicString().lowerASCII(); bool hasArguments = token.type() == FunctionToken; - selector->updatePseudoType(AtomicString(value.is8Bit() ? value.lower() : value), hasArguments); + selector->updatePseudoType(value, hasArguments); if (selector->match() == CSSSelector::PseudoElement && m_disallowPseudoElements) return nullptr;
diff --git a/third_party/WebKit/Source/core/dom/Node.cpp b/third_party/WebKit/Source/core/dom/Node.cpp index 25340b13..0dcfd67 100644 --- a/third_party/WebKit/Source/core/dom/Node.cpp +++ b/third_party/WebKit/Source/core/dom/Node.cpp
@@ -214,30 +214,34 @@ } } - printf("Number of Nodes: %d\n\n", liveNodeSet().size()); - printf("Number of Nodes with RareData: %zu\n\n", nodesWithRareData); - - printf("NodeType distribution:\n"); - printf(" Number of Element nodes: %zu\n", elementNodes); - printf(" Number of Attribute nodes: %zu\n", attrNodes); - printf(" Number of Text nodes: %zu\n", textNodes); - printf(" Number of CDATASection nodes: %zu\n", cdataNodes); - printf(" Number of Comment nodes: %zu\n", commentNodes); - printf(" Number of ProcessingInstruction nodes: %zu\n", piNodes); - printf(" Number of Document nodes: %zu\n", documentNodes); - printf(" Number of DocumentType nodes: %zu\n", docTypeNodes); - printf(" Number of DocumentFragment nodes: %zu\n", fragmentNodes); - printf(" Number of ShadowRoot nodes: %zu\n", shadowRootNodes); - - printf("Element tag name distibution:\n"); + std::stringstream perTagStream; for (const auto& entry : perTagCount) - printf(" Number of <%s> tags: %zu\n", entry.key.utf8().data(), entry.value); + perTagStream << " Number of <" << entry.key.utf8().data() << "> tags: " << entry.value << "\n"; - printf("Attributes:\n"); - printf(" Number of Attributes (non-Node and Node): %zu [%zu]\n", attributes, sizeof(Attribute)); - printf(" Number of Elements with attribute storage: %zu [%zu]\n", elementsWithAttributeStorage, sizeof(ElementData)); - printf(" Number of Elements with RareData: %zu\n", elementsWithRareData); - printf(" Number of Elements with NamedNodeMap: %zu [%zu]\n", elementsWithNamedNodeMap, sizeof(NamedNodeMap)); + LOG(INFO) << "\n" + << "Number of Nodes: " << liveNodeSet().size() << "\n" + << "Number of Nodes with RareData: " << nodesWithRareData << "\n\n" + + << "NodeType distribution:\n" + << " Number of Element nodes: " << elementNodes << "\n" + << " Number of Attribute nodes: " << attrNodes << "\n" + << " Number of Text nodes: " << textNodes << "\n" + << " Number of CDATASection nodes: " << cdataNodes << "\n" + << " Number of Comment nodes: " << commentNodes << "\n" + << " Number of ProcessingInstruction nodes: " << piNodes << "\n" + << " Number of Document nodes: " << documentNodes << "\n" + << " Number of DocumentType nodes: " << docTypeNodes << "\n" + << " Number of DocumentFragment nodes: " << fragmentNodes << "\n" + << " Number of ShadowRoot nodes: " << shadowRootNodes << "\n" + + << "Element tag name distibution:\n" + << perTagStream.str() + + << "Attributes:\n" + << " Number of Attributes (non-Node and Node): " << attributes << " x " << sizeof(Attribute) << "Bytes\n" + << " Number of Elements with attribute storage: " << elementsWithAttributeStorage << " x " << sizeof(ElementData) << "Bytes\n" + << " Number of Elements with RareData: " << elementsWithRareData << "\n" + << " Number of Elements with NamedNodeMap: " << elementsWithNamedNodeMap << " x " << sizeof(NamedNodeMap) << "Bytes"; #endif }
diff --git a/third_party/WebKit/Source/core/dom/Range.cpp b/third_party/WebKit/Source/core/dom/Range.cpp index e49ac61..c6b8dc7 100644 --- a/third_party/WebKit/Source/core/dom/Range.cpp +++ b/third_party/WebKit/Source/core/dom/Range.cpp
@@ -1568,11 +1568,11 @@ void showTree(const blink::Range* range) { if (range && range->boundaryPointsValid()) { - // TODO(tkent): Replace WTFLogAlways with something else. - WTFLogAlways("%s", range->startContainer()->toMarkedTreeString(range->startContainer(), "S", range->endContainer(), "E").utf8().data()); - fprintf(stderr, "start offset: %d, end offset: %d\n", range->startOffset(), range->endOffset()); + LOG(INFO) << "\n" + << range->startContainer()->toMarkedTreeString(range->startContainer(), "S", range->endContainer(), "E").utf8().data() + << "start offset: " << range->startOffset() << ", end offset: " << range->endOffset(); } else { - fprintf(stderr, "Cannot show tree if range is null, or if boundary points are invalid.\n"); + LOG(INFO) << "Cannot show tree if range is null, or if boundary points are invalid."; } }
diff --git a/third_party/WebKit/Source/core/fetch/OWNERS b/third_party/WebKit/Source/core/fetch/OWNERS index f8c53d1..3160250 100644 --- a/third_party/WebKit/Source/core/fetch/OWNERS +++ b/third_party/WebKit/Source/core/fetch/OWNERS
@@ -1,2 +1,3 @@ japhet@chromium.org mkwst@chromium.org +yhirano@chromium.org
diff --git a/third_party/WebKit/Source/core/fetch/RawResource.cpp b/third_party/WebKit/Source/core/fetch/RawResource.cpp index ae770f3..4aec264 100644 --- a/third_party/WebKit/Source/core/fetch/RawResource.cpp +++ b/third_party/WebKit/Source/core/fetch/RawResource.cpp
@@ -299,7 +299,9 @@ void RawResourceClientStateChecker::responseReceived() { - SECURITY_CHECK(m_state == Started); + // TODO(hiroshige): Temporarily we use DCHECK() here instead of CHECK(), + // due to crbug.com/640960. + SECURITY_DCHECK(m_state == Started); m_state = ResponseReceived; }
diff --git a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp index 143bb107..5ff0d0d 100644 --- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp +++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
@@ -253,7 +253,7 @@ resource->setCORSFailed(); if (!forPreload) { String resourceType = Resource::resourceTypeToString(resource->getType(), resource->options().initiatorInfo); - context().addConsoleMessage("Access to " + resourceType + " at '" + response.url().getString() + "' from origin '" + SecurityOrigin::create(response.url())->toString() + "' has been blocked by CORS policy: " + errorDescription); + context().addConsoleMessage("Access to " + resourceType + " at '" + response.url().getString() + "' from origin '" + sourceOrigin->toString() + "' has been blocked by CORS policy: " + errorDescription); } return false; }
diff --git a/third_party/WebKit/Source/core/inspector/browser_protocol.json b/third_party/WebKit/Source/core/inspector/browser_protocol.json index 7cda362..1afca60 100644 --- a/third_party/WebKit/Source/core/inspector/browser_protocol.json +++ b/third_party/WebKit/Source/core/inspector/browser_protocol.json
@@ -1149,13 +1149,11 @@ "parameters": [ { "name": "maxTotalBufferSize", "type": "integer", "optional": true, "experimental": true, "description": "Buffer size in bytes to use when preserving network payloads (XHRs, etc)." }, { "name": "maxResourceBufferSize", "type": "integer", "optional": true, "experimental": true, "description": "Per-resource buffer size in bytes to use when preserving network payloads (XHRs, etc)." } - ], - "handlers": ["renderer", "browser"] + ] }, { "name": "disable", - "description": "Disables network tracking, prevents network events from being sent to the client.", - "handlers": ["renderer", "browser"] + "description": "Disables network tracking, prevents network events from being sent to the client." }, { "name": "setUserAgentOverride",
diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp index b8d834e..bb9bf621 100644 --- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp +++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
@@ -437,11 +437,13 @@ // More IE extensions. clientWidth and clientHeight represent the interior of an object // excluding border and scrollbar. +DISABLE_CFI_PERF LayoutUnit LayoutBox::clientWidth() const { return m_frameRect.width() - borderLeft() - borderRight() - verticalScrollbarWidth(); } +DISABLE_CFI_PERF LayoutUnit LayoutBox::clientHeight() const { return m_frameRect.height() - borderTop() - borderBottom() - horizontalScrollbarHeight(); @@ -452,6 +454,7 @@ return snapSizeToPixel(clientWidth(), location().x() + clientLeft()); } +DISABLE_CFI_PERF int LayoutBox::pixelSnappedClientHeight() const { return snapSizeToPixel(clientHeight(), location().y() + clientTop()); @@ -1110,6 +1113,7 @@ return m_minPreferredLogicalWidth; } +DISABLE_CFI_PERF LayoutUnit LayoutBox::maxPreferredLogicalWidth() const { if (preferredLogicalWidthsDirty()) { @@ -1498,6 +1502,7 @@ return false; } +DISABLE_CFI_PERF bool LayoutBox::computeBackgroundIsKnownToBeObscured() const { if (scrollsOverflow()) @@ -2262,6 +2267,7 @@ return maxWidth; } +DISABLE_CFI_PERF void LayoutBox::computeLogicalWidth(LogicalExtentComputedValues& computedValues) const { computedValues.m_extent = style()->containsSize() ? borderAndPaddingLogicalWidth() : logicalWidth(); @@ -2367,6 +2373,7 @@ return available; } +DISABLE_CFI_PERF LayoutUnit LayoutBox::computeIntrinsicLogicalWidthUsing(const Length& logicalWidthLength, LayoutUnit availableLogicalWidth, LayoutUnit borderAndPadding) const { if (logicalWidthLength.type() == FillAvailable) @@ -2392,6 +2399,7 @@ return LayoutUnit(); } +DISABLE_CFI_PERF LayoutUnit LayoutBox::computeLogicalWidthUsing(SizeType widthType, const Length& logicalWidth, LayoutUnit availableLogicalWidth, const LayoutBlock* cb) const { ASSERT(widthType == MinSize || widthType == MainOrPreferredSize || !logicalWidth.isAuto()); @@ -2591,6 +2599,7 @@ marginEnd = marginEndWidth; } +DISABLE_CFI_PERF void LayoutBox::updateLogicalHeight() { m_intrinsicContentLogicalHeight = contentLogicalHeight(); @@ -3984,6 +3993,7 @@ return createPositionWithAffinity(firstPositionInOrBeforeNode(nonPseudoNode())); } +DISABLE_CFI_PERF bool LayoutBox::shrinkToAvoidFloats() const { // Floating objects don't shrink. Objects that don't avoid floats don't shrink. @@ -4000,6 +4010,7 @@ return node && node->isElementNode() && (toElement(node)->isFormControlElement() || isHTMLImageElement(toElement(node))); } +DISABLE_CFI_PERF bool LayoutBox::avoidsFloats() const { return isAtomicInlineLevel() || shouldBeConsideredAsReplaced(node()) || hasOverflowClip() || isHR() || isLegend() || isWritingModeRoot() || isFlexItemIncludingDeprecated() || style()->containsPaint() || style()->containsLayout(); @@ -4093,6 +4104,7 @@ return LayoutRectOutsets(top, right, bottom, left); } +DISABLE_CFI_PERF void LayoutBox::addOverflowFromChild(LayoutBox* child, const LayoutSize& delta) { // Never allow flow threads to propagate overflow up to a parent. @@ -4126,6 +4138,7 @@ return !style()->isLeftToRightDirection() && isHorizontalWritingMode(); } +DISABLE_CFI_PERF void LayoutBox::addLayoutOverflow(const LayoutRect& rect) { if (rect.isEmpty()) @@ -4213,6 +4226,7 @@ return computePercentageLogicalHeight(fakeLength) != -1; } +DISABLE_CFI_PERF bool LayoutBox::hasUnsplittableScrollingOverflow() const { // We will paginate as long as we don't scroll overflow in the pagination direction. @@ -4253,6 +4267,7 @@ return LayoutUnit(); } +DISABLE_CFI_PERF int LayoutBox::baselinePosition(FontBaseline baselineType, bool /*firstLine*/, LineDirectionMode direction, LinePositionMode linePositionMode) const { ASSERT(linePositionMode == PositionOnContainingLine); @@ -4286,6 +4301,7 @@ return rect; } +DISABLE_CFI_PERF LayoutRect LayoutBox::visualOverflowRectForPropagation(const ComputedStyle& parentStyle) const { // If the writing modes of the child and parent match, then we don't have to @@ -4302,6 +4318,7 @@ return rect; } +DISABLE_CFI_PERF LayoutRect LayoutBox::logicalLayoutOverflowRectForPropagation(const ComputedStyle& parentStyle) const { LayoutRect rect = layoutOverflowRectForPropagation(parentStyle); @@ -4310,6 +4327,7 @@ return rect; } +DISABLE_CFI_PERF LayoutRect LayoutBox::layoutOverflowRectForPropagation(const ComputedStyle& parentStyle) const { // Only propagate interior layout overflow if we don't clip it. @@ -4352,6 +4370,7 @@ return rect; } +DISABLE_CFI_PERF LayoutRect LayoutBox::noOverflowRect() const { // Because of the special coordinate system used for overflow rectangles and many other
diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.h b/third_party/WebKit/Source/core/layout/LayoutBox.h index d99fec6..f1c3ef71 100644 --- a/third_party/WebKit/Source/core/layout/LayoutBox.h +++ b/third_party/WebKit/Source/core/layout/LayoutBox.h
@@ -347,7 +347,7 @@ IntRect borderBoundingBox() const final { return pixelSnappedBorderBoxRect(); } // The content area of the box (excludes padding - and intrinsic padding for table cells, etc... - and border). - LayoutRect contentBoxRect() const { return LayoutRect(borderLeft() + paddingLeft(), borderTop() + paddingTop(), contentWidth(), contentHeight()); } + DISABLE_CFI_PERF LayoutRect contentBoxRect() const { return LayoutRect(borderLeft() + paddingLeft(), borderTop() + paddingTop(), contentWidth(), contentHeight()); } LayoutSize contentBoxOffset() const { return LayoutSize(borderLeft() + paddingLeft(), borderTop() + paddingTop()); } // The content box in absolute coords. Ignores transforms. IntRect absoluteContentBox() const; @@ -417,8 +417,8 @@ void updateLayerTransformAfterLayout(); - LayoutUnit contentWidth() const { return clientWidth() - paddingLeft() - paddingRight(); } - LayoutUnit contentHeight() const { return clientHeight() - paddingTop() - paddingBottom(); } + DISABLE_CFI_PERF LayoutUnit contentWidth() const { return clientWidth() - paddingLeft() - paddingRight(); } + DISABLE_CFI_PERF LayoutUnit contentHeight() const { return clientHeight() - paddingTop() - paddingBottom(); } LayoutSize contentSize() const { return LayoutSize(contentWidth(), contentHeight()); } LayoutUnit contentLogicalWidth() const { return style()->isHorizontalWritingMode() ? contentWidth() : contentHeight(); } LayoutUnit contentLogicalHeight() const { return style()->isHorizontalWritingMode() ? contentHeight() : contentWidth(); } @@ -433,14 +433,14 @@ // More IE extensions. clientWidth and clientHeight represent the interior of an object // excluding border and scrollbar. clientLeft/Top are just the borderLeftWidth and borderTopWidth. - LayoutUnit clientLeft() const { return LayoutUnit(borderLeft() + (shouldPlaceBlockDirectionScrollbarOnLogicalLeft() ? verticalScrollbarWidth() : 0)); } - LayoutUnit clientTop() const { return LayoutUnit(borderTop()); } + DISABLE_CFI_PERF LayoutUnit clientLeft() const { return LayoutUnit(borderLeft() + (shouldPlaceBlockDirectionScrollbarOnLogicalLeft() ? verticalScrollbarWidth() : 0)); } + DISABLE_CFI_PERF LayoutUnit clientTop() const { return LayoutUnit(borderTop()); } LayoutUnit clientWidth() const; LayoutUnit clientHeight() const; - LayoutUnit clientLogicalWidth() const { return style()->isHorizontalWritingMode() ? clientWidth() : clientHeight(); } - LayoutUnit clientLogicalHeight() const { return style()->isHorizontalWritingMode() ? clientHeight() : clientWidth(); } - LayoutUnit clientLogicalBottom() const { return borderBefore() + clientLogicalHeight(); } - LayoutRect clientBoxRect() const { return LayoutRect(clientLeft(), clientTop(), clientWidth(), clientHeight()); } + DISABLE_CFI_PERF LayoutUnit clientLogicalWidth() const { return style()->isHorizontalWritingMode() ? clientWidth() : clientHeight(); } + DISABLE_CFI_PERF LayoutUnit clientLogicalHeight() const { return style()->isHorizontalWritingMode() ? clientHeight() : clientWidth(); } + DISABLE_CFI_PERF LayoutUnit clientLogicalBottom() const { return borderBefore() + clientLogicalHeight(); } + DISABLE_CFI_PERF LayoutRect clientBoxRect() const { return LayoutRect(clientLeft(), clientTop(), clientWidth(), clientHeight()); } int pixelSnappedClientWidth() const; int pixelSnappedClientHeight() const; @@ -771,9 +771,9 @@ virtual void stopAutoscroll() { } virtual void panScroll(const IntPoint&); - bool hasAutoVerticalScrollbar() const { return hasOverflowClip() && (style()->overflowY() == OverflowAuto || style()->overflowY() == OverflowPagedY || style()->overflowY() == OverflowOverlay); } - bool hasAutoHorizontalScrollbar() const { return hasOverflowClip() && (style()->overflowX() == OverflowAuto || style()->overflowX() == OverflowOverlay); } - bool scrollsOverflow() const { return scrollsOverflowX() || scrollsOverflowY(); } + DISABLE_CFI_PERF bool hasAutoVerticalScrollbar() const { return hasOverflowClip() && (style()->overflowY() == OverflowAuto || style()->overflowY() == OverflowPagedY || style()->overflowY() == OverflowOverlay); } + DISABLE_CFI_PERF bool hasAutoHorizontalScrollbar() const { return hasOverflowClip() && (style()->overflowX() == OverflowAuto || style()->overflowX() == OverflowOverlay); } + DISABLE_CFI_PERF bool scrollsOverflow() const { return scrollsOverflowX() || scrollsOverflowY(); } virtual bool shouldPlaceBlockDirectionScrollbarOnLogicalLeft() const { return style()->shouldPlaceBlockDirectionScrollbarOnLogicalLeft(); } bool hasScrollableOverflowX() const { return scrollsOverflowX() && pixelSnappedScrollWidth() != pixelSnappedClientWidth(); }
diff --git a/third_party/WebKit/Source/core/layout/ng/layout_ng_block_flow.cc b/third_party/WebKit/Source/core/layout/ng/layout_ng_block_flow.cc index d272fad..f265f80 100644 --- a/third_party/WebKit/Source/core/layout/ng/layout_ng_block_flow.cc +++ b/third_party/WebKit/Source/core/layout/ng/layout_ng_block_flow.cc
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "core/layout/ng/layout_ng_block_flow.h" -#include "core/layout/ng/ng_derived_constraint_space.h" +#include "core/layout/ng/ng_constraint_space.h" #include "core/layout/ng/ng_block_layout_algorithm.h" #include "core/layout/ng/ng_fragment.h" #include "core/layout/LayoutAnalyzer.h" @@ -21,7 +21,7 @@ LayoutAnalyzer::BlockScope analyzer(*this); const auto* constraint_space = - NGDerivedConstraintSpace::CreateFromLayoutObject(*this); + NGConstraintSpace::CreateFromLayoutObject(*this); NGBox* box = new NGBox(this); NGFragment* fragment; while (!box->Layout(constraint_space, &fragment))
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc index 334d383..9082202 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc +++ b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc
@@ -32,8 +32,9 @@ // -1? LayoutUnit block_size = computeBlockSizeForFragment( *constraint_space, *style_, LayoutUnit(-1)); - constraint_space_for_children_ = new NGConstraintSpace( - *constraint_space, NGLogicalSize(inline_size, block_size)); + constraint_space_for_children_ = + new NGConstraintSpace(*constraint_space, NGLogicalOffset(), + NGLogicalSize(inline_size, block_size)); content_size_ = LayoutUnit(); builder_ = new NGFragmentBuilder(NGPhysicalFragmentBase::FragmentBox);
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.cc b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.cc index 39d3e82e..213ab83 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.cc +++ b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.cc
@@ -13,21 +13,67 @@ // NGPhysicalConstraintSpace. NGConstraintSpace::NGConstraintSpace(NGWritingMode writing_mode, NGLogicalSize container_size) - : physical_space_(new NGPhysicalConstraintSpace()), - writing_mode_(writing_mode) { - SetContainerSize(container_size); -} + : physical_space_(new NGPhysicalConstraintSpace( + container_size.ConvertToPhysical(writing_mode))), + size_(container_size), + writing_mode_(writing_mode) {} NGConstraintSpace::NGConstraintSpace(NGWritingMode writing_mode, NGPhysicalConstraintSpace* physical_space) - : physical_space_(physical_space), writing_mode_(writing_mode) { -} + : physical_space_(physical_space), + size_(physical_space->ContainerSize().ConvertToLogical(writing_mode)), + writing_mode_(writing_mode) {} + +NGConstraintSpace::NGConstraintSpace(NGWritingMode writing_mode, + const NGConstraintSpace* constraint_space) + : physical_space_(constraint_space->PhysicalSpace()), + offset_(constraint_space->Offset()), + size_(constraint_space->Size()), + writing_mode_(writing_mode) {} + +NGConstraintSpace::NGConstraintSpace(NGWritingMode writing_mode, + const NGConstraintSpace& other, + NGLogicalOffset offset, + NGLogicalSize size) + : physical_space_(other.PhysicalSpace()), + offset_(offset), + size_(size), + writing_mode_(writing_mode) {} NGConstraintSpace::NGConstraintSpace(const NGConstraintSpace& other, - NGLogicalSize container_size) - : physical_space_(*other.physical_space_), - writing_mode_(other.writing_mode_) { - SetContainerSize(container_size); + NGLogicalOffset offset, + NGLogicalSize size) + : physical_space_(other.PhysicalSpace()), + offset_(offset), + size_(size), + writing_mode_(other.WritingMode()) {} + +NGConstraintSpace* NGConstraintSpace::CreateFromLayoutObject( + const LayoutBox& box) { + bool fixed_inline = false, fixed_block = false; + // XXX for orthogonal writing mode this is not right + LayoutUnit container_logical_width = + std::max(LayoutUnit(), box.containingBlockLogicalWidthForContent()); + // XXX Make sure this height is correct + LayoutUnit container_logical_height = + box.containingBlockLogicalHeightForContent(ExcludeMarginBorderPadding); + if (box.hasOverrideLogicalContentWidth()) { + container_logical_width = box.overrideLogicalContentWidth(); + fixed_inline = true; + } + if (box.hasOverrideLogicalContentHeight()) { + container_logical_width = box.overrideLogicalContentHeight(); + fixed_block = true; + } + + NGConstraintSpace* derived_constraint_space = new NGConstraintSpace( + FromPlatformWritingMode(box.styleRef().getWritingMode()), + NGLogicalSize(container_logical_width, container_logical_height)); + derived_constraint_space->SetOverflowTriggersScrollbar( + box.styleRef().overflowInlineDirection() == OverflowAuto, + box.styleRef().overflowBlockDirection() == OverflowAuto); + derived_constraint_space->SetFixedSize(fixed_inline, fixed_block); + return derived_constraint_space; } NGLogicalSize NGConstraintSpace::ContainerSize() const { @@ -75,11 +121,6 @@ return iterator; } -void NGConstraintSpace::SetContainerSize(NGLogicalSize container_size) { - physical_space_->container_size_ = container_size.ConvertToPhysical( - static_cast<NGWritingMode>(writing_mode_)); -} - void NGConstraintSpace::SetOverflowTriggersScrollbar(bool inline_triggers, bool block_triggers) { if (writing_mode_ == HorizontalTopBottom) {
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.h b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.h index f51f59f..04c25f3a 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.h +++ b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.h
@@ -6,6 +6,7 @@ #define NGConstraintSpace_h #include "core/CoreExport.h" +#include "core/layout/LayoutBox.h" #include "core/layout/ng/ng_physical_constraint_space.h" #include "core/layout/ng/ng_writing_mode.h" #include "platform/heap/Handle.h" @@ -21,26 +22,35 @@ // which a layout algorithm may produce a NGFragment within. It is a view on // top of a NGPhysicalConstraintSpace and provides accessor methods in the // logical coordinate system defined by the writing mode given. -class CORE_EXPORT NGConstraintSpace +class CORE_EXPORT NGConstraintSpace final : public GarbageCollected<NGConstraintSpace> { public: // Constructs a constraint space with a new backing NGPhysicalConstraintSpace. - NGConstraintSpace(NGWritingMode writing_mode, NGLogicalSize container_size); + NGConstraintSpace(NGWritingMode, NGLogicalSize); // Constructs a constraint space based on an existing backing // NGPhysicalConstraintSpace. - NGConstraintSpace(NGWritingMode writing_mode, NGPhysicalConstraintSpace*); + NGConstraintSpace(NGWritingMode, NGPhysicalConstraintSpace*); // Constructs a constraint space with a different NGWritingMode. - NGConstraintSpace(NGWritingMode writing_mode, - const NGConstraintSpace* constraint_space) - : physical_space_(constraint_space->PhysicalSpace()), - writing_mode_(writing_mode) {} + NGConstraintSpace(NGWritingMode, const NGConstraintSpace*); - // TODO: This should either be removed or also take an offset (if we merge - // this with NGDerivedConstraintSpace). + // Constructs a derived constraint space sharing the same backing + // NGPhysicalConstraintSpace and NGWritingMode. NGConstraintSpace(const NGConstraintSpace& other, - NGLogicalSize container_size); + NGLogicalOffset, + NGLogicalSize); + + // Constructs a derived constraint space sharing the same backing + // NGPhysicalConstraintSpace and a different NGWritingMode. + NGConstraintSpace(NGWritingMode, + const NGConstraintSpace& other, + NGLogicalOffset, + NGLogicalSize); + + // This should live on NGBox or another layout bridge and probably take a root + // NGConstraintSpace or a NGPhysicalConstraintSpace. + static NGConstraintSpace* CreateFromLayoutObject(const LayoutBox&); NGPhysicalConstraintSpace* PhysicalSpace() const { return physical_space_; } @@ -56,10 +66,13 @@ // direction. NGLogicalSize ContainerSize() const; - // Returns the effective size of the constraint space. Defaults to + // Offset relative to the root constraint space. + NGLogicalOffset Offset() const { return offset_; } + + // Returns the effective size of the constraint space. Equal to the // ContainerSize() for the root constraint space but derived constraint spaces - // overrides it to return the size of the layout opportunity. - virtual NGLogicalSize Size() const { return ContainerSize(); } + // return the size of the layout opportunity. + virtual NGLogicalSize Size() const { return size_; } // Whether exceeding the containerSize triggers the presence of a scrollbar // for the indicated direction. @@ -90,16 +103,16 @@ DEFINE_INLINE_VIRTUAL_TRACE() { visitor->trace(physical_space_); } - protected: // The setters for the NGConstraintSpace should only be used when constructing - // via the NGDerivedConstraintSpace. - void SetContainerSize(NGLogicalSize); + // a derived NGConstraintSpace. void SetOverflowTriggersScrollbar(bool inlineTriggers, bool blockTriggers); void SetFixedSize(bool inlineFixed, bool blockFixed); void SetFragmentationType(NGFragmentationType); private: Member<NGPhysicalConstraintSpace> physical_space_; + NGLogicalOffset offset_; + NGLogicalSize size_; unsigned writing_mode_ : 3; };
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_test.cc b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_test.cc index 9229e4d8..4a392c3 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_test.cc +++ b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_test.cc
@@ -4,7 +4,6 @@ #include "core/layout/ng/ng_constraint_space.h" -#include "core/layout/ng/ng_derived_constraint_space.h" #include "testing/gtest/include/gtest/gtest.h" namespace blink { @@ -12,9 +11,12 @@ namespace { TEST(NGConstraintSpaceTest, WritingMode) { - NGConstraintSpace* horz_space = new NGDerivedConstraintSpace( - HorizontalTopBottom, NGLogicalSize(LayoutUnit(200), LayoutUnit(100)), - true, false, true, false, FragmentColumn); + NGConstraintSpace* horz_space = new NGConstraintSpace( + HorizontalTopBottom, NGLogicalSize(LayoutUnit(200), LayoutUnit(100))); + horz_space->SetOverflowTriggersScrollbar(true, false); + horz_space->SetFixedSize(true, false); + horz_space->SetFragmentationType(FragmentColumn); + NGConstraintSpace* vert_space = new NGConstraintSpace(VerticalRightLeft, horz_space); @@ -41,18 +43,7 @@ } TEST(NGConstraintSpaceTest, LayoutOpportunities) { - NGPhysicalSize physical_size; - physical_size.width = LayoutUnit(600); - physical_size.height = LayoutUnit(400); - auto* physical_space = new NGPhysicalConstraintSpace(physical_size); - auto* space = new NGConstraintSpace(HorizontalTopBottom, physical_space); - - bool for_inline_or_bfc = false; - auto iterator = space->LayoutOpportunities(NGClearNone, for_inline_or_bfc); - - auto firstOpportunity = iterator.Next(); - EXPECT_EQ(LayoutUnit(600), firstOpportunity->Size().inline_size); - EXPECT_EQ(LayoutUnit(400), firstOpportunity->Size().block_size); + // TODO(eae): Implement in followup change. } } // namespace
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_derived_constraint_space.h b/third_party/WebKit/Source/core/layout/ng/ng_derived_constraint_space.h deleted file mode 100644 index 9b46495..0000000 --- a/third_party/WebKit/Source/core/layout/ng/ng_derived_constraint_space.h +++ /dev/null
@@ -1,57 +0,0 @@ -// Copyright 2016 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. - -#ifndef NGDerivedConstraintSpace_h -#define NGDerivedConstraintSpace_h - -#include "core/CoreExport.h" -#include "core/layout/ng/ng_constraint_space.h" -#include "core/layout/ng/ng_units.h" -#include "platform/LayoutUnit.h" -#include "wtf/DoublyLinkedList.h" - -namespace blink { - -class CORE_EXPORT NGDerivedConstraintSpace final : public NGConstraintSpace { - public: - // Constructs a NGConstraintSpace from legacy layout object. - static NGDerivedConstraintSpace* CreateFromLayoutObject(const LayoutBox&); - - NGDerivedConstraintSpace(NGWritingMode, - NGLogicalSize container_size, - bool inline_triggers, - bool block_triggers, - bool fixed_inline, - bool fixed_block, - NGFragmentationType); - - NGLogicalOffset Offset() const { return offset_; } - NGLogicalSize Size() const override { return size_; } - NGDirection Direction() const { return direction_; } - - // TODO(layout-ng): All exclusion operations on a NGDerivedConstraintSpace - // should be performed on it's parent if it exists. This is so that if a float - // is added by a child an arbitary sibling can avoid/clear that float. - // Alternatively the list of exclusions could be shared between constraint - // spaces. - - DEFINE_INLINE_VIRTUAL_TRACE() { - visitor->trace(parent_); - NGConstraintSpace::trace(visitor); - } - - private: - Member<NGConstraintSpace> parent_; - NGLogicalOffset offset_; - - // TODO(layout-ng) move to NGPhysicalConstraintSpace? - NGLogicalSize size_; - - // TODO(layout-ng) move to NGConstraintSpace? - NGDirection direction_; -}; - -} // namespace blink - -#endif // NGDerivedConstraintSpace_h
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_length_utils_test.cc b/third_party/WebKit/Source/core/layout/ng/ng_length_utils_test.cc index d01ff47..11fbee8 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_length_utils_test.cc +++ b/third_party/WebKit/Source/core/layout/ng/ng_length_utils_test.cc
@@ -5,7 +5,6 @@ #include "core/layout/ng/ng_length_utils.h" #include "core/layout/ng/ng_constraint_space.h" -#include "core/layout/ng/ng_derived_constraint_space.h" #include "core/layout/ng/ng_margin_strut.h" #include "core/style/ComputedStyle.h" #include "platform/CalculationValue.h" @@ -25,10 +24,12 @@ int block_size, bool fixed_inline = false, bool fixed_block = false) { - return new NGDerivedConstraintSpace( + NGConstraintSpace* derived_constraint_space = new NGConstraintSpace( HorizontalTopBottom, - NGLogicalSize(LayoutUnit(inline_size), LayoutUnit(block_size)), false, - false, fixed_inline, fixed_block, FragmentNone); + NGLogicalSize(LayoutUnit(inline_size), LayoutUnit(block_size))); + derived_constraint_space->SetOverflowTriggersScrollbar(false, false); + derived_constraint_space->SetFixedSize(fixed_inline, fixed_block); + return derived_constraint_space; } LayoutUnit resolveInlineLength(
diff --git a/third_party/WebKit/Source/core/layout/svg/LayoutSVGTransformableContainer.cpp b/third_party/WebKit/Source/core/layout/svg/LayoutSVGTransformableContainer.cpp index 44fda47..fbf5eb6 100644 --- a/third_party/WebKit/Source/core/layout/svg/LayoutSVGTransformableContainer.cpp +++ b/third_party/WebKit/Source/core/layout/svg/LayoutSVGTransformableContainer.cpp
@@ -90,7 +90,7 @@ } if (useElement) { - SVGLengthContext lengthContext(useElement); + SVGLengthContext lengthContext(element); FloatSize translation( useElement->x()->currentValue()->value(lengthContext), useElement->y()->currentValue()->value(lengthContext));
diff --git a/third_party/WebKit/Source/core/loader/OWNERS b/third_party/WebKit/Source/core/loader/OWNERS index f8c53d1..3160250 100644 --- a/third_party/WebKit/Source/core/loader/OWNERS +++ b/third_party/WebKit/Source/core/loader/OWNERS
@@ -1,2 +1,3 @@ japhet@chromium.org mkwst@chromium.org +yhirano@chromium.org
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.cpp b/third_party/WebKit/Source/core/style/ComputedStyle.cpp index 6f789250..79b8d1e 100644 --- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp +++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
@@ -2020,7 +2020,8 @@ static inline Vector<GridTrackSize> initialGridAutoTracks() { Vector<GridTrackSize> trackSizeList; - trackSizeList.append(GridTrackSize(Length(Auto))); + trackSizeList.reserveInitialCapacity(1); + trackSizeList.uncheckedAppend(GridTrackSize(Length(Auto))); return trackSizeList; }
diff --git a/third_party/WebKit/Source/core/svg/SVGAnimateElement.cpp b/third_party/WebKit/Source/core/svg/SVGAnimateElement.cpp index ecd0090b4..3e70586 100644 --- a/third_party/WebKit/Source/core/svg/SVGAnimateElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGAnimateElement.cpp
@@ -157,19 +157,6 @@ return true; } -SVGElementInstances SVGAnimateElement::findElementInstances(SVGElement* targetElement) -{ - ASSERT(targetElement); - SVGElementInstances animatedElements; - - animatedElements.append(targetElement); - - const auto& instances = targetElement->instancesForElement(); - animatedElements.appendRange(instances.begin(), instances.end()); - - return animatedElements; -} - void SVGAnimateElement::resetAnimatedType() { SVGElement* targetElement = this->targetElement();
diff --git a/third_party/WebKit/Source/core/svg/SVGAnimateElement.h b/third_party/WebKit/Source/core/svg/SVGAnimateElement.h index 5c6b66c..98e90e2 100644 --- a/third_party/WebKit/Source/core/svg/SVGAnimateElement.h +++ b/third_party/WebKit/Source/core/svg/SVGAnimateElement.h
@@ -32,9 +32,6 @@ namespace blink { -// The size of SVGElementInstances is 1 unless there is a <use> instance of the element. -using SVGElementInstances = HeapVector<Member<SVGElement>, 1u>; - class CORE_EXPORT SVGAnimateElement : public SVGAnimationElement { DEFINE_WRAPPERTYPEINFO(); public: @@ -48,8 +45,6 @@ AnimatedPropertyType animatedPropertyType(); bool animatedPropertyTypeSupportsAddition(); - static SVGElementInstances findElementInstances(SVGElement* targetElement); - protected: SVGAnimateElement(const QualifiedName&, Document&);
diff --git a/third_party/WebKit/Source/core/svg/SVGElement.cpp b/third_party/WebKit/Source/core/svg/SVGElement.cpp index 00919b33..dab56f8 100644 --- a/third_party/WebKit/Source/core/svg/SVGElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGElement.cpp
@@ -42,7 +42,6 @@ #include "core/html/HTMLElement.h" #include "core/layout/LayoutObject.h" #include "core/layout/svg/LayoutSVGResourceContainer.h" -#include "core/svg/SVGAnimateElement.h" #include "core/svg/SVGCursorElement.h" #include "core/svg/SVGDocumentExtensions.h" #include "core/svg/SVGElementRareData.h" @@ -247,7 +246,8 @@ static void forSelfAndInstances(SVGElement* element, T callback) { SVGElement::InstanceUpdateBlocker blocker(element); - for (SVGElement* instance : SVGAnimateElement::findElementInstances(element)) + callback(element); + for (SVGElement* instance : element->instancesForElement()) callback(instance); }
diff --git a/third_party/WebKit/Source/devtools/front_end/bindings/FileSystemWorkspaceBinding.js b/third_party/WebKit/Source/devtools/front_end/bindings/FileSystemWorkspaceBinding.js index 352a453..6ff92a3 100644 --- a/third_party/WebKit/Source/devtools/front_end/bindings/FileSystemWorkspaceBinding.js +++ b/third_party/WebKit/Source/devtools/front_end/bindings/FileSystemWorkspaceBinding.js
@@ -38,12 +38,14 @@ this._isolatedFileSystemManager = isolatedFileSystemManager; this._workspace = workspace; this._eventListeners = [ - this._isolatedFileSystemManager.addEventListener(WebInspector.IsolatedFileSystemManager.Events.FileSystemAdded, this._fileSystemAdded, this), - this._isolatedFileSystemManager.addEventListener(WebInspector.IsolatedFileSystemManager.Events.FileSystemRemoved, this._fileSystemRemoved, this), + this._isolatedFileSystemManager.addEventListener(WebInspector.IsolatedFileSystemManager.Events.FileSystemAdded, this._onFileSystemAdded, this), + this._isolatedFileSystemManager.addEventListener(WebInspector.IsolatedFileSystemManager.Events.FileSystemRemoved, this._onFileSystemRemoved, this), this._isolatedFileSystemManager.addEventListener(WebInspector.IsolatedFileSystemManager.Events.FileSystemFilesChanged, this._fileSystemFilesChanged, this) ]; /** @type {!Map.<string, !WebInspector.FileSystemWorkspaceBinding.FileSystem>} */ this._boundFileSystems = new Map(); + this._isolatedFileSystemManager.waitForFileSystems() + .then(this._onFileSystemsLoaded.bind(this)); } WebInspector.FileSystemWorkspaceBinding._styleSheetExtensions = new Set(["css", "scss", "sass", "less"]); @@ -109,11 +111,28 @@ }, /** + * @param {!Array<!WebInspector.IsolatedFileSystem>} fileSystems + */ + _onFileSystemsLoaded: function(fileSystems) + { + for (var fileSystem of fileSystems) + this._addFileSystem(fileSystem); + }, + + /** * @param {!WebInspector.Event} event */ - _fileSystemAdded: function(event) + _onFileSystemAdded: function(event) { var fileSystem = /** @type {!WebInspector.IsolatedFileSystem} */ (event.data); + this._addFileSystem(fileSystem); + }, + + /** + * @param {!WebInspector.IsolatedFileSystem} fileSystem + */ + _addFileSystem: function(fileSystem) + { var boundFileSystem = new WebInspector.FileSystemWorkspaceBinding.FileSystem(this, fileSystem, this._workspace); this._boundFileSystems.set(fileSystem.path(), boundFileSystem); }, @@ -121,7 +140,7 @@ /** * @param {!WebInspector.Event} event */ - _fileSystemRemoved: function(event) + _onFileSystemRemoved: function(event) { var fileSystem = /** @type {!WebInspector.IsolatedFileSystem} */ (event.data); var boundFileSystem = this._boundFileSystems.get(fileSystem.path());
diff --git a/third_party/WebKit/Source/devtools/front_end/bindings/NetworkMapping.js b/third_party/WebKit/Source/devtools/front_end/bindings/NetworkMapping.js index 6aa4d3ee..399a348a 100644 --- a/third_party/WebKit/Source/devtools/front_end/bindings/NetworkMapping.js +++ b/third_party/WebKit/Source/devtools/front_end/bindings/NetworkMapping.js
@@ -17,24 +17,29 @@ this._fileSystemMapping = fileSystemMapping; InspectorFrontendHost.events.addEventListener(InspectorFrontendHostAPI.Events.RevealSourceLine, this._revealSourceLine, this); - // For now, following block is here primarily for testing since in the real life, network manager is created early enough to capture those events. var fileSystemManager = fileSystemWorkspaceBinding.fileSystemManager(); - for (var fileSystem of fileSystemManager.fileSystems()) - this._addMappingsForFilesystem(fileSystem); - if (fileSystemManager.fileSystemsLoaded()) - this._fileSystemsLoaded(); - this._eventListeners = [ fileSystemManager.addEventListener(WebInspector.IsolatedFileSystemManager.Events.FileSystemAdded, this._fileSystemAdded, this), fileSystemManager.addEventListener(WebInspector.IsolatedFileSystemManager.Events.FileSystemRemoved, this._fileSystemRemoved, this), - fileSystemManager.addEventListener(WebInspector.IsolatedFileSystemManager.Events.FileSystemsLoaded, this._fileSystemsLoaded, this), this._fileSystemMapping.addEventListener(WebInspector.FileSystemMapping.Events.FileMappingAdded, this._fileSystemMappingChanged, this), this._fileSystemMapping.addEventListener(WebInspector.FileSystemMapping.Events.FileMappingRemoved, this._fileSystemMappingChanged, this) ]; + + fileSystemManager.waitForFileSystems() + .then(this._fileSystemsLoaded.bind(this)); } WebInspector.NetworkMapping.prototype = { /** + * @param {!Array<!WebInspector.IsolatedFileSystem>} fileSystems + */ + _fileSystemsLoaded: function(fileSystems) + { + for (var fileSystem of fileSystems) + this._addMappingsForFilesystem(fileSystem); + }, + + /** * @param {!WebInspector.Event} event */ _fileSystemAdded: function(event) @@ -238,14 +243,9 @@ this._workspace.addEventListener(WebInspector.Workspace.Events.UISourceCodeAdded, listener, this); }, - _fileSystemsLoaded: function() - { - this._fileSystemsReady = true; - }, - _fileSystemMappingChanged: function() { - if (!this._fileSystemsReady || this._addingFileSystem) + if (this._addingFileSystem) return; this._targetManager.suspendAndResumeAllTargets(); },
diff --git a/third_party/WebKit/Source/devtools/front_end/main/Main.js b/third_party/WebKit/Source/devtools/front_end/main/Main.js index fa7d924..4a1148f 100644 --- a/third_party/WebKit/Source/devtools/front_end/main/Main.js +++ b/third_party/WebKit/Source/devtools/front_end/main/Main.js
@@ -136,7 +136,8 @@ // Request filesystems early, we won't create connections until callback is fired. Things will happen in parallel. WebInspector.isolatedFileSystemManager = new WebInspector.IsolatedFileSystemManager(); - WebInspector.isolatedFileSystemManager.initialize(this._didInitializeFileSystemManager.bind(this)); + WebInspector.isolatedFileSystemManager.waitForFileSystems() + .then(this._didInitializeFileSystemManager.bind(this)); var themeSetting = WebInspector.settings.createSetting("uiTheme", "default"); WebInspector.initializeUIUtils(document, themeSetting);
diff --git a/third_party/WebKit/Source/devtools/front_end/workspace/IsolatedFileSystemManager.js b/third_party/WebKit/Source/devtools/front_end/workspace/IsolatedFileSystemManager.js index 0b44857..cb36fad 100644 --- a/third_party/WebKit/Source/devtools/front_end/workspace/IsolatedFileSystemManager.js +++ b/third_party/WebKit/Source/devtools/front_end/workspace/IsolatedFileSystemManager.js
@@ -41,7 +41,6 @@ /** @type {!Map<number, !WebInspector.Progress>} */ this._progresses = new Map(); - InspectorFrontendHost.events.addEventListener(InspectorFrontendHostAPI.Events.FileSystemsLoaded, this._onFileSystemsLoaded, this); InspectorFrontendHost.events.addEventListener(InspectorFrontendHostAPI.Events.FileSystemRemoved, this._onFileSystemRemoved, this); InspectorFrontendHost.events.addEventListener(InspectorFrontendHostAPI.Events.FileSystemAdded, this._onFileSystemAdded, this); InspectorFrontendHost.events.addEventListener(InspectorFrontendHostAPI.Events.FileSystemFilesChanged, this._onFileSystemFilesChanged, this); @@ -51,6 +50,8 @@ InspectorFrontendHost.events.addEventListener(InspectorFrontendHostAPI.Events.SearchCompleted, this._onSearchCompleted, this); this._initExcludePatterSetting(); + + this._fileSystemsLoadedPromise = this._requestFileSystems(); } /** @typedef {!{fileSystemName: string, rootURL: string, fileSystemPath: string}} */ @@ -60,7 +61,6 @@ WebInspector.IsolatedFileSystemManager.Events = { FileSystemAdded: Symbol("FileSystemAdded"), FileSystemRemoved: Symbol("FileSystemRemoved"), - FileSystemsLoaded: Symbol("FileSystemsLoaded"), FileSystemFilesChanged: Symbol("FileSystemFilesChanged"), ExcludedFolderAdded: Symbol("ExcludedFolderAdded"), ExcludedFolderRemoved: Symbol("ExcludedFolderRemoved") @@ -86,12 +86,36 @@ WebInspector.IsolatedFileSystemManager.prototype = { /** - * @param {function()} callback + * @return {!Promise<!Array<!WebInspector.IsolatedFileSystem>>} */ - initialize: function(callback) + _requestFileSystems: function() { - this._initializeCallback = callback; + var fulfill; + var promise = new Promise(f => fulfill = f); InspectorFrontendHost.requestFileSystems(); + InspectorFrontendHost.events.addEventListener(InspectorFrontendHostAPI.Events.FileSystemsLoaded, onFileSystemsLoaded, this); + return promise; + + /** + * @param {!WebInspector.Event} event + * @this {WebInspector.IsolatedFileSystemManager} + */ + function onFileSystemsLoaded(event) + { + var fileSystems = /** @type {!Array.<!WebInspector.IsolatedFileSystemManager.FileSystem>} */ (event.data); + var promises = []; + for (var i = 0; i < fileSystems.length; ++i) + promises.push(this._innerAddFileSystem(fileSystems[i], false)); + Promise.all(promises).then(onFileSystemsAdded); + } + + /** + * @param {!Array<?WebInspector.IsolatedFileSystem>} fileSystems + */ + function onFileSystemsAdded(fileSystems) + { + fulfill(fileSystems.filter(fs => !!fs)); + } }, addFileSystem: function() @@ -104,45 +128,23 @@ */ removeFileSystem: function(fileSystem) { - InspectorFrontendHost.removeFileSystem(fileSystem.embedderPath()); }, /** - * @param {!WebInspector.Event} event + * @return {!Promise<!Array<!WebInspector.IsolatedFileSystem>>} */ - _onFileSystemsLoaded: function(event) + waitForFileSystems: function() { - var fileSystems = /** @type {!Array.<!WebInspector.IsolatedFileSystemManager.FileSystem>} */ (event.data); - var promises = []; - for (var i = 0; i < fileSystems.length; ++i) - promises.push(this._innerAddFileSystem(fileSystems[i])); - Promise.all(promises).then(fireFileSystemsLoaded.bind(this)); - - /** - * @this {WebInspector.IsolatedFileSystemManager} - */ - function fireFileSystemsLoaded() - { - this._initializeCallback(); - delete this._initializeCallback; - this.dispatchEventToListeners(WebInspector.IsolatedFileSystemManager.Events.FileSystemsLoaded); - } - }, - - /** - * @return {boolean} - */ - fileSystemsLoaded: function() - { - return !this._initializeCallback; + return this._fileSystemsLoadedPromise; }, /** * @param {!WebInspector.IsolatedFileSystemManager.FileSystem} fileSystem - * @return {!Promise} + * @param {boolean} dispatchEvent + * @return {!Promise<?WebInspector.IsolatedFileSystem>} */ - _innerAddFileSystem: function(fileSystem) + _innerAddFileSystem: function(fileSystem, dispatchEvent) { var embedderPath = fileSystem.fileSystemPath; var fileSystemPath = WebInspector.IsolatedFileSystemManager.normalizePath(fileSystem.fileSystemPath); @@ -156,9 +158,11 @@ function storeFileSystem(fileSystem) { if (!fileSystem) - return; + return null; this._fileSystems.set(fileSystemPath, fileSystem); - this.dispatchEventToListeners(WebInspector.IsolatedFileSystemManager.Events.FileSystemAdded, fileSystem); + if (dispatchEvent) + this.dispatchEventToListeners(WebInspector.IsolatedFileSystemManager.Events.FileSystemAdded, fileSystem); + return fileSystem; } }, @@ -172,7 +176,7 @@ if (errorMessage) WebInspector.console.error(errorMessage); else if (fileSystem) - this._innerAddFileSystem(fileSystem); + this._innerAddFileSystem(fileSystem, true); }, /** @@ -180,7 +184,14 @@ */ _onFileSystemRemoved: function(event) { - this._fileSystemRemoved(/** @type {string} */ (event.data)); + var embedderPath = /** @type {string} */ (event.data); + var fileSystemPath = WebInspector.IsolatedFileSystemManager.normalizePath(embedderPath); + var isolatedFileSystem = this._fileSystems.get(fileSystemPath); + if (!isolatedFileSystem) + return; + this._fileSystems.delete(fileSystemPath); + isolatedFileSystem.fileSystemRemoved(); + this.dispatchEventToListeners(WebInspector.IsolatedFileSystemManager.Events.FileSystemRemoved, isolatedFileSystem); }, /** @@ -194,20 +205,6 @@ }, /** - * @param {string} embedderPath - */ - _fileSystemRemoved: function(embedderPath) - { - var fileSystemPath = WebInspector.IsolatedFileSystemManager.normalizePath(embedderPath); - var isolatedFileSystem = this._fileSystems.get(fileSystemPath); - if (!isolatedFileSystem) - return; - this._fileSystems.delete(fileSystemPath); - isolatedFileSystem.fileSystemRemoved(); - this.dispatchEventToListeners(WebInspector.IsolatedFileSystemManager.Events.FileSystemRemoved, isolatedFileSystem); - }, - - /** * @return {!Array<!WebInspector.IsolatedFileSystem>} */ fileSystems: function()
diff --git a/third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandle.cpp b/third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandle.cpp index 11474211..f775815 100644 --- a/third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandle.cpp +++ b/third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandle.cpp
@@ -78,6 +78,8 @@ m_loader->cancel(); m_loader = nullptr; } + if (!m_registeredBlobURL.isEmpty()) + BlobRegistry::revokePublicBlobURL(m_registeredBlobURL); } void start(ExecutionContext* executionContext) override @@ -85,17 +87,17 @@ ASSERT(executionContext->isContextThread()); ASSERT(!m_loader); - KURL url = BlobURL::createPublicURL(executionContext->getSecurityOrigin()); - if (url.isEmpty()) { + m_registeredBlobURL = BlobURL::createPublicURL(executionContext->getSecurityOrigin()); + if (m_registeredBlobURL.isEmpty()) { m_updater->update(createUnexpectedErrorDataConsumerHandle()); return; } - BlobRegistry::registerPublicBlobURL(executionContext->getSecurityOrigin(), url, m_blobDataHandle); + BlobRegistry::registerPublicBlobURL(executionContext->getSecurityOrigin(), m_registeredBlobURL, m_blobDataHandle); m_loader = createLoader(executionContext, this); ASSERT(m_loader); - ResourceRequest request(url); + ResourceRequest request(m_registeredBlobURL); request.setRequestContext(WebURLRequest::RequestContextInternal); request.setUseStreamOnResponse(true); // We intentionally skip 'setExternalRequestStateFromRequestorAddressSpace', as 'data:' can never be external. @@ -155,6 +157,7 @@ RefPtr<BlobDataHandle> m_blobDataHandle; Persistent<FetchBlobDataConsumerHandle::LoaderFactory> m_loaderFactory; Persistent<ThreadableLoader> m_loader; + KURL m_registeredBlobURL; bool m_receivedResponse; };
diff --git a/third_party/WebKit/Source/platform/BUILD.gn b/third_party/WebKit/Source/platform/BUILD.gn index 16528f3..b9c8ddc 100644 --- a/third_party/WebKit/Source/platform/BUILD.gn +++ b/third_party/WebKit/Source/platform/BUILD.gn
@@ -10,7 +10,6 @@ import("//third_party/WebKit/Source/config.gni") import( "//third_party/WebKit/Source/platform/inspector_protocol/inspector_protocol.gni") -import("//third_party/WebKit/Source/platform/platform.gni") import("//third_party/WebKit/Source/platform/platform_generated.gni") # Most targets in this file are private actions so use that as the default. @@ -291,8 +290,6 @@ ] } -# TODO(brettw) Objective C Renaming postbuild steps on Mac. -# blink_platform target in blink_platform.gyp component("platform") { visibility = [] # Allow re-assignment of list. visibility = [ @@ -302,7 +299,1211 @@ ] output_name = "blink_platform" - sources = platform_files + sources = [ + "AsyncFileSystemCallbacks.h", + "CalculationValue.h", + "CheckedInt.h", + "ContentDecryptionModuleResult.h", + "ContentSettingCallbacks.cpp", + "ContentSettingCallbacks.h", + "ContentType.cpp", + "ContentType.h", + "ContextMenu.cpp", + "ContextMenu.h", + "ContextMenuItem.cpp", + "ContextMenuItem.h", + "CrossThreadCopier.cpp", + "CrossThreadCopier.h", + "Crypto.cpp", + "Crypto.h", + "CryptoResult.h", + "Cursor.cpp", + "Cursor.h", + "DateComponents.cpp", + "DateComponents.h", + "Decimal.cpp", + "Decimal.h", + "DragImage.cpp", + "DragImage.h", + "EventDispatchForbiddenScope.cpp", + "EventDispatchForbiddenScope.h", + "EventTracer.cpp", + "EventTracer.h", + "FileChooser.cpp", + "FileChooser.h", + "FileMetadata.cpp", + "FileMetadata.h", + "FileSystemType.h", + "FloatConversion.h", + "Histogram.cpp", + "Histogram.h", + "HostWindow.h", + "KeyboardCodes.h", + "KillRing.h", + "KillRingNone.cpp", + "Language.cpp", + "Language.h", + "LayoutLocale.cpp", + "LayoutLocale.h", + "LayoutTestSupport.cpp", + "LayoutTestSupport.h", + "LayoutUnit.cpp", + "LayoutUnit.h", + "Length.cpp", + "Length.h", + "LengthBox.cpp", + "LengthBox.h", + "LengthFunctions.cpp", + "LengthFunctions.h", + "LengthPoint.h", + "LengthSize.h", + "LifecycleNotifier.h", + "LifecycleObserver.h", + "LinkHash.cpp", + "LinkHash.h", + "MIMETypeFromURL.cpp", + "MIMETypeFromURL.h", + "MIMETypeRegistry.cpp", + "MIMETypeRegistry.h", + "MemoryCacheDumpProvider.cpp", + "MemoryCacheDumpProvider.h", + "MemoryCoordinator.cpp", + "MemoryCoordinator.h", + "PODArena.h", + "PODFreeListArena.h", + "PODInterval.h", + "PODIntervalTree.h", + "PODRedBlackTree.h", + "PartitionAllocMemoryDumpProvider.cpp", + "PartitionAllocMemoryDumpProvider.h", + "PasteMode.h", + "PlatformEvent.h", + "PlatformGestureEvent.h", + "PlatformInstrumentation.cpp", + "PlatformInstrumentation.h", + "PlatformMouseEvent.h", + "PlatformResourceLoader.cpp", + "PlatformResourceLoader.h", + "PlatformTouchEvent.h", + "PlatformTouchPoint.h", + "PlatformWheelEvent.h", + "PluginScriptForbiddenScope.cpp", + "PluginScriptForbiddenScope.h", + "PopupMenu.h", + "Prerender.cpp", + "Prerender.h", + "PrerenderClient.h", + "ScopedOrientationChangeIndicator.cpp", + "ScopedOrientationChangeIndicator.h", + "ScriptForbiddenScope.cpp", + "ScriptForbiddenScope.h", + "SecureTextInput.cpp", + "SecureTextInput.h", + "SerializedResource.h", + "SharedBuffer.cpp", + "SharedBuffer.h", + "SharedBufferChunkReader.cpp", + "SharedBufferChunkReader.h", + "StorageQuotaCallbacks.h", + "Supplementable.cpp", + "Supplementable.h", + "Theme.cpp", + "Theme.h", + "ThemeTypes.h", + "Timer.cpp", + "Timer.h", + "TraceEvent.h", + "TraceEventCommon.h", + "TracedValue.cpp", + "TracedValue.h", + "UUID.cpp", + "UUID.h", + "UserGestureIndicator.cpp", + "UserGestureIndicator.h", + "WaitableEvent.cpp", + "WaitableEvent.h", + "WebIconSizesParser.cpp", + "WebScheduler.cpp", + "WebTaskRunner.cpp", + "WebThread.cpp", + "WebThreadSupportingGC.cpp", + "WebThreadSupportingGC.h", + "Widget.cpp", + "Widget.h", + "WindowsKeyboardCodes.h", + "animation/AnimationTranslationUtil.cpp", + "animation/AnimationTranslationUtil.h", + "animation/AnimationUtilities.h", + "animation/CompositorAnimation.cpp", + "animation/CompositorAnimation.h", + "animation/CompositorAnimationCurve.h", + "animation/CompositorAnimationDelegate.h", + "animation/CompositorAnimationHost.cpp", + "animation/CompositorAnimationHost.h", + "animation/CompositorAnimationPlayer.cpp", + "animation/CompositorAnimationPlayer.h", + "animation/CompositorAnimationPlayerClient.cpp", + "animation/CompositorAnimationPlayerClient.h", + "animation/CompositorAnimationTimeline.cpp", + "animation/CompositorAnimationTimeline.h", + "animation/CompositorFilterAnimationCurve.cpp", + "animation/CompositorFilterAnimationCurve.h", + "animation/CompositorFilterKeyframe.cpp", + "animation/CompositorFilterKeyframe.h", + "animation/CompositorFloatAnimationCurve.cpp", + "animation/CompositorFloatAnimationCurve.h", + "animation/CompositorFloatKeyframe.cpp", + "animation/CompositorFloatKeyframe.h", + "animation/CompositorKeyframe.cpp", + "animation/CompositorKeyframe.h", + "animation/CompositorScrollOffsetAnimationCurve.cpp", + "animation/CompositorScrollOffsetAnimationCurve.h", + "animation/CompositorTargetProperty.h", + "animation/CompositorTransformAnimationCurve.cpp", + "animation/CompositorTransformAnimationCurve.h", + "animation/CompositorTransformKeyframe.cpp", + "animation/CompositorTransformKeyframe.h", + "animation/CompositorTransformOperations.cpp", + "animation/CompositorTransformOperations.h", + "animation/TimingFunction.cpp", + "animation/TimingFunction.h", + "audio/AudioArray.h", + "audio/AudioBus.cpp", + "audio/AudioBus.h", + "audio/AudioChannel.cpp", + "audio/AudioChannel.h", + "audio/AudioDSPKernel.cpp", + "audio/AudioDSPKernel.h", + "audio/AudioDSPKernelProcessor.cpp", + "audio/AudioDSPKernelProcessor.h", + "audio/AudioDelayDSPKernel.cpp", + "audio/AudioDelayDSPKernel.h", + "audio/AudioDestination.cpp", + "audio/AudioDestination.h", + "audio/AudioDestinationConsumer.h", + "audio/AudioFIFO.cpp", + "audio/AudioFIFO.h", + "audio/AudioFileReader.h", + "audio/AudioIOCallback.h", + "audio/AudioProcessor.cpp", + "audio/AudioProcessor.h", + "audio/AudioPullFIFO.cpp", + "audio/AudioPullFIFO.h", + "audio/AudioResampler.cpp", + "audio/AudioResampler.h", + "audio/AudioResamplerKernel.cpp", + "audio/AudioResamplerKernel.h", + "audio/AudioSourceProvider.h", + "audio/AudioSourceProviderClient.h", + "audio/AudioUtilities.cpp", + "audio/AudioUtilities.h", + "audio/Biquad.cpp", + "audio/Biquad.h", + "audio/Cone.cpp", + "audio/Cone.h", + "audio/DenormalDisabler.h", + "audio/DirectConvolver.cpp", + "audio/DirectConvolver.h", + "audio/Distance.cpp", + "audio/Distance.h", + "audio/DownSampler.cpp", + "audio/DownSampler.h", + "audio/DynamicsCompressor.cpp", + "audio/DynamicsCompressor.h", + "audio/DynamicsCompressorKernel.cpp", + "audio/DynamicsCompressorKernel.h", + "audio/EqualPowerPanner.cpp", + "audio/EqualPowerPanner.h", + "audio/FFTConvolver.cpp", + "audio/FFTConvolver.h", + "audio/FFTFrame.cpp", + "audio/FFTFrame.h", + "audio/FFTFrameStub.cpp", + "audio/HRTFDatabase.cpp", + "audio/HRTFDatabase.h", + "audio/HRTFDatabaseLoader.cpp", + "audio/HRTFDatabaseLoader.h", + "audio/HRTFElevation.cpp", + "audio/HRTFElevation.h", + "audio/HRTFKernel.cpp", + "audio/HRTFKernel.h", + "audio/HRTFPanner.cpp", + "audio/HRTFPanner.h", + "audio/IIRFilter.cpp", + "audio/IIRFilter.h", + "audio/MultiChannelResampler.cpp", + "audio/MultiChannelResampler.h", + "audio/Panner.cpp", + "audio/Panner.h", + "audio/Reverb.cpp", + "audio/Reverb.h", + "audio/ReverbAccumulationBuffer.cpp", + "audio/ReverbAccumulationBuffer.h", + "audio/ReverbConvolver.cpp", + "audio/ReverbConvolver.h", + "audio/ReverbConvolverStage.cpp", + "audio/ReverbConvolverStage.h", + "audio/ReverbInputBuffer.cpp", + "audio/ReverbInputBuffer.h", + "audio/SincResampler.cpp", + "audio/SincResampler.h", + "audio/StereoPanner.cpp", + "audio/StereoPanner.h", + "audio/UpSampler.cpp", + "audio/UpSampler.h", + "audio/VectorMath.cpp", + "audio/VectorMath.h", + "audio/ZeroPole.cpp", + "audio/ZeroPole.h", + "audio/android/FFTFrameOpenMAXDLAndroid.cpp", + "audio/ffmpeg/FFTFrameFFMPEG.cpp", + "audio/ipp/FFTFrameIPP.cpp", + "audio/mac/FFTFrameMac.cpp", + "blob/BlobData.cpp", + "blob/BlobData.h", + "blob/BlobRegistry.cpp", + "blob/BlobRegistry.h", + "blob/BlobURL.cpp", + "blob/BlobURL.h", + "clipboard/ClipboardMimeTypes.cpp", + "clipboard/ClipboardMimeTypes.h", + "clipboard/ClipboardUtilities.cpp", + "clipboard/ClipboardUtilities.h", + "clipboard/ClipboardUtilitiesPosix.cpp", + "clipboard/ClipboardUtilitiesWin.cpp", + "credentialmanager/PlatformCredential.cpp", + "credentialmanager/PlatformCredential.h", + "credentialmanager/PlatformFederatedCredential.cpp", + "credentialmanager/PlatformFederatedCredential.h", + "credentialmanager/PlatformPasswordCredential.cpp", + "credentialmanager/PlatformPasswordCredential.h", + "exported/Platform.cpp", + "exported/ServiceRegistry.cpp", + "exported/WebActiveGestureAnimation.cpp", + "exported/WebActiveGestureAnimation.h", + "exported/WebAudioBus.cpp", + "exported/WebAudioDevice.cpp", + "exported/WebBlobData.cpp", + "exported/WebCanvasCaptureHandler.cpp", + "exported/WebContentDecryptionModule.cpp", + "exported/WebContentDecryptionModuleAccess.cpp", + "exported/WebContentDecryptionModuleResult.cpp", + "exported/WebContentDecryptionModuleSession.cpp", + "exported/WebContentSettingCallbacks.cpp", + "exported/WebCredential.cpp", + "exported/WebCryptoAlgorithm.cpp", + "exported/WebCryptoKey.cpp", + "exported/WebCryptoKeyAlgorithm.cpp", + "exported/WebCryptoResult.cpp", + "exported/WebCursorInfo.cpp", + "exported/WebData.cpp", + "exported/WebDataConsumerHandle.cpp", + "exported/WebDeviceMotionData.cpp", + "exported/WebDeviceOrientationData.cpp", + "exported/WebDragData.cpp", + "exported/WebEncryptedMediaClient.cpp", + "exported/WebEncryptedMediaKeyInformation.cpp", + "exported/WebEncryptedMediaRequest.cpp", + "exported/WebFederatedCredential.cpp", + "exported/WebFileSystemCallbacks.cpp", + "exported/WebFont.cpp", + "exported/WebFontDescription.cpp", + "exported/WebHTTPBody.cpp", + "exported/WebHTTPLoadInfo.cpp", + "exported/WebImage.cpp", + "exported/WebImageGenerator.cpp", + "exported/WebMediaConstraints.cpp", + "exported/WebMediaDeviceInfo.cpp", + "exported/WebMediaPlayerClient.cpp", + "exported/WebMediaPlayerEncryptedMediaClient.cpp", + "exported/WebMediaPlayerSource.cpp", + "exported/WebMediaRecorderHandler.cpp", + "exported/WebMediaStream.cpp", + "exported/WebMediaStreamSource.cpp", + "exported/WebMediaStreamTrack.cpp", + "exported/WebMediaStreamTrackSourcesRequest.cpp", + "exported/WebMemoryCoordinator.cpp", + "exported/WebMessagePortChannelClient.cpp", + "exported/WebMixedContent.cpp", + "exported/WebPasswordCredential.cpp", + "exported/WebPrerender.cpp", + "exported/WebPrerenderingSupport.cpp", + "exported/WebPresentationAvailabilityObserver.cpp", + "exported/WebPresentationController.cpp", + "exported/WebRTCAnswerOptions.cpp", + "exported/WebRTCConfiguration.cpp", + "exported/WebRTCICECandidate.cpp", + "exported/WebRTCOfferOptions.cpp", + "exported/WebRTCSessionDescription.cpp", + "exported/WebRTCSessionDescriptionRequest.cpp", + "exported/WebRTCStatsRequest.cpp", + "exported/WebRTCStatsResponse.cpp", + "exported/WebRTCVoidRequest.cpp", + "exported/WebScrollbarImpl.cpp", + "exported/WebScrollbarImpl.h", + "exported/WebScrollbarThemeClientImpl.cpp", + "exported/WebScrollbarThemeClientImpl.h", + "exported/WebScrollbarThemeGeometryNative.cpp", + "exported/WebScrollbarThemeGeometryNative.h", + "exported/WebScrollbarThemePainter.cpp", + "exported/WebSecurityOrigin.cpp", + "exported/WebServiceWorkerProviderClient.cpp", + "exported/WebServiceWorkerProxy.cpp", + "exported/WebServiceWorkerRequest.cpp", + "exported/WebServiceWorkerResponse.cpp", + "exported/WebSourceInfo.cpp", + "exported/WebSpeechSynthesisUtterance.cpp", + "exported/WebSpeechSynthesisVoice.cpp", + "exported/WebSpeechSynthesizerClientImpl.cpp", + "exported/WebSpeechSynthesizerClientImpl.h", + "exported/WebStorageQuotaCallbacks.cpp", + "exported/WebTextRun.cpp", + "exported/WebThreadSafeData.cpp", + "exported/WebURL.cpp", + "exported/WebURLError.cpp", + "exported/WebURLLoadTiming.cpp", + "exported/WebURLLoaderClient.cpp", + "exported/WebURLLoaderTestDelegate.cpp", + "exported/WebURLRequest.cpp", + "exported/WebURLResponse.cpp", + "exported/WrappedResourceRequest.h", + "exported/WrappedResourceResponse.h", + "fonts/AcceptLanguagesResolver.cpp", + "fonts/AcceptLanguagesResolver.h", + "fonts/AlternateFontFamily.h", + "fonts/CharacterRange.h", + "fonts/CustomFontData.h", + "fonts/Font.cpp", + "fonts/Font.h", + "fonts/FontBaseline.h", + "fonts/FontCache.cpp", + "fonts/FontCache.h", + "fonts/FontCacheClient.h", + "fonts/FontCacheKey.h", + "fonts/FontCacheMemoryDumpProvider.cpp", + "fonts/FontCacheMemoryDumpProvider.h", + "fonts/FontCustomPlatformData.cpp", + "fonts/FontCustomPlatformData.h", + "fonts/FontData.cpp", + "fonts/FontData.h", + "fonts/FontDataCache.cpp", + "fonts/FontDataCache.h", + "fonts/FontDataForRangeSet.cpp", + "fonts/FontDataForRangeSet.h", + "fonts/FontDescription.cpp", + "fonts/FontFaceCreationParams.h", + "fonts/FontFallbackIterator.cpp", + "fonts/FontFallbackIterator.h", + "fonts/FontFallbackList.cpp", + "fonts/FontFallbackList.h", + "fonts/FontFallbackPriority.cpp", + "fonts/FontFallbackPriority.h", + "fonts/FontFamily.cpp", + "fonts/FontFamily.h", + "fonts/FontFeatureSettings.cpp", + "fonts/FontFeatureSettings.h", + "fonts/FontPlatformData.cpp", + "fonts/FontPlatformData.h", + "fonts/FontVariantNumeric.h", + "fonts/GenericFontFamilySettings.cpp", + "fonts/GenericFontFamilySettings.h", + "fonts/GlyphBuffer.h", + "fonts/GlyphMetricsMap.h", + "fonts/GlyphPage.h", + "fonts/GlyphPageTreeNode.cpp", + "fonts/GlyphPageTreeNode.h", + "fonts/Latin1TextIterator.h", + "fonts/OrientationIterator.cpp", + "fonts/OrientationIterator.h", + "fonts/ScriptRunIterator.cpp", + "fonts/ScriptRunIterator.h", + "fonts/SegmentedFontData.cpp", + "fonts/SegmentedFontData.h", + "fonts/SimpleFontData.cpp", + "fonts/SimpleFontData.h", + "fonts/SmallCapsIterator.cpp", + "fonts/SmallCapsIterator.h", + "fonts/SymbolsIterator.cpp", + "fonts/SymbolsIterator.h", + "fonts/TextBlob.h", + "fonts/UTF16TextIterator.cpp", + "fonts/UTF16TextIterator.h", + "fonts/UnicodeRangeSet.cpp", + "fonts/UnicodeRangeSet.h", + "fonts/VDMXParser.cpp", + "fonts/VDMXParser.h", + "fonts/WebFontDecoder.cpp", + "fonts/WebFontDecoder.h", + "fonts/android/FontCacheAndroid.cpp", + "fonts/linux/FontCacheLinux.cpp", + "fonts/linux/FontPlatformDataLinux.cpp", + "fonts/linux/FontRenderStyle.cpp", + "fonts/linux/FontRenderStyle.h", + "fonts/mac/FontCacheMac.mm", + "fonts/mac/FontFamilyMatcherMac.h", + "fonts/mac/FontFamilyMatcherMac.mm", + "fonts/mac/FontPlatformDataMac.mm", + "fonts/opentype/OpenTypeCapsSupport.cpp", + "fonts/opentype/OpenTypeCapsSupport.h", + "fonts/opentype/OpenTypeCapsSupportMPL.cpp", + "fonts/opentype/OpenTypeTypes.h", + "fonts/opentype/OpenTypeVerticalData.cpp", + "fonts/opentype/OpenTypeVerticalData.h", + "fonts/shaping/CachingWordShapeIterator.h", + "fonts/shaping/CachingWordShaper.cpp", + "fonts/shaping/CachingWordShaper.h", + "fonts/shaping/CaseMappingHarfBuzzBufferFiller.cpp", + "fonts/shaping/CaseMappingHarfBuzzBufferFiller.h", + "fonts/shaping/HarfBuzzFace.cpp", + "fonts/shaping/HarfBuzzFace.h", + "fonts/shaping/HarfBuzzShaper.cpp", + "fonts/shaping/HarfBuzzShaper.h", + "fonts/shaping/RunSegmenter.cpp", + "fonts/shaping/RunSegmenter.h", + "fonts/shaping/ShapeCache.h", + "fonts/shaping/ShapeResult.cpp", + "fonts/shaping/ShapeResult.h", + "fonts/shaping/ShapeResultBuffer.cpp", + "fonts/shaping/ShapeResultBuffer.h", + "fonts/shaping/ShapeResultInlineHeaders.h", + "fonts/shaping/ShapeResultSpacing.cpp", + "fonts/shaping/ShapeResultSpacing.h", + "fonts/shaping/ShapeResultTestInfo.cpp", + "fonts/shaping/ShapeResultTestInfo.h", + "fonts/shaping/Shaper.cpp", + "fonts/shaping/Shaper.h", + "fonts/shaping/SimpleShaper.cpp", + "fonts/shaping/SimpleShaper.h", + "fonts/skia/FontCacheSkia.cpp", + "fonts/skia/SkiaTextMetrics.cpp", + "fonts/skia/SkiaTextMetrics.h", + "fonts/win/FontCacheSkiaWin.cpp", + "fonts/win/FontFallbackWin.cpp", + "fonts/win/FontFallbackWin.h", + "fonts/win/FontPlatformDataWin.cpp", + "geometry/DoublePoint.cpp", + "geometry/DoublePoint.h", + "geometry/DoubleRect.cpp", + "geometry/DoubleRect.h", + "geometry/DoubleSize.cpp", + "geometry/DoubleSize.h", + "geometry/FloatBox.cpp", + "geometry/FloatBox.h", + "geometry/FloatPoint.cpp", + "geometry/FloatPoint.h", + "geometry/FloatPoint3D.cpp", + "geometry/FloatPoint3D.h", + "geometry/FloatPolygon.cpp", + "geometry/FloatPolygon.h", + "geometry/FloatQuad.cpp", + "geometry/FloatQuad.h", + "geometry/FloatRect.cpp", + "geometry/FloatRect.h", + "geometry/FloatRectOutsets.h", + "geometry/FloatRoundedRect.cpp", + "geometry/FloatRoundedRect.h", + "geometry/FloatSize.cpp", + "geometry/FloatSize.h", + "geometry/IntPoint.cpp", + "geometry/IntPoint.h", + "geometry/IntRect.cpp", + "geometry/IntRect.h", + "geometry/IntRectOutsets.h", + "geometry/IntSize.cpp", + "geometry/IntSize.h", + "geometry/IntSizeHash.h", + "geometry/LayoutPoint.cpp", + "geometry/LayoutPoint.h", + "geometry/LayoutRect.cpp", + "geometry/LayoutRect.h", + "geometry/LayoutRectOutsets.cpp", + "geometry/LayoutRectOutsets.h", + "geometry/LayoutSize.cpp", + "geometry/LayoutSize.h", + "geometry/Region.cpp", + "geometry/Region.h", + "geometry/TransformState.cpp", + "geometry/TransformState.h", + "geometry/cg/FloatPointCG.cpp", + "geometry/cg/FloatRectCG.cpp", + "geometry/cg/FloatSizeCG.cpp", + "geometry/cg/IntPointCG.cpp", + "geometry/cg/IntRectCG.cpp", + "geometry/cg/IntSizeCG.cpp", + "geometry/mac/FloatPointMac.mm", + "geometry/mac/FloatRectMac.mm", + "geometry/mac/FloatSizeMac.mm", + "geometry/mac/IntPointMac.mm", + "geometry/mac/IntRectMac.mm", + "geometry/mac/IntSizeMac.mm", + "graphics/AcceleratedStaticBitmapImage.cpp", + "graphics/AcceleratedStaticBitmapImage.h", + "graphics/BitmapImage.cpp", + "graphics/BitmapImage.h", + "graphics/BitmapImageMetrics.cpp", + "graphics/BitmapImageMetrics.h", + "graphics/BoxReflection.cpp", + "graphics/BoxReflection.h", + "graphics/Canvas2DImageBufferSurface.h", + "graphics/Canvas2DLayerBridge.cpp", + "graphics/Canvas2DLayerBridge.h", + "graphics/CanvasMetrics.cpp", + "graphics/CanvasMetrics.h", + "graphics/CanvasSurfaceLayerBridge.cpp", + "graphics/CanvasSurfaceLayerBridge.h", + "graphics/CanvasSurfaceLayerBridgeClient.h", + "graphics/CanvasSurfaceLayerBridgeClientImpl.cpp", + "graphics/CanvasSurfaceLayerBridgeClientImpl.h", + "graphics/Color.cpp", + "graphics/Color.h", + "graphics/ColorSpace.cpp", + "graphics/ColorSpace.h", + "graphics/ColorSpaceProfileData.cpp", + "graphics/ColorSpaceProfileData.h", + "graphics/CompositingReasons.cpp", + "graphics/CompositingReasons.h", + "graphics/CompositorElementId.cpp", + "graphics/CompositorElementId.h", + "graphics/CompositorFilterOperations.cpp", + "graphics/CompositorFilterOperations.h", + "graphics/CompositorMutableState.cpp", + "graphics/CompositorMutableState.h", + "graphics/CompositorMutableStateProvider.cpp", + "graphics/CompositorMutableStateProvider.h", + "graphics/CompositorMutationsTarget.h", + "graphics/CompositorMutator.h", + "graphics/CompositorMutatorClient.cpp", + "graphics/CompositorMutatorClient.h", + "graphics/ContentLayerDelegate.cpp", + "graphics/ContentLayerDelegate.h", + "graphics/ContiguousContainer.cpp", + "graphics/ContiguousContainer.h", + "graphics/CrossfadeGeneratedImage.cpp", + "graphics/CrossfadeGeneratedImage.h", + "graphics/DecodingImageGenerator.cpp", + "graphics/DecodingImageGenerator.h", + "graphics/DeferredImageDecoder.cpp", + "graphics/DeferredImageDecoder.h", + "graphics/DrawLooperBuilder.cpp", + "graphics/DrawLooperBuilder.h", + "graphics/ExpensiveCanvasHeuristicParameters.h", + "graphics/FirstPaintInvalidationTracking.cpp", + "graphics/FirstPaintInvalidationTracking.h", + "graphics/FrameData.cpp", + "graphics/FrameData.h", + "graphics/GeneratedImage.cpp", + "graphics/GeneratedImage.h", + "graphics/Gradient.cpp", + "graphics/Gradient.h", + "graphics/GradientGeneratedImage.cpp", + "graphics/GradientGeneratedImage.h", + "graphics/GraphicsContext.cpp", + "graphics/GraphicsContext.h", + "graphics/GraphicsContextState.cpp", + "graphics/GraphicsContextState.h", + "graphics/GraphicsContextStateSaver.h", + "graphics/GraphicsLayer.cpp", + "graphics/GraphicsLayer.h", + "graphics/GraphicsLayerClient.h", + "graphics/GraphicsLayerDebugInfo.cpp", + "graphics/GraphicsLayerDebugInfo.h", + "graphics/GraphicsTypes.cpp", + "graphics/GraphicsTypes.h", + "graphics/GraphicsTypes3D.h", + "graphics/Image.cpp", + "graphics/Image.h", + "graphics/ImageAnimationPolicy.h", + "graphics/ImageBuffer.cpp", + "graphics/ImageBuffer.h", + "graphics/ImageBufferClient.h", + "graphics/ImageBufferSurface.cpp", + "graphics/ImageBufferSurface.h", + "graphics/ImageDecodingStore.cpp", + "graphics/ImageDecodingStore.h", + "graphics/ImageFrameGenerator.cpp", + "graphics/ImageFrameGenerator.h", + "graphics/ImageObserver.cpp", + "graphics/ImageObserver.h", + "graphics/ImageOrientation.cpp", + "graphics/ImageOrientation.h", + "graphics/ImagePattern.cpp", + "graphics/ImagePattern.h", + "graphics/ImageSource.cpp", + "graphics/ImageSource.h", + "graphics/InterceptingCanvas.cpp", + "graphics/InterceptingCanvas.h", + "graphics/LinkHighlight.h", + "graphics/LoggingCanvas.cpp", + "graphics/LoggingCanvas.h", + "graphics/PaintGeneratedImage.cpp", + "graphics/PaintGeneratedImage.h", + "graphics/PaintInvalidationReason.cpp", + "graphics/PaintInvalidationReason.h", + "graphics/Path.cpp", + "graphics/Path.h", + "graphics/PathTraversalState.cpp", + "graphics/PathTraversalState.h", + "graphics/Pattern.cpp", + "graphics/Pattern.h", + "graphics/PicturePattern.cpp", + "graphics/PicturePattern.h", + "graphics/PictureSnapshot.cpp", + "graphics/PictureSnapshot.h", + "graphics/ProfilingCanvas.cpp", + "graphics/ProfilingCanvas.h", + "graphics/RecordingImageBufferSurface.cpp", + "graphics/RecordingImageBufferSurface.h", + "graphics/ReplayingCanvas.cpp", + "graphics/ReplayingCanvas.h", + "graphics/SquashingDisallowedReasons.cpp", + "graphics/SquashingDisallowedReasons.h", + "graphics/StaticBitmapImage.cpp", + "graphics/StaticBitmapImage.h", + "graphics/StrokeData.cpp", + "graphics/StrokeData.h", + "graphics/UnacceleratedImageBufferSurface.cpp", + "graphics/UnacceleratedImageBufferSurface.h", + "graphics/compositing/PaintArtifactCompositor.cpp", + "graphics/compositing/PaintArtifactCompositor.h", + "graphics/cpu/arm/WebGLImageConversionNEON.h", + "graphics/cpu/x86/WebGLImageConversionSSE.h", + "graphics/filters/DistantLightSource.cpp", + "graphics/filters/DistantLightSource.h", + "graphics/filters/FEBlend.cpp", + "graphics/filters/FEBlend.h", + "graphics/filters/FEBoxReflect.cpp", + "graphics/filters/FEBoxReflect.h", + "graphics/filters/FEColorMatrix.cpp", + "graphics/filters/FEColorMatrix.h", + "graphics/filters/FEComponentTransfer.cpp", + "graphics/filters/FEComponentTransfer.h", + "graphics/filters/FEComposite.cpp", + "graphics/filters/FEComposite.h", + "graphics/filters/FEConvolveMatrix.cpp", + "graphics/filters/FEConvolveMatrix.h", + "graphics/filters/FEDiffuseLighting.cpp", + "graphics/filters/FEDiffuseLighting.h", + "graphics/filters/FEDisplacementMap.cpp", + "graphics/filters/FEDisplacementMap.h", + "graphics/filters/FEDropShadow.cpp", + "graphics/filters/FEDropShadow.h", + "graphics/filters/FEFlood.cpp", + "graphics/filters/FEFlood.h", + "graphics/filters/FEGaussianBlur.cpp", + "graphics/filters/FEGaussianBlur.h", + "graphics/filters/FELighting.cpp", + "graphics/filters/FELighting.h", + "graphics/filters/FEMerge.cpp", + "graphics/filters/FEMerge.h", + "graphics/filters/FEMorphology.cpp", + "graphics/filters/FEMorphology.h", + "graphics/filters/FEOffset.cpp", + "graphics/filters/FEOffset.h", + "graphics/filters/FESpecularLighting.cpp", + "graphics/filters/FESpecularLighting.h", + "graphics/filters/FETile.cpp", + "graphics/filters/FETile.h", + "graphics/filters/FETurbulence.cpp", + "graphics/filters/FETurbulence.h", + "graphics/filters/Filter.cpp", + "graphics/filters/Filter.h", + "graphics/filters/FilterEffect.cpp", + "graphics/filters/FilterEffect.h", + "graphics/filters/FilterOperation.cpp", + "graphics/filters/FilterOperation.h", + "graphics/filters/FilterOperations.cpp", + "graphics/filters/FilterOperations.h", + "graphics/filters/LightSource.cpp", + "graphics/filters/LightSource.h", + "graphics/filters/PaintFilterEffect.cpp", + "graphics/filters/PaintFilterEffect.h", + "graphics/filters/PointLightSource.cpp", + "graphics/filters/PointLightSource.h", + "graphics/filters/SkiaImageFilterBuilder.cpp", + "graphics/filters/SkiaImageFilterBuilder.h", + "graphics/filters/SourceAlpha.cpp", + "graphics/filters/SourceAlpha.h", + "graphics/filters/SourceGraphic.cpp", + "graphics/filters/SourceGraphic.h", + "graphics/filters/SpotLightSource.cpp", + "graphics/filters/SpotLightSource.h", + "graphics/gpu/AcceleratedImageBufferSurface.cpp", + "graphics/gpu/AcceleratedImageBufferSurface.h", + "graphics/gpu/DrawingBuffer.cpp", + "graphics/gpu/DrawingBuffer.h", + "graphics/gpu/Extensions3DUtil.cpp", + "graphics/gpu/Extensions3DUtil.h", + "graphics/gpu/SharedContextRateLimiter.cpp", + "graphics/gpu/SharedContextRateLimiter.h", + "graphics/gpu/WebGLImageConversion.cpp", + "graphics/gpu/WebGLImageConversion.h", + "graphics/paint/ClipDisplayItem.cpp", + "graphics/paint/ClipDisplayItem.h", + "graphics/paint/ClipPaintPropertyNode.h", + "graphics/paint/ClipPathDisplayItem.cpp", + "graphics/paint/ClipPathDisplayItem.h", + "graphics/paint/ClipPathRecorder.cpp", + "graphics/paint/ClipPathRecorder.h", + "graphics/paint/ClipRecorder.cpp", + "graphics/paint/ClipRecorder.h", + "graphics/paint/CompositingDisplayItem.cpp", + "graphics/paint/CompositingDisplayItem.h", + "graphics/paint/CompositingRecorder.cpp", + "graphics/paint/CompositingRecorder.h", + "graphics/paint/CullRect.cpp", + "graphics/paint/CullRect.h", + "graphics/paint/DisplayItem.cpp", + "graphics/paint/DisplayItem.h", + "graphics/paint/DisplayItemCacheSkipper.h", + "graphics/paint/DisplayItemClient.cpp", + "graphics/paint/DisplayItemClient.h", + "graphics/paint/DisplayItemList.cpp", + "graphics/paint/DisplayItemList.h", + "graphics/paint/DrawingDisplayItem.cpp", + "graphics/paint/DrawingDisplayItem.h", + "graphics/paint/DrawingRecorder.cpp", + "graphics/paint/DrawingRecorder.h", + "graphics/paint/EffectPaintPropertyNode.h", + "graphics/paint/FilterDisplayItem.cpp", + "graphics/paint/FilterDisplayItem.h", + "graphics/paint/FloatClipDisplayItem.cpp", + "graphics/paint/FloatClipDisplayItem.h", + "graphics/paint/ForeignLayerDisplayItem.cpp", + "graphics/paint/ForeignLayerDisplayItem.h", + "graphics/paint/GeometryMapper.cpp", + "graphics/paint/GeometryMapper.h", + "graphics/paint/PaintArtifact.cpp", + "graphics/paint/PaintArtifact.h", + "graphics/paint/PaintArtifactToSkCanvas.cpp", + "graphics/paint/PaintArtifactToSkCanvas.h", + "graphics/paint/PaintChunk.h", + "graphics/paint/PaintChunkProperties.h", + "graphics/paint/PaintChunker.cpp", + "graphics/paint/PaintChunker.h", + "graphics/paint/PaintController.cpp", + "graphics/paint/PaintController.h", + "graphics/paint/PropertyTreeState.h", + "graphics/paint/ScopedPaintChunkProperties.h", + "graphics/paint/ScrollDisplayItem.cpp", + "graphics/paint/ScrollDisplayItem.h", + "graphics/paint/SkPictureBuilder.cpp", + "graphics/paint/SkPictureBuilder.h", + "graphics/paint/SubsequenceDisplayItem.h", + "graphics/paint/SubsequenceRecorder.cpp", + "graphics/paint/SubsequenceRecorder.h", + "graphics/paint/Transform3DDisplayItem.cpp", + "graphics/paint/Transform3DDisplayItem.h", + "graphics/paint/TransformDisplayItem.cpp", + "graphics/paint/TransformDisplayItem.h", + "graphics/paint/TransformPaintPropertyNode.h", + "graphics/skia/ImagePixelLocker.cpp", + "graphics/skia/ImagePixelLocker.h", + "graphics/skia/SkSizeHash.h", + "graphics/skia/SkiaUtils.cpp", + "graphics/skia/SkiaUtils.h", + "image-decoders/FastSharedBufferReader.cpp", + "image-decoders/FastSharedBufferReader.h", + "image-decoders/ImageAnimation.h", + "image-decoders/ImageDecoder.cpp", + "image-decoders/ImageDecoder.h", + "image-decoders/ImageFrame.cpp", + "image-decoders/ImageFrame.h", + "image-decoders/SegmentReader.cpp", + "image-decoders/SegmentReader.h", + "image-decoders/bmp/BMPImageDecoder.cpp", + "image-decoders/bmp/BMPImageDecoder.h", + "image-decoders/bmp/BMPImageReader.cpp", + "image-decoders/bmp/BMPImageReader.h", + "image-decoders/gif/GIFImageDecoder.cpp", + "image-decoders/gif/GIFImageDecoder.h", + "image-decoders/gif/GIFImageReader.cpp", + "image-decoders/gif/GIFImageReader.h", + "image-decoders/ico/ICOImageDecoder.cpp", + "image-decoders/ico/ICOImageDecoder.h", + "image-decoders/jpeg/JPEGImageDecoder.cpp", + "image-decoders/jpeg/JPEGImageDecoder.h", + "image-decoders/png/PNGImageDecoder.cpp", + "image-decoders/png/PNGImageDecoder.h", + "image-decoders/webp/WEBPImageDecoder.cpp", + "image-decoders/webp/WEBPImageDecoder.h", + "image-encoders/JPEGImageEncoder.cpp", + "image-encoders/JPEGImageEncoder.h", + "image-encoders/PNGImageEncoder.cpp", + "image-encoders/PNGImageEncoder.h", + "image-encoders/WEBPImageEncoder.cpp", + "image-encoders/WEBPImageEncoder.h", + "json/JSONParser.cpp", + "json/JSONParser.h", + "json/JSONValues.cpp", + "json/JSONValues.h", + "mac/BlockExceptions.h", + "mac/BlockExceptions.mm", + "mac/ColorMac.h", + "mac/ColorMac.mm", + "mac/KillRingMac.mm", + "mac/LocalCurrentGraphicsContext.h", + "mac/LocalCurrentGraphicsContext.mm", + "mac/NSScrollerImpDetails.h", + "mac/ScrollAnimatorMac.h", + "mac/ScrollAnimatorMac.mm", + "mac/ThemeMac.h", + "mac/ThemeMac.mm", + "mac/VersionUtilMac.h", + "mac/VersionUtilMac.mm", + "mac/WebCoreNSCellExtras.h", + "mac/WebCoreNSCellExtras.mm", + "mediastream/MediaStreamCenter.cpp", + "mediastream/MediaStreamCenter.h", + "mediastream/MediaStreamComponent.cpp", + "mediastream/MediaStreamComponent.h", + "mediastream/MediaStreamDescriptor.cpp", + "mediastream/MediaStreamDescriptor.h", + "mediastream/MediaStreamSource.cpp", + "mediastream/MediaStreamSource.h", + "mediastream/MediaStreamTrackSourcesRequest.h", + "mediastream/MediaStreamWebAudioSource.cpp", + "mediastream/MediaStreamWebAudioSource.h", + "mhtml/ArchiveResource.cpp", + "mhtml/MHTMLArchive.cpp", + "mhtml/MHTMLArchive.h", + "mhtml/MHTMLParser.cpp", + "mhtml/MHTMLParser.h", + "mojo/MojoHelper.h", + "network/ContentSecurityPolicyParsers.cpp", + "network/ContentSecurityPolicyParsers.h", + "network/ContentSecurityPolicyResponseHeaders.cpp", + "network/ContentSecurityPolicyResponseHeaders.h", + "network/EncodedFormData.cpp", + "network/EncodedFormData.h", + "network/FormDataEncoder.cpp", + "network/FormDataEncoder.h", + "network/HTTPHeaderMap.cpp", + "network/HTTPHeaderMap.h", + "network/HTTPParsers.cpp", + "network/HTTPParsers.h", + "network/LinkHeader.cpp", + "network/LinkHeader.h", + "network/NetworkHints.cpp", + "network/NetworkHints.h", + "network/NetworkLog.h", + "network/NetworkUtils.cpp", + "network/NetworkUtils.h", + "network/ParsedContentType.cpp", + "network/ParsedContentType.h", + "network/ResourceError.cpp", + "network/ResourceError.h", + "network/ResourceLoadTiming.cpp", + "network/ResourceLoadTiming.h", + "network/ResourceRequest.cpp", + "network/ResourceRequest.h", + "network/ResourceResponse.cpp", + "network/ResourceResponse.h", + "network/ResourceTimingInfo.cpp", + "network/ResourceTimingInfo.h", + "network/WebSocketHandshakeRequest.cpp", + "network/WebSocketHandshakeRequest.h", + "network/WebSocketHandshakeResponse.cpp", + "network/WebSocketHandshakeResponse.h", + "peerconnection/RTCAnswerOptionsPlatform.h", + "peerconnection/RTCConfiguration.h", + "peerconnection/RTCOfferOptionsPlatform.h", + "peerconnection/RTCSessionDescriptionRequest.h", + "peerconnection/RTCStatsRequest.h", + "peerconnection/RTCStatsResponseBase.h", + "peerconnection/RTCVoidRequest.h", + "plugins/PluginData.cpp", + "plugins/PluginData.h", + "plugins/PluginListBuilder.cpp", + "plugins/PluginListBuilder.h", + "scheduler/CancellableTaskFactory.cpp", + "scheduler/CancellableTaskFactory.h", + "scheduler/base/cancelable_closure_holder.cc", + "scheduler/base/cancelable_closure_holder.h", + "scheduler/base/enqueue_order.cc", + "scheduler/base/enqueue_order.h", + "scheduler/base/lazy_now.cc", + "scheduler/base/lazy_now.h", + "scheduler/base/pollable_thread_safe_flag.cc", + "scheduler/base/pollable_thread_safe_flag.h", + "scheduler/base/queueing_time_estimator.cc", + "scheduler/base/queueing_time_estimator.h", + "scheduler/base/real_time_domain.cc", + "scheduler/base/real_time_domain.h", + "scheduler/base/task_queue_impl.cc", + "scheduler/base/task_queue_impl.h", + "scheduler/base/task_queue_manager.cc", + "scheduler/base/task_queue_manager.h", + "scheduler/base/task_queue_manager_delegate.h", + "scheduler/base/task_queue_selector.cc", + "scheduler/base/task_queue_selector.h", + "scheduler/base/thread_load_tracker.cc", + "scheduler/base/thread_load_tracker.h", + "scheduler/base/time_domain.cc", + "scheduler/base/time_domain.h", + "scheduler/base/virtual_time_domain.cc", + "scheduler/base/virtual_time_domain.h", + "scheduler/base/work_queue.cc", + "scheduler/base/work_queue.h", + "scheduler/base/work_queue_sets.cc", + "scheduler/base/work_queue_sets.h", + "scheduler/child/compositor_worker_scheduler.cc", + "scheduler/child/idle_helper.cc", + "scheduler/child/idle_helper.h", + "scheduler/child/scheduler_helper.cc", + "scheduler/child/scheduler_helper.h", + "scheduler/child/scheduler_tqm_delegate.h", + "scheduler/child/scheduler_tqm_delegate_impl.cc", + "scheduler/child/scheduler_tqm_delegate_impl.h", + "scheduler/child/single_thread_idle_task_runner.cc", + "scheduler/child/web_scheduler_impl.cc", + "scheduler/child/web_scheduler_impl.h", + "scheduler/child/web_task_runner_impl.cc", + "scheduler/child/web_task_runner_impl.h", + "scheduler/child/webthread_base.cc", + "scheduler/child/webthread_impl_for_worker_scheduler.cc", + "scheduler/child/worker_scheduler.cc", + "scheduler/child/worker_scheduler_impl.cc", + "scheduler/child/worker_scheduler_impl.h", + "scheduler/renderer/auto_advancing_virtual_time_domain.cc", + "scheduler/renderer/auto_advancing_virtual_time_domain.h", + "scheduler/renderer/deadline_task_runner.cc", + "scheduler/renderer/deadline_task_runner.h", + "scheduler/renderer/idle_time_estimator.cc", + "scheduler/renderer/idle_time_estimator.h", + "scheduler/renderer/render_widget_scheduling_state.cc", + "scheduler/renderer/render_widget_signals.cc", + "scheduler/renderer/render_widget_signals.h", + "scheduler/renderer/renderer_scheduler.cc", + "scheduler/renderer/renderer_scheduler_impl.cc", + "scheduler/renderer/renderer_scheduler_impl.h", + "scheduler/renderer/renderer_web_scheduler_impl.cc", + "scheduler/renderer/renderer_web_scheduler_impl.h", + "scheduler/renderer/task_cost_estimator.cc", + "scheduler/renderer/task_cost_estimator.h", + "scheduler/renderer/throttled_time_domain.cc", + "scheduler/renderer/throttled_time_domain.h", + "scheduler/renderer/throttling_helper.cc", + "scheduler/renderer/throttling_helper.h", + "scheduler/renderer/user_model.cc", + "scheduler/renderer/user_model.h", + "scheduler/renderer/web_frame_scheduler_impl.cc", + "scheduler/renderer/web_frame_scheduler_impl.h", + "scheduler/renderer/web_view_scheduler_impl.cc", + "scheduler/renderer/web_view_scheduler_impl.h", + "scheduler/renderer/webthread_impl_for_renderer_scheduler.cc", + "scheduler/renderer/webthread_impl_for_renderer_scheduler.h", + "scheduler/utility/webthread_impl_for_utility_thread.cc", + "scroll/MainThreadScrollingReason.h", + "scroll/ProgrammaticScrollAnimator.cpp", + "scroll/ProgrammaticScrollAnimator.h", + "scroll/ScrollAnimator.cpp", + "scroll/ScrollAnimator.h", + "scroll/ScrollAnimatorBase.cpp", + "scroll/ScrollAnimatorBase.h", + "scroll/ScrollAnimatorCompositorCoordinator.cpp", + "scroll/ScrollAnimatorCompositorCoordinator.h", + "scroll/ScrollStateData.h", + "scroll/ScrollTypes.h", + "scroll/ScrollableArea.cpp", + "scroll/ScrollableArea.h", + "scroll/Scrollbar.cpp", + "scroll/Scrollbar.h", + "scroll/ScrollbarTheme.cpp", + "scroll/ScrollbarTheme.h", + "scroll/ScrollbarThemeAndroid.cpp", + "scroll/ScrollbarThemeAura.cpp", + "scroll/ScrollbarThemeAura.h", + "scroll/ScrollbarThemeClient.h", + "scroll/ScrollbarThemeMac.h", + "scroll/ScrollbarThemeMac.mm", + "scroll/ScrollbarThemeMock.cpp", + "scroll/ScrollbarThemeMock.h", + "scroll/ScrollbarThemeOverlay.cpp", + "scroll/ScrollbarThemeOverlay.h", + "scroll/ScrollbarThemeOverlayMock.h", + "speech/PlatformSpeechSynthesisUtterance.cpp", + "speech/PlatformSpeechSynthesisUtterance.h", + "speech/PlatformSpeechSynthesisVoice.cpp", + "speech/PlatformSpeechSynthesisVoice.h", + "speech/PlatformSpeechSynthesizer.cpp", + "speech/PlatformSpeechSynthesizer.h", + "text/BidiCharacterRun.cpp", + "text/BidiCharacterRun.h", + "text/BidiContext.cpp", + "text/BidiContext.h", + "text/BidiResolver.h", + "text/BidiRunList.h", + "text/BidiTextRun.cpp", + "text/BidiTextRun.h", + "text/Character.cpp", + "text/Character.h", + "text/CharacterEmoji.cpp", + "text/DateTimeFormat.cpp", + "text/DateTimeFormat.h", + "text/DecodeEscapeSequences.h", + "text/Hyphenation.cpp", + "text/Hyphenation.h", + "text/LineEnding.cpp", + "text/LineEnding.h", + "text/LocaleICU.cpp", + "text/LocaleICU.h", + "text/LocaleMac.h", + "text/LocaleMac.mm", + "text/LocaleToScriptMapping.cpp", + "text/LocaleToScriptMapping.h", + "text/LocaleWin.cpp", + "text/LocaleWin.h", + "text/PlatformLocale.cpp", + "text/PlatformLocale.h", + "text/QuotedPrintable.cpp", + "text/QuotedPrintable.h", + "text/SegmentedString.cpp", + "text/SegmentedString.h", + "text/StringTruncator.cpp", + "text/StringTruncator.h", + "text/SuffixTree.h", + "text/TextBoundaries.cpp", + "text/TextBoundaries.h", + "text/TextBreakIterator.cpp", + "text/TextBreakIterator.h", + "text/TextBreakIteratorICU.cpp", + "text/TextBreakIteratorInternalICU.cpp", + "text/TextBreakIteratorInternalICU.h", + "text/TextCheckerClient.cpp", + "text/TextCheckerClient.h", + "text/TextChecking.h", + "text/TextDecoration.h", + "text/TextEncodingDetector.cpp", + "text/TextEncodingDetector.h", + "text/TextPath.h", + "text/TextRun.cpp", + "text/TextRun.h", + "text/TextRunIterator.h", + "text/TextStream.cpp", + "text/TextStream.h", + "text/UnicodeBidi.h", + "text/UnicodeRange.cpp", + "text/UnicodeRange.h", + "text/UnicodeUtilities.cpp", + "text/UnicodeUtilities.h", + "text/linux/HyphenationLinux.cpp", + "text/mac/HyphenationMac.cpp", + "text/win/HyphenationWin.cpp", + "threading/BackgroundTaskRunner.cpp", + "threading/BackgroundTaskRunner.h", + "transforms/AffineTransform.cpp", + "transforms/AffineTransform.h", + "transforms/IdentityTransformOperation.h", + "transforms/InterpolatedTransformOperation.cpp", + "transforms/InterpolatedTransformOperation.h", + "transforms/Matrix3DTransformOperation.cpp", + "transforms/Matrix3DTransformOperation.h", + "transforms/MatrixTransformOperation.cpp", + "transforms/MatrixTransformOperation.h", + "transforms/PerspectiveTransformOperation.cpp", + "transforms/PerspectiveTransformOperation.h", + "transforms/RotateTransformOperation.cpp", + "transforms/RotateTransformOperation.h", + "transforms/Rotation.cpp", + "transforms/Rotation.h", + "transforms/ScaleTransformOperation.cpp", + "transforms/ScaleTransformOperation.h", + "transforms/SkewTransformOperation.cpp", + "transforms/SkewTransformOperation.h", + "transforms/TransformOperations.cpp", + "transforms/TransformationMatrix.cpp", + "transforms/TransformationMatrix.h", + "transforms/TranslateTransformOperation.cpp", + "transforms/TranslateTransformOperation.h", + "v8_inspector/Allocator.h", + "v8_inspector/Atomics.h", + "v8_inspector/InjectedScript.cpp", + "v8_inspector/InjectedScript.h", + "v8_inspector/InjectedScriptNative.cpp", + "v8_inspector/InjectedScriptNative.h", + "v8_inspector/InspectedContext.cpp", + "v8_inspector/InspectedContext.h", + "v8_inspector/JavaScriptCallFrame.cpp", + "v8_inspector/JavaScriptCallFrame.h", + "v8_inspector/ProtocolPlatform.h", + "v8_inspector/RemoteObjectId.cpp", + "v8_inspector/RemoteObjectId.h", + "v8_inspector/ScriptBreakpoint.h", + "v8_inspector/SearchUtil.cpp", + "v8_inspector/SearchUtil.h", + "v8_inspector/String16.cpp", + "v8_inspector/String16.h", + "v8_inspector/StringUtil.cpp", + "v8_inspector/StringUtil.h", + "v8_inspector/V8Compat.h", + "v8_inspector/V8Console.cpp", + "v8_inspector/V8Console.h", + "v8_inspector/V8ConsoleAgentImpl.cpp", + "v8_inspector/V8ConsoleAgentImpl.h", + "v8_inspector/V8ConsoleMessage.cpp", + "v8_inspector/V8ConsoleMessage.h", + "v8_inspector/V8Debugger.cpp", + "v8_inspector/V8Debugger.h", + "v8_inspector/V8DebuggerAgentImpl.cpp", + "v8_inspector/V8DebuggerAgentImpl.h", + "v8_inspector/V8DebuggerScript.cpp", + "v8_inspector/V8DebuggerScript.h", + "v8_inspector/V8FunctionCall.cpp", + "v8_inspector/V8FunctionCall.h", + "v8_inspector/V8HeapProfilerAgentImpl.cpp", + "v8_inspector/V8HeapProfilerAgentImpl.h", + "v8_inspector/V8InjectedScriptHost.cpp", + "v8_inspector/V8InjectedScriptHost.h", + "v8_inspector/V8InspectorImpl.cpp", + "v8_inspector/V8InspectorImpl.h", + "v8_inspector/V8InspectorSessionImpl.cpp", + "v8_inspector/V8InspectorSessionImpl.h", + "v8_inspector/V8InternalValueType.cpp", + "v8_inspector/V8InternalValueType.h", + "v8_inspector/V8ProfilerAgentImpl.cpp", + "v8_inspector/V8ProfilerAgentImpl.h", + "v8_inspector/V8Regex.cpp", + "v8_inspector/V8Regex.h", + "v8_inspector/V8RuntimeAgentImpl.cpp", + "v8_inspector/V8RuntimeAgentImpl.h", + "v8_inspector/V8SchemaAgentImpl.cpp", + "v8_inspector/V8SchemaAgentImpl.h", + "v8_inspector/V8StackTraceImpl.cpp", + "v8_inspector/V8StackTraceImpl.h", + "v8_inspector/V8ValueCopier.cpp", + "v8_inspector/V8ValueCopier.h", + "v8_inspector/public/StringBuffer.h", + "v8_inspector/public/StringView.h", + "v8_inspector/public/V8ContextInfo.h", + "v8_inspector/public/V8Inspector.h", + "v8_inspector/public/V8InspectorClient.h", + "v8_inspector/public/V8InspectorSession.h", + "v8_inspector/public/V8StackTrace.h", + "web_memory_allocator_dump.cc", + "web_memory_allocator_dump.h", + "web_process_memory_dump.cc", + "web_process_memory_dump.h", + "weborigin/KURL.cpp", + "weborigin/KURL.h", + "weborigin/KURLHash.h", + "weborigin/KnownPorts.cpp", + "weborigin/KnownPorts.h", + "weborigin/OriginAccessEntry.cpp", + "weborigin/OriginAccessEntry.h", + "weborigin/Referrer.h", + "weborigin/ReferrerPolicy.h", + "weborigin/SchemeRegistry.cpp", + "weborigin/SchemeRegistry.h", + "weborigin/SecurityOrigin.cpp", + "weborigin/SecurityOrigin.h", + "weborigin/SecurityOriginCache.h", + "weborigin/SecurityOriginHash.h", + "weborigin/SecurityPolicy.cpp", + "weborigin/SecurityPolicy.h", + "weborigin/Suborigin.cpp", + "weborigin/Suborigin.h", + ] + sources -= blink_platform_neon_files sources -= blink_platform_sse_files @@ -468,10 +1669,58 @@ } static_library("test_support") { - sources = platform_test_support_files visibility += [ "//third_party/WebKit/*" ] testonly = true + sources = [ + "scheduler/base/task_queue_manager_delegate_for_test.cc", + "scheduler/base/test_time_source.cc", + "scheduler/child/scheduler_tqm_delegate_for_test.cc", + "scheduler/test/fake_renderer_scheduler.cc", + "scheduler/test/fake_web_task_runner.cc", + "scheduler/test/fake_web_task_runner.h", + "scheduler/test/lazy_scheduler_message_loop_delegate_for_tests.cc", + "scheduler/test/lazy_scheduler_message_loop_delegate_for_tests.h", + "scheduler/test/renderer_scheduler_test_support.cc", + "scroll/ScrollbarTestSuite.h", + "testing/CompositorTest.cpp", + "testing/CompositorTest.h", + "testing/FakeDisplayItemClient.h", + "testing/FakeGraphicsLayer.h", + "testing/FakeGraphicsLayerClient.h", + "testing/FontTestHelpers.cpp", + "testing/FontTestHelpers.h", + "testing/FuzzedDataProvider.cpp", + "testing/FuzzedDataProvider.h", + "testing/GeometryPrinters.cpp", + "testing/GeometryPrinters.h", + "testing/HistogramTester.cpp", + "testing/HistogramTester.h", + "testing/MessageLoopForMojo.h", + "testing/PaintPrinters.cpp", + "testing/PaintPrinters.h", + "testing/PictureMatchers.cpp", + "testing/PictureMatchers.h", + "testing/PlatformTestPrinters.cpp", + "testing/RuntimeEnabledFeaturesTestHelpers.h", + "testing/TestPaintArtifact.cpp", + "testing/TestPaintArtifact.h", + "testing/TestingPlatformSupport.cpp", + "testing/TestingPlatformSupport.h", + "testing/TransformPrinters.cpp", + "testing/TransformPrinters.h", + "testing/URLTestHelpers.cpp", + "testing/URLTestHelpers.h", + "testing/UnitTestHelpers.cpp", + "testing/UnitTestHelpers.h", + "testing/WebLayerTreeViewImplForTesting.cpp", + "testing/WebLayerTreeViewImplForTesting.h", + "testing/weburl_loader_mock.cc", + "testing/weburl_loader_mock.h", + "testing/weburl_loader_mock_factory_impl.cc", + "testing/weburl_loader_mock_factory_impl.h", + ] + configs += [ "//third_party/WebKit/Source:config", "//third_party/WebKit/Source:inside_blink", @@ -502,7 +1751,154 @@ visibility = [] # Allow re-assignment of list. visibility = [ "*" ] - sources = platform_test_files + sources = [ + "DecimalTest.cpp", + "DragImageTest.cpp", + "HistogramTest.cpp", + "LayoutLocaleTest.cpp", + "LayoutUnitTest.cpp", + "LifecycleContextTest.cpp", + "PODArenaTest.cpp", + "PODFreeListArenaTest.cpp", + "PODIntervalTreeTest.cpp", + "PODRedBlackTreeTest.cpp", + "ScopedOrientationChangeIndicatorTest.cpp", + "SharedBufferTest.cpp", + "TimerTest.cpp", + "TracedValueTest.cpp", + "UUIDTest.cpp", + "UserGestureIndicatorTest.cpp", + "WebIconSizesParserTest.cpp", + "WebScreenInfoTest.cpp", + "WebVectorTest.cpp", + "animation/AnimationTranslationUtilTest.cpp", + "animation/CompositorAnimationHostTest.cpp", + "animation/CompositorAnimationPlayerTest.cpp", + "animation/CompositorAnimationTest.cpp", + "animation/CompositorAnimationTimelineTest.cpp", + "animation/CompositorFloatAnimationCurveTest.cpp", + "animation/TimingFunctionTest.cpp", + "blob/BlobDataTest.cpp", + "clipboard/ClipboardUtilitiesTest.cpp", + "exported/FilePathConversionTest.cpp", + "fonts/AcceptLanguagesResolverTest.cpp", + "fonts/FontCacheTest.cpp", + "fonts/FontDescriptionTest.cpp", + "fonts/FontPlatformDataTest.cpp", + "fonts/GlyphBufferTest.cpp", + "fonts/GlyphPageTreeNodeTest.cpp", + "fonts/OrientationIteratorTest.cpp", + "fonts/ScriptRunIteratorTest.cpp", + "fonts/SmallCapsIteratorTest.cpp", + "fonts/SymbolsIteratorTest.cpp", + "fonts/UnicodeRangeSetTest.cpp", + "fonts/android/FontCacheAndroidTest.cpp", + "fonts/mac/FontFamilyMatcherMacTest.mm", + "fonts/opentype/OpenTypeVerticalDataTest.cpp", + "fonts/shaping/CachingWordShaperTest.cpp", + "fonts/shaping/HarfBuzzShaperTest.cpp", + "fonts/shaping/RunSegmenterTest.cpp", + "geometry/DoubleRectTest.cpp", + "geometry/FloatBoxTest.cpp", + "geometry/FloatBoxTestHelpers.cpp", + "geometry/FloatPointTest.cpp", + "geometry/FloatPolygonTest.cpp", + "geometry/FloatQuadTest.cpp", + "geometry/FloatRectTest.cpp", + "geometry/FloatRoundedRectTest.cpp", + "geometry/FloatSizeTest.cpp", + "geometry/GeometryTestHelpers.cpp", + "geometry/IntRectTest.cpp", + "geometry/LayoutRectOutsetsTest.cpp", + "geometry/LayoutRectTest.cpp", + "geometry/RegionTest.cpp", + "graphics/BitmapImageTest.cpp", + "graphics/CompositorMutableStateTest.cpp", + "graphics/CompositorMutatorClientTest.cpp", + "graphics/ContiguousContainerTest.cpp", + "graphics/DeferredImageDecoderTestWoPlatform.cpp", + "graphics/GraphicsContextTest.cpp", + "graphics/RecordingImageBufferSurfaceTest.cpp", + "graphics/compositing/PaintArtifactCompositorTest.cpp", + "graphics/filters/FilterOperationsTest.cpp", + "graphics/filters/ImageFilterBuilderTest.cpp", + "graphics/gpu/DrawingBufferTest.cpp", + "graphics/paint/DisplayItemClientTest.cpp", + "graphics/paint/DisplayItemListTest.cpp", + "graphics/paint/DisplayItemTest.cpp", + "graphics/paint/GeometryMapperTest.cpp", + "graphics/paint/PaintArtifactToSkCanvasTest.cpp", + "graphics/paint/PaintChunkTest.cpp", + "graphics/paint/PaintChunkerTest.cpp", + "graphics/paint/PaintControllerTest.cpp", + "graphics/paint/PropertyTreeStateTest.cpp", + "image-decoders/FastSharedBufferReaderTest.cpp", + "image-decoders/ImageDecoderTest.cpp", + "image-decoders/ImageDecoderTestHelpers.cpp", + "image-decoders/ImageDecoderTestHelpers.h", + "image-decoders/bmp/BMPImageDecoderTest.cpp", + "image-decoders/gif/GIFImageDecoderTest.cpp", + "image-decoders/ico/ICOImageDecoderTest.cpp", + "image-decoders/jpeg/JPEGImageDecoderTest.cpp", + "image-decoders/webp/WEBPImageDecoderTest.cpp", + "json/JSONParserTest.cpp", + "mac/VersionUtilMacTest.mm", + "mojo/KURLSecurityOriginTest.cpp", + "network/EncodedFormDataTest.cpp", + "network/HTTPParsersTest.cpp", + "network/LinkHeaderTest.cpp", + "network/NetworkUtilsTest.cpp", + "network/ResourceRequestTest.cpp", + "network/ResourceResponseTest.cpp", + "scheduler/CancellableTaskFactoryTest.cpp", + "scheduler/base/queueing_time_estimator_unittest.cc", + "scheduler/base/task_queue_manager_unittest.cc", + "scheduler/base/task_queue_selector_unittest.cc", + "scheduler/base/test_count_uses_time_source.cc", + "scheduler/base/thread_load_tracker_unittest.cc", + "scheduler/base/time_domain_unittest.cc", + "scheduler/base/work_queue_sets_unittest.cc", + "scheduler/child/idle_helper_unittest.cc", + "scheduler/child/scheduler_helper_unittest.cc", + "scheduler/child/scheduler_tqm_delegate_impl_unittest.cc", + "scheduler/child/webthread_impl_for_worker_scheduler_unittest.cc", + "scheduler/child/worker_scheduler_impl_unittest.cc", + "scheduler/renderer/auto_advancing_virtual_time_domain_unittest.cc", + "scheduler/renderer/deadline_task_runner_unittest.cc", + "scheduler/renderer/idle_time_estimator_unittest.cc", + "scheduler/renderer/renderer_scheduler_impl_unittest.cc", + "scheduler/renderer/task_cost_estimator_unittest.cc", + "scheduler/renderer/throttling_helper_unittest.cc", + "scheduler/renderer/user_model_unittest.cc", + "scheduler/renderer/web_frame_scheduler_impl_unittest.cc", + "scheduler/renderer/web_view_scheduler_impl_unittest.cc", + "scheduler/renderer/webthread_impl_for_renderer_scheduler_unittest.cc", + "scroll/ScrollableAreaTest.cpp", + "testing/ArenaTestHelpers.h", + "testing/TreeTestHelpers.cpp", + "testing/TreeTestHelpers.h", + "text/BidiResolverTest.cpp", + "text/CharacterTest.cpp", + "text/DateTimeFormatTest.cpp", + "text/HyphenationTest.cpp", + "text/SegmentedStringTest.cpp", + "text/TextBreakIteratorTest.cpp", + "text/TextEncodingDetectorTest.cpp", + "text/UnicodeUtilitiesTest.cpp", + "threading/BackgroundTaskRunnerTest.cpp", + "transforms/AffineTransformTest.cpp", + "transforms/RotationTest.cpp", + "transforms/TransformOperationsTest.cpp", + "transforms/TransformationMatrixTest.cpp", + "web_process_memory_dump_test.cc", + "weborigin/KURLTest.cpp", + "weborigin/KnownPortsTest.cpp", + "weborigin/OriginAccessEntryTest.cpp", + "weborigin/SchemeRegistryTest.cpp", + "weborigin/SecurityOriginTest.cpp", + "weborigin/SecurityPolicyTest.cpp", + "weborigin/SuboriginTest.cpp", + ] if (is_win) { sources += [ "text/LocaleWinTest.cpp" ] @@ -659,3 +2055,35 @@ "//third_party/WebKit/Source:config", ] } + +# NOTE: These are legacy unit tests and tests that require a Platform +# object. Do not add more unless the test requires a Platform object. +# These tests are a part of the webkit_unit_tests binary. +source_set("unit_tests") { + testonly = true + visibility = [] + visibility = [ "//third_party/WebKit/Source/*" ] + sources = [ + "graphics/Canvas2DLayerBridgeTest.cpp", + "graphics/CanvasSurfaceLayerBridgeTest.cpp", + "graphics/DeferredImageDecoderTest.cpp", + "graphics/GraphicsLayerTest.cpp", + "graphics/ImageDecodingStoreTest.cpp", + "graphics/ImageFrameGeneratorTest.cpp", + "graphics/ImageLayerChromiumTest.cpp", + "graphics/test/FakeGLES2Interface.h", + "graphics/test/FakeWebGraphicsContext3DProvider.h", + "graphics/test/MockImageDecoder.h", + ] + + configs += [ + "//third_party/WebKit/Source:config", + "//third_party/WebKit/Source:inside_blink", + ] + + deps = [ + ":test_support", + "//testing/gmock", + "//testing/gtest", + ] +}
diff --git a/third_party/WebKit/Source/platform/blink_platform.gypi b/third_party/WebKit/Source/platform/blink_platform.gypi deleted file mode 100644 index 8bae2321..0000000 --- a/third_party/WebKit/Source/platform/blink_platform.gypi +++ /dev/null
@@ -1,1459 +0,0 @@ -{ - 'includes': [ - 'platform_generated.gypi', - ], - 'variables': { - 'platform_files': [ - 'AsyncFileSystemCallbacks.h', - 'CalculationValue.h', - 'CheckedInt.h', - 'ContentDecryptionModuleResult.h', - 'ContentSettingCallbacks.cpp', - 'ContentSettingCallbacks.h', - 'ContentType.cpp', - 'ContentType.h', - 'ContextMenu.cpp', - 'ContextMenu.h', - 'ContextMenuItem.cpp', - 'ContextMenuItem.h', - 'CrossThreadCopier.cpp', - 'CrossThreadCopier.h', - 'Crypto.cpp', - 'Crypto.h', - 'CryptoResult.h', - 'Cursor.cpp', - 'Cursor.h', - 'DateComponents.cpp', - 'DateComponents.h', - 'Decimal.cpp', - 'Decimal.h', - 'DragImage.cpp', - 'DragImage.h', - 'EventDispatchForbiddenScope.cpp', - 'EventDispatchForbiddenScope.h', - 'EventTracer.cpp', - 'EventTracer.h', - 'FileChooser.cpp', - 'FileChooser.h', - 'FileMetadata.cpp', - 'FileMetadata.h', - 'FileSystemType.h', - 'FloatConversion.h', - 'Histogram.cpp', - 'Histogram.h', - 'HostWindow.h', - 'KeyboardCodes.h', - 'KillRing.h', - 'KillRingNone.cpp', - 'Language.cpp', - 'Language.h', - 'LayoutLocale.cpp', - 'LayoutLocale.h', - 'LayoutTestSupport.cpp', - 'LayoutTestSupport.h', - 'LayoutUnit.cpp', - 'LayoutUnit.h', - 'Length.cpp', - 'Length.h', - 'LengthBox.cpp', - 'LengthBox.h', - 'LengthFunctions.cpp', - 'LengthFunctions.h', - 'LengthPoint.h', - 'LengthSize.h', - 'LifecycleNotifier.h', - 'LifecycleObserver.h', - 'LinkHash.cpp', - 'LinkHash.h', - 'MIMETypeFromURL.cpp', - 'MIMETypeFromURL.h', - 'MIMETypeRegistry.cpp', - 'MIMETypeRegistry.h', - 'MemoryCacheDumpProvider.cpp', - 'MemoryCacheDumpProvider.h', - 'MemoryCoordinator.cpp', - 'MemoryCoordinator.h', - 'PartitionAllocMemoryDumpProvider.cpp', - 'PartitionAllocMemoryDumpProvider.h', - 'PODArena.h', - 'PODFreeListArena.h', - 'PODInterval.h', - 'PODIntervalTree.h', - 'PODRedBlackTree.h', - 'PasteMode.h', - 'PlatformEvent.h', - 'PlatformGestureEvent.h', - 'PlatformInstrumentation.cpp', - 'PlatformInstrumentation.h', - 'PlatformMouseEvent.h', - 'PlatformResourceLoader.cpp', - 'PlatformResourceLoader.h', - 'PlatformTouchEvent.h', - 'PlatformTouchPoint.h', - 'PlatformWheelEvent.h', - 'PluginScriptForbiddenScope.cpp', - 'PluginScriptForbiddenScope.h', - 'PopupMenu.h', - 'Prerender.cpp', - 'Prerender.h', - 'PrerenderClient.h', - 'ScopedOrientationChangeIndicator.cpp', - 'ScopedOrientationChangeIndicator.h', - 'ScriptForbiddenScope.cpp', - 'ScriptForbiddenScope.h', - 'SecureTextInput.cpp', - 'SecureTextInput.h', - 'SerializedResource.h', - 'SharedBuffer.cpp', - 'SharedBuffer.h', - 'SharedBufferChunkReader.cpp', - 'SharedBufferChunkReader.h', - 'StorageQuotaCallbacks.h', - 'Supplementable.cpp', - 'Supplementable.h', - 'Theme.cpp', - 'Theme.h', - 'ThemeTypes.h', - 'Timer.cpp', - 'Timer.h', - 'TraceEvent.h', - 'TraceEventCommon.h', - 'TracedValue.cpp', - 'TracedValue.h', - 'UUID.cpp', - 'UUID.h', - 'UserGestureIndicator.cpp', - 'UserGestureIndicator.h', - 'WaitableEvent.cpp', - 'WaitableEvent.h', - 'WebIconSizesParser.cpp', - 'WebScheduler.cpp', - 'WebTaskRunner.cpp', - 'WebThreadSupportingGC.cpp', - 'WebThreadSupportingGC.h', - 'WebThread.cpp', - 'Widget.cpp', - 'Widget.h', - 'WindowsKeyboardCodes.h', - 'animation/AnimationTranslationUtil.cpp', - 'animation/AnimationTranslationUtil.h', - 'animation/AnimationUtilities.h', - 'animation/CompositorAnimation.cpp', - 'animation/CompositorAnimation.h', - 'animation/CompositorAnimationCurve.h', - 'animation/CompositorAnimationDelegate.h', - 'animation/CompositorAnimationHost.cpp', - 'animation/CompositorAnimationHost.h', - 'animation/CompositorAnimationPlayer.cpp', - 'animation/CompositorAnimationPlayer.h', - 'animation/CompositorAnimationPlayerClient.cpp', - 'animation/CompositorAnimationPlayerClient.h', - 'animation/CompositorAnimationTimeline.cpp', - 'animation/CompositorAnimationTimeline.h', - 'animation/CompositorFilterAnimationCurve.cpp', - 'animation/CompositorFilterAnimationCurve.h', - 'animation/CompositorFilterKeyframe.cpp', - 'animation/CompositorFilterKeyframe.h', - 'animation/CompositorFloatAnimationCurve.cpp', - 'animation/CompositorFloatAnimationCurve.h', - 'animation/CompositorFloatKeyframe.cpp', - 'animation/CompositorFloatKeyframe.h', - 'animation/CompositorKeyframe.cpp', - 'animation/CompositorKeyframe.h', - 'animation/CompositorScrollOffsetAnimationCurve.cpp', - 'animation/CompositorScrollOffsetAnimationCurve.h', - 'animation/CompositorTargetProperty.h', - 'animation/CompositorTransformAnimationCurve.cpp', - 'animation/CompositorTransformAnimationCurve.h', - 'animation/CompositorTransformKeyframe.cpp', - 'animation/CompositorTransformKeyframe.h', - 'animation/CompositorTransformOperations.cpp', - 'animation/CompositorTransformOperations.h', - 'animation/TimingFunction.cpp', - 'animation/TimingFunction.h', - 'audio/AudioArray.h', - 'audio/AudioBus.cpp', - 'audio/AudioBus.h', - 'audio/AudioChannel.cpp', - 'audio/AudioChannel.h', - 'audio/AudioDSPKernel.cpp', - 'audio/AudioDSPKernel.h', - 'audio/AudioDSPKernelProcessor.cpp', - 'audio/AudioDSPKernelProcessor.h', - 'audio/AudioDelayDSPKernel.cpp', - 'audio/AudioDelayDSPKernel.h', - 'audio/AudioDestination.cpp', - 'audio/AudioDestination.h', - 'audio/AudioDestinationConsumer.h', - 'audio/AudioFIFO.cpp', - 'audio/AudioFIFO.h', - 'audio/AudioFileReader.h', - 'audio/AudioIOCallback.h', - 'audio/AudioProcessor.cpp', - 'audio/AudioProcessor.h', - 'audio/AudioPullFIFO.cpp', - 'audio/AudioPullFIFO.h', - 'audio/AudioResampler.cpp', - 'audio/AudioResampler.h', - 'audio/AudioResamplerKernel.cpp', - 'audio/AudioResamplerKernel.h', - 'audio/AudioSourceProvider.h', - 'audio/AudioSourceProviderClient.h', - 'audio/AudioUtilities.cpp', - 'audio/AudioUtilities.h', - 'audio/Biquad.cpp', - 'audio/Biquad.h', - 'audio/Cone.cpp', - 'audio/Cone.h', - 'audio/DenormalDisabler.h', - 'audio/DirectConvolver.cpp', - 'audio/DirectConvolver.h', - 'audio/Distance.cpp', - 'audio/Distance.h', - 'audio/DownSampler.cpp', - 'audio/DownSampler.h', - 'audio/DynamicsCompressor.cpp', - 'audio/DynamicsCompressor.h', - 'audio/DynamicsCompressorKernel.cpp', - 'audio/DynamicsCompressorKernel.h', - 'audio/EqualPowerPanner.cpp', - 'audio/EqualPowerPanner.h', - 'audio/FFTConvolver.cpp', - 'audio/FFTConvolver.h', - 'audio/FFTFrame.cpp', - 'audio/FFTFrame.h', - 'audio/FFTFrameStub.cpp', - 'audio/HRTFDatabase.cpp', - 'audio/HRTFDatabase.h', - 'audio/HRTFDatabaseLoader.cpp', - 'audio/HRTFDatabaseLoader.h', - 'audio/HRTFElevation.cpp', - 'audio/HRTFElevation.h', - 'audio/HRTFKernel.cpp', - 'audio/HRTFKernel.h', - 'audio/HRTFPanner.cpp', - 'audio/HRTFPanner.h', - 'audio/IIRFilter.cpp', - 'audio/IIRFilter.h', - 'audio/MultiChannelResampler.cpp', - 'audio/MultiChannelResampler.h', - 'audio/Panner.cpp', - 'audio/Panner.h', - 'audio/Reverb.cpp', - 'audio/Reverb.h', - 'audio/ReverbAccumulationBuffer.cpp', - 'audio/ReverbAccumulationBuffer.h', - 'audio/ReverbConvolver.cpp', - 'audio/ReverbConvolver.h', - 'audio/ReverbConvolverStage.cpp', - 'audio/ReverbConvolverStage.h', - 'audio/ReverbInputBuffer.cpp', - 'audio/ReverbInputBuffer.h', - 'audio/SincResampler.cpp', - 'audio/SincResampler.h', - 'audio/StereoPanner.cpp', - 'audio/StereoPanner.h', - 'audio/UpSampler.cpp', - 'audio/UpSampler.h', - 'audio/VectorMath.cpp', - 'audio/VectorMath.h', - 'audio/ZeroPole.cpp', - 'audio/ZeroPole.h', - 'audio/android/FFTFrameOpenMAXDLAndroid.cpp', - 'audio/ffmpeg/FFTFrameFFMPEG.cpp', - 'audio/ipp/FFTFrameIPP.cpp', - 'audio/mac/FFTFrameMac.cpp', - 'blob/BlobData.cpp', - 'blob/BlobData.h', - 'blob/BlobRegistry.cpp', - 'blob/BlobRegistry.h', - 'blob/BlobURL.cpp', - 'blob/BlobURL.h', - 'clipboard/ClipboardMimeTypes.cpp', - 'clipboard/ClipboardMimeTypes.h', - 'clipboard/ClipboardUtilities.cpp', - 'clipboard/ClipboardUtilities.h', - 'clipboard/ClipboardUtilitiesPosix.cpp', - 'clipboard/ClipboardUtilitiesWin.cpp', - 'credentialmanager/PlatformCredential.cpp', - 'credentialmanager/PlatformCredential.h', - 'credentialmanager/PlatformFederatedCredential.cpp', - 'credentialmanager/PlatformFederatedCredential.h', - 'credentialmanager/PlatformPasswordCredential.cpp', - 'credentialmanager/PlatformPasswordCredential.h', - 'exported/Platform.cpp', - 'exported/ServiceRegistry.cpp', - 'exported/WebActiveGestureAnimation.cpp', - 'exported/WebActiveGestureAnimation.h', - 'exported/WebAudioBus.cpp', - 'exported/WebAudioDevice.cpp', - 'exported/WebBlobData.cpp', - 'exported/WebCanvasCaptureHandler.cpp', - 'exported/WebContentDecryptionModule.cpp', - 'exported/WebContentDecryptionModuleAccess.cpp', - 'exported/WebContentDecryptionModuleResult.cpp', - 'exported/WebContentDecryptionModuleSession.cpp', - 'exported/WebContentSettingCallbacks.cpp', - 'exported/WebCredential.cpp', - 'exported/WebCryptoAlgorithm.cpp', - 'exported/WebCryptoKey.cpp', - 'exported/WebCryptoKeyAlgorithm.cpp', - 'exported/WebCryptoResult.cpp', - 'exported/WebCursorInfo.cpp', - 'exported/WebData.cpp', - 'exported/WebDataConsumerHandle.cpp', - 'exported/WebDeviceMotionData.cpp', - 'exported/WebDeviceOrientationData.cpp', - 'exported/WebDragData.cpp', - 'exported/WebEncryptedMediaClient.cpp', - 'exported/WebEncryptedMediaKeyInformation.cpp', - 'exported/WebEncryptedMediaRequest.cpp', - 'exported/WebFederatedCredential.cpp', - 'exported/WebFileSystemCallbacks.cpp', - 'exported/WebFont.cpp', - 'exported/WebFontDescription.cpp', - 'exported/WebHTTPBody.cpp', - 'exported/WebHTTPLoadInfo.cpp', - 'exported/WebImage.cpp', - 'exported/WebImageGenerator.cpp', - 'exported/WebMediaConstraints.cpp', - 'exported/WebMediaDeviceInfo.cpp', - 'exported/WebMediaPlayerClient.cpp', - 'exported/WebMediaPlayerEncryptedMediaClient.cpp', - 'exported/WebMediaPlayerSource.cpp', - 'exported/WebMediaRecorderHandler.cpp', - 'exported/WebMediaStream.cpp', - 'exported/WebMediaStreamSource.cpp', - 'exported/WebMediaStreamTrack.cpp', - 'exported/WebMediaStreamTrackSourcesRequest.cpp', - 'exported/WebMemoryCoordinator.cpp', - 'exported/WebMessagePortChannelClient.cpp', - 'exported/WebMixedContent.cpp', - 'exported/WebPasswordCredential.cpp', - 'exported/WebPrerender.cpp', - 'exported/WebPrerenderingSupport.cpp', - 'exported/WebPresentationAvailabilityObserver.cpp', - 'exported/WebPresentationController.cpp', - 'exported/WebRTCAnswerOptions.cpp', - 'exported/WebRTCConfiguration.cpp', - 'exported/WebRTCICECandidate.cpp', - 'exported/WebRTCOfferOptions.cpp', - 'exported/WebRTCSessionDescription.cpp', - 'exported/WebRTCSessionDescriptionRequest.cpp', - 'exported/WebRTCStatsRequest.cpp', - 'exported/WebRTCStatsResponse.cpp', - 'exported/WebRTCVoidRequest.cpp', - 'exported/WebScrollbarImpl.cpp', - 'exported/WebScrollbarImpl.h', - 'exported/WebScrollbarThemeClientImpl.cpp', - 'exported/WebScrollbarThemeClientImpl.h', - 'exported/WebScrollbarThemeGeometryNative.cpp', - 'exported/WebScrollbarThemeGeometryNative.h', - 'exported/WebScrollbarThemePainter.cpp', - 'exported/WebSecurityOrigin.cpp', - 'exported/WebServiceWorkerProviderClient.cpp', - 'exported/WebServiceWorkerProxy.cpp', - 'exported/WebServiceWorkerRequest.cpp', - 'exported/WebServiceWorkerResponse.cpp', - 'exported/WebSourceInfo.cpp', - 'exported/WebSpeechSynthesisUtterance.cpp', - 'exported/WebSpeechSynthesisVoice.cpp', - 'exported/WebSpeechSynthesizerClientImpl.cpp', - 'exported/WebSpeechSynthesizerClientImpl.h', - 'exported/WebStorageQuotaCallbacks.cpp', - 'exported/WebTextRun.cpp', - 'exported/WebThreadSafeData.cpp', - 'exported/WebURL.cpp', - 'exported/WebURLError.cpp', - 'exported/WebURLLoaderClient.cpp', - 'exported/WebURLLoaderTestDelegate.cpp', - 'exported/WebURLLoadTiming.cpp', - 'exported/WebURLRequest.cpp', - 'exported/WebURLResponse.cpp', - 'exported/WrappedResourceRequest.h', - 'exported/WrappedResourceResponse.h', - 'fonts/AcceptLanguagesResolver.cpp', - 'fonts/AcceptLanguagesResolver.h', - 'fonts/AlternateFontFamily.h', - 'fonts/CharacterRange.h', - 'fonts/CustomFontData.h', - 'fonts/Font.cpp', - 'fonts/Font.h', - 'fonts/FontBaseline.h', - 'fonts/FontCache.cpp', - 'fonts/FontCache.h', - 'fonts/FontCacheClient.h', - 'fonts/FontCacheKey.h', - 'fonts/FontCacheMemoryDumpProvider.h', - 'fonts/FontCacheMemoryDumpProvider.cpp', - 'fonts/FontCustomPlatformData.h', - 'fonts/FontCustomPlatformData.cpp', - 'fonts/FontData.cpp', - 'fonts/FontData.h', - 'fonts/FontDataCache.cpp', - 'fonts/FontDataCache.h', - 'fonts/FontDataForRangeSet.h', - 'fonts/FontDataForRangeSet.cpp', - 'fonts/FontDescription.cpp', - 'fonts/FontFaceCreationParams.h', - 'fonts/FontFallbackIterator.cpp', - 'fonts/FontFallbackIterator.h', - 'fonts/FontFallbackList.cpp', - 'fonts/FontFallbackList.h', - 'fonts/FontFallbackPriority.h', - 'fonts/FontFallbackPriority.cpp', - 'fonts/FontFamily.cpp', - 'fonts/FontFamily.h', - 'fonts/FontFeatureSettings.cpp', - 'fonts/FontFeatureSettings.h', - 'fonts/FontPlatformData.cpp', - 'fonts/FontPlatformData.h', - 'fonts/FontVariantNumeric.h', - 'fonts/GenericFontFamilySettings.cpp', - 'fonts/GenericFontFamilySettings.h', - 'fonts/GlyphBuffer.h', - 'fonts/GlyphMetricsMap.h', - 'fonts/GlyphPage.h', - 'fonts/GlyphPageTreeNode.cpp', - 'fonts/GlyphPageTreeNode.h', - 'fonts/Latin1TextIterator.h', - 'fonts/OrientationIterator.h', - 'fonts/OrientationIterator.cpp', - 'fonts/ScriptRunIterator.h', - 'fonts/ScriptRunIterator.cpp', - 'fonts/SegmentedFontData.cpp', - 'fonts/SegmentedFontData.h', - 'fonts/SimpleFontData.cpp', - 'fonts/SimpleFontData.h', - 'fonts/SmallCapsIterator.cpp', - 'fonts/SmallCapsIterator.h', - 'fonts/SymbolsIterator.cpp', - 'fonts/SymbolsIterator.h', - 'fonts/TextBlob.h', - 'fonts/UnicodeRangeSet.cpp', - 'fonts/UnicodeRangeSet.h', - 'fonts/UTF16TextIterator.cpp', - 'fonts/UTF16TextIterator.h', - 'fonts/VDMXParser.cpp', - 'fonts/VDMXParser.h', - 'fonts/WebFontDecoder.h', - 'fonts/WebFontDecoder.cpp', - 'fonts/android/FontCacheAndroid.cpp', - 'fonts/linux/FontCacheLinux.cpp', - 'fonts/linux/FontPlatformDataLinux.cpp', - 'fonts/linux/FontRenderStyle.cpp', - 'fonts/linux/FontRenderStyle.h', - 'fonts/mac/FontFamilyMatcherMac.h', - 'fonts/mac/FontFamilyMatcherMac.mm', - 'fonts/mac/FontCacheMac.mm', - 'fonts/mac/FontPlatformDataMac.mm', - 'fonts/opentype/OpenTypeCapsSupport.h', - 'fonts/opentype/OpenTypeCapsSupport.cpp', - 'fonts/opentype/OpenTypeCapsSupportMPL.cpp', - 'fonts/opentype/OpenTypeTypes.h', - 'fonts/opentype/OpenTypeVerticalData.cpp', - 'fonts/opentype/OpenTypeVerticalData.h', - 'fonts/shaping/CachingWordShapeIterator.h', - 'fonts/shaping/CachingWordShaper.cpp', - 'fonts/shaping/CachingWordShaper.h', - 'fonts/shaping/CaseMappingHarfBuzzBufferFiller.cpp', - 'fonts/shaping/CaseMappingHarfBuzzBufferFiller.h', - 'fonts/shaping/HarfBuzzFace.cpp', - 'fonts/shaping/HarfBuzzFace.h', - 'fonts/shaping/HarfBuzzShaper.cpp', - 'fonts/shaping/HarfBuzzShaper.h', - 'fonts/shaping/RunSegmenter.h', - 'fonts/shaping/RunSegmenter.cpp', - 'fonts/shaping/ShapeCache.h', - 'fonts/shaping/ShapeResult.cpp', - 'fonts/shaping/ShapeResult.h', - 'fonts/shaping/ShapeResultBuffer.cpp', - 'fonts/shaping/ShapeResultBuffer.h', - 'fonts/shaping/ShapeResultInlineHeaders.h', - 'fonts/shaping/ShapeResultSpacing.cpp', - 'fonts/shaping/ShapeResultSpacing.h', - 'fonts/shaping/ShapeResultTestInfo.cpp', - 'fonts/shaping/ShapeResultTestInfo.h', - 'fonts/shaping/Shaper.cpp', - 'fonts/shaping/Shaper.h', - 'fonts/shaping/SimpleShaper.cpp', - 'fonts/shaping/SimpleShaper.h', - 'fonts/skia/FontCacheSkia.cpp', - 'fonts/skia/SkiaTextMetrics.h', - 'fonts/skia/SkiaTextMetrics.cpp', - 'fonts/win/FontCacheSkiaWin.cpp', - 'fonts/win/FontFallbackWin.cpp', - 'fonts/win/FontFallbackWin.h', - 'fonts/win/FontPlatformDataWin.cpp', - 'geometry/DoublePoint.cpp', - 'geometry/DoublePoint.h', - 'geometry/DoubleRect.cpp', - 'geometry/DoubleRect.h', - 'geometry/DoubleSize.cpp', - 'geometry/DoubleSize.h', - 'geometry/FloatBox.cpp', - 'geometry/FloatBox.h', - 'geometry/FloatRectOutsets.h', - 'geometry/FloatPoint.cpp', - 'geometry/FloatPoint.h', - 'geometry/FloatPoint3D.cpp', - 'geometry/FloatPoint3D.h', - 'geometry/FloatPolygon.cpp', - 'geometry/FloatPolygon.h', - 'geometry/FloatQuad.cpp', - 'geometry/FloatQuad.h', - 'geometry/FloatRect.cpp', - 'geometry/FloatRect.h', - 'geometry/FloatRoundedRect.cpp', - 'geometry/FloatRoundedRect.h', - 'geometry/FloatSize.cpp', - 'geometry/FloatSize.h', - 'geometry/IntRectOutsets.h', - 'geometry/IntPoint.h', - 'geometry/IntPoint.cpp', - 'geometry/IntRect.cpp', - 'geometry/IntRect.h', - 'geometry/IntSize.h', - 'geometry/IntSize.cpp', - 'geometry/IntSizeHash.h', - 'geometry/LayoutRectOutsets.cpp', - 'geometry/LayoutRectOutsets.h', - 'geometry/LayoutPoint.h', - 'geometry/LayoutPoint.cpp', - 'geometry/LayoutRect.cpp', - 'geometry/LayoutRect.h', - 'geometry/LayoutSize.h', - 'geometry/LayoutSize.cpp', - 'geometry/Region.cpp', - 'geometry/Region.h', - 'geometry/TransformState.cpp', - 'geometry/TransformState.h', - 'geometry/cg/FloatPointCG.cpp', - 'geometry/cg/FloatRectCG.cpp', - 'geometry/cg/FloatSizeCG.cpp', - 'geometry/cg/IntPointCG.cpp', - 'geometry/cg/IntRectCG.cpp', - 'geometry/cg/IntSizeCG.cpp', - 'geometry/mac/FloatPointMac.mm', - 'geometry/mac/FloatRectMac.mm', - 'geometry/mac/FloatSizeMac.mm', - 'geometry/mac/IntPointMac.mm', - 'geometry/mac/IntRectMac.mm', - 'geometry/mac/IntSizeMac.mm', - 'graphics/AcceleratedStaticBitmapImage.cpp', - 'graphics/AcceleratedStaticBitmapImage.h', - 'graphics/BitmapImage.cpp', - 'graphics/BitmapImage.h', - 'graphics/BitmapImageMetrics.cpp', - 'graphics/BitmapImageMetrics.h', - 'graphics/BoxReflection.cpp', - 'graphics/BoxReflection.h', - 'graphics/Canvas2DImageBufferSurface.h', - 'graphics/Canvas2DLayerBridge.cpp', - 'graphics/Canvas2DLayerBridge.h', - 'graphics/CanvasMetrics.cpp', - 'graphics/CanvasMetrics.h', - 'graphics/CanvasSurfaceLayerBridge.cpp', - 'graphics/CanvasSurfaceLayerBridge.h', - 'graphics/CanvasSurfaceLayerBridgeClient.h', - 'graphics/CanvasSurfaceLayerBridgeClientImpl.cpp', - 'graphics/CanvasSurfaceLayerBridgeClientImpl.h', - 'graphics/Color.cpp', - 'graphics/Color.h', - 'graphics/ColorSpace.cpp', - 'graphics/ColorSpace.h', - 'graphics/ColorSpaceProfileData.cpp', - 'graphics/ColorSpaceProfileData.h', - 'graphics/CompositingReasons.cpp', - 'graphics/CompositingReasons.h', - 'graphics/CompositorElementId.cpp', - 'graphics/CompositorElementId.h', - 'graphics/CompositorFilterOperations.cpp', - 'graphics/CompositorFilterOperations.h', - 'graphics/CompositorMutableState.cpp', - 'graphics/CompositorMutableState.h', - 'graphics/CompositorMutableStateProvider.cpp', - 'graphics/CompositorMutableStateProvider.h', - 'graphics/CompositorMutator.h', - 'graphics/ContentLayerDelegate.cpp', - 'graphics/ContentLayerDelegate.h', - 'graphics/ContiguousContainer.cpp', - 'graphics/ContiguousContainer.h', - 'graphics/CrossfadeGeneratedImage.cpp', - 'graphics/CrossfadeGeneratedImage.h', - 'graphics/DecodingImageGenerator.cpp', - 'graphics/DecodingImageGenerator.h', - 'graphics/DeferredImageDecoder.cpp', - 'graphics/DeferredImageDecoder.h', - 'graphics/ExpensiveCanvasHeuristicParameters.h', - 'graphics/PaintGeneratedImage.cpp', - 'graphics/PaintGeneratedImage.h', - 'graphics/PicturePattern.cpp', - 'graphics/PicturePattern.h', - 'graphics/PictureSnapshot.h', - 'graphics/PictureSnapshot.cpp', - 'graphics/DrawLooperBuilder.cpp', - 'graphics/DrawLooperBuilder.h', - 'graphics/FirstPaintInvalidationTracking.cpp', - 'graphics/FirstPaintInvalidationTracking.h', - 'graphics/FrameData.cpp', - 'graphics/FrameData.h', - 'graphics/GeneratedImage.cpp', - 'graphics/GeneratedImage.h', - 'graphics/Gradient.cpp', - 'graphics/Gradient.h', - 'graphics/GradientGeneratedImage.cpp', - 'graphics/GradientGeneratedImage.h', - 'graphics/GraphicsContext.cpp', - 'graphics/GraphicsContext.h', - 'graphics/GraphicsContextState.cpp', - 'graphics/GraphicsContextState.h', - 'graphics/GraphicsContextStateSaver.h', - 'graphics/GraphicsLayer.cpp', - 'graphics/GraphicsLayer.h', - 'graphics/GraphicsLayerClient.h', - 'graphics/GraphicsLayerDebugInfo.cpp', - 'graphics/GraphicsLayerDebugInfo.h', - 'graphics/GraphicsTypes.cpp', - 'graphics/GraphicsTypes.h', - 'graphics/GraphicsTypes3D.h', - 'graphics/Image.cpp', - 'graphics/Image.h', - 'graphics/ImageAnimationPolicy.h', - 'graphics/ImageBuffer.cpp', - 'graphics/ImageBuffer.h', - 'graphics/ImageBufferClient.h', - 'graphics/ImageBufferSurface.cpp', - 'graphics/ImageBufferSurface.h', - 'graphics/ImageDecodingStore.cpp', - 'graphics/ImageDecodingStore.h', - 'graphics/ImageFrameGenerator.cpp', - 'graphics/ImageFrameGenerator.h', - 'graphics/ImageObserver.cpp', - 'graphics/ImageObserver.h', - 'graphics/ImageOrientation.cpp', - 'graphics/ImageOrientation.h', - 'graphics/ImagePattern.cpp', - 'graphics/ImagePattern.h', - 'graphics/ImageSource.cpp', - 'graphics/ImageSource.h', - 'graphics/InterceptingCanvas.cpp', - 'graphics/InterceptingCanvas.h', - 'graphics/LinkHighlight.h', - 'graphics/LoggingCanvas.cpp', - 'graphics/LoggingCanvas.h', - 'graphics/CompositorMutationsTarget.h', - 'graphics/CompositorMutatorClient.cpp', - 'graphics/CompositorMutatorClient.h', - 'graphics/PaintInvalidationReason.cpp', - 'graphics/PaintInvalidationReason.h', - 'graphics/Path.cpp', - 'graphics/Path.h', - 'graphics/PathTraversalState.cpp', - 'graphics/PathTraversalState.h', - 'graphics/Pattern.cpp', - 'graphics/Pattern.h', - 'graphics/ProfilingCanvas.cpp', - 'graphics/ProfilingCanvas.h', - 'graphics/RecordingImageBufferSurface.cpp', - 'graphics/RecordingImageBufferSurface.h', - 'graphics/ReplayingCanvas.cpp', - 'graphics/ReplayingCanvas.h', - 'graphics/SquashingDisallowedReasons.cpp', - 'graphics/SquashingDisallowedReasons.h', - 'graphics/StaticBitmapImage.cpp', - 'graphics/StaticBitmapImage.h', - 'graphics/StrokeData.cpp', - 'graphics/StrokeData.h', - 'graphics/UnacceleratedImageBufferSurface.cpp', - 'graphics/UnacceleratedImageBufferSurface.h', - 'graphics/compositing/PaintArtifactCompositor.cpp', - 'graphics/compositing/PaintArtifactCompositor.h', - 'graphics/cpu/arm/WebGLImageConversionNEON.h', - 'graphics/cpu/x86/WebGLImageConversionSSE.h', - 'graphics/filters/DistantLightSource.cpp', - 'graphics/filters/DistantLightSource.h', - 'graphics/filters/FEBlend.cpp', - 'graphics/filters/FEBlend.h', - 'graphics/filters/FEBoxReflect.cpp', - 'graphics/filters/FEBoxReflect.h', - 'graphics/filters/FEColorMatrix.cpp', - 'graphics/filters/FEColorMatrix.h', - 'graphics/filters/FEComponentTransfer.cpp', - 'graphics/filters/FEComponentTransfer.h', - 'graphics/filters/FEComposite.cpp', - 'graphics/filters/FEComposite.h', - 'graphics/filters/FEConvolveMatrix.cpp', - 'graphics/filters/FEConvolveMatrix.h', - 'graphics/filters/FEDiffuseLighting.cpp', - 'graphics/filters/FEDiffuseLighting.h', - 'graphics/filters/FEDisplacementMap.cpp', - 'graphics/filters/FEDisplacementMap.h', - 'graphics/filters/FEDropShadow.cpp', - 'graphics/filters/FEDropShadow.h', - 'graphics/filters/FEFlood.cpp', - 'graphics/filters/FEFlood.h', - 'graphics/filters/FEGaussianBlur.cpp', - 'graphics/filters/FEGaussianBlur.h', - 'graphics/filters/FELighting.cpp', - 'graphics/filters/FELighting.h', - 'graphics/filters/FEMerge.cpp', - 'graphics/filters/FEMerge.h', - 'graphics/filters/FEMorphology.cpp', - 'graphics/filters/FEMorphology.h', - 'graphics/filters/FEOffset.cpp', - 'graphics/filters/FEOffset.h', - 'graphics/filters/FESpecularLighting.cpp', - 'graphics/filters/FESpecularLighting.h', - 'graphics/filters/FETile.cpp', - 'graphics/filters/FETile.h', - 'graphics/filters/FETurbulence.cpp', - 'graphics/filters/FETurbulence.h', - 'graphics/filters/Filter.cpp', - 'graphics/filters/Filter.h', - 'graphics/filters/FilterEffect.cpp', - 'graphics/filters/FilterEffect.h', - 'graphics/filters/FilterOperation.cpp', - 'graphics/filters/FilterOperation.h', - 'graphics/filters/FilterOperations.cpp', - 'graphics/filters/FilterOperations.h', - 'graphics/filters/LightSource.cpp', - 'graphics/filters/LightSource.h', - 'graphics/filters/PaintFilterEffect.cpp', - 'graphics/filters/PaintFilterEffect.h', - 'graphics/filters/PointLightSource.cpp', - 'graphics/filters/PointLightSource.h', - 'graphics/filters/SkiaImageFilterBuilder.cpp', - 'graphics/filters/SkiaImageFilterBuilder.h', - 'graphics/filters/SourceAlpha.cpp', - 'graphics/filters/SourceAlpha.h', - 'graphics/filters/SourceGraphic.cpp', - 'graphics/filters/SourceGraphic.h', - 'graphics/filters/SpotLightSource.cpp', - 'graphics/filters/SpotLightSource.h', - 'graphics/gpu/AcceleratedImageBufferSurface.cpp', - 'graphics/gpu/AcceleratedImageBufferSurface.h', - 'graphics/gpu/SharedContextRateLimiter.cpp', - 'graphics/gpu/SharedContextRateLimiter.h', - 'graphics/gpu/DrawingBuffer.cpp', - 'graphics/gpu/DrawingBuffer.h', - 'graphics/gpu/Extensions3DUtil.cpp', - 'graphics/gpu/Extensions3DUtil.h', - 'graphics/gpu/WebGLImageConversion.cpp', - 'graphics/gpu/WebGLImageConversion.h', - 'graphics/paint/ClipDisplayItem.cpp', - 'graphics/paint/ClipDisplayItem.h', - 'graphics/paint/ClipPaintPropertyNode.h', - 'graphics/paint/ClipPathDisplayItem.cpp', - 'graphics/paint/ClipPathDisplayItem.h', - 'graphics/paint/ClipPathRecorder.cpp', - 'graphics/paint/ClipPathRecorder.h', - 'graphics/paint/ClipRecorder.cpp', - 'graphics/paint/ClipRecorder.h', - 'graphics/paint/CompositingRecorder.cpp', - 'graphics/paint/CompositingRecorder.h', - 'graphics/paint/CullRect.cpp', - 'graphics/paint/CullRect.h', - 'graphics/paint/DisplayItem.cpp', - 'graphics/paint/DisplayItem.h', - 'graphics/paint/DisplayItemCacheSkipper.h', - 'graphics/paint/DisplayItemClient.cpp', - 'graphics/paint/DisplayItemClient.h', - 'graphics/paint/DisplayItemList.cpp', - 'graphics/paint/DisplayItemList.h', - 'graphics/paint/DrawingDisplayItem.cpp', - 'graphics/paint/DrawingDisplayItem.h', - 'graphics/paint/DrawingRecorder.cpp', - 'graphics/paint/DrawingRecorder.h', - 'graphics/paint/EffectPaintPropertyNode.h', - 'graphics/paint/FilterDisplayItem.cpp', - 'graphics/paint/FilterDisplayItem.h', - 'graphics/paint/FloatClipDisplayItem.cpp', - 'graphics/paint/FloatClipDisplayItem.h', - 'graphics/paint/ForeignLayerDisplayItem.cpp', - 'graphics/paint/ForeignLayerDisplayItem.h', - 'graphics/paint/GeometryMapper.cpp', - 'graphics/paint/GeometryMapper.h', - 'graphics/paint/PaintArtifact.cpp', - 'graphics/paint/PaintArtifact.h', - 'graphics/paint/PaintArtifactToSkCanvas.cpp', - 'graphics/paint/PaintArtifactToSkCanvas.h', - 'graphics/paint/PaintChunkProperties.h', - 'graphics/paint/PaintChunk.h', - 'graphics/paint/PaintChunker.cpp', - 'graphics/paint/PaintChunker.h', - 'graphics/paint/PaintController.cpp', - 'graphics/paint/PaintController.h', - 'graphics/paint/PropertyTreeState.h', - 'graphics/paint/ScopedPaintChunkProperties.h', - 'graphics/paint/ScrollDisplayItem.cpp', - 'graphics/paint/ScrollDisplayItem.h', - 'graphics/paint/SkPictureBuilder.h', - 'graphics/paint/SkPictureBuilder.cpp', - 'graphics/paint/SubsequenceDisplayItem.h', - 'graphics/paint/SubsequenceRecorder.cpp', - 'graphics/paint/SubsequenceRecorder.h', - 'graphics/paint/Transform3DDisplayItem.cpp', - 'graphics/paint/Transform3DDisplayItem.h', - 'graphics/paint/TransformDisplayItem.cpp', - 'graphics/paint/TransformDisplayItem.h', - 'graphics/paint/TransformPaintPropertyNode.h', - 'graphics/paint/CompositingDisplayItem.cpp', - 'graphics/paint/CompositingDisplayItem.h', - 'graphics/skia/ImagePixelLocker.cpp', - 'graphics/skia/ImagePixelLocker.h', - 'graphics/skia/SkSizeHash.h', - 'graphics/skia/SkiaUtils.cpp', - 'graphics/skia/SkiaUtils.h', - 'image-decoders/FastSharedBufferReader.cpp', - 'image-decoders/FastSharedBufferReader.h', - 'image-decoders/ImageAnimation.h', - 'image-decoders/ImageDecoder.cpp', - 'image-decoders/ImageDecoder.h', - 'image-decoders/ImageFrame.cpp', - 'image-decoders/ImageFrame.h', - 'image-decoders/SegmentReader.cpp', - 'image-decoders/SegmentReader.h', - 'image-decoders/bmp/BMPImageDecoder.cpp', - 'image-decoders/bmp/BMPImageDecoder.h', - 'image-decoders/bmp/BMPImageReader.cpp', - 'image-decoders/bmp/BMPImageReader.h', - 'image-decoders/gif/GIFImageDecoder.cpp', - 'image-decoders/gif/GIFImageDecoder.h', - 'image-decoders/gif/GIFImageReader.cpp', - 'image-decoders/gif/GIFImageReader.h', - 'image-decoders/ico/ICOImageDecoder.cpp', - 'image-decoders/ico/ICOImageDecoder.h', - 'image-decoders/jpeg/JPEGImageDecoder.cpp', - 'image-decoders/jpeg/JPEGImageDecoder.h', - 'image-decoders/png/PNGImageDecoder.cpp', - 'image-decoders/png/PNGImageDecoder.h', - 'image-decoders/webp/WEBPImageDecoder.cpp', - 'image-decoders/webp/WEBPImageDecoder.h', - 'image-encoders/JPEGImageEncoder.cpp', - 'image-encoders/JPEGImageEncoder.h', - 'image-encoders/PNGImageEncoder.cpp', - 'image-encoders/PNGImageEncoder.h', - 'image-encoders/WEBPImageEncoder.cpp', - 'image-encoders/WEBPImageEncoder.h', - 'json/JSONParser.cpp', - 'json/JSONParser.h', - 'json/JSONValues.cpp', - 'json/JSONValues.h', - 'mac/BlockExceptions.h', - 'mac/BlockExceptions.mm', - 'mac/ColorMac.h', - 'mac/ColorMac.mm', - 'mac/KillRingMac.mm', - 'mac/LocalCurrentGraphicsContext.h', - 'mac/LocalCurrentGraphicsContext.mm', - 'mac/NSScrollerImpDetails.h', - 'mac/ScrollAnimatorMac.h', - 'mac/ScrollAnimatorMac.mm', - 'mac/ThemeMac.h', - 'mac/ThemeMac.mm', - 'mac/VersionUtilMac.h', - 'mac/VersionUtilMac.mm', - 'mac/WebCoreNSCellExtras.h', - 'mac/WebCoreNSCellExtras.mm', - 'mediastream/MediaStreamCenter.cpp', - 'mediastream/MediaStreamCenter.h', - 'mediastream/MediaStreamComponent.cpp', - 'mediastream/MediaStreamComponent.h', - 'mediastream/MediaStreamDescriptor.cpp', - 'mediastream/MediaStreamDescriptor.h', - 'mediastream/MediaStreamSource.cpp', - 'mediastream/MediaStreamSource.h', - 'mediastream/MediaStreamTrackSourcesRequest.h', - 'mediastream/MediaStreamWebAudioSource.cpp', - 'mediastream/MediaStreamWebAudioSource.h', - 'mhtml/ArchiveResource.cpp', - 'mhtml/MHTMLArchive.cpp', - 'mhtml/MHTMLArchive.h', - 'mhtml/MHTMLParser.cpp', - 'mhtml/MHTMLParser.h', - 'mojo/MojoHelper.h', - 'network/ContentSecurityPolicyParsers.cpp', - 'network/ContentSecurityPolicyParsers.h', - 'network/ContentSecurityPolicyResponseHeaders.cpp', - 'network/ContentSecurityPolicyResponseHeaders.h', - 'network/EncodedFormData.cpp', - 'network/EncodedFormData.h', - 'network/FormDataEncoder.cpp', - 'network/FormDataEncoder.h', - 'network/HTTPHeaderMap.cpp', - 'network/HTTPHeaderMap.h', - 'network/HTTPParsers.cpp', - 'network/HTTPParsers.h', - 'network/LinkHeader.cpp', - 'network/LinkHeader.h', - 'network/NetworkHints.cpp', - 'network/NetworkHints.h', - 'network/NetworkLog.h', - 'network/NetworkUtils.cpp', - 'network/NetworkUtils.h', - 'network/ParsedContentType.cpp', - 'network/ParsedContentType.h', - 'network/ResourceError.cpp', - 'network/ResourceError.h', - 'network/ResourceLoadTiming.cpp', - 'network/ResourceLoadTiming.h', - 'network/ResourceRequest.cpp', - 'network/ResourceRequest.h', - 'network/ResourceResponse.cpp', - 'network/ResourceResponse.h', - 'network/ResourceTimingInfo.cpp', - 'network/ResourceTimingInfo.h', - 'network/WebSocketHandshakeRequest.cpp', - 'network/WebSocketHandshakeRequest.h', - 'network/WebSocketHandshakeResponse.cpp', - 'network/WebSocketHandshakeResponse.h', - 'peerconnection/RTCAnswerOptionsPlatform.h', - 'peerconnection/RTCConfiguration.h', - 'peerconnection/RTCOfferOptionsPlatform.h', - 'peerconnection/RTCSessionDescriptionRequest.h', - 'peerconnection/RTCStatsRequest.h', - 'peerconnection/RTCStatsResponseBase.h', - 'peerconnection/RTCVoidRequest.h', - 'plugins/PluginData.cpp', - 'plugins/PluginData.h', - 'plugins/PluginListBuilder.cpp', - 'plugins/PluginListBuilder.h', - 'scheduler/CancellableTaskFactory.cpp', - 'scheduler/CancellableTaskFactory.h', - 'scheduler/base/cancelable_closure_holder.cc', - 'scheduler/base/cancelable_closure_holder.h', - 'scheduler/base/enqueue_order.cc', - 'scheduler/base/enqueue_order.h', - 'scheduler/base/lazy_now.cc', - 'scheduler/base/lazy_now.h', - 'scheduler/base/pollable_thread_safe_flag.cc', - 'scheduler/base/pollable_thread_safe_flag.h', - 'scheduler/base/queueing_time_estimator.cc', - 'scheduler/base/queueing_time_estimator.h', - 'scheduler/base/real_time_domain.cc', - 'scheduler/base/real_time_domain.h', - 'scheduler/base/task_queue_impl.cc', - 'scheduler/base/task_queue_impl.h', - 'scheduler/base/task_queue_manager.cc', - 'scheduler/base/task_queue_manager.h', - 'scheduler/base/task_queue_manager_delegate.h', - 'scheduler/base/task_queue_selector.cc', - 'scheduler/base/task_queue_selector.h', - 'scheduler/base/thread_load_tracker.cc', - 'scheduler/base/thread_load_tracker.h', - 'scheduler/base/time_domain.cc', - 'scheduler/base/time_domain.h', - 'scheduler/base/virtual_time_domain.cc', - 'scheduler/base/virtual_time_domain.h', - 'scheduler/base/work_queue.cc', - 'scheduler/base/work_queue.h', - 'scheduler/base/work_queue_sets.cc', - 'scheduler/base/work_queue_sets.h', - 'scheduler/child/compositor_worker_scheduler.cc', - 'scheduler/child/idle_helper.cc', - 'scheduler/child/idle_helper.h', - 'scheduler/child/scheduler_helper.cc', - 'scheduler/child/scheduler_helper.h', - 'scheduler/child/scheduler_tqm_delegate.h', - 'scheduler/child/scheduler_tqm_delegate_impl.cc', - 'scheduler/child/scheduler_tqm_delegate_impl.h', - 'scheduler/child/single_thread_idle_task_runner.cc', - 'scheduler/child/web_scheduler_impl.cc', - 'scheduler/child/web_scheduler_impl.h', - 'scheduler/child/web_task_runner_impl.cc', - 'scheduler/child/web_task_runner_impl.h', - 'scheduler/child/webthread_base.cc', - 'scheduler/child/webthread_impl_for_worker_scheduler.cc', - 'scheduler/child/worker_scheduler.cc', - 'scheduler/child/worker_scheduler_impl.cc', - 'scheduler/child/worker_scheduler_impl.h', - 'scheduler/renderer/auto_advancing_virtual_time_domain.cc', - 'scheduler/renderer/auto_advancing_virtual_time_domain.h', - 'scheduler/renderer/deadline_task_runner.cc', - 'scheduler/renderer/deadline_task_runner.h', - 'scheduler/renderer/idle_time_estimator.cc', - 'scheduler/renderer/idle_time_estimator.h', - 'scheduler/renderer/render_widget_scheduling_state.cc', - 'scheduler/renderer/render_widget_signals.cc', - 'scheduler/renderer/render_widget_signals.h', - 'scheduler/renderer/renderer_scheduler.cc', - 'scheduler/renderer/renderer_scheduler_impl.cc', - 'scheduler/renderer/renderer_scheduler_impl.h', - 'scheduler/renderer/renderer_web_scheduler_impl.cc', - 'scheduler/renderer/renderer_web_scheduler_impl.h', - 'scheduler/renderer/task_cost_estimator.cc', - 'scheduler/renderer/task_cost_estimator.h', - 'scheduler/renderer/throttled_time_domain.cc', - 'scheduler/renderer/throttled_time_domain.h', - 'scheduler/renderer/throttling_helper.cc', - 'scheduler/renderer/throttling_helper.h', - 'scheduler/renderer/user_model.cc', - 'scheduler/renderer/user_model.h', - 'scheduler/renderer/web_frame_scheduler_impl.cc', - 'scheduler/renderer/web_frame_scheduler_impl.h', - 'scheduler/renderer/web_view_scheduler_impl.cc', - 'scheduler/renderer/web_view_scheduler_impl.h', - 'scheduler/renderer/webthread_impl_for_renderer_scheduler.cc', - 'scheduler/renderer/webthread_impl_for_renderer_scheduler.h', - 'scheduler/utility/webthread_impl_for_utility_thread.cc', - 'scroll/MainThreadScrollingReason.h', - 'scroll/ProgrammaticScrollAnimator.cpp', - 'scroll/ProgrammaticScrollAnimator.h', - 'scroll/ScrollAnimatorBase.cpp', - 'scroll/ScrollAnimatorBase.h', - 'scroll/ScrollAnimatorCompositorCoordinator.cpp', - 'scroll/ScrollAnimatorCompositorCoordinator.h', - 'scroll/ScrollAnimator.cpp', - 'scroll/ScrollAnimator.h', - 'scroll/ScrollTypes.h', - 'scroll/ScrollableArea.cpp', - 'scroll/ScrollableArea.h', - 'scroll/Scrollbar.cpp', - 'scroll/Scrollbar.h', - 'scroll/ScrollbarTheme.cpp', - 'scroll/ScrollbarTheme.h', - 'scroll/ScrollbarThemeAndroid.cpp', - 'scroll/ScrollbarThemeAura.cpp', - 'scroll/ScrollbarThemeAura.h', - 'scroll/ScrollbarThemeClient.h', - 'scroll/ScrollbarThemeMac.h', - 'scroll/ScrollbarThemeMac.mm', - 'scroll/ScrollbarThemeMock.cpp', - 'scroll/ScrollbarThemeMock.h', - 'scroll/ScrollbarThemeOverlay.cpp', - 'scroll/ScrollbarThemeOverlay.h', - 'scroll/ScrollbarThemeOverlayMock.h', - 'scroll/ScrollStateData.h', - 'speech/PlatformSpeechSynthesisUtterance.cpp', - 'speech/PlatformSpeechSynthesisUtterance.h', - 'speech/PlatformSpeechSynthesisVoice.cpp', - 'speech/PlatformSpeechSynthesisVoice.h', - 'speech/PlatformSpeechSynthesizer.cpp', - 'speech/PlatformSpeechSynthesizer.h', - 'text/BidiCharacterRun.cpp', - 'text/BidiCharacterRun.h', - 'text/BidiContext.cpp', - 'text/BidiContext.h', - 'text/BidiResolver.h', - 'text/BidiRunList.h', - 'text/BidiTextRun.cpp', - 'text/BidiTextRun.h', - 'text/Character.cpp', - 'text/Character.h', - 'text/CharacterEmoji.cpp', - 'text/DateTimeFormat.cpp', - 'text/DateTimeFormat.h', - 'text/DecodeEscapeSequences.h', - 'text/Hyphenation.cpp', - 'text/Hyphenation.h', - 'text/LineEnding.cpp', - 'text/LineEnding.h', - 'text/LocaleICU.cpp', - 'text/LocaleICU.h', - 'text/LocaleMac.h', - 'text/LocaleMac.mm', - 'text/LocaleToScriptMapping.cpp', - 'text/LocaleToScriptMapping.h', - 'text/LocaleWin.cpp', - 'text/LocaleWin.h', - 'text/PlatformLocale.cpp', - 'text/PlatformLocale.h', - 'text/QuotedPrintable.cpp', - 'text/QuotedPrintable.h', - 'text/SegmentedString.cpp', - 'text/SegmentedString.h', - 'text/StringTruncator.cpp', - 'text/StringTruncator.h', - 'text/SuffixTree.h', - 'text/TextBoundaries.cpp', - 'text/TextBoundaries.h', - 'text/TextBreakIterator.cpp', - 'text/TextBreakIterator.h', - 'text/TextBreakIteratorICU.cpp', - 'text/TextBreakIteratorInternalICU.cpp', - 'text/TextBreakIteratorInternalICU.h', - 'text/TextCheckerClient.cpp', - 'text/TextCheckerClient.h', - 'text/TextChecking.h', - 'text/TextDecoration.h', - 'text/TextEncodingDetector.cpp', - 'text/TextEncodingDetector.h', - 'text/TextPath.h', - 'text/TextRun.cpp', - 'text/TextRun.h', - 'text/TextRunIterator.h', - 'text/TextStream.cpp', - 'text/TextStream.h', - 'text/UnicodeBidi.h', - 'text/UnicodeRange.cpp', - 'text/UnicodeRange.h', - 'text/UnicodeUtilities.cpp', - 'text/UnicodeUtilities.h', - 'text/linux/HyphenationLinux.cpp', - 'text/mac/HyphenationMac.cpp', - 'text/win/HyphenationWin.cpp', - 'threading/BackgroundTaskRunner.cpp', - 'threading/BackgroundTaskRunner.h', - 'transforms/AffineTransform.cpp', - 'transforms/AffineTransform.h', - 'transforms/IdentityTransformOperation.h', - 'transforms/InterpolatedTransformOperation.cpp', - 'transforms/InterpolatedTransformOperation.h', - 'transforms/Matrix3DTransformOperation.cpp', - 'transforms/Matrix3DTransformOperation.h', - 'transforms/MatrixTransformOperation.cpp', - 'transforms/MatrixTransformOperation.h', - 'transforms/PerspectiveTransformOperation.cpp', - 'transforms/PerspectiveTransformOperation.h', - 'transforms/Rotation.cpp', - 'transforms/Rotation.h', - 'transforms/RotateTransformOperation.cpp', - 'transforms/RotateTransformOperation.h', - 'transforms/ScaleTransformOperation.cpp', - 'transforms/ScaleTransformOperation.h', - 'transforms/SkewTransformOperation.cpp', - 'transforms/SkewTransformOperation.h', - 'transforms/TransformOperations.cpp', - 'transforms/TransformationMatrix.cpp', - 'transforms/TransformationMatrix.h', - 'transforms/TranslateTransformOperation.cpp', - 'transforms/TranslateTransformOperation.h', - 'v8_inspector/Allocator.h', - 'v8_inspector/Atomics.h', - 'v8_inspector/InjectedScript.cpp', - 'v8_inspector/InjectedScript.h', - 'v8_inspector/InjectedScriptNative.cpp', - 'v8_inspector/InjectedScriptNative.h', - 'v8_inspector/InspectedContext.cpp', - 'v8_inspector/InspectedContext.h', - 'v8_inspector/JavaScriptCallFrame.cpp', - 'v8_inspector/JavaScriptCallFrame.h', - 'v8_inspector/ProtocolPlatform.h', - 'v8_inspector/RemoteObjectId.cpp', - 'v8_inspector/RemoteObjectId.h', - 'v8_inspector/ScriptBreakpoint.h', - 'v8_inspector/SearchUtil.cpp', - 'v8_inspector/SearchUtil.h', - 'v8_inspector/String16.cpp', - 'v8_inspector/String16.h', - 'v8_inspector/StringUtil.cpp', - 'v8_inspector/StringUtil.h', - 'v8_inspector/V8Compat.h', - 'v8_inspector/V8ConsoleAgentImpl.cpp', - 'v8_inspector/V8ConsoleAgentImpl.h', - 'v8_inspector/V8ConsoleMessage.cpp', - 'v8_inspector/V8ConsoleMessage.h', - 'v8_inspector/V8Debugger.cpp', - 'v8_inspector/V8Debugger.h', - 'v8_inspector/V8DebuggerAgentImpl.cpp', - 'v8_inspector/V8DebuggerAgentImpl.h', - 'v8_inspector/V8InspectorImpl.cpp', - 'v8_inspector/V8InspectorImpl.h', - 'v8_inspector/V8DebuggerScript.cpp', - 'v8_inspector/V8DebuggerScript.h', - 'v8_inspector/V8FunctionCall.cpp', - 'v8_inspector/V8FunctionCall.h', - 'v8_inspector/V8HeapProfilerAgentImpl.cpp', - 'v8_inspector/V8HeapProfilerAgentImpl.h', - 'v8_inspector/V8Console.cpp', - 'v8_inspector/V8Console.h', - 'v8_inspector/V8InjectedScriptHost.cpp', - 'v8_inspector/V8InjectedScriptHost.h', - 'v8_inspector/V8InspectorSessionImpl.cpp', - 'v8_inspector/V8InspectorSessionImpl.h', - 'v8_inspector/V8InternalValueType.cpp', - 'v8_inspector/V8InternalValueType.h', - 'v8_inspector/V8SchemaAgentImpl.cpp', - 'v8_inspector/V8SchemaAgentImpl.h', - 'v8_inspector/V8ProfilerAgentImpl.cpp', - 'v8_inspector/V8ProfilerAgentImpl.h', - 'v8_inspector/V8Regex.cpp', - 'v8_inspector/V8Regex.h', - 'v8_inspector/V8RuntimeAgentImpl.cpp', - 'v8_inspector/V8RuntimeAgentImpl.h', - 'v8_inspector/V8StackTraceImpl.cpp', - 'v8_inspector/V8StackTraceImpl.h', - 'v8_inspector/V8ValueCopier.cpp', - 'v8_inspector/V8ValueCopier.h', - 'v8_inspector/public/StringBuffer.h', - 'v8_inspector/public/StringView.h', - 'v8_inspector/public/V8ContextInfo.h', - 'v8_inspector/public/V8Inspector.h', - 'v8_inspector/public/V8InspectorClient.h', - 'v8_inspector/public/V8InspectorSession.h', - 'v8_inspector/public/V8StackTrace.h', - 'web_memory_allocator_dump.cc', - 'web_memory_allocator_dump.h', - 'web_process_memory_dump.cc', - 'web_process_memory_dump.h', - 'weborigin/KURL.cpp', - 'weborigin/KURL.h', - 'weborigin/KURLHash.h', - 'weborigin/KnownPorts.cpp', - 'weborigin/KnownPorts.h', - 'weborigin/OriginAccessEntry.cpp', - 'weborigin/OriginAccessEntry.h', - 'weborigin/Referrer.h', - 'weborigin/ReferrerPolicy.h', - 'weborigin/SchemeRegistry.cpp', - 'weborigin/SchemeRegistry.h', - 'weborigin/SecurityOrigin.cpp', - 'weborigin/SecurityOrigin.h', - 'weborigin/SecurityOriginCache.h', - 'weborigin/SecurityOriginHash.h', - 'weborigin/SecurityPolicy.cpp', - 'weborigin/SecurityPolicy.h', - 'weborigin/Suborigin.cpp', - 'weborigin/Suborigin.h', - ], - 'platform_test_files': [ - 'ScopedOrientationChangeIndicatorTest.cpp', - 'DecimalTest.cpp', - 'DragImageTest.cpp', - 'HistogramTest.cpp', - 'LayoutLocaleTest.cpp', - 'LayoutUnitTest.cpp', - 'LifecycleContextTest.cpp', - 'PODArenaTest.cpp', - 'PODFreeListArenaTest.cpp', - 'PODIntervalTreeTest.cpp', - 'PODRedBlackTreeTest.cpp', - 'SharedBufferTest.cpp', - 'TimerTest.cpp', - 'TracedValueTest.cpp', - 'UserGestureIndicatorTest.cpp', - 'UUIDTest.cpp', - 'WebIconSizesParserTest.cpp', - 'WebScreenInfoTest.cpp', - 'WebVectorTest.cpp', - 'animation/AnimationTranslationUtilTest.cpp', - 'animation/CompositorAnimationHostTest.cpp', - 'animation/CompositorAnimationPlayerTest.cpp', - 'animation/CompositorAnimationTest.cpp', - 'animation/CompositorAnimationTimelineTest.cpp', - 'animation/CompositorFloatAnimationCurveTest.cpp', - 'animation/TimingFunctionTest.cpp', - 'blob/BlobDataTest.cpp', - 'clipboard/ClipboardUtilitiesTest.cpp', - 'exported/FilePathConversionTest.cpp', - 'fonts/AcceptLanguagesResolverTest.cpp', - 'fonts/FontCacheTest.cpp', - 'fonts/FontDescriptionTest.cpp', - 'fonts/FontPlatformDataTest.cpp', - 'fonts/GlyphBufferTest.cpp', - 'fonts/GlyphPageTreeNodeTest.cpp', - 'fonts/OrientationIteratorTest.cpp', - 'fonts/ScriptRunIteratorTest.cpp', - 'fonts/SmallCapsIteratorTest.cpp', - 'fonts/SymbolsIteratorTest.cpp', - 'fonts/UnicodeRangeSetTest.cpp', - 'fonts/android/FontCacheAndroidTest.cpp', - 'fonts/mac/FontFamilyMatcherMacTest.mm', - 'fonts/opentype/OpenTypeVerticalDataTest.cpp', - 'fonts/shaping/CachingWordShaperTest.cpp', - 'fonts/shaping/HarfBuzzShaperTest.cpp', - 'fonts/shaping/RunSegmenterTest.cpp', - 'geometry/DoubleRectTest.cpp', - 'geometry/FloatBoxTest.cpp', - 'geometry/FloatBoxTestHelpers.cpp', - 'geometry/FloatPointTest.cpp', - 'geometry/FloatPolygonTest.cpp', - 'geometry/FloatQuadTest.cpp', - 'geometry/FloatRectTest.cpp', - 'geometry/FloatRoundedRectTest.cpp', - 'geometry/FloatSizeTest.cpp', - 'geometry/GeometryTestHelpers.cpp', - 'geometry/IntRectTest.cpp', - 'geometry/LayoutRectTest.cpp', - 'geometry/LayoutRectOutsetsTest.cpp', - 'geometry/RegionTest.cpp', - 'graphics/BitmapImageTest.cpp', - 'graphics/CompositorMutableStateTest.cpp', - 'graphics/CompositorMutatorClientTest.cpp', - 'graphics/ContiguousContainerTest.cpp', - 'graphics/DeferredImageDecoderTestWoPlatform.cpp', - 'graphics/GraphicsContextTest.cpp', - 'graphics/RecordingImageBufferSurfaceTest.cpp', - 'graphics/compositing/PaintArtifactCompositorTest.cpp', - 'graphics/filters/FilterOperationsTest.cpp', - 'graphics/filters/ImageFilterBuilderTest.cpp', - 'graphics/gpu/DrawingBufferTest.cpp', - 'graphics/paint/DisplayItemClientTest.cpp', - 'graphics/paint/DisplayItemListTest.cpp', - 'graphics/paint/DisplayItemTest.cpp', - 'graphics/paint/GeometryMapperTest.cpp', - 'graphics/paint/PaintArtifactToSkCanvasTest.cpp', - 'graphics/paint/PaintChunkTest.cpp', - 'graphics/paint/PaintChunkerTest.cpp', - 'graphics/paint/PaintControllerTest.cpp', - 'graphics/paint/PropertyTreeStateTest.cpp', - 'image-decoders/FastSharedBufferReaderTest.cpp', - 'image-decoders/ImageDecoderTest.cpp', - 'image-decoders/ImageDecoderTestHelpers.cpp', - 'image-decoders/ImageDecoderTestHelpers.h', - 'image-decoders/bmp/BMPImageDecoderTest.cpp', - 'image-decoders/gif/GIFImageDecoderTest.cpp', - 'image-decoders/jpeg/JPEGImageDecoderTest.cpp', - 'image-decoders/webp/WEBPImageDecoderTest.cpp', - 'image-decoders/ico/ICOImageDecoderTest.cpp', - 'json/JSONParserTest.cpp', - 'mac/VersionUtilMacTest.mm', - 'mojo/KURLSecurityOriginTest.cpp', - 'network/EncodedFormDataTest.cpp', - 'network/HTTPParsersTest.cpp', - 'network/LinkHeaderTest.cpp', - 'network/NetworkUtilsTest.cpp', - 'network/ResourceRequestTest.cpp', - 'network/ResourceResponseTest.cpp', - 'scheduler/CancellableTaskFactoryTest.cpp', - 'scheduler/base/queueing_time_estimator_unittest.cc', - 'scheduler/base/task_queue_manager_unittest.cc', - 'scheduler/base/task_queue_selector_unittest.cc', - 'scheduler/base/test_count_uses_time_source.cc', - 'scheduler/base/thread_load_tracker_unittest.cc', - 'scheduler/base/time_domain_unittest.cc', - 'scheduler/base/work_queue_sets_unittest.cc', - 'scheduler/child/idle_helper_unittest.cc', - 'scheduler/child/scheduler_helper_unittest.cc', - 'scheduler/child/scheduler_tqm_delegate_impl_unittest.cc', - 'scheduler/child/webthread_impl_for_worker_scheduler_unittest.cc', - 'scheduler/child/worker_scheduler_impl_unittest.cc', - 'scheduler/renderer/auto_advancing_virtual_time_domain_unittest.cc', - 'scheduler/renderer/deadline_task_runner_unittest.cc', - 'scheduler/renderer/idle_time_estimator_unittest.cc', - 'scheduler/renderer/renderer_scheduler_impl_unittest.cc', - 'scheduler/renderer/task_cost_estimator_unittest.cc', - 'scheduler/renderer/throttling_helper_unittest.cc', - 'scheduler/renderer/user_model_unittest.cc', - 'scheduler/renderer/web_frame_scheduler_impl_unittest.cc', - 'scheduler/renderer/web_view_scheduler_impl_unittest.cc', - 'scheduler/renderer/webthread_impl_for_renderer_scheduler_unittest.cc', - 'scroll/ScrollableAreaTest.cpp', - 'testing/ArenaTestHelpers.h', - 'testing/TreeTestHelpers.cpp', - 'testing/TreeTestHelpers.h', - 'text/BidiResolverTest.cpp', - 'text/CharacterTest.cpp', - 'text/DateTimeFormatTest.cpp', - 'text/HyphenationTest.cpp', - 'text/SegmentedStringTest.cpp', - 'text/TextBreakIteratorTest.cpp', - 'text/TextEncodingDetectorTest.cpp', - 'text/UnicodeUtilitiesTest.cpp', - 'threading/BackgroundTaskRunnerTest.cpp', - 'transforms/AffineTransformTest.cpp', - 'transforms/TransformOperationsTest.cpp', - 'transforms/TransformationMatrixTest.cpp', - 'transforms/RotationTest.cpp', - 'web_process_memory_dump_test.cc', - 'weborigin/KnownPortsTest.cpp', - 'weborigin/KURLTest.cpp', - 'weborigin/OriginAccessEntryTest.cpp', - 'weborigin/SchemeRegistryTest.cpp', - 'weborigin/SecurityOriginTest.cpp', - 'weborigin/SecurityPolicyTest.cpp', - 'weborigin/SuboriginTest.cpp', - ], - # NOTE: These are legacy unit tests and tests that require a Platform - # object. Do not add more unless the test requires a Platform object. - # These tests are a part of the web:webkit_unit_tests binary. - 'platform_web_unittest_files': [ - 'graphics/Canvas2DLayerBridgeTest.cpp', - 'graphics/CanvasSurfaceLayerBridgeTest.cpp', - 'graphics/DeferredImageDecoderTest.cpp', - 'graphics/GraphicsLayerTest.cpp', - 'graphics/ImageDecodingStoreTest.cpp', - 'graphics/ImageFrameGeneratorTest.cpp', - 'graphics/ImageLayerChromiumTest.cpp', - 'graphics/test/FakeGLES2Interface.h', - 'graphics/test/FakeWebGraphicsContext3DProvider.h', - 'graphics/test/MockImageDecoder.h', - ], - 'platform_test_support_files': [ - 'scheduler/base/task_queue_manager_delegate_for_test.cc', - 'scheduler/base/test_time_source.cc', - 'scheduler/child/scheduler_tqm_delegate_for_test.cc', - 'scheduler/test/fake_renderer_scheduler.cc', - 'scheduler/test/fake_web_task_runner.cc', - 'scheduler/test/fake_web_task_runner.h', - 'scheduler/test/lazy_scheduler_message_loop_delegate_for_tests.cc', - 'scheduler/test/lazy_scheduler_message_loop_delegate_for_tests.h', - 'scheduler/test/renderer_scheduler_test_support.cc', - 'scroll/ScrollbarTestSuite.h', - 'testing/CompositorTest.cpp', - 'testing/CompositorTest.h', - 'testing/FakeDisplayItemClient.h', - 'testing/FakeGraphicsLayer.h', - 'testing/FakeGraphicsLayerClient.h', - 'testing/FontTestHelpers.cpp', - 'testing/FontTestHelpers.h', - 'testing/FuzzedDataProvider.cpp', - 'testing/FuzzedDataProvider.h', - 'testing/GeometryPrinters.cpp', - 'testing/GeometryPrinters.h', - 'testing/HistogramTester.cpp', - 'testing/HistogramTester.h', - 'testing/MessageLoopForMojo.h', - 'testing/PaintPrinters.cpp', - 'testing/PaintPrinters.h', - 'testing/PictureMatchers.cpp', - 'testing/PictureMatchers.h', - 'testing/PlatformTestPrinters.cpp', - 'testing/RuntimeEnabledFeaturesTestHelpers.h', - 'testing/TestingPlatformSupport.cpp', - 'testing/TestingPlatformSupport.h', - 'testing/TestPaintArtifact.cpp', - 'testing/TestPaintArtifact.h', - 'testing/TransformPrinters.cpp', - 'testing/TransformPrinters.h', - 'testing/URLTestHelpers.cpp', - 'testing/URLTestHelpers.h', - 'testing/UnitTestHelpers.cpp', - 'testing/UnitTestHelpers.h', - 'testing/WebLayerTreeViewImplForTesting.cpp', - 'testing/WebLayerTreeViewImplForTesting.h', - 'testing/weburl_loader_mock.cc', - 'testing/weburl_loader_mock.h', - 'testing/weburl_loader_mock_factory_impl.cc', - 'testing/weburl_loader_mock_factory_impl.h', - ], - 'conditions': [ - ['OS=="win"', - { - 'platform_test_files': [ - 'text/LocaleWinTest.cpp', - ], - } - ], - ['OS=="mac"', - { - 'platform_test_files': [ - 'text/LocaleMacTest.cpp', - ] - } - ], - ['os_posix==1 and OS!="mac"', - { - 'platform_test_files': [ - 'text/LocaleICUTest.cpp', - ], - } - ], - ['OS!="mac"', - { - 'platform_test_files': [ - 'scroll/ScrollAnimatorTest.cpp', - ], - } - ], - ['use_default_render_theme==1', - { - 'platform_test_files': [ - 'scroll/ScrollbarThemeAuraTest.cpp', - ], - } - ], - ], - }, -}
diff --git a/third_party/WebKit/Source/platform/platform.gni b/third_party/WebKit/Source/platform/platform.gni deleted file mode 100644 index 5c53a6a..0000000 --- a/third_party/WebKit/Source/platform/platform.gni +++ /dev/null
@@ -1,18 +0,0 @@ -# Copyright 2014 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. - -# This file is the GN version of blink_platform.gypi. We rebase most paths to -# be absolute so these lists can be used by BUILD files in different directories -# without worrying about the base directory. -_gypi = exec_script("//build/gypi_to_gn.py", - [ rebase_path("blink_platform.gypi") ], - "scope", - [ "blink_platform.gypi" ]) - -platform_files = _gypi.platform_files -platform_test_files = get_path_info(_gypi.platform_test_files, "abspath") -platform_web_unittest_files = - get_path_info(_gypi.platform_web_unittest_files, "abspath") -platform_test_support_files = - get_path_info(_gypi.platform_test_support_files, "abspath")
diff --git a/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp b/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp index 09dece2c..07144975 100644 --- a/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp +++ b/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp
@@ -525,7 +525,9 @@ { if (port < 0 || port > MaxAllowedPort) return createUnique(); - String decodedHost = decodeURLEscapeSequences(host); + + DCHECK_EQ(host, decodeURLEscapeSequences(host)); + String portPart = port ? ":" + String::number(port) : String(); return create(KURL(KURL(), protocol + "://" + host + portPart + "/")); }
diff --git a/third_party/WebKit/Source/web/BUILD.gn b/third_party/WebKit/Source/web/BUILD.gn index 74dcc09e..150d43d 100644 --- a/third_party/WebKit/Source/web/BUILD.gn +++ b/third_party/WebKit/Source/web/BUILD.gn
@@ -8,7 +8,6 @@ import("//third_party/WebKit/Source/config.gni") import("//third_party/WebKit/Source/core/core.gni") import("//third_party/WebKit/Source/modules/modules.gni") -import("//third_party/WebKit/Source/platform/platform.gni") visibility = [ "//third_party/WebKit/*" ] @@ -389,7 +388,6 @@ "tests/sim/SimWebViewClient.h", ] sources += bindings_unittest_files - sources += platform_web_unittest_files deps = [ ":test_support", @@ -405,6 +403,7 @@ "//third_party/WebKit/Source/core:unit_tests", "//third_party/WebKit/Source/modules:unit_tests", "//third_party/WebKit/Source/platform:test_support", + "//third_party/WebKit/Source/platform:unit_tests", "//third_party/WebKit/Source/wtf", "//third_party/libwebp", "//third_party/zlib",
diff --git a/tools/cfi/blacklist.txt b/tools/cfi/blacklist.txt index f7c2c08..7cd0b41 100644 --- a/tools/cfi/blacklist.txt +++ b/tools/cfi/blacklist.txt
@@ -153,37 +153,6 @@ fun:*LayoutBlockFlow*rebuildFloatsFromIntruding* fun:*LayoutBlockFlow*yPositionForFloatIncludingMargin* fun:*LayoutBlockFlow*styleDidChange* -fun:*LayoutBox*addLayoutOverflow* -fun:*LayoutBox*addOverflowFromChild* -fun:*LayoutBox*avoidsFloats* -fun:*LayoutBox*baselinePosition* -fun:*LayoutBox*clientBoxRect* -fun:*LayoutBox*clientHeight* -fun:*LayoutBox*clientLeft* -fun:*LayoutBox*clientLogicalBottom* -fun:*LayoutBox*clientLogicalHeight* -fun:*LayoutBox*clientLogicalWidth* -fun:*LayoutBox*clientTop* -fun:*LayoutBox*clientWidth* -fun:*LayoutBox*computeBackgroundIsKnownToBeObscured* -fun:*LayoutBox*computeIntrinsicLogicalWidthUsing* -fun:*LayoutBox*computeLogicalHeight* -fun:*LayoutBox*computeLogicalWidthUsing* -fun:*LayoutBox*contentBoxRect* -fun:*LayoutBox*contentHeight* -fun:*LayoutBox*contentWidth* -fun:*LayoutBox*hasAutoHorizontalScrollbar* -fun:*LayoutBox*hasAutoVerticalScrollbar* -fun:*LayoutBox*hasUnsplittableScrollingOverflow* -fun:*LayoutBox*layoutOverflowRectForPropagation* -fun:*LayoutBox*logicalLayoutOverflowRectForPropagation* -fun:*LayoutBox*maxPreferredLogicalWidth* -fun:*LayoutBox*noOverflowRect* -fun:*LayoutBox*pixelSnappedOffsetHeight* -fun:*LayoutBox*scrollsOverflow* -fun:*LayoutBox*shrinkToAvoidFloats* -fun:*LayoutBox*updateLogicalHeight* -fun:*LayoutBox*visualOverflowRectForPropagation* fun:*LayoutBoxModelObject*borderAndPaddingHeight* fun:*LayoutBoxModelObject*borderAndPaddingWidth* fun:*LayoutBoxModelObject*borderAndPaddingBefore*
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt index 0feb3a08..cf2a4ea9 100644 --- a/tools/valgrind/memcheck/suppressions.txt +++ b/tools/valgrind/memcheck/suppressions.txt
@@ -1382,16 +1382,6 @@ fun:_ZNK7blink11RenderLayer18backgroundClipRectEPKS0_PNS_12RenderRegionENS_13ClipRectsTypeENS_29OverlayScrollbarSizeRelevancyE } { - bug_138058 - Memcheck:Uninitialized - ... - fun:_ZN5blink12WebVTTParser22constructTreeFromTokenEPNS_8DocumentE - fun:_ZN5blink12WebVTTParser33createDocumentFragmentFromCueTextERKN3WTF6StringE - fun:_ZN5blink12TextTrackCue12getCueAsHTMLEv - fun:_ZN5blink12TextTrackCue17updateDisplayTreeEf - fun:_ZN5blink16HTMLMediaElement25updateActiveTextTrackCuesEf -} -{ bug_138060 Memcheck:Uninitialized fun:_NPN_EvaluateHelper @@ -1836,12 +1826,6 @@ fun:_ZN2v88internal25FunctionCallbackArguments4CallEPFvRKNS_20FunctionCallbackInfoINS_5ValueEEEE } { - bug_298143 - Memcheck:Uninitialized - ... - fun:_ZN5blink25TypeConversionsV8Internal*AttributeGetterE* -} -{ bug_298788 Memcheck:Leak fun:_Znw*
diff --git a/ui/android/context_provider_factory.h b/ui/android/context_provider_factory.h index 8ad9d6f..0933afe2 100644 --- a/ui/android/context_provider_factory.h +++ b/ui/android/context_provider_factory.h
@@ -31,8 +31,24 @@ // This class is not thread-safe and should only be accessed from the UI thread. class UI_ANDROID_EXPORT ContextProviderFactory { public: + enum class ContextCreationResult { + FAILURE_GPU_PROCESS_INITIALIZATION_FAILED, + + // Used when the factory is shutting down. No more requests should be made + // to the factory after this response is dispatched. + FAILURE_FACTORY_SHUTDOWN, + + // The GpuSurfaceHandle for the request was lost before the context could be + // created. This is used for on-screen context requests only. + FAILURE_GPU_SURFACE_HANDLE_LOST, + + // Set if the Context creation was successful. + SUCCESS, + }; + using ContextProviderCallback = - base::Callback<void(const scoped_refptr<cc::ContextProvider>&)>; + base::Callback<void(const scoped_refptr<cc::ContextProvider>&, + ContextCreationResult)>; enum class ContextType { BLIMP_RENDER_COMPOSITOR_CONTEXT, @@ -52,8 +68,8 @@ // Creates an offscreen ContextProvider for the compositor. Any shared // contexts passed here *must* have been created using this factory. - // The callback may be triggered synchronously if possible, and will always - // have the context provider. + // The callback may be triggered synchronously if possible. If the context + // creation fails, a null context is passed with the specified reason. virtual void CreateOffscreenContextProvider( ContextType context_type, gpu::SharedMemoryLimits shared_memory_limits,
diff --git a/ui/arc/notification/arc_custom_notification_item.cc b/ui/arc/notification/arc_custom_notification_item.cc index 0ef1db68..79e4a9a8 100644 --- a/ui/arc/notification/arc_custom_notification_item.cc +++ b/ui/arc/notification/arc_custom_notification_item.cc
@@ -7,7 +7,7 @@ #include "base/memory/ptr_util.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" -#include "components/exo/notification_surface.h" +#include "components/arc/bitmap/bitmap_type_converters.h" #include "ui/arc/notification/arc_custom_notification_view.h" #include "ui/message_center/notification.h" #include "ui/message_center/notification_types.h" @@ -24,14 +24,7 @@ : item_(item) {} std::unique_ptr<views::View> CreateCustomContent() override { - if (!surface_) - return nullptr; - - return base::MakeUnique<ArcCustomNotificationView>(item_, surface_); - } - - void set_notification_surface(exo::NotificationSurface* surface) { - surface_ = surface; + return base::MakeUnique<ArcCustomNotificationView>(item_); } private: @@ -39,7 +32,6 @@ ~ArcNotificationDelegate() override {} ArcCustomNotificationItem* const item_; - exo::NotificationSurface* surface_ = nullptr; DISALLOW_COPY_AND_ASSIGN(ArcNotificationDelegate); }; @@ -55,13 +47,9 @@ message_center, notification_key, profile_id) { - ArcNotificationSurfaceManager::Get()->AddObserver(this); } ArcCustomNotificationItem::~ArcCustomNotificationItem() { - if (ArcNotificationSurfaceManager::Get()) - ArcNotificationSurfaceManager::Get()->RemoveObserver(this); - FOR_EACH_OBSERVER(Observer, observers_, OnItemDestroying()); } @@ -92,13 +80,18 @@ GURL(), // empty origin url, for system component notifier_id, rich_data, new ArcNotificationDelegate(this))); - exo::NotificationSurface* surface = - ArcNotificationSurfaceManager::Get()->GetSurface(notification_key()); - if (surface) - OnNotificationSurfaceAdded(surface); - pinned_ = rich_data.pinned; - FOR_EACH_OBSERVER(Observer, observers_, OnItemPinnedChanged()); + + if (data.snapshot_image.is_null()) { + snapshot_ = gfx::ImageSkia(); + } else { + snapshot_ = gfx::ImageSkia(gfx::ImageSkiaRep( + data.snapshot_image.To<SkBitmap>(), data.snapshot_image_scale)); + } + + FOR_EACH_OBSERVER(Observer, observers_, OnItemUpdated()); + + AddToMessageCenter(); } void ArcCustomNotificationItem::CloseFromCloseButton() { @@ -116,24 +109,17 @@ observers_.RemoveObserver(observer); } -void ArcCustomNotificationItem::OnNotificationSurfaceAdded( - exo::NotificationSurface* surface) { - if (!pending_notification() || - surface->notification_id() != notification_key()) { - return; - } - - static_cast<ArcNotificationDelegate*>(pending_notification()->delegate()) - ->set_notification_surface(surface); - AddToMessageCenter(); +void ArcCustomNotificationItem::IncrementWindowRefCount() { + ++window_ref_count_; + if (window_ref_count_ == 1) + manager()->CreateNotificationWindow(notification_key()); } -void ArcCustomNotificationItem::OnNotificationSurfaceRemoved( - exo::NotificationSurface* surface) { - if (surface->notification_id() != notification_key()) - return; - - FOR_EACH_OBSERVER(Observer, observers_, OnItemNotificationSurfaceRemoved()); +void ArcCustomNotificationItem::DecrementWindowRefCount() { + DCHECK_GT(window_ref_count_, 0); + --window_ref_count_; + if (window_ref_count_ == 0) + manager()->CloseNotificationWindow(notification_key()); } } // namespace arc
diff --git a/ui/arc/notification/arc_custom_notification_item.h b/ui/arc/notification/arc_custom_notification_item.h index 14c9446..c2069aa 100644 --- a/ui/arc/notification/arc_custom_notification_item.h +++ b/ui/arc/notification/arc_custom_notification_item.h
@@ -8,24 +8,19 @@ #include "base/macros.h" #include "base/observer_list.h" #include "ui/arc/notification/arc_notification_item.h" -#include "ui/arc/notification/arc_notification_surface_manager.h" +#include "ui/gfx/image/image_skia.h" namespace arc { -class ArcCustomNotificationItem - : public ArcNotificationItem, - public ArcNotificationSurfaceManager::Observer { +class ArcCustomNotificationItem : public ArcNotificationItem { public: class Observer { public: // Invoked when the notification data for this item has changed. virtual void OnItemDestroying() = 0; - // Invoked when the pinned stated is changed. - virtual void OnItemPinnedChanged() = 0; - - // Invoked when the notification surface for this item is gone. - virtual void OnItemNotificationSurfaceRemoved() = 0; + // Invoked when the notification data for the item is updated. + virtual void OnItemUpdated() = 0; protected: virtual ~Observer() = default; @@ -45,14 +40,22 @@ void AddObserver(Observer* observer); void RemoveObserver(Observer* observer); + // Increment |window_ref_count_| and a CreateNotificationWindow request + // is sent when |window_ref_count_| goes from zero to one. + void IncrementWindowRefCount(); + + // Decrement |window_ref_count_| and a CloseNotificationWindow request + // is sent when |window_ref_count_| goes from one to zero. + void DecrementWindowRefCount(); + bool pinned() const { return pinned_; } + const gfx::ImageSkia& snapshot() const { return snapshot_; } private: - // ArcNotificationSurfaceManager::Observer: - void OnNotificationSurfaceAdded(exo::NotificationSurface* surface) override; - void OnNotificationSurfaceRemoved(exo::NotificationSurface* surface) override; - bool pinned_ = false; + gfx::ImageSkia snapshot_; + int window_ref_count_ = 0; + base::ObserverList<Observer> observers_; DISALLOW_COPY_AND_ASSIGN(ArcCustomNotificationItem);
diff --git a/ui/arc/notification/arc_custom_notification_view.cc b/ui/arc/notification/arc_custom_notification_view.cc index c9fe786a..1ac5c33 100644 --- a/ui/arc/notification/arc_custom_notification_view.cc +++ b/ui/arc/notification/arc_custom_notification_view.cc
@@ -12,6 +12,8 @@ #include "ui/compositor/layer_animation_observer.h" #include "ui/display/screen.h" #include "ui/events/event_handler.h" +#include "ui/gfx/canvas.h" +#include "ui/gfx/image/image_skia.h" #include "ui/gfx/transform.h" #include "ui/message_center/message_center_style.h" #include "ui/resources/grit/ui_resources.h" @@ -140,24 +142,39 @@ }; ArcCustomNotificationView::ArcCustomNotificationView( - ArcCustomNotificationItem* item, - exo::NotificationSurface* surface) - : item_(item), event_forwarder_(new EventForwarder(this)) { - SetSurface(surface); + ArcCustomNotificationItem* item) + : item_(item), + notification_key_(item->notification_key()), + event_forwarder_(new EventForwarder(this)) { + item_->IncrementWindowRefCount(); item_->AddObserver(this); - OnItemPinnedChanged(); + + ArcNotificationSurfaceManager::Get()->AddObserver(this); + exo::NotificationSurface* surface = + ArcNotificationSurfaceManager::Get()->GetSurface(notification_key_); + if (surface) + OnNotificationSurfaceAdded(surface); // Create a layer as an anchor to insert surface copy during a slide. SetPaintToLayer(true); + UpdatePreferredSize(); } ArcCustomNotificationView::~ArcCustomNotificationView() { SetSurface(nullptr); - if (item_) + if (item_) { + item_->DecrementWindowRefCount(); item_->RemoveObserver(this); + } + + if (ArcNotificationSurfaceManager::Get()) + ArcNotificationSurfaceManager::Get()->RemoveObserver(this); } void ArcCustomNotificationView::CreateFloatingCloseButton() { + if (!surface_) + return; + floating_close_button_ = new views::ImageButton(this); floating_close_button_->set_background( views::Background::CreateSolidBackground(SK_ColorTRANSPARENT)); @@ -205,11 +222,21 @@ if (surface_ && surface_->window()) { surface_->window()->AddObserver(this); surface_->window()->AddPreTargetHandler(event_forwarder_.get()); + + if (GetWidget()) + AttachSurface(); + + UpdatePinnedState(); } } void ArcCustomNotificationView::UpdatePreferredSize() { - gfx::Size preferred_size = surface_->GetSize(); + gfx::Size preferred_size = + surface_ ? surface_->GetSize() : item_ ? item_->snapshot().size() + : gfx::Size(); + if (preferred_size.IsEmpty()) + return; + if (preferred_size.width() != message_center::kNotificationWidth) { const float scale = static_cast<float>(message_center::kNotificationWidth) / preferred_size.width(); @@ -236,6 +263,34 @@ floating_close_button_widget_->Hide(); } +void ArcCustomNotificationView::UpdatePinnedState() { + if (item_->pinned() && floating_close_button_widget_) { + floating_close_button_widget_.reset(); + } else if (!item_->pinned() && !floating_close_button_widget_) { + CreateFloatingCloseButton(); + } +} + +void ArcCustomNotificationView::UpdateSnapshot() { + // Bail if we have a |surface_| because it controls the sizes and paints UI. + if (surface_) + return; + + UpdatePreferredSize(); + SchedulePaint(); +} + +void ArcCustomNotificationView::AttachSurface() { + if (!GetWidget()) + return; + + UpdatePreferredSize(); + Attach(surface_->window()); + + // Creates slide helper after this view is added to its parent. + slide_helper_.reset(new SlideHelper(this)); +} + void ArcCustomNotificationView::ViewHierarchyChanged( const views::View::ViewHierarchyChangedDetails& details) { views::Widget* widget = GetWidget(); @@ -256,11 +311,7 @@ if (!widget || !surface_ || !details.is_add) return; - UpdatePreferredSize(); - Attach(surface_->window()); - - // Creates slide helper after this view is added to its parent. - slide_helper_.reset(new SlideHelper(this)); + AttachSurface(); } void ArcCustomNotificationView::Layout() { @@ -293,6 +344,19 @@ UpdateCloseButtonVisiblity(); } +void ArcCustomNotificationView::OnPaint(gfx::Canvas* canvas) { + views::NativeViewHost::OnPaint(canvas); + + // Bail if there is a |surface_| or no item or no snapshot image. + if (surface_ || !item_ || item_->snapshot().isNull()) + return; + const gfx::Rect contents_bounds = GetContentsBounds(); + canvas->DrawImageInt(item_->snapshot(), 0, 0, item_->snapshot().width(), + item_->snapshot().height(), contents_bounds.x(), + contents_bounds.y(), contents_bounds.width(), + contents_bounds.height(), false); +} + void ArcCustomNotificationView::OnKeyEvent(ui::KeyEvent* event) { // Forward to parent CustomNotificationView to handle keyboard dismissal. parent()->OnKeyEvent(event); @@ -327,7 +391,7 @@ } void ArcCustomNotificationView::OnWindowDestroying(aura::Window* window) { - window->RemoveObserver(this); + SetSurface(nullptr); } void ArcCustomNotificationView::OnItemDestroying() { @@ -339,15 +403,24 @@ SetSurface(nullptr); } -void ArcCustomNotificationView::OnItemPinnedChanged() { - if (item_->pinned() && floating_close_button_widget_) { - floating_close_button_widget_.reset(); - } else if (!item_->pinned() && !floating_close_button_widget_) { - CreateFloatingCloseButton(); - } +void ArcCustomNotificationView::OnItemUpdated() { + UpdatePinnedState(); + UpdateSnapshot(); } -void ArcCustomNotificationView::OnItemNotificationSurfaceRemoved() { +void ArcCustomNotificationView::OnNotificationSurfaceAdded( + exo::NotificationSurface* surface) { + if (surface->notification_id() != notification_key_) + return; + + SetSurface(surface); +} + +void ArcCustomNotificationView::OnNotificationSurfaceRemoved( + exo::NotificationSurface* surface) { + if (surface->notification_id() != notification_key_) + return; + SetSurface(nullptr); }
diff --git a/ui/arc/notification/arc_custom_notification_view.h b/ui/arc/notification/arc_custom_notification_view.h index 4f2a4e3..2c0b58d 100644 --- a/ui/arc/notification/arc_custom_notification_view.h +++ b/ui/arc/notification/arc_custom_notification_view.h
@@ -10,6 +10,7 @@ #include "base/macros.h" #include "ui/arc/notification/arc_custom_notification_item.h" +#include "ui/arc/notification/arc_notification_surface_manager.h" #include "ui/aura/window_observer.h" #include "ui/views/controls/button/button.h" #include "ui/views/controls/native/native_view_host.h" @@ -25,13 +26,14 @@ namespace arc { -class ArcCustomNotificationView : public views::NativeViewHost, - public views::ButtonListener, - public aura::WindowObserver, - public ArcCustomNotificationItem::Observer { +class ArcCustomNotificationView + : public views::NativeViewHost, + public views::ButtonListener, + public aura::WindowObserver, + public ArcCustomNotificationItem::Observer, + public ArcNotificationSurfaceManager::Observer { public: - ArcCustomNotificationView(ArcCustomNotificationItem* item, - exo::NotificationSurface* surface); + explicit ArcCustomNotificationView(ArcCustomNotificationItem* item); ~ArcCustomNotificationView() override; private: @@ -42,11 +44,15 @@ void SetSurface(exo::NotificationSurface* surface); void UpdatePreferredSize(); void UpdateCloseButtonVisiblity(); + void UpdatePinnedState(); + void UpdateSnapshot(); + void AttachSurface(); // views::NativeViewHost void ViewHierarchyChanged( const ViewHierarchyChangedDetails& details) override; void Layout() override; + void OnPaint(gfx::Canvas* canvas) override; void OnKeyEvent(ui::KeyEvent* event) override; void OnGestureEvent(ui::GestureEvent* event) override; void OnMouseEntered(const ui::MouseEvent& event) override; @@ -63,12 +69,17 @@ // ArcCustomNotificationItem::Observer void OnItemDestroying() override; - void OnItemPinnedChanged() override; - void OnItemNotificationSurfaceRemoved() override; + void OnItemUpdated() override; + + // ArcNotificationSurfaceManager::Observer: + void OnNotificationSurfaceAdded(exo::NotificationSurface* surface) override; + void OnNotificationSurfaceRemoved(exo::NotificationSurface* surface) override; ArcCustomNotificationItem* item_ = nullptr; exo::NotificationSurface* surface_ = nullptr; + const std::string notification_key_; + // A pre-target event handler to forward events on the surface to this view. // Using a pre-target event handler instead of a target handler on the surface // window because it has descendant aura::Window and the events on them need
diff --git a/ui/arc/notification/arc_notification_item.h b/ui/arc/notification/arc_notification_item.h index e59515e..3c5131b 100644 --- a/ui/arc/notification/arc_notification_item.h +++ b/ui/arc/notification/arc_notification_item.h
@@ -39,6 +39,8 @@ void Click(); void ButtonClick(int button_index); + const std::string& notification_key() const { return notification_key_; } + protected: static int ConvertAndroidPriority(int android_priority); static gfx::Image ConvertAndroidSmallIcon( @@ -59,9 +61,9 @@ bool CalledOnValidThread() const; const AccountId& profile_id() const { return profile_id_; } - const std::string& notification_key() const { return notification_key_; } const std::string& notification_id() const { return notification_id_; } message_center::MessageCenter* message_center() { return message_center_; } + ArcNotificationManager* manager() { return manager_; } message_center::Notification* pending_notification() { return notification_.get();
diff --git a/ui/arc/notification/arc_notification_manager.cc b/ui/arc/notification/arc_notification_manager.cc index 34c13f2..59be98a7 100644 --- a/ui/arc/notification/arc_notification_manager.cc +++ b/ui/arc/notification/arc_notification_manager.cc
@@ -14,6 +14,13 @@ namespace arc { +namespace { + +// Min version to support Create/CloseNotificationWindow. +constexpr int kMinVersionNotificationWindow = 7; + +} // namespace + ArcNotificationManager::ArcNotificationManager(ArcBridgeService* bridge_service, const AccountId& main_profile_id) : ArcNotificationManager(bridge_service, @@ -192,6 +199,57 @@ notifications_instance->SendNotificationEventToAndroid(key, command); } +void ArcNotificationManager::CreateNotificationWindow(const std::string& key) { + if (items_.find(key) == items_.end()) { + VLOG(3) << "Chrome requests to create window on notification (key: " << key + << "), but it is gone."; + return; + } + + auto* notifications_instance = + arc_bridge_service()->notifications()->instance(); + // On shutdown, the ARC channel may quit earlier then notifications. + if (!notifications_instance) { + VLOG(2) << "Request to create window for ARC Notification (key: " << key + << "), but the ARC channel has already gone."; + return; + } + + if (arc_bridge_service()->notifications()->version() < + kMinVersionNotificationWindow) { + VLOG(2) + << "NotificationInstance does not support CreateNotificationWindow."; + return; + } + + notifications_instance->CreateNotificationWindow(key); +} + +void ArcNotificationManager::CloseNotificationWindow(const std::string& key) { + if (items_.find(key) == items_.end()) { + VLOG(3) << "Chrome requests to close window on notification (key: " << key + << "), but it is gone."; + return; + } + + auto* notifications_instance = + arc_bridge_service()->notifications()->instance(); + // On shutdown, the ARC channel may quit earlier then notifications. + if (!notifications_instance) { + VLOG(2) << "Request to close window for ARC Notification (key: " << key + << "), but the ARC channel has already gone."; + return; + } + + if (arc_bridge_service()->notifications()->version() < + kMinVersionNotificationWindow) { + VLOG(2) << "NotificationInstance does not support CloseNotificationWindow."; + return; + } + + notifications_instance->CloseNotificationWindow(key); +} + void ArcNotificationManager::OnToastPosted(mojom::ArcToastDataPtr data) { ash::WmShell::Get()->toast_manager()->Show( ash::ToastData(data->id, data->text.To<base::string16>(), data->duration,
diff --git a/ui/arc/notification/arc_notification_manager.h b/ui/arc/notification/arc_notification_manager.h index 26fe969..d8932e1 100644 --- a/ui/arc/notification/arc_notification_manager.h +++ b/ui/arc/notification/arc_notification_manager.h
@@ -49,6 +49,8 @@ void SendNotificationClickedOnChrome(const std::string& key); void SendNotificationButtonClickedOnChrome(const std::string& key, int button_index); + void CreateNotificationWindow(const std::string& key); + void CloseNotificationWindow(const std::string& key); private: const AccountId main_profile_id_;
diff --git a/ui/views/accessibility/ax_aura_obj_cache.cc b/ui/views/accessibility/ax_aura_obj_cache.cc index 28162c3..2ca3ba50 100644 --- a/ui/views/accessibility/ax_aura_obj_cache.cc +++ b/ui/views/accessibility/ax_aura_obj_cache.cc
@@ -74,8 +74,12 @@ RemoveViewSubtree(widget->GetRootView()); } -void AXAuraObjCache::Remove(aura::Window* window) { +void AXAuraObjCache::Remove(aura::Window* window, aura::Window* parent) { + int id = GetIDInternal(parent, window_to_id_map_); + AXAuraObjWrapper* parent_window_obj = Get(id); RemoveInternal(window, window_to_id_map_); + if (parent && delegate_) + delegate_->OnChildWindowRemoved(parent_window_obj); } AXAuraObjWrapper* AXAuraObjCache::Get(int32_t id) { @@ -117,8 +121,8 @@ AXAuraObjCache::AXAuraObjCache() : current_id_(1), focus_client_(nullptr), - is_destroying_(false) { -} + is_destroying_(false), + delegate_(nullptr) {} AXAuraObjCache::~AXAuraObjCache() { is_destroying_ = true;
diff --git a/ui/views/accessibility/ax_aura_obj_cache.h b/ui/views/accessibility/ax_aura_obj_cache.h index 763f8f99..321b416 100644 --- a/ui/views/accessibility/ax_aura_obj_cache.h +++ b/ui/views/accessibility/ax_aura_obj_cache.h
@@ -39,6 +39,11 @@ // Get the single instance of this class. static AXAuraObjCache* GetInstance(); + class Delegate { + public: + virtual void OnChildWindowRemoved(AXAuraObjWrapper* parent) = 0; + }; + // Get or create an entry in the cache based on an Aura view. AXAuraObjWrapper* GetOrCreate(View* view); AXAuraObjWrapper* GetOrCreate(Widget* widget); @@ -56,7 +61,10 @@ // Removes an entry from this cache based on an Aura view. void Remove(View* view); void Remove(Widget* widget); - void Remove(aura::Window* window); + + // Removes |window| and optionally notifies delegate by sending an event on + // the |parent| if provided. + void Remove(aura::Window* window, aura::Window* parent); // Removes a view and all of its descendants from the cache. void RemoveViewSubtree(View* view); @@ -76,6 +84,8 @@ // Indicates if this object's currently being destroyed. bool is_destroying() { return is_destroying_; } + void SetDelegate(Delegate* delegate) { delegate_ = delegate; } + private: friend struct base::DefaultSingletonTraits<AXAuraObjCache>; @@ -117,6 +127,8 @@ // True immediately when entering this object's destructor. bool is_destroying_; + Delegate* delegate_; + DISALLOW_COPY_AND_ASSIGN(AXAuraObjCache); };
diff --git a/ui/views/accessibility/ax_widget_obj_wrapper.cc b/ui/views/accessibility/ax_widget_obj_wrapper.cc index 1def13f..2a05b19 100644 --- a/ui/views/accessibility/ax_widget_obj_wrapper.cc +++ b/ui/views/accessibility/ax_widget_obj_wrapper.cc
@@ -58,6 +58,10 @@ AXAuraObjCache::GetInstance()->Remove(widget); } +void AXWidgetObjWrapper::OnWidgetClosing(Widget* widget) { + AXAuraObjCache::GetInstance()->Remove(widget); +} + void AXWidgetObjWrapper::OnWillRemoveView(Widget* widget, View* view) { AXAuraObjCache::GetInstance()->RemoveViewSubtree(view); }
diff --git a/ui/views/accessibility/ax_widget_obj_wrapper.h b/ui/views/accessibility/ax_widget_obj_wrapper.h index 4913581..244fca5 100644 --- a/ui/views/accessibility/ax_widget_obj_wrapper.h +++ b/ui/views/accessibility/ax_widget_obj_wrapper.h
@@ -31,6 +31,7 @@ // WidgetObserver overrides. void OnWidgetDestroying(Widget* widget) override; + void OnWidgetClosing(Widget* widget) override; // WidgetRemovalsObserver overrides. void OnWillRemoveView(Widget* widget, View* view) override;
diff --git a/ui/views/accessibility/ax_window_obj_wrapper.cc b/ui/views/accessibility/ax_window_obj_wrapper.cc index 5a3bd3d..7117443c 100644 --- a/ui/views/accessibility/ax_window_obj_wrapper.cc +++ b/ui/views/accessibility/ax_window_obj_wrapper.cc
@@ -61,7 +61,19 @@ } void AXWindowObjWrapper::OnWindowDestroyed(aura::Window* window) { - AXAuraObjCache::GetInstance()->Remove(window); + AXAuraObjCache::GetInstance()->Remove(window, nullptr); +} + +void AXWindowObjWrapper::OnWindowDestroying(aura::Window* window) { + Widget* widget = Widget::GetWidgetForNativeView(window); + if (widget) + AXAuraObjCache::GetInstance()->Remove(widget); +} + +void AXWindowObjWrapper::OnWindowHierarchyChanged( + const HierarchyChangeParams& params) { + if (params.phase == WindowObserver::HierarchyChangeParams::HIERARCHY_CHANGED) + AXAuraObjCache::GetInstance()->Remove(params.target, params.old_parent); } } // namespace views
diff --git a/ui/views/accessibility/ax_window_obj_wrapper.h b/ui/views/accessibility/ax_window_obj_wrapper.h index bcf35481..5a949c722 100644 --- a/ui/views/accessibility/ax_window_obj_wrapper.h +++ b/ui/views/accessibility/ax_window_obj_wrapper.h
@@ -38,6 +38,8 @@ // WindowObserver overrides. void OnWindowDestroyed(aura::Window* window) override; + void OnWindowDestroying(aura::Window* window) override; + void OnWindowHierarchyChanged(const HierarchyChangeParams& params) override; private: aura::Window* window_;
