diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-13 16:23:34 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-14 10:37:21 +0000 |
commit | 38a9a29f4f9436cace7f0e7abf9c586057df8a4e (patch) | |
tree | c4e8c458dc595bc0ddb435708fa2229edfd00bd4 /chromium/third_party/blink/renderer/modules/xr/xr_webgl_layer.h | |
parent | e684a3455bcc29a6e3e66a004e352dea4e1141e7 (diff) | |
download | qtwebengine-chromium-38a9a29f4f9436cace7f0e7abf9c586057df8a4e.tar.gz |
BASELINE: Update Chromium to 73.0.3683.37
Change-Id: I08c9af2948b645f671e5d933aca1f7a90ea372f2
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/modules/xr/xr_webgl_layer.h')
-rw-r--r-- | chromium/third_party/blink/renderer/modules/xr/xr_webgl_layer.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/chromium/third_party/blink/renderer/modules/xr/xr_webgl_layer.h b/chromium/third_party/blink/renderer/modules/xr/xr_webgl_layer.h index a23ece99225..ad5996b8439 100644 --- a/chromium/third_party/blink/renderer/modules/xr/xr_webgl_layer.h +++ b/chromium/third_party/blink/renderer/modules/xr/xr_webgl_layer.h @@ -26,8 +26,7 @@ class WebGLRenderingContextBase; class XRSession; class XRViewport; -class XRWebGLLayer final : public XRLayer, - public XRWebGLDrawingBuffer::MirrorClient { +class XRWebGLLayer final : public XRLayer { DEFINE_WRAPPERTYPEINFO(); public: @@ -58,7 +57,6 @@ class XRWebGLLayer final : public XRLayer, bool depth() const { return drawing_buffer_->depth(); } bool stencil() const { return drawing_buffer_->stencil(); } bool alpha() const { return drawing_buffer_->alpha(); } - bool multiview() const { return drawing_buffer_->multiview(); } XRViewport* getViewport(XRView*); void requestViewportScaling(double scale_factor); @@ -78,26 +76,23 @@ class XRWebGLLayer final : public XRLayer, void OverwriteColorBufferFromMailboxTexture(const gpu::MailboxHolder&, const IntSize& size); + void UpdateWebXRMirror(); + scoped_refptr<StaticBitmapImage> TransferToStaticBitmapImage( std::unique_ptr<viz::SingleReleaseCallback>* out_release_callback); - // XRWebGLDrawingBuffer::MirrorClient impementation - void OnMirrorImageAvailable( - scoped_refptr<StaticBitmapImage>, - std::unique_ptr<viz::SingleReleaseCallback>) override; - void Trace(blink::Visitor*) override; private: Member<XRViewport> left_viewport_; Member<XRViewport> right_viewport_; + scoped_refptr<XRWebGLDrawingBuffer::MirrorClient> mirror_client_; + TraceWrapperMember<WebGLRenderingContextBase> webgl_context_; scoped_refptr<XRWebGLDrawingBuffer> drawing_buffer_; Member<WebGLFramebuffer> framebuffer_; - std::unique_ptr<viz::SingleReleaseCallback> mirror_release_callback_; - double framebuffer_scale_ = 1.0; double requested_viewport_scale_ = 1.0; double viewport_scale_ = 1.0; |