From ba49bfb6ba8d2c40da2b6e700ce6d15fe1faf53a Mon Sep 17 00:00:00 2001
From: Sergey Linev <S.Linev@gsi.de>
Date: Thu, 14 Mar 2019 18:38:53 +0100
Subject: [PATCH] webgui: try to resolve API changes in CEF
With the time they tend to modify some methods.
To coupe with such changes, we will try to use #ifdef - as long as it
works.
---
gui/cefdisplay/inc/osr_handler.h | 6 ++++++
gui/cefdisplay/src/osr_handler.cxx | 7 ++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/gui/cefdisplay/inc/osr_handler.h b/gui/cefdisplay/inc/osr_handler.h
index 0de09fae8ee..19da5918ef2 100644
--- a/gui/cefdisplay/inc/osr_handler.h
+++ b/gui/cefdisplay/inc/osr_handler.h
@@ -18,6 +18,8 @@
#include "base_handler.h"
+#include "include/cef_version.h"
+
/// Class used to handle off-screen application and should emulate some render requests
class OsrHandler : public BaseHandler, public CefRenderHandler {
@@ -30,7 +32,11 @@ public:
// CefRenderHandler methods.
virtual bool GetRootScreenRect(CefRefPtr<CefBrowser> browser, CefRect &rect) OVERRIDE;
+#if CEF_COMMIT_NUMBER > 1894
+ virtual void GetViewRect(CefRefPtr<CefBrowser> browser, CefRect &rect) OVERRIDE;
+#else
virtual bool GetViewRect(CefRefPtr<CefBrowser> browser, CefRect &rect) OVERRIDE;
+#endif
virtual bool GetScreenPoint(CefRefPtr<CefBrowser> browser, int viewX, int viewY, int &screenX,
int &screenY) OVERRIDE;
virtual bool GetScreenInfo(CefRefPtr<CefBrowser> browser, CefScreenInfo &screen_info) OVERRIDE;
diff --git a/gui/cefdisplay/src/osr_handler.cxx b/gui/cefdisplay/src/osr_handler.cxx
index 5b474eb077f..ea814fad6a5 100644
--- a/gui/cefdisplay/src/osr_handler.cxx
+++ b/gui/cefdisplay/src/osr_handler.cxx
@@ -44,7 +44,11 @@ bool OsrHandler::GetRootScreenRect(CefRefPtr<CefBrowser> browser, CefRect &rect)
// return osr_delegate_->GetRootScreenRect(browser, rect);
}
+#if CEF_COMMIT_NUMBER > 1894
+void OsrHandler::GetViewRect(CefRefPtr<CefBrowser> browser, CefRect &rect)
+#else
bool OsrHandler::GetViewRect(CefRefPtr<CefBrowser> browser, CefRect &rect)
+#endif
{
CEF_REQUIRE_UI_THREAD();
@@ -52,8 +56,9 @@ bool OsrHandler::GetViewRect(CefRefPtr<CefBrowser> browser, CefRect &rect)
rect.width = 800;
rect.height = 600;
+#if CEF_COMMIT_NUMBER <= 1894
return true;
-
+#endif
// if (!osr_delegate_) return false;
// return osr_delegate_->GetViewRect(browser, rect);
}
--
GitLab