81bf15877f
* fix: make OSR work with viz compositor * fix: update OSR patch * fix: update patch again * fix: update viz_osr.patch for macOS * fix: gn check warnings * chore: no need to change SoftwareOutputDeviceWinProxy * chore: add check in case we missed something * fix: consider scale factor when compare size * fix: make GPU OSR work * fix: autofill popups with OSR * chore: use UNIX line ending for osr_video_consumer * chore: code is already in defined(OS_MACOSX) * fix: share same OSR implementation on macOS This should also fix the crash when there is navigation on macOS. * test: osr window should not crash after navigation * fix: make osr work on Mac properly * fix: software osr on windows * fix: software osr on Linux * fix: compilation error introduced with rebase * fix: split local surface id allocation into two * Update osr_host_display_client_mac.mm * chore: update copyright year * fix: update patch
77 lines
2.4 KiB
C++
77 lines
2.4 KiB
C++
// Copyright (c) 2019 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#ifndef ATOM_BROWSER_OSR_OSR_HOST_DISPLAY_CLIENT_H_
|
|
#define ATOM_BROWSER_OSR_OSR_HOST_DISPLAY_CLIENT_H_
|
|
|
|
#include <memory>
|
|
|
|
#include "base/callback.h"
|
|
#include "base/memory/shared_memory.h"
|
|
#include "components/viz/host/host_display_client.h"
|
|
#include "services/viz/privileged/interfaces/compositing/layered_window_updater.mojom.h"
|
|
#include "third_party/skia/include/core/SkBitmap.h"
|
|
#include "third_party/skia/include/core/SkCanvas.h"
|
|
#include "ui/gfx/native_widget_types.h"
|
|
|
|
namespace atom {
|
|
|
|
typedef base::Callback<void(const gfx::Rect&, const SkBitmap&)> OnPaintCallback;
|
|
|
|
class LayeredWindowUpdater : public viz::mojom::LayeredWindowUpdater {
|
|
public:
|
|
explicit LayeredWindowUpdater(viz::mojom::LayeredWindowUpdaterRequest request,
|
|
OnPaintCallback callback);
|
|
~LayeredWindowUpdater() override;
|
|
|
|
void SetActive(bool active);
|
|
|
|
// viz::mojom::LayeredWindowUpdater implementation.
|
|
void OnAllocatedSharedMemory(
|
|
const gfx::Size& pixel_size,
|
|
mojo::ScopedSharedBufferHandle scoped_buffer_handle) override;
|
|
void Draw(const gfx::Rect& damage_rect, DrawCallback draw_callback) override;
|
|
|
|
private:
|
|
OnPaintCallback callback_;
|
|
mojo::Binding<viz::mojom::LayeredWindowUpdater> binding_;
|
|
std::unique_ptr<SkCanvas> canvas_;
|
|
bool active_ = false;
|
|
|
|
#if !defined(WIN32)
|
|
base::WritableSharedMemoryMapping shm_mapping_;
|
|
#endif
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(LayeredWindowUpdater);
|
|
};
|
|
|
|
class OffScreenHostDisplayClient : public viz::HostDisplayClient {
|
|
public:
|
|
explicit OffScreenHostDisplayClient(gfx::AcceleratedWidget widget,
|
|
OnPaintCallback callback);
|
|
~OffScreenHostDisplayClient() override;
|
|
|
|
void SetActive(bool active);
|
|
|
|
private:
|
|
void IsOffscreen(IsOffscreenCallback callback) override;
|
|
|
|
#if defined(OS_MACOSX)
|
|
void OnDisplayReceivedCALayerParams(
|
|
const gfx::CALayerParams& ca_layer_params) override;
|
|
#endif
|
|
|
|
void CreateLayeredWindowUpdater(
|
|
viz::mojom::LayeredWindowUpdaterRequest request) override;
|
|
|
|
std::unique_ptr<LayeredWindowUpdater> layered_window_updater_;
|
|
OnPaintCallback callback_;
|
|
bool active_ = false;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(OffScreenHostDisplayClient);
|
|
};
|
|
|
|
} // namespace atom
|
|
|
|
#endif // ATOM_BROWSER_OSR_OSR_HOST_DISPLAY_CLIENT_H_
|