Index: ui/gl/gl_surface_ozone.cc |
diff --git a/ui/gl/gl_surface_ozone.cc b/ui/gl/gl_surface_ozone.cc |
index 377597d7efb3a14ffceb4c6f73ddf2105b751de3..fb12b9a2e22a832e85105bcc8e7d693f1ac53e2d 100644 |
--- a/ui/gl/gl_surface_ozone.cc |
+++ b/ui/gl/gl_surface_ozone.cc |
@@ -44,7 +44,7 @@ class GL_EXPORT GLSurfaceOzoneEGL : public NativeViewGLSurfaceEGL { |
// GLSurface: |
bool Initialize() override; |
- bool Resize(const gfx::Size& size) override; |
+ bool Resize(const gfx::Size& size, float scale_factor) override; |
gfx::SwapResult SwapBuffers() override; |
bool ScheduleOverlayPlane(int z_order, |
OverlayTransform transform, |
@@ -77,14 +77,14 @@ bool GLSurfaceOzoneEGL::Initialize() { |
return Initialize(ozone_surface_->CreateVSyncProvider()); |
} |
-bool GLSurfaceOzoneEGL::Resize(const gfx::Size& size) { |
+bool GLSurfaceOzoneEGL::Resize(const gfx::Size& size, float scale_factor) { |
if (!ozone_surface_->ResizeNativeWindow(size)) { |
if (!ReinitializeNativeSurface() || |
!ozone_surface_->ResizeNativeWindow(size)) |
return false; |
} |
- return NativeViewGLSurfaceEGL::Resize(size); |
+ return NativeViewGLSurfaceEGL::Resize(size, scale_factor); |
} |
gfx::SwapResult GLSurfaceOzoneEGL::SwapBuffers() { |
@@ -142,7 +142,7 @@ class GL_EXPORT GLSurfaceOzoneSurfaceless : public SurfacelessEGL { |
// GLSurface: |
bool Initialize() override; |
- bool Resize(const gfx::Size& size) override; |
+ bool Resize(const gfx::Size& size, float scale_factor) override; |
gfx::SwapResult SwapBuffers() override; |
bool ScheduleOverlayPlane(int z_order, |
OverlayTransform transform, |
@@ -261,11 +261,12 @@ bool GLSurfaceOzoneSurfaceless::Initialize() { |
return true; |
} |
-bool GLSurfaceOzoneSurfaceless::Resize(const gfx::Size& size) { |
+bool GLSurfaceOzoneSurfaceless::Resize(const gfx::Size& size, |
+ float scale_factor) { |
if (!ozone_surface_->ResizeNativeWindow(size)) |
return false; |
- return SurfacelessEGL::Resize(size); |
+ return SurfacelessEGL::Resize(size, scale_factor); |
} |
gfx::SwapResult GLSurfaceOzoneSurfaceless::SwapBuffers() { |
@@ -426,7 +427,7 @@ class GL_EXPORT GLSurfaceOzoneSurfacelessSurfaceImpl |
// GLSurface: |
unsigned int GetBackingFrameBufferObject() override; |
bool OnMakeCurrent(GLContext* context) override; |
- bool Resize(const gfx::Size& size) override; |
+ bool Resize(const gfx::Size& size, float scale_factor) override; |
bool SupportsPostSubBuffer() override; |
gfx::SwapResult SwapBuffers() override; |
bool SwapBuffersAsync(const SwapCompletionCallback& callback) override; |
@@ -479,10 +480,12 @@ bool GLSurfaceOzoneSurfacelessSurfaceImpl::OnMakeCurrent(GLContext* context) { |
return SurfacelessEGL::OnMakeCurrent(context); |
} |
-bool GLSurfaceOzoneSurfacelessSurfaceImpl::Resize(const gfx::Size& size) { |
+bool GLSurfaceOzoneSurfacelessSurfaceImpl::Resize(const gfx::Size& size, |
+ float scale_factor) { |
if (size == GetSize()) |
return true; |
- return GLSurfaceOzoneSurfaceless::Resize(size) && CreatePixmaps(); |
+ return GLSurfaceOzoneSurfaceless::Resize(size, scale_factor) && |
+ CreatePixmaps(); |
} |
bool GLSurfaceOzoneSurfacelessSurfaceImpl::SupportsPostSubBuffer() { |