diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index d9aef136bf75..e32a76e4e4b1 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,11 +1,11 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 4327edd56870d864b524bbfb32661707e67b02d1..fbc1cc921ac8bb5a8d8eb164d51e20e3d940b58a 100644 +index 628bbf0d999e7b263af28d18afdcaa8cdc67fefd..546dd103ce4c4f732367600b2e9373e13e996521 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=78 MINOR=0 -BUILD=3904 --PATCH=87 +-PATCH=97 +BUILD=72 +PATCH=121 diff --git a/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch b/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch index 896a325c4e13..81b05d873e98 100644 --- a/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch +++ b/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/notifications/notification_platform_bridge_mac.mm b/chrome/browser/notifications/notification_platform_bridge_mac.mm -index f4e3046614e13837050edf3862d66bccee3cc9e1..724e1a39cdfe950d6ce933f630195a273f35c7e8 100644 +index 53c1005044d101029550842c460d76f52a975feb..02f2e95997176c766e31e62fe8cf695cb47bb545 100644 --- a/chrome/browser/notifications/notification_platform_bridge_mac.mm +++ b/chrome/browser/notifications/notification_platform_bridge_mac.mm -@@ -226,6 +226,7 @@ void NotificationPlatformBridgeMac::Display( +@@ -232,6 +232,7 @@ void NotificationPlatformBridgeMac::Display( initWithCloseLabel:l10n_util::GetNSString(IDS_NOTIFICATION_BUTTON_CLOSE) optionsLabel:l10n_util::GetNSString(IDS_NOTIFICATION_BUTTON_MORE) settingsLabel:l10n_util::GetNSString( @@ -10,7 +10,7 @@ index f4e3046614e13837050edf3862d66bccee3cc9e1..724e1a39cdfe950d6ce933f630195a27 IDS_NOTIFICATION_BUTTON_SETTINGS)]); [builder -@@ -300,6 +301,7 @@ void NotificationPlatformBridgeMac::Display( +@@ -306,6 +307,7 @@ void NotificationPlatformBridgeMac::Display( } else { NSUserNotification* toast = [builder buildUserNotification]; [notification_center_ deliverNotification:toast]; diff --git a/patches/content-renderer-media-android-media_player_renderer_client.cc.patch b/patches/content-renderer-media-android-media_player_renderer_client.cc.patch deleted file mode 100644 index fd8985cace98..000000000000 --- a/patches/content-renderer-media-android-media_player_renderer_client.cc.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/content/renderer/media/android/media_player_renderer_client.cc b/content/renderer/media/android/media_player_renderer_client.cc -index 4fb8299465105e71943d5e27703d0cb1b892733b..20c61db1755cda91b85c8393d5307ae4af1f67d3 100644 ---- a/content/renderer/media/android/media_player_renderer_client.cc -+++ b/content/renderer/media/android/media_player_renderer_client.cc -@@ -121,15 +121,7 @@ void MediaPlayerRendererClient::OnRemoteRendererInitialized( - - void MediaPlayerRendererClient::OnFrameAvailable() { - DCHECK(compositor_task_runner_->BelongsToCurrentThread()); -- -- // The frame generated by the StreamTextureWrapper is "static", i.e., even as -- // new frames are drawn it does not change. Downstream components expect that -- // each new VideoFrame will have a different unique_id() when it changes, so -- // we need to add a wrapping frame with a new unique_id(). -- auto frame = stream_texture_wrapper_->GetCurrentFrame(); -- auto unique_frame = media::VideoFrame::WrapVideoFrame( -- frame, frame->format(), frame->visible_rect(), frame->natural_size()); -- sink_->PaintSingleFrame(std::move(unique_frame)); -+ sink_->PaintSingleFrame(stream_texture_wrapper_->GetCurrentFrame(), true); - } - - void MediaPlayerRendererClient::OnVideoSizeChange(const gfx::Size& size) {