![electron-roller[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 141.0.7341.0 * chore: bump chromium in DEPS to 141.0.7342.0 * chore: update patches manually resolved conflict in `osr_shared_texture_remove_keyed_mutex_on_win_dxgi.patch` due to https://crrev.com/c/6681354 * 6819541: WebShare: Improve mac share behavior when sharing a URL https://chromium-review.googlesource.com/c/chromium/src/+/6819541 * Add missing include for SkBitmap Couldn't quickly find where we lost the full definition in this file's includes. 🤷 * 6771055: [SxS] Move devtools to ContentsContainerView supporting side-by-side. https://chromium-review.googlesource.com/c/chromium/src/+/6771055 There may be some simplification possible here (set_x, Rect position, ...), but this change is satisfactory to maintain the current behavior. * 6813689: Switch SystemMemoryInfoKB to use ByteCount https://chromium-review.googlesource.com/c/chromium/src/+/6813689 * 6818486: Track DevTools feature usage in new badge tracker https://chromium-review.googlesource.com/c/chromium/src/+/6818486 * chore: bump chromium in DEPS to 141.0.7344.0 * Remove ELECTRON_OZONE_PLATFORM_HINT env var 6819616: Remove OzonePlatformHint | https://chromium-review.googlesource.com/c/chromium/src/+/6819616 See: https://github.com/electron/electron/issues/48001 * chore: update patches * Add missing include for `base::NumberToString` * Remove `DESKTOP_STARTUP_ID` code This was removed upstream in https://chromium-review.googlesource.com/c/chromium/src/+/6819616 and I confirmed with the author that it was an intentional change. Going to mirror upstream and remove it here too. * chore: bump chromium in DEPS to 141.0.7346.0 * chore: update patches * 6828465: Reland "Remove BluezDBusThreadManager" https://chromium-review.googlesource.com/c/chromium/src/+/6828465 * Patch change to Node.js test output V8 enhanced the stack trace of "thenable" async tasks. A couple of Node.js tests needed to have their snapshots updates to accomodate the extra stack trace frames in the output. This patch should be upstreamed to Node.js. See: 6826001: fix thenable async stack trace https://chromium-review.googlesource.com/c/v8/v8/+/6826001 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: clavin <clavin@electronjs.org>
55 lines
1.4 KiB
C++
55 lines
1.4 KiB
C++
// Copyright (c) 2017 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#ifndef ELECTRON_SHELL_BROWSER_OSR_OSR_VIEW_PROXY_H_
|
|
#define ELECTRON_SHELL_BROWSER_OSR_OSR_VIEW_PROXY_H_
|
|
|
|
#include <memory>
|
|
|
|
#include "base/memory/raw_ptr.h"
|
|
#include "third_party/skia/include/core/SkBitmap.h"
|
|
#include "ui/events/event.h"
|
|
#include "ui/gfx/geometry/rect.h"
|
|
#include "ui/views/view.h"
|
|
|
|
namespace electron {
|
|
|
|
class OffscreenViewProxy;
|
|
|
|
class OffscreenViewProxyObserver {
|
|
public:
|
|
virtual void OnProxyViewPaint(const gfx::Rect& damage_rect) = 0;
|
|
virtual void ProxyViewDestroyed(OffscreenViewProxy* proxy) = 0;
|
|
};
|
|
|
|
class OffscreenViewProxy {
|
|
public:
|
|
explicit OffscreenViewProxy(views::View* view);
|
|
~OffscreenViewProxy();
|
|
|
|
void SetObserver(OffscreenViewProxyObserver* observer);
|
|
void RemoveObserver();
|
|
|
|
const SkBitmap* bitmap() const { return view_bitmap_.get(); }
|
|
void SetBitmap(const SkBitmap& bitmap);
|
|
|
|
const gfx::Rect& bounds() { return view_bounds_; }
|
|
void SetBounds(const gfx::Rect& bounds);
|
|
|
|
void OnEvent(ui::Event* event);
|
|
|
|
void ResetView() { view_ = nullptr; }
|
|
|
|
private:
|
|
raw_ptr<views::View> view_;
|
|
|
|
gfx::Rect view_bounds_;
|
|
std::unique_ptr<SkBitmap> view_bitmap_;
|
|
|
|
raw_ptr<OffscreenViewProxyObserver> observer_ = nullptr;
|
|
};
|
|
|
|
} // namespace electron
|
|
|
|
#endif // ELECTRON_SHELL_BROWSER_OSR_OSR_VIEW_PROXY_H_
|