diff --git a/DEPS b/DEPS index 2beb82a0..b55419f21 100644 --- a/DEPS +++ b/DEPS
@@ -643,7 +643,7 @@ Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + 'd458ada06171a85af00367251a4ed55db7fe2018', 'src/third_party/webrtc': - Var('webrtc_git') + '/src.git' + '@' + '5ec7e1276029f63ab6aaa244d402c3cf10011151', # commit position 20628 + Var('webrtc_git') + '/src.git' + '@' + '221b12666ff66398eed8c815e2065a049e93f294', # commit position 20628 'src/third_party/xdg-utils': { 'url': Var('chromium_git') + '/chromium/deps/xdg-utils.git' + '@' + 'd80274d5869b17b8c9067a1022e4416ee7ed5e0d',
diff --git a/build/config/gcc/BUILD.gn b/build/config/gcc/BUILD.gn index 0f4493f..f1950bf 100644 --- a/build/config/gcc/BUILD.gn +++ b/build/config/gcc/BUILD.gn
@@ -16,6 +16,7 @@ # especially when cross-compiling. # Note: this gn arg is similar to gyp target_rpath generator flag. gcc_target_rpath = "" + ldso_path = "" } # This config causes functions not to be automatically exported from shared @@ -88,6 +89,9 @@ "-Wl,-rpath-link=${rpath_link}", ] } + if (current_toolchain == default_toolchain && ldso_path != "") { + ldflags += [ "-Wl,--dynamic-linker=${ldso_path}" ] + } } }
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellNativeUiTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellNativeUiTest.java index 1fac6a9..4811fd5 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellNativeUiTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellNativeUiTest.java
@@ -4,13 +4,7 @@ package org.chromium.chrome.browser.vr_shell; -import static org.chromium.chrome.browser.UrlConstants.BOOKMARKS_FOLDER_URL; -import static org.chromium.chrome.browser.UrlConstants.BOOKMARKS_UNCATEGORIZED_URL; -import static org.chromium.chrome.browser.UrlConstants.BOOKMARKS_URL; -import static org.chromium.chrome.browser.UrlConstants.DOWNLOADS_URL; -import static org.chromium.chrome.browser.UrlConstants.NATIVE_HISTORY_URL; -import static org.chromium.chrome.browser.UrlConstants.NTP_URL; -import static org.chromium.chrome.browser.UrlConstants.RECENT_TABS_URL; +import static org.chromium.chrome.browser.vr_shell.VrTestFramework.NATIVE_URLS_OF_INTEREST; import static org.chromium.chrome.browser.vr_shell.VrTestFramework.PAGE_LOAD_TIMEOUT_S; import static org.chromium.chrome.browser.vr_shell.VrTestFramework.POLL_TIMEOUT_LONG_MS; import static org.chromium.chrome.test.util.ChromeRestriction.RESTRICTION_TYPE_DEVICE_DAYDREAM; @@ -60,27 +54,11 @@ @MediumTest public void testUrlOnNativeUi() throws IllegalArgumentException, InterruptedException, TimeoutException { - mVrTestRule.loadUrl(BOOKMARKS_URL, PAGE_LOAD_TIMEOUT_S); - Assert.assertFalse( - "Should not be showing URL", TestVrShellDelegate.isDisplayingUrlForTesting()); - mVrTestRule.loadUrl(BOOKMARKS_FOLDER_URL, PAGE_LOAD_TIMEOUT_S); - Assert.assertFalse( - "Should not be showing URL", TestVrShellDelegate.isDisplayingUrlForTesting()); - mVrTestRule.loadUrl(BOOKMARKS_UNCATEGORIZED_URL, PAGE_LOAD_TIMEOUT_S); - Assert.assertFalse( - "Should not be showing URL", TestVrShellDelegate.isDisplayingUrlForTesting()); - mVrTestRule.loadUrl(DOWNLOADS_URL, PAGE_LOAD_TIMEOUT_S); - Assert.assertFalse( - "Should not be showing URL", TestVrShellDelegate.isDisplayingUrlForTesting()); - mVrTestRule.loadUrl(NTP_URL, PAGE_LOAD_TIMEOUT_S); - Assert.assertFalse( - "Should not be showing URL", TestVrShellDelegate.isDisplayingUrlForTesting()); - mVrTestRule.loadUrl(NATIVE_HISTORY_URL, PAGE_LOAD_TIMEOUT_S); - Assert.assertFalse( - "Should not be showing URL", TestVrShellDelegate.isDisplayingUrlForTesting()); - mVrTestRule.loadUrl(RECENT_TABS_URL, PAGE_LOAD_TIMEOUT_S); - Assert.assertFalse( - "Should not be showing URL", TestVrShellDelegate.isDisplayingUrlForTesting()); + for (String url : NATIVE_URLS_OF_INTEREST) { + mVrTestRule.loadUrl(url, PAGE_LOAD_TIMEOUT_S); + Assert.assertFalse("Should not be showing URL on " + url, + TestVrShellDelegate.isDisplayingUrlForTesting()); + } } /**
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellNavigationTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellNavigationTest.java index 99115d68..96b4ac3a 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellNavigationTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellNavigationTest.java
@@ -4,6 +4,7 @@ package org.chromium.chrome.browser.vr_shell; +import static org.chromium.chrome.browser.vr_shell.VrTestFramework.NATIVE_URLS_OF_INTEREST; import static org.chromium.chrome.browser.vr_shell.VrTestFramework.PAGE_LOAD_TIMEOUT_S; import static org.chromium.chrome.browser.vr_shell.VrTestFramework.POLL_TIMEOUT_LONG_MS; import static org.chromium.chrome.browser.vr_shell.VrTestFramework.POLL_TIMEOUT_SHORT_MS; @@ -357,10 +358,7 @@ @Restriction(RESTRICTION_TYPE_VIEWER_DAYDREAM) public void testNativeNavigationAndInteraction() throws IllegalArgumentException, InterruptedException { - String[] nativeUrls = {UrlConstants.NTP_URL, UrlConstants.BOOKMARKS_URL, - UrlConstants.DOWNLOADS_URL, UrlConstants.RECENT_TABS_URL, - UrlConstants.NATIVE_HISTORY_URL}; - for (String url : nativeUrls) { + for (String url : NATIVE_URLS_OF_INTEREST) { mVrTestRule.loadUrl(TEST_PAGE_2D_URL, PAGE_LOAD_TIMEOUT_S); mVrTestRule.loadUrl(url, PAGE_LOAD_TIMEOUT_S); ClickUtils.mouseSingleClickView(InstrumentationRegistry.getInstrumentation(),
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrTestFramework.java b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrTestFramework.java index 5142ad7a..ed6a0be 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrTestFramework.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrTestFramework.java
@@ -10,6 +10,7 @@ import org.chromium.base.Log; import org.chromium.base.test.util.UrlUtils; +import org.chromium.chrome.browser.UrlConstants; import org.chromium.chrome.test.ChromeActivityTestRule; import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.test.util.Criteria; @@ -50,6 +51,11 @@ public static final int POLL_TIMEOUT_SHORT_MS = 1000; public static final int POLL_TIMEOUT_LONG_MS = 10000; + public static final String[] NATIVE_URLS_OF_INTEREST = {UrlConstants.BOOKMARKS_FOLDER_URL, + UrlConstants.BOOKMARKS_UNCATEGORIZED_URL, UrlConstants.BOOKMARKS_URL, + UrlConstants.DOWNLOADS_URL, UrlConstants.NATIVE_HISTORY_URL, UrlConstants.NTP_URL, + UrlConstants.RECENT_TABS_URL}; + private static final String TAG = "VrTestFramework"; static final String TEST_DIR = "chrome/test/data/vr/e2e_test_files";
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/WebVrInputTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/WebVrInputTest.java index 91a767a..ce07d2d 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/WebVrInputTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/WebVrInputTest.java
@@ -13,7 +13,6 @@ import android.os.Build; import android.os.SystemClock; -import android.support.test.InstrumentationRegistry; import android.support.test.filters.MediumTest; import android.view.MotionEvent; import android.view.View; @@ -43,9 +42,9 @@ import org.chromium.chrome.browser.vr_shell.util.VrTransitionUtils; import org.chromium.chrome.test.ChromeActivityTestRule; import org.chromium.chrome.test.ChromeJUnit4RunnerDelegate; -import org.chromium.content.browser.test.util.ClickUtils; import org.chromium.content.browser.test.util.Criteria; import org.chromium.content.browser.test.util.CriteriaHelper; +import org.chromium.content.browser.test.util.TouchCommon; import java.util.List; import java.util.concurrent.Callable; @@ -107,8 +106,7 @@ touchRegisteredLatch.countDown(); } }); - ClickUtils.mouseSingleClickView(InstrumentationRegistry.getInstrumentation(), - mVrTestRule.getActivity().getWindow().getDecorView().getRootView()); + TouchCommon.singleClickView(mVrTestRule.getActivity().getWindow().getDecorView()); Assert.assertTrue("VrShellImpl dispatched touches", touchRegisteredLatch.await(POLL_TIMEOUT_SHORT_MS, TimeUnit.MILLISECONDS)); VrTestFramework.executeStepAndWait(
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index a5da827..b0ad4d2 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd
@@ -785,7 +785,7 @@ </message> </if> <!-- Since Flash is a proper noun we don't have to distinguish between title and non-title case. --> - <message name="IDS_CONTENT_CONTEXT_ENABLE_FLASH" desc="The name of the Enable Flash command on the blocked plugin context menu"> + <message name="IDS_CONTENT_CONTEXT_ENABLE_FLASH" desc="The name of the Enable Flash command on the blocked plugin context menu. 'Flash' is the name of a plugin and should not be translated."> Enable Flash </message> @@ -2320,13 +2320,13 @@ <message name="IDS_BLOCKED_JAVASCRIPT_LINK" desc="Link to JavaScript section of content blocking management dialog, displayed in bubble when a page tries to run JavaScript."> Manage JavaScript blocking... </message> - <message name="IDS_BLOCKED_PLUGINS_TITLE" desc="Bubble info header text when a page is not allowed to run Flash."> + <message name="IDS_BLOCKED_PLUGINS_TITLE" desc="Bubble info header text when a page is not allowed to run Flash. 'Flash' is the name of a plugin and should not be translated."> Flash was blocked on this page </message> - <message name="IDS_BLOCKED_PLUGINS_MESSAGE" desc="Tooltip on the icon when a page is not allowed to run Flash."> + <message name="IDS_BLOCKED_PLUGINS_MESSAGE" desc="Tooltip on the icon when a page is not allowed to run Flash. 'Flash' is the name of a plugin and should not be translated."> Flash was blocked on this page. </message> - <message name="IDS_BLOCKED_PLUGINS_LOAD_ALL" desc="Button to load all blocked plugins on a page, displayed in bubble when a page tries to display plugins."> + <message name="IDS_BLOCKED_PLUGINS_LOAD_ALL" desc="Button to load all blocked plugins on a page, displayed in bubble when a page tries to display plugins. 'Flash' is the name of a plugin and should not be translated."> Run Flash this time </message> <message name="IDS_BLOCKED_SOUND_TITLE" desc="Tooltip and bubble info header text when a page is not allowed to play sound."> @@ -5097,7 +5097,7 @@ <message name="IDS_FLASH_LOADING_MESSAGE" desc="Shown while loading until full list of modules is retrieved"> Loading... </message> - <message name="IDS_FLASH_TITLE_MESSAGE" desc="Shown while loading until full list of modules is retrieved"> + <message name="IDS_FLASH_TITLE_MESSAGE" desc="Shown while loading until full list of modules is retrieved. 'Flash' is the name of a plugin and should not be translated."> About Flash </message> @@ -5687,7 +5687,7 @@ <message name="IDS_CLEAR_BROWSING_DATA_TITLE" desc="Dialog title"> Clear browsing data </message> - <message name="IDS_FLASH_PERMISSION_FRAGMENT" desc="Permission asked in the permission bubble when a URL wants to use Flash Plugins on the page. Preceded by the prompt 'This site would like to:'"> + <message name="IDS_FLASH_PERMISSION_FRAGMENT" desc="Permission asked in the permission bubble when a URL wants to use Flash Plugins on the page. Preceded by the prompt 'This site would like to:'. 'Flash' is the name of a plugin and should not be translated."> Run Flash </message> <message name="IDS_CLEAR_BROWSING_DATA_HISTORY_FOOTER" desc="A text shown at the bottom of the Clear Browsing Data dialog, informing the user that deleting Chrome browsing history will not delete other forms of history stored at Google My Activity.">
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index d8f880de..a48b0b7 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -1535,11 +1535,6 @@ kOsMac | kOsWin | kOsCrOS | kOsAndroid, SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), }, - {"mojo-video-encode-accelerator", - flag_descriptions::kMojoVideoEncodeAcceleratorName, - flag_descriptions::kMojoVideoEncodeAcceleratorDescription, - kOsMac | kOsWin | kOsCrOS | kOsAndroid, - FEATURE_VALUE_TYPE(features::kMojoVideoEncodeAccelerator)}, #if defined(OS_WIN) {"enable-hdr", flag_descriptions::kEnableHDRName, flag_descriptions::kEnableHDRDescription, kOsWin,
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc index fcd95a0..4ef5e0c 100644 --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc
@@ -848,12 +848,6 @@ const char kMhtmlSkipNostoreMain[] = "Skips no-store main frame."; const char kMhtmlSkipNostoreAll[] = "Skips all no-store resources."; -const char kMojoVideoEncodeAcceleratorName[] = - "Hardware-accelerated video encoder accessed using Mojo IPC"; -const char kMojoVideoEncodeAcceleratorDescription[] = - "Use new Mojo IPC to access hardware-accelerated video encoder, where " - "available."; - const char kModuleScriptsDynamicImportName[] = "Enable ECMAScript 6 modules dynamic import"; const char kModuleScriptsDynamicImportDescription[] =
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h index 713bb3e..523d4fa 100644 --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h
@@ -531,9 +531,6 @@ extern const char kMhtmlSkipNostoreMain[]; extern const char kMhtmlSkipNostoreAll[]; -extern const char kMojoVideoEncodeAcceleratorName[]; -extern const char kMojoVideoEncodeAcceleratorDescription[]; - extern const char kModuleScriptsDynamicImportName[]; extern const char kModuleScriptsDynamicImportDescription[];
diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc index e87f324..6b94a2c 100644 --- a/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc
@@ -196,10 +196,6 @@ const base::Feature kMojoSessionStorage{"MojoSessionStorage", base::FEATURE_DISABLED_BY_DEFAULT}; -// Enables/disables hardware video encode acceleration using Mojo (falls back). -const base::Feature kMojoVideoEncodeAccelerator{ - "MojoVideoEncodeAccelerator", base::FEATURE_ENABLED_BY_DEFAULT}; - // ES6 Modules dynamic imports. const base::Feature kModuleScriptsDynamicImport{ "ModuleScriptsDynamicImport", base::FEATURE_ENABLED_BY_DEFAULT};
diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h index 1b944a3..8c68e84d 100644 --- a/content/public/common/content_features.h +++ b/content/public/common/content_features.h
@@ -59,7 +59,6 @@ CONTENT_EXPORT extern const base::Feature kMojoBlobs; CONTENT_EXPORT extern const base::Feature kMojoInputMessages; CONTENT_EXPORT extern const base::Feature kMojoSessionStorage; -CONTENT_EXPORT extern const base::Feature kMojoVideoEncodeAccelerator; CONTENT_EXPORT extern const base::Feature kModuleScriptsDynamicImport; CONTENT_EXPORT extern const base::Feature kModuleScriptsImportMetaUrl; CONTENT_EXPORT extern const base::Feature kNotificationsWithMojo;
diff --git a/content/test/blink_test_environment.cc b/content/public/test/blink_test_environment.cc similarity index 96% rename from content/test/blink_test_environment.cc rename to content/public/test/blink_test_environment.cc index ba13983c..9bb40037 100644 --- a/content/test/blink_test_environment.cc +++ b/content/public/test/blink_test_environment.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/test/blink_test_environment.h" +#include "content/public/test/blink_test_environment.h" #include <string> @@ -47,8 +47,7 @@ &discardable_memory_allocator_); } - ~TestEnvironment() { - } + ~TestEnvironment() {} // This returns when both the main thread and the TaskSchedules queues are // empty.
diff --git a/content/test/blink_test_environment.h b/content/public/test/blink_test_environment.h similarity index 73% rename from content/test/blink_test_environment.h rename to content/public/test/blink_test_environment.h index 6ae05d5..da56a64 100644 --- a/content/test/blink_test_environment.h +++ b/content/public/test/blink_test_environment.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_TEST_BLINK_TEST_ENVIRONMENT_H_ -#define CONTENT_TEST_BLINK_TEST_ENVIRONMENT_H_ +#ifndef CONTENT_PUBLIC_TEST_BLINK_TEST_ENVIRONMENT_H_ +#define CONTENT_PUBLIC_TEST_BLINK_TEST_ENVIRONMENT_H_ // This package provides functions used by webkit_unit_tests. namespace content { @@ -16,4 +16,4 @@ } // namespace content -#endif // CONTENT_TEST_BLINK_TEST_ENVIRONMENT_H_ +#endif // CONTENT_PUBLIC_TEST_BLINK_TEST_ENVIRONMENT_H_
diff --git a/content/renderer/media/gpu/gpu_video_accelerator_factories_impl.cc b/content/renderer/media/gpu/gpu_video_accelerator_factories_impl.cc index f0234c4..05deb05 100644 --- a/content/renderer/media/gpu/gpu_video_accelerator_factories_impl.cc +++ b/content/renderer/media/gpu/gpu_video_accelerator_factories_impl.cc
@@ -170,8 +170,6 @@ if (CheckContextLost()) return nullptr; - DCHECK(base::FeatureList::IsEnabled(features::kMojoVideoEncodeAccelerator)); - media::mojom::VideoEncodeAcceleratorPtr vea; vea_provider_->CreateVideoEncodeAccelerator(mojo::MakeRequest(&vea));
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn index 60fc209e..cf355bd 100644 --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn
@@ -56,6 +56,8 @@ "../browser/service_worker/service_worker_test_utils.h", "../public/test/background_sync_test_util.cc", "../public/test/background_sync_test_util.h", + "../public/test/blink_test_environment.cc", + "../public/test/blink_test_environment.h", "../public/test/browser_side_navigation_test_utils.cc", "../public/test/browser_side_navigation_test_utils.h", "../public/test/browser_test.h", @@ -178,8 +180,6 @@ "accessibility_browser_test_utils.h", "appcache_test_helper.cc", "appcache_test_helper.h", - "blink_test_environment.cc", - "blink_test_environment.h", "content_browser_sanity_checker.cc", "content_browser_sanity_checker.h", "content_test_suite.cc",
diff --git a/content/test/test_overscroll_delegate.h b/content/test/test_overscroll_delegate.h index 54b580f..724e981f 100644 --- a/content/test/test_overscroll_delegate.h +++ b/content/test/test_overscroll_delegate.h
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#ifndef CONTENT_TEST_TEST_OVERSCROLL_DELEGATE_H_ +#define CONTENT_TEST_TEST_OVERSCROLL_DELEGATE_H_ + #include <vector> #include "base/optional.h" @@ -52,3 +55,5 @@ }; } // namespace content + +#endif // CONTENT_TEST_TEST_OVERSCROLL_DELEGATE_H_
diff --git a/ios/chrome/browser/ui/fullscreen/fullscreen_mediator.mm b/ios/chrome/browser/ui/fullscreen/fullscreen_mediator.mm index f01f89c..400dacf 100644 --- a/ios/chrome/browser/ui/fullscreen/fullscreen_mediator.mm +++ b/ios/chrome/browser/ui/fullscreen/fullscreen_mediator.mm
@@ -9,6 +9,7 @@ #import "ios/chrome/browser/ui/fullscreen/fullscreen_controller_observer.h" #import "ios/chrome/browser/ui/fullscreen/fullscreen_model.h" #import "ios/chrome/browser/ui/fullscreen/fullscreen_scroll_end_animator.h" +#include "ios/chrome/browser/ui/ui_util.h" #if !defined(__has_feature) || !__has_feature(objc_arc) #error "This file requires ARC support." @@ -64,8 +65,11 @@ FullscreenModel* model) { DCHECK_EQ(model_, model); DCHECK(!animator_); - animator_ = [[FullscreenScrollEndAnimator alloc] - initWithStartProgress:model_->progress()]; + CGFloat progress = model_->progress(); + if (AreCGFloatsEqual(progress, 0.0) || AreCGFloatsEqual(progress, 1.0)) + return; + animator_ = + [[FullscreenScrollEndAnimator alloc] initWithStartProgress:progress]; [animator_ addCompletion:^(UIViewAnimatingPosition finalPosition) { DCHECK_EQ(finalPosition, UIViewAnimatingPositionEnd); model_->AnimationEndedWithProgress(
diff --git a/ios/chrome/browser/ui/fullscreen/fullscreen_scroll_end_animator.mm b/ios/chrome/browser/ui/fullscreen/fullscreen_scroll_end_animator.mm index 33f35a59..5c4e86b 100644 --- a/ios/chrome/browser/ui/fullscreen/fullscreen_scroll_end_animator.mm +++ b/ios/chrome/browser/ui/fullscreen/fullscreen_scroll_end_animator.mm
@@ -33,8 +33,15 @@ UICubicTimingParameters* timingParams = [[UICubicTimingParameters alloc] initWithControlPoint1:CGPointMake(0.0, 0.0) controlPoint2:CGPointMake(0.2, 0.1)]; - self = [super initWithDuration:ios::material::kDuration1 - timingParameters:timingParams]; + DCHECK_GE(startProgress, 0.0); + DCHECK_LE(startProgress, 1.0); + CGFloat finalProgress = roundf(startProgress); + // Scale the duration by the progress delta traversed in this animation. + // Since |finalProgress - startProgress| <= 0.5, the delta is multiplied by + // 2.0. + NSTimeInterval duration = + 2.0 * fabs(finalProgress - startProgress) * ios::material::kDuration1; + self = [super initWithDuration:duration timingParameters:timingParams]; if (self) { DCHECK_GE(startProgress, 0.0); DCHECK_LE(startProgress, 1.0);
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations index 4c7e799..47426b4 100644 --- a/third_party/WebKit/LayoutTests/TestExpectations +++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -151,12 +151,6 @@ # Fails because of an 8bit precision error in the YUV -> RGB conversion matrix crbug.com/774567 [ Win Linux ] external/wpt/webvtt/rendering/cues-with-video/processing-model/dom_override_remove_cue_while_paused.html [ Failure ] -# Failing after the Skia roll https://chromium.googlesource.com/chromium/src/+/dc8531cb84f4d3334fc520c2c9269935a90d0c30 -crbug.com/796766 [ Mac Win Linux ] fast/webgl/texImage-imageBitmap-from-canvas-resize.html [ Failure Pass ] -crbug.com/796766 [ Mac Win Linux ] fast/webgl/texImage-imageBitmap-from-image-resize.html [ Failure Pass ] -crbug.com/796766 [ Mac Win Linux ] fast/webgl/texImage-imageBitmap-from-imageData-resize.html [ Failure Pass ] -crbug.com/796766 [ Mac Win Linux ] fast/webgl/texImage-imageBitmap-from-offscreen-canvas-resize.html [ Failure Pass ] - # Fails because the manual test hasn't been automated yet crbug.com/762054 external/wpt/css/cssom-view/overscrollBehavior-manual.html [ Skip ] @@ -1952,7 +1946,6 @@ crbug.com/626703 external/wpt/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-integrity-classic.html [ Skip ] crbug.com/626703 external/wpt/html/semantics/scripting-1/the-script-element/module/dynamic-import/string-compilation-integrity-module.html [ Skip ] crbug.com/626703 external/wpt/svg/path/bearing/absolute.svg [ Failure ] -crbug.com/626703 [ Android Win7 ] external/wpt/longtask-timing/longtask-in-sibling-iframe.html [ Timeout ] crbug.com/626703 [ Linux Win ] external/wpt/css/css-color/t425-hsla-onscreen-b.xht [ Failure ] crbug.com/626703 external/wpt/css/css-color/t32-opacity-offscreen-b.xht [ Failure ] crbug.com/626703 external/wpt/css/css-color/t32-opacity-offscreen-with-alpha-c.xht [ Failure ] @@ -1970,7 +1963,6 @@ crbug.com/626703 external/wpt/service-workers/service-worker/clients-get-client-types.https.html [ Timeout ] crbug.com/626703 [ Linux Mac ] virtual/outofblink-cors/external/wpt/service-workers/service-worker/clients-get.https.html [ Timeout ] crbug.com/626703 [ Linux Mac ] virtual/mojo-blobs/external/wpt/service-workers/service-worker/clients-get-client-types.https.html [ Timeout ] -crbug.com/626703 [ Mac10.12 ] external/wpt/longtask-timing/longtask-in-sibling-iframe.html [ Timeout ] crbug.com/626703 external/wpt/html/rendering/non-replaced-elements/the-page/body-margin-1i.html [ Failure ] crbug.com/626703 external/wpt/html/rendering/non-replaced-elements/the-page/body-margin-1j.html [ Failure ] crbug.com/626703 external/wpt/html/rendering/non-replaced-elements/the-page/body-margin-1k.html [ Failure ] @@ -2411,6 +2403,8 @@ crbug.com/796733 [ Win ] external/wpt/css/css-ui/text-overflow-016.html [ Pass Failure ] crbug.com/796733 [ Win ] external/wpt/css/css-ui/text-overflow-020.html [ Pass Failure ] +crbug.com/796668 external/wpt/longtask-timing/longtask-in-sibling-iframe.html [ Skip ] + # This test times out on debug builds, see https://crbug.com/755810 crbug.com/626703 [ Debug ] external/wpt/html/semantics/tabular-data/processing-model-1/span-limits.html [ Skip ]
diff --git a/third_party/WebKit/LayoutTests/fast/webgl/resources/tex-image-and-sub-image-image-bitmap-utils-resize.js b/third_party/WebKit/LayoutTests/fast/webgl/resources/tex-image-and-sub-image-image-bitmap-utils-resize.js index b67a1b6..ca99a4d 100644 --- a/third_party/WebKit/LayoutTests/fast/webgl/resources/tex-image-and-sub-image-image-bitmap-utils-resize.js +++ b/third_party/WebKit/LayoutTests/fast/webgl/resources/tex-image-and-sub-image-image-bitmap-utils-resize.js
@@ -32,8 +32,8 @@ var refBufLowUnpremul = [ 255,0,0,255, 255,0,0,197, 255,0,0,83, 255,0,0,26, - 191,63,0,255, 192,63,0,197, 190,61,0,83, 186,59,0,26, - 63,191,0,255, 63,192,0,197, 61,190,0,83, 59,186,0,26, + 191,63,0,255, 191,63,0,197, 191,63,0,83, 191,63,0,26, + 63,191,0,255, 63,191,0,197, 63,191,0,83, 63,191,0,26, 0,255,0,255, 0,255,0,197, 0,255,0,83, 0,255,0,26]; var refBufLowPremulFlipY = [ @@ -44,8 +44,8 @@ var refBufLowUnpremulFlipY = [ 0,255,0,255, 0,255,0,197, 0,255,0,83, 0,255,0,26, - 63,191,0,255, 63,192,0,197, 61,190,0,83, 59,186,0,26, - 191,63,0,255, 192,63,0,197, 190,61,0,83, 186,59,0,26, + 63,191,0,255, 63,191,0,197, 63,191,0,83, 63,191,0,26, + 191,63,0,255, 191,63,0,197, 191,63,0,83, 191,63,0,26, 255,0,0,255, 255,0,0,197, 255,0,0,83, 255,0,0,26]; //-------------- Reference Buffers for Medium Filter Quality ---------------// @@ -54,65 +54,39 @@ var refBufMediumPremulFlipY = refBufLowPremulFlipY; var refBufMediumUnpremulFlipY = refBufLowUnpremulFlipY; -//-------- Reference Buffers for High Filter Quality (Premul Source) -------// -var refBufHighPremulSourcePremul = [ - 255,0,0,255, 200,0,0,200, 81,0,0,81, 21,0,0,21, +//---------------- Reference Buffers for High Filter Quality ---------------// +var refBufHighPremul = [ + 255,0,0,255, 204,0,0,200, 83,0,0,81, 21,0,0,21, 198,63,0,255, 152,48,0,200, 62,20,0,81, 16,5,0,21, 63,198,0,255, 48,152,0,200, 20,62,0,81, 5,16,0,21, - 0,255,0,255, 0,200,0,200, 0,81,0,81, 0,21,0,21]; + 0,255,0,255, 0,204,0,200, 0,83,0,81, 0,21,0,21]; -var refBufHighUnpremulSourcePremul = [ - 255,0,0,255, 255,0,0,200, 255,0,0,81, 255,0,0,21, - 198,63,0,255, 194,61,0,200, 195,63,0,81, 194,61,0,21, - 63,198,0,255, 61,194,0,200, 63,195,0,81, 61,194,0,21, - 0,255,0,255, 0,255,0,200, 0,255,0,81, 0,255,0,21]; - -var refBufHighPremulFlipYSourcePremul = [ - 0,255,0,255, 0,200,0,200, 0,81,0,81, 0,21,0,21, - 63,198,0,255, 48,152,0,200, 20,62,0,81, 5,16,0,21, - 198,63,0,255, 152,48,0,200, 62,20,0,81, 16,5,0,21, - 255,0,0,255, 200,0,0,200, 81,0,0,81, 21,0,0,21]; - -var refBufHighUnpremulFlipYSourcePremul = [ - 0,255,0,255, 0,255,0,200, 0,255,0,81, 0,255,0,21, - 63,198,0,255, 61,194,0,200, 63,195,0,81, 61,194,0,21, - 198,63,0,255, 194,61,0,200, 195,63,0,81, 194,61,0,21, - 255,0,0,255, 255,0,0,200, 255,0,0,81, 255,0,0,21]; - -//------- Reference Buffers for High Filter Quality (Unpremul Source) ------// -var refBufHighPremulSourceUnpremul = [ - 255,0,0,255, 200,0,0,200, 81,0,0,81, 21,0,0,21, - 198,63,0,255, 152,48,0,200, 62,20,0,81, 16,5,0,21, - 63,198,0,255, 48,152,0,200, 20,62,0,81, 5,16,0,21, - 0,255,0,255, 0,200,0,200, 0,81,0,81, 0,21,0,21]; - -var refBufHighUnpremulSourceUnpremul = [ +var refBufHighUnpremul = [ 255,0,0,255, 255,0,0,200, 255,0,0,81, 255,0,0,21, 193,62,0,255, 193,62,0,200, 193,62,0,81, 193,62,0,21, 62,193,0,255, 62,193,0,200, 62,193,0,81, 62,193,0,21, 0,255,0,255, 0,255,0,200, 0,255,0,81, 0,255,0,21]; -var refBufHighPremulFlipYSourceUnpremul = [ - 0,255,0,255, 0,200,0,200, 0,81,0,81, 0,21,0,21, +var refBufHighPremulFlipY = [ + 0,255,0,255, 0,204,0,200, 0,83,0,81, 0,21,0,21, 63,198,0,255, 48,152,0,200, 20,62,0,81, 5,16,0,21, 198,63,0,255, 152,48,0,200, 62,20,0,81, 16,5,0,21, - 255,0,0,255, 200,0,0,200, 81,0,0,81, 21,0,0,21]; + 255,0,0,255, 204,0,0,200, 83,0,0,81, 21,0,0,21]; -var refBufHighUnpremulFlipYSourceUnpremul = [ +var refBufHighUnpremulFlipY = [ 0,255,0,255, 0,255,0,200, 0,255,0,81, 0,255,0,21, 62,193,0,255, 62,193,0,200, 62,193,0,81, 62,193,0,21, 193,62,0,255, 193,62,0,200, 193,62,0,81, 193,62,0,21, 255,0,0,255, 255,0,0,200, 255,0,0,81, 255,0,0,21]; - var wtu = WebGLTestUtils; var tiu = TexImageUtils; var gl = null; var internalFormat = "RGBA"; var pixelFormat = "RGBA"; var pixelType = "UNSIGNED_BYTE"; -var opaqueTolerance = 0; -var transparentTolerance = 0; +var opaqueTolerance = 1; +var transparentTolerance = 1; var transparentToleranceForBlob = 5; function getRefBuffer(testOptions, flipY, premultiplyAlpha) { @@ -125,12 +99,6 @@ refBufName += "Unpremul"; if (flipY) refBufName += "FlipY"; - if (testOptions.resizeQuality == "high") { - if (testOptions.sourceIsPremul) - refBufName += "SourcePremul"; - else - refBufName += "SourceUnpremul"; - } return eval(refBufName); }
diff --git a/third_party/WebKit/Source/controller/tests/DEPS b/third_party/WebKit/Source/controller/tests/DEPS index e442447f..4fd7f5f 100644 --- a/third_party/WebKit/Source/controller/tests/DEPS +++ b/third_party/WebKit/Source/controller/tests/DEPS
@@ -5,6 +5,6 @@ specific_include_rules = { 'RunAllTests\.cpp': [ - "+content/test/blink_test_environment.h", + "+content/public/test/blink_test_environment.h", ], }
diff --git a/third_party/WebKit/Source/controller/tests/RunAllTests.cpp b/third_party/WebKit/Source/controller/tests/RunAllTests.cpp index ffa0c3a..5f65ec2 100644 --- a/third_party/WebKit/Source/controller/tests/RunAllTests.cpp +++ b/third_party/WebKit/Source/controller/tests/RunAllTests.cpp
@@ -34,7 +34,7 @@ #include "base/test/test_suite.h" #include "base/threading/thread_task_runner_handle.h" #include "bindings/core/v8/V8GCController.h" -#include "content/test/blink_test_environment.h" +#include "content/public/test/blink_test_environment.h" #include "platform/heap/ThreadState.h" #include "platform/weborigin/SchemeRegistry.h" #include "v8/include/v8.h"
diff --git a/third_party/WebKit/Source/core/imagebitmap/ImageBitmap.cpp b/third_party/WebKit/Source/core/imagebitmap/ImageBitmap.cpp index 88d95f28..5299c3c 100644 --- a/third_party/WebKit/Source/core/imagebitmap/ImageBitmap.cpp +++ b/third_party/WebKit/Source/core/imagebitmap/ImageBitmap.cpp
@@ -301,32 +301,15 @@ static_cast<Uint8Array*>(pixels)->Release(); } -// Resizes an SkImage using scalePixels(). This code path should not be used if -// source image is not premul and premul is not allowed and the requested filter -// quality is high. -sk_sp<SkImage> ScaleSkImage(sk_sp<SkImage> image, - const ImageBitmap::ParsedOptions& parsed_options, - AlphaDisposition alpha_disposition) { +scoped_refptr<StaticBitmapImage> ScaleImage( + scoped_refptr<StaticBitmapImage>&& image, + const ImageBitmap::ParsedOptions& parsed_options) { + auto sk_image = image->PaintImageForCurrentFrame().GetSkImage(); auto image_info = GetSkImageInfo(image); - DCHECK(image_info.alphaType() == kPremul_SkAlphaType || - !ShouldAvoidPremul(parsed_options) || - parsed_options.resize_quality != kHigh_SkFilterQuality); // Avoid sRGB transfer function by setting the color space to nullptr. if (SkColorSpace::Equals(image_info.colorSpace(), - SkColorSpace::MakeSRGB().get())) + SkColorSpace::MakeSRGB().get())) { image_info = image_info.makeColorSpace(nullptr); - - // Premul if needed - if (alpha_disposition == kPremultiplyAlpha && - image_info.alphaType() == kUnpremul_SkAlphaType) { - image_info = image_info.makeAlphaType(kPremul_SkAlphaType); - sk_sp<SkSurface> surface = SkSurface::MakeRaster(image_info); - if (!surface) - return nullptr; - SkPaint paint; - paint.setBlendMode(SkBlendMode::kSrc); - surface->getCanvas()->drawImage(image.get(), 0, 0, &paint); - image = surface->makeImageSnapshot(); } SkImageInfo resized_info = image_info.makeWH(parsed_options.resize_width, @@ -341,7 +324,7 @@ return nullptr; SkPixmap resized_pixmap(resized_info, resized_pixels->Data(), resized_info.minRowBytes()); - image->scalePixels(resized_pixmap, parsed_options.resize_quality); + sk_image->scalePixels(resized_pixmap, parsed_options.resize_quality); // Tag the resized Pixmap with the correct color space. resized_pixmap.setColorSpace(GetSkImageInfo(image).refColorSpace()); @@ -350,110 +333,10 @@ pixels->AddRef(); resized_pixels = nullptr; } - return SkImage::MakeFromRaster(resized_pixmap, freePixels, pixels); -} - -scoped_refptr<StaticBitmapImage> ScaleImage( - scoped_refptr<StaticBitmapImage>&& image, - const ImageBitmap::ParsedOptions& parsed_options) { - // Use ScaleSkImage() to resize the image unless the image is unpremul and - // premul code path is not allowed and the filter quality is high. - auto image_info = GetSkImageInfo(image); - if (image_info.alphaType() == kPremul_SkAlphaType || - !ShouldAvoidPremul(parsed_options) || - parsed_options.resize_quality != kHigh_SkFilterQuality) { - auto sk_image = image->PaintImageForCurrentFrame().GetSkImage(); - AlphaDisposition alpha_disposition = kDontChangeAlpha; - if (image_info.alphaType() == kUnpremul_SkAlphaType && - !ShouldAvoidPremul(parsed_options)) - alpha_disposition = kPremultiplyAlpha; - auto resized_sk_image = - ScaleSkImage(sk_image, parsed_options, alpha_disposition); - return StaticBitmapImage::Create(resized_sk_image, - image->ContextProviderWrapper()); - } - - // If source image is unpremul, premul code path is not allowed, and the - // filter quality is high, we cannot use SkImage::scalePixels(), and thus - // ScaleSkImage(), as Skia clamps color channels to alpha in this case. - // Instead, we scale color channels and alpha channel separately: RGBA -> - // RGB/255 and A/255,255,255, scale, merge. - SkScalar set_alpha_255[] = {1, 0, 0, 0, 0, // copy red channel - 0, 1, 0, 0, 0, // copy green channel - 0, 0, 1, 0, 0, // copy blue channel - 0, 0, 0, 0, 255}; // set alpha to 255 - auto color_filter_set_alpha_255 = - SkColorFilter::MakeMatrixFilterRowMajor255(set_alpha_255); - auto image_filter_set_alpha_255 = SkColorFilterImageFilter::Make( - std::move(color_filter_set_alpha_255), nullptr, nullptr); - - SkScalar copy_alpha_to_red[] = {0, 0, 0, 1, 0, // copy alpha to red - 0, 0, 0, 0, 0, // set green to zero - 0, 0, 0, 0, 0, // set blue to zero - 0, 0, 0, 0, 255}; // set alpha to 255 - auto color_filter_copy_alpha_to_red = - SkColorFilter::MakeMatrixFilterRowMajor255(copy_alpha_to_red); - auto image_filter_copy_alpha_to_red = SkColorFilterImageFilter::Make( - std::move(color_filter_copy_alpha_to_red), nullptr, nullptr); - - // separate RGBA to RGB/255 and A,0,0/255 - SkIRect subset; - SkIPoint offset; - auto sk_image = image->PaintImageForCurrentFrame().GetSkImage(); - auto rgb_image = sk_image->makeWithFilter( - image_filter_set_alpha_255.get(), sk_image->bounds(), sk_image->bounds(), - &subset, &offset); - auto alpha_image = sk_image->makeWithFilter( - image_filter_copy_alpha_to_red.get(), sk_image->bounds(), - sk_image->bounds(), &subset, &offset); - - // resize - auto resized_rgb_image = - ScaleSkImage(rgb_image, parsed_options, kDontChangeAlpha); - auto resized_alpha_image = - ScaleSkImage(alpha_image, parsed_options, kDontChangeAlpha); - - // Merge two resized rgb and alpha SkImages together. - // A better solution would be using SkImageFilter and SkBlendMode to merge - // the images: convert RGB/255 to RGB/0, convert A,0,0/255 to 0,0,0/A, merge - // using kSrc and kLighten blend modes. Unfortunately, this doesn't work as - // SkImageFilter clamps color channels to zero when setting alpha to zero. - // Therefore, we use a pixmap here. - scoped_refptr<Uint8Array> rgb_data = - CopyImageData(StaticBitmapImage::Create(resized_rgb_image)); - scoped_refptr<Uint8Array> alpha_data = - CopyImageData(StaticBitmapImage::Create(resized_alpha_image)); - SkImageInfo resized_image_info = GetSkImageInfo(resized_rgb_image); - if (resized_image_info.colorType() == kRGBA_F16_SkColorType) { - uint16_t* rgb_data_iter = static_cast<uint16_t*>((void*)(rgb_data->Data())); - uint16_t* alpha_data_iter = - static_cast<uint16_t*>((void*)(alpha_data->Data())); - for (int i = 0; - i < resized_image_info.width() * resized_image_info.height(); i++) - *(rgb_data_iter + i * 4 + 3) = *(alpha_data_iter + i * 4); - } else { - uint8_t* rgb_data_iter = static_cast<uint8_t*>(rgb_data->Data()); - uint8_t* alpha_data_iter = static_cast<uint8_t*>(alpha_data->Data()); - int red_channel_locator = - (kN32_SkColorType == kRGBA_8888_SkColorType) ? 0 : 2; - for (int i = 0; - i < resized_image_info.width() * resized_image_info.height(); i++) { - *(rgb_data_iter + i * 4 + 3) = - *(alpha_data_iter + i * 4 + red_channel_locator); - } - } - - SkImageInfo resized_unpremul_info = - resized_image_info.makeAlphaType(kUnpremul_SkAlphaType); - SkPixmap pixmap(resized_unpremul_info, rgb_data->Data(), - resized_unpremul_info.minRowBytes()); - Uint8Array* pixels = rgb_data.get(); - if (pixels) { - pixels->AddRef(); - rgb_data = nullptr; - } - return StaticBitmapImage::Create( - SkImage::MakeFromRaster(pixmap, freePixels, pixels)); + sk_sp<SkImage> resized_sk_image = + SkImage::MakeFromRaster(resized_pixmap, freePixels, pixels); + return StaticBitmapImage::Create(resized_sk_image, + image->ContextProviderWrapper()); } scoped_refptr<StaticBitmapImage> ApplyColorSpaceConversion( @@ -581,6 +464,11 @@ return nullptr; } + // premultiply / unpremultiply if needed + result = GetImageWithAlphaDisposition(std::move(result), + parsed_options.premultiply_alpha + ? kPremultiplyAlpha + : kUnpremultiplyAlpha); // resize if up-scaling if (up_scaling) { result = ScaleImage(std::move(result), parsed_options); @@ -588,12 +476,6 @@ return nullptr; } - // premultiply / unpremultiply if needed - result = GetImageWithAlphaDisposition(std::move(result), - parsed_options.premultiply_alpha - ? kPremultiplyAlpha - : kUnpremultiplyAlpha); - return result; }
diff --git a/third_party/WebKit/Source/platform/heap/DEPS b/third_party/WebKit/Source/platform/heap/DEPS index 837d98ed..9abd940a 100644 --- a/third_party/WebKit/Source/platform/heap/DEPS +++ b/third_party/WebKit/Source/platform/heap/DEPS
@@ -4,3 +4,9 @@ "+base/bits.h", "+base/sys_info.h", ] + +specific_include_rules = { + 'RunAllTests\.cpp': [ + "+content/public/test/blink_test_environment.h", + ], +}
diff --git a/third_party/WebKit/Source/platform/heap/RunAllTests.cpp b/third_party/WebKit/Source/platform/heap/RunAllTests.cpp index 5b4dd1b..830a17bd 100644 --- a/third_party/WebKit/Source/platform/heap/RunAllTests.cpp +++ b/third_party/WebKit/Source/platform/heap/RunAllTests.cpp
@@ -28,13 +28,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "platform/heap/Handle.h" -#include <base/bind.h> -#include <base/test/launcher/unit_test_launcher.h> -#include <base/test/test_suite.h> -#include <base/time/time.h> -#include <content/test/blink_test_environment.h> #include <string.h> +#include "base/bind.h" +#include "base/test/launcher/unit_test_launcher.h" +#include "base/test/test_suite.h" +#include "content/public/test/blink_test_environment.h" +#include "platform/heap/ThreadState.h" class BlinkTestEnvironmentScope { public:
diff --git a/third_party/WebKit/Source/platform/testing/BlinkFuzzerTestSupport.cpp b/third_party/WebKit/Source/platform/testing/BlinkFuzzerTestSupport.cpp index 5900be4..a10f7b0 100644 --- a/third_party/WebKit/Source/platform/testing/BlinkFuzzerTestSupport.cpp +++ b/third_party/WebKit/Source/platform/testing/BlinkFuzzerTestSupport.cpp
@@ -7,8 +7,8 @@ #include "base/at_exit.h" #include "base/command_line.h" #include "base/i18n/icu_util.h" +#include "content/public/test/blink_test_environment.h" #include "platform/weborigin/SchemeRegistry.h" -#include <content/test/blink_test_environment.h> namespace blink {
diff --git a/third_party/WebKit/Source/platform/testing/DEPS b/third_party/WebKit/Source/platform/testing/DEPS index 7a4e13c..7c08b28 100644 --- a/third_party/WebKit/Source/platform/testing/DEPS +++ b/third_party/WebKit/Source/platform/testing/DEPS
@@ -15,3 +15,9 @@ "+mojo/edk/embedder", '+testing', ] + +specific_include_rules = { + 'BlinkFuzzerTestSupport\.cpp': [ + "+content/public/test/blink_test_environment.h", + ], +}
diff --git a/tools/perf/expectations.config b/tools/perf/expectations.config index 15b0eaf..19563760 100644 --- a/tools/perf/expectations.config +++ b/tools/perf/expectations.config
@@ -97,26 +97,6 @@ crbug.com/667432 [ All ] smoothness.gpu_rasterization.top_25_smooth/http://www.amazon.com [ Skip ] crbug.com/528474 [ All ] smoothness.gpu_rasterization.top_25_smooth/http://www.cnn.com [ Skip ] -# Benchmark: smoothness.gpu_rasterization.tough_pinch_zoom_cases -crbug.com/610021 [ Android ] smoothness.gpu_rasterization.tough_pinch_zoom_cases/https://www.google.com/calendar/ [ Skip ] -crbug.com/610021 [ Android ] smoothness.gpu_rasterization.tough_pinch_zoom_cases/http://games.yahoo.com [ Skip ] -crbug.com/610021 [ Android ] smoothness.gpu_rasterization.tough_pinch_zoom_cases/https://www.google.com/#hl=en&q=barack+obama [ Skip ] -crbug.com/610021 [ Android ] smoothness.gpu_rasterization.tough_pinch_zoom_cases/ESPN [ Skip ] -crbug.com/610021 [ Android ] smoothness.gpu_rasterization.tough_pinch_zoom_cases/https://mail.google.com/mail/ [ Skip ] -crbug.com/610021 [ Android ] smoothness.gpu_rasterization.tough_pinch_zoom_cases/Blogger [ Skip ] -crbug.com/610021 [ Android ] smoothness.gpu_rasterization.tough_pinch_zoom_cases/Twitter [ Skip ] -crbug.com/610021 [ Android ] smoothness.gpu_rasterization.tough_pinch_zoom_cases/http://sports.yahoo.com/ [ Skip ] -crbug.com/610021 [ Android ] smoothness.gpu_rasterization.tough_pinch_zoom_cases/LinkedIn [ Skip ] -crbug.com/610021 [ Android ] smoothness.gpu_rasterization.tough_pinch_zoom_cases/http://www.youtube.com [ Skip ] -crbug.com/610021 [ Android ] smoothness.gpu_rasterization.tough_pinch_zoom_cases/Facebook [ Skip ] -crbug.com/610021 [ Android ] smoothness.gpu_rasterization.tough_pinch_zoom_cases/http://www.amazon.com [ Skip ] -crbug.com/610021 [ Android ] smoothness.gpu_rasterization.tough_pinch_zoom_cases/Weather.com [ Skip ] -crbug.com/610021 [ Android ] smoothness.gpu_rasterization.tough_pinch_zoom_cases/http://www.cnn.com [ Skip ] -crbug.com/610021 [ Android ] smoothness.gpu_rasterization.tough_pinch_zoom_cases/http://www.ebay.com [ Skip ] -crbug.com/610021 [ Android ] smoothness.gpu_rasterization.tough_pinch_zoom_cases/https://www.google.com/search?q=cats&tbm=isch [ Skip ] -crbug.com/610021 [ Android ] smoothness.gpu_rasterization.tough_pinch_zoom_cases/http://booking.com [ Skip ] -crbug.com/610021 [ Android ] smoothness.gpu_rasterization.tough_pinch_zoom_cases/http://news.yahoo.com [ Skip ] - # Benchmark: smoothness.key_desktop_move_cases crbug.com/750131 [ Win ] smoothness.key_desktop_move_cases/https://mail.google.com/mail/ [ Skip ] crbug.com/770904 [ Mac ] smoothness.key_desktop_move_cases/https://mail.google.com/mail/ [ Skip ] @@ -165,26 +145,6 @@ crbug.com/785286 [ Android_Webview ] smoothness.tough_canvas_cases/http://www.effectgames.com/demos/canvascycle/ [ Skip ] crbug.com/364248 [ Nexus_5 ] smoothness.tough_canvas_cases/http://geoapis.appspot.com/agdnZW9hcGlzchMLEgtFeGFtcGxlQ29kZRjh1wIM [ Skip ] -# Benchmark: smoothness.tough_pinch_zoom_cases -crbug.com/631015 [ Android ] smoothness.tough_pinch_zoom_cases/https://www.google.com/calendar/ [ Skip ] -crbug.com/631015 [ Android ] smoothness.tough_pinch_zoom_cases/http://games.yahoo.com [ Skip ] -crbug.com/631015 [ Android ] smoothness.tough_pinch_zoom_cases/https://www.google.com/#hl=en&q=barack+obama [ Skip ] -crbug.com/631015 [ Android ] smoothness.tough_pinch_zoom_cases/ESPN [ Skip ] -crbug.com/631015 [ Android ] smoothness.tough_pinch_zoom_cases/https://mail.google.com/mail/ [ Skip ] -crbug.com/631015 [ Android ] smoothness.tough_pinch_zoom_cases/Blogger [ Skip ] -crbug.com/631015 [ Android ] smoothness.tough_pinch_zoom_cases/Twitter [ Skip ] -crbug.com/631015 [ Android ] smoothness.tough_pinch_zoom_cases/http://sports.yahoo.com/ [ Skip ] -crbug.com/631015 [ Android ] smoothness.tough_pinch_zoom_cases/LinkedIn [ Skip ] -crbug.com/631015 [ Android ] smoothness.tough_pinch_zoom_cases/http://www.youtube.com [ Skip ] -crbug.com/631015 [ Android ] smoothness.tough_pinch_zoom_cases/Facebook [ Skip ] -crbug.com/631015 [ Android ] smoothness.tough_pinch_zoom_cases/http://www.amazon.com [ Skip ] -crbug.com/631015 [ Android ] smoothness.tough_pinch_zoom_cases/Weather.com [ Skip ] -crbug.com/631015 [ Android ] smoothness.tough_pinch_zoom_cases/http://www.cnn.com [ Skip ] -crbug.com/631015 [ Android ] smoothness.tough_pinch_zoom_cases/http://www.ebay.com [ Skip ] -crbug.com/631015 [ Android ] smoothness.tough_pinch_zoom_cases/https://www.google.com/search?q=cats&tbm=isch [ Skip ] -crbug.com/631015 [ Android ] smoothness.tough_pinch_zoom_cases/http://booking.com [ Skip ] -crbug.com/631015 [ Android ] smoothness.tough_pinch_zoom_cases/http://news.yahoo.com [ Skip ] - # Benchmark: smoothness.tough_scrolling_cases crbug.com/785473 [ Android_Webview ] smoothness.tough_scrolling_cases/canvas_15000_pixels_per_second [ Skip ] crbug.com/785473 [ Android_Webview ] smoothness.tough_scrolling_cases/canvas_20000_pixels_per_second [ Skip ]
diff --git a/ui/compositor/layer_animator.cc b/ui/compositor/layer_animator.cc index c4ae683..01b17ca7 100644 --- a/ui/compositor/layer_animator.cc +++ b/ui/compositor/layer_animator.cc
@@ -39,7 +39,7 @@ namespace { -const int kDefaultTransitionDurationMs = 120; +const int kLayerAnimatorDefaultTransitionDurationMs = 120; } // namespace @@ -76,8 +76,8 @@ // static LayerAnimator* LayerAnimator::CreateImplicitAnimator() { - return new LayerAnimator( - base::TimeDelta::FromMilliseconds(kDefaultTransitionDurationMs)); + return new LayerAnimator(base::TimeDelta::FromMilliseconds( + kLayerAnimatorDefaultTransitionDurationMs)); } // This macro provides the implementation for the setter and getter (well,
diff --git a/ui/compositor/scoped_layer_animation_settings.cc b/ui/compositor/scoped_layer_animation_settings.cc index a01a2ef..085b15f6 100644 --- a/ui/compositor/scoped_layer_animation_settings.cc +++ b/ui/compositor/scoped_layer_animation_settings.cc
@@ -12,9 +12,11 @@ #include "ui/compositor/layer_animator.h" #include "ui/compositor/layer_observer.h" +namespace ui { + namespace { -const int kDefaultTransitionDurationMs = 200; +const int kScopedLayerAnimationDefaultTransitionDurationMs = 200; template <typename Trait> class ScopedLayerAnimationObserver : public ui::ImplicitAnimationObserver, @@ -104,8 +106,6 @@ } // namespace -namespace ui { - // ScopedLayerAnimationSettings ------------------------------------------------ ScopedLayerAnimationSettings::ScopedLayerAnimationSettings( scoped_refptr<LayerAnimator> animator) @@ -115,8 +115,8 @@ old_transition_duration_(animator->GetTransitionDuration()), old_tween_type_(animator->tween_type()), old_preemption_strategy_(animator->preemption_strategy()) { - SetTransitionDuration( - base::TimeDelta::FromMilliseconds(kDefaultTransitionDurationMs)); + SetTransitionDuration(base::TimeDelta::FromMilliseconds( + kScopedLayerAnimationDefaultTransitionDurationMs)); } ScopedLayerAnimationSettings::~ScopedLayerAnimationSettings() {