mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: make OSR compile on Windows

Browse source
This commit is contained in:
Heilig Benedek 2019-02-04 14:33:47 +01:00 • committed by deepak1556
parent 66db627913
commit cece8bce0b
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/osr/osr_render_widget_host_view.cc
View file

@ -23,6 +23,7 @@
#include "content/browser/renderer_host/cursor_manager.h" #include "content/browser/renderer_host/cursor_manager.h"
#include "content/browser/renderer_host/render_widget_host_delegate.h" #include "content/browser/renderer_host/render_widget_host_delegate.h"
#include "content/browser/renderer_host/render_widget_host_impl.h" #include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_owner_delegate.h"
#include "content/common/view_messages.h" #include "content/common/view_messages.h"
#include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
@ -286,6 +287,8 @@ class AtomDelegatedFrameHostClient : public content::DelegatedFrameHostClient {
return view_->render_widget_host()->CollectSurfaceIdsForEviction(); return view_->render_widget_host()->CollectSurfaceIdsForEviction();
} }
bool ShouldShowStaleContentOnEviction() override { return false; }
void OnBeginFrame(base::TimeTicks frame_time) override {} void OnBeginFrame(base::TimeTicks frame_time) override {}
void InvalidateLocalSurfaceIdOnEviction() override {} void InvalidateLocalSurfaceIdOnEviction() override {}
@ -526,7 +529,7 @@ void OffScreenRenderWidgetHostView::SetBackgroundColor(SkColor color) {
// We short-cut here to show a sensible color before that happens. // We short-cut here to show a sensible color before that happens.
UpdateBackgroundColorFromRenderer(color); UpdateBackgroundColorFromRenderer(color);
if (render_widget_host_) { if (render_widget_host_ && render_widget_host_->owner_delegate()) {
render_widget_host_->owner_delegate()->SetBackgroundOpaque( render_widget_host_->owner_delegate()->SetBackgroundOpaque(
SkColorGetA(color) == SK_AlphaOPAQUE); SkColorGetA(color) == SK_AlphaOPAQUE);
} }

2
atom/browser/osr/osr_render_widget_host_view.h
View file

@ -343,7 +343,7 @@ class OffScreenRenderWidgetHostView : public content::RenderWidgetHostViewBase,
// Latest capture sequence number which is incremented when the caller // Latest capture sequence number which is incremented when the caller
// requests surfaces be synchronized via // requests surfaces be synchronized via
// EnsureSurfaceSynchronizedForLayoutTest(). // EnsureSurfaceSynchronizedForWebTest().
uint32_t latest_capture_sequence_number_ = 0u; uint32_t latest_capture_sequence_number_ = 0u;
SkColor background_color_ = SkColor(); SkColor background_color_ = SkColor();