Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(209)

Unified Diff: content/browser/renderer_host/render_widget_host_view_mac.mm

Issue 2503203002: Revert "Getting rid of DelegatedFrameData" (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_widget_host_view_mac.mm
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index c7a78ff0f1e97c6911bb50254f6b6f8b6c0f6ddc..689ae2c79378a2bae94edf1267e6cbff35472788 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -35,6 +35,7 @@
#import "content/browser/accessibility/browser_accessibility_cocoa.h"
#import "content/browser/accessibility/browser_accessibility_mac.h"
#include "content/browser/accessibility/browser_accessibility_manager_mac.h"
+#include "content/browser/bad_message.h"
#import "content/browser/cocoa/system_hotkey_helper_mac.h"
#import "content/browser/cocoa/system_hotkey_map.h"
#include "content/browser/frame_host/frame_tree.h"
@@ -1415,9 +1416,15 @@ void RenderWidgetHostViewMac::OnSwapCompositorFrame(
page_at_minimum_scale_ =
frame.metadata.page_scale_factor == frame.metadata.min_page_scale_factor;
- browser_compositor_->SwapCompositorFrame(compositor_frame_sink_id,
- std::move(frame));
- UpdateDisplayVSyncParameters();
+ if (frame.delegated_frame_data) {
+ browser_compositor_->SwapCompositorFrame(compositor_frame_sink_id,
+ std::move(frame));
+ UpdateDisplayVSyncParameters();
+ } else {
+ DLOG(ERROR) << "Received unexpected frame type.";
+ bad_message::ReceivedBadMessage(render_widget_host_->GetProcess(),
+ bad_message::RWHVM_UNEXPECTED_FRAME_TYPE);
+ }
}
void RenderWidgetHostViewMac::ClearCompositorFrame() {

Powered by Google App Engine
This is Rietveld 408576698