Merge branch 'speedup-gpu' of https://github.com/MaxWhere/electron into speedup-gpu

This commit is contained in:
Heilig Benedek 2016-08-01 02:18:37 +02:00
commit c39ded0481

View file

@ -492,7 +492,7 @@ void OffScreenRenderWidgetHostView::Focus() {
} }
bool OffScreenRenderWidgetHostView::HasFocus() const { bool OffScreenRenderWidgetHostView::HasFocus() const {
return true; return false;
} }
bool OffScreenRenderWidgetHostView::IsSurfaceAvailableForCopy() const { bool OffScreenRenderWidgetHostView::IsSurfaceAvailableForCopy() const {
@ -554,9 +554,6 @@ void OffScreenRenderWidgetHostView::OnSwapCompositorFrame(
TRACE_EVENT0("electron", TRACE_EVENT0("electron",
"OffScreenRenderWidgetHostView::OnSwapCompositorFrame"); "OffScreenRenderWidgetHostView::OnSwapCompositorFrame");
// if (!painting_)
// return;
if (frame->metadata.root_scroll_offset != last_scroll_offset_) { if (frame->metadata.root_scroll_offset != last_scroll_offset_) {
last_scroll_offset_ = frame->metadata.root_scroll_offset; last_scroll_offset_ = frame->metadata.root_scroll_offset;
} }