summaryrefslogtreecommitdiffstats
path: root/content/content_tests.gypi
diff options
context:
space:
mode:
authorjdduke@chromium.org <jdduke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-08 18:12:05 +0000
committerjdduke@chromium.org <jdduke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-08 18:13:08 +0000
commit33d76bb0f87cd9e3ad5b1589bb29872924e4e5e3 (patch)
tree53c71fe658765d5b61701554d224876baf20834c /content/content_tests.gypi
parentc16f8d313d371c7fc6e38cc87fab155cdfbb94ec (diff)
downloadchromium_src-33d76bb0f87cd9e3ad5b1589bb29872924e4e5e3.zip
chromium_src-33d76bb0f87cd9e3ad5b1589bb29872924e4e5e3.tar.gz
chromium_src-33d76bb0f87cd9e3ad5b1589bb29872924e4e5e3.tar.bz2
Revert of Revert of [Android] Use UIResource for overscroll glow (https://codereview.chromium.org/454863003/)
Reason for revert: The ToT builder failures appear to be unrelated to this change, and the upstream instrumentation already exercise these code paths. Tentatively reverting the revert and will keep an eye on downstream rolls. Original issue's description: > Revert of [Android] Use UIResource for overscroll glow (https://codereview.chromium.org/422013003/) > > Reason for revert: > This is breaking chrome ToT downstream and the change quie complex so > I don't feel qualified to try to fix it in place. > > The failure we hit is > F/chromium( 2961): [FATAL:system_ui_resource_manager_impl.cc(35)] Check failed: !bitmap.empty(). > > See an example of a failed run in > https://uberchromegw.corp.google.com/i/clank.tot/builders/instrumentation-yakju-clankium-tot/builds/32007 > > (but just trying to boot clank with this patch will trigger it) > > > Original issue's description: > > [Android] Use UIResource for overscroll glow > > > > Introduce a SystemUIResourceManager class for loading and providing access to > > shared UIResourceId's. Wire this class to the existing OverscrollGlow effect, > > using the shared id's with a UIResourceLayer for both glow and edge layers. > > > > This patch is a subset of powei@'s original SystemUIResource patch found at > > https://codereview.chromium.org/377013002/. > > > > BUG=326326 > > > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=288095 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=288330 TBR=aelias@chromium.org,powei@chromium.org,yfriedman@chromium.org,sky@chromium.org,miguelg@chromium.org NOTREECHECKS=true NOTRY=true BUG=326326 Review URL: https://codereview.chromium.org/454113002 Cr-Commit-Position: refs/heads/master@{#288392} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288392 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_tests.gypi')
-rw-r--r--content/content_tests.gypi1
1 files changed, 1 insertions, 0 deletions
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index b15c5d7..f7a3c38 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -901,6 +901,7 @@
'browser/android/java/gin_java_method_invocation_helper_unittest.cc',
'browser/android/java/java_type_unittest.cc',
'browser/android/java/jni_helper_unittest.cc',
+ 'browser/android/system_ui_resource_manager_impl_unittest.cc',
'renderer/java/gin_java_bridge_value_converter_unittest.cc',
],
'sources!': [