Update from chromium https://crrev.com/301315
This updates from chromium commit
060d7dc875cc41f46ab264181d1d622d02c3c8b7 aka commit position 301315. The
following changes from earlier rolls are included:
*) Remove gpu_media.patch, no longer needed thanks to
https://crrev.com/301048
*) Added skia_build.patch to resolve blink dependency added by
https://crrev.com/301105
*) Applied mojo changes for https://crrev.com/301165
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/681713002
diff --git a/ui/gl/gpu_switching_manager.cc b/ui/gl/gpu_switching_manager.cc
index 05a7865..f904629 100644
--- a/ui/gl/gpu_switching_manager.cc
+++ b/ui/gl/gpu_switching_manager.cc
@@ -102,6 +102,18 @@
gpu_count_ = gpu_count;
}
+void GpuSwitchingManager::AddObserver(GpuSwitchingObserver* observer) {
+ observer_list_.AddObserver(observer);
+}
+
+void GpuSwitchingManager::RemoveObserver(GpuSwitchingObserver* observer) {
+ observer_list_.RemoveObserver(observer);
+}
+
+void GpuSwitchingManager::NotifyGpuSwitched() {
+ FOR_EACH_OBSERVER(GpuSwitchingObserver, observer_list_, OnGpuSwitched());
+}
+
gfx::GpuPreference GpuSwitchingManager::AdjustGpuPreference(
gfx::GpuPreference gpu_preference) {
if (!gpu_switching_option_set_)
