Fix phpdesktop.ToggleFullscreen()

Author: cztomczak

cef/app.cpp

@@ -35,8 +35,8 @@ bool App::OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
                                     CefRefPtr<CefFrame> frame,
                                     CefProcessId source_process,
                                     CefRefPtr<CefProcessMessage> message) {
-    LOGGER_DEBUG << "renderer[" << browser->GetIdentifier() << "] "
-              << "OnProcessMessageReceived: " << message->GetName().ToString();
+    LOGGER_DEBUG << "V8 renderer[" << browser->GetIdentifier() << "] "
+              << "received process message: " << message->GetName().ToString();
     if (message->GetName() == "SetIsFullscreen") {
         CefRefPtr<CefListValue> args = message->GetArgumentList();
         bool isFullscreen = args->GetBool(0);
@@ -62,7 +62,7 @@ void App::OnContextCreated(CefRefPtr<CefBrowser> browser,
                             CefRefPtr<CefFrame> frame,
                             CefRefPtr<CefV8Context> context) {
     // RENDERER PROCESS.
-    LOGGER_DEBUG << "V8 context created";
+    LOGGER_DEBUG << "V8 context created, in context: " << CefV8Context::InContext();
     CefRefPtr<CefV8Value> window = context->GetGlobal();
     CefRefPtr<CefV8Handler> handler = GetJavascriptApi(browser);
     if (!handler.get()) {
@@ -95,16 +95,16 @@ void App::OnContextCreated(CefRefPtr<CefBrowser> browser,
 ///
 /*--cef()--*/
 void App::OnBrowserCreated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefDictionaryValue> extra_info) {
-    LOGGER_DEBUG << "OnBrowserCreated()";
-    StoreJavascriptApi(browser, new JavascriptApi(browser));
+    LOGGER_DEBUG << "V8 browser was created";
+    StoreJavascriptApi(browser, new JavascriptApi());
 }
 
 ///
 // Called before a browser is destroyed.
 ///
 /*--cef()--*/
 void App::OnBrowserDestroyed(CefRefPtr<CefBrowser> browser) {
-    LOGGER_DEBUG << "OnBrowserDestroyed()";
+    LOGGER_DEBUG << "V8 browser was destroyed";
     RemoveJavascriptApi(browser);
 }
 

cef/browser_window.cpp

@@ -69,7 +69,7 @@ void StoreBrowserWindow(HWND hwnd, BrowserWindow* browser) {
     }
 }
 void RemoveBrowserWindow(HWND hwnd) {
-    LOGGER_DEBUG << "RemoveBrowserWindow(): hwnd = " << (uintptr_t) hwnd;
+    LOGGER_DEBUG << "Remove browser window, hwnd = " << (uintptr_t) hwnd;
     BrowserWindow* browser = GetBrowserWindow(hwnd);
     if (!browser) {
         LOGGER_WARNING << "RemoveBrowserWindow() failed: "
@@ -138,6 +138,7 @@ void BrowserWindow::SetCefBrowser(CefRefPtr<CefBrowser> cefBrowser) {
             CefRefPtr<CefProcessMessage> message = \
                     CefProcessMessage::Create("SetIsFullscreen");
             message->GetArgumentList()->SetBool(0, fullscreen_->IsFullscreen());
+            LOGGER_DEBUG << "Send process message to V8: SetIsFullscreen";
             cefBrowser->GetMainFrame()->SendProcessMessage(PID_RENDERER, message);
         }
     }

cef/client_handler.cpp

@@ -72,7 +72,7 @@ bool ClientHandler::OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
                                             CefProcessId source_process,
                                             CefRefPtr<CefProcessMessage> message) {
     LOGGER_DEBUG << "browser[" << browser->GetIdentifier() << "] "
-              << "OnProcessMessageReceived: " << message->GetName().ToString();
+              << "received process message: " << message->GetName().ToString();
     if (message->GetName() == "ToggleFullscreen") {
         BrowserWindow* browserWindow = GetBrowserWindow(\
                 browser->GetHost()->GetWindowHandle());
@@ -174,11 +174,11 @@ void ClientHandler::OnAfterCreated(CefRefPtr<CefBrowser> cefBrowser) {
 ///
 void ClientHandler::OnBeforeClose(CefRefPtr<CefBrowser> browser) {
     REQUIRE_UI_THREAD();
-    LOGGER_DEBUG << "OnBeforeClose() hwnd="
+    LOGGER_DEBUG << "Before browser is closed, hwnd="
                  << (uintptr_t) browser->GetHost()->GetWindowHandle();
     RemoveBrowserWindow(browser->GetHost()->GetWindowHandle());
     if (g_browserWindows.empty()) {
-        LOGGER_DEBUG << "Calling CefQuitMessageLoop()";
+        LOGGER_DEBUG << "Quit CEF message loop";
         CefQuitMessageLoop();
     }
 }

cef/fullscreen.cpp

@@ -18,6 +18,7 @@ void Fullscreen::ToggleFullscreen() {
     }
     HWND hwnd = browserWindow->GetWindowHandle();
     if (!isFullscreen_) {
+        LOGGER_DEBUG << "Toggle fullscreen On";
         isMaximized_ = (IsZoomed(hwnd) != 0);
         if (isMaximized_) {
             SendMessage(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0);
@@ -49,6 +50,7 @@ void Fullscreen::ToggleFullscreen() {
                 left, top, right-left, bottom-top,
                 SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
     } else {
+        LOGGER_DEBUG << "Toggle fullscreen Off";
         SetWindowLong(hwnd, GWL_STYLE, gwlStyle_);
         SetWindowLong(hwnd, GWL_EXSTYLE, gwlExStyle_);
         RECT rect = windowRect_;

cef/javascript_api.cpp

@@ -4,20 +4,27 @@
 
 #include "javascript_api.h"
 #include "../version.h"
+#include "../logger.h"
 
 bool JavascriptApi::Execute(const CefString& name,
                        CefRefPtr<CefV8Value> object,
                        const CefV8ValueList& arguments,
                        CefRefPtr<CefV8Value>& retval,
                        CefString& exception) {
+    LOGGER_DEBUG << "V8 execute phpdesktop object method: " << name;
     if (name == "GetVersion") {
         retval = CefV8Value::CreateString(GetPhpDesktopVersion());
         return true;
     } else if (name == "ToggleFullscreen") {
-        CefRefPtr<CefProcessMessage> message = \
-                CefProcessMessage::Create("ToggleFullscreen");
-        cefBrowser_->GetMainFrame()->SendProcessMessage(PID_BROWSER, message);
-        isFullscreen_ = !(isFullscreen_);
+        CefRefPtr<CefProcessMessage> message = CefProcessMessage::Create("ToggleFullscreen");
+        if (message->IsValid()) {
+            // Browser object must be obtained using current context, cannot use previously stored object.
+            CefRefPtr<CefV8Context> context = CefV8Context::GetCurrentContext();
+            context->GetBrowser()->GetMainFrame()->SendProcessMessage(PID_BROWSER, message);
+            isFullscreen_ = !(isFullscreen_);
+        } else {
+            LOGGER_ERROR << "V8 could not create process message: ToggleFullscreen";
+        }
         return true;
     } else if (name == "IsFullscreen") {
         retval = CefV8Value::CreateBool(isFullscreen_);

cef/javascript_api.h

@@ -11,9 +11,8 @@
 class JavascriptApi : public CefV8Handler
 {
 public:
-    JavascriptApi(CefRefPtr<CefBrowser> cefBrowser)
-        : cefBrowser_(cefBrowser),
-            isFullscreen_(false) 
+    JavascriptApi()
+        : isFullscreen_(false)
     {
     }
 
@@ -28,7 +27,9 @@ class JavascriptApi : public CefV8Handler
     }
 
 protected:
-    CefRefPtr<CefBrowser> cefBrowser_;
+    // Can't store CefBrowser object in CefV8Handler as it won't work properly when sending process message.
+    // Issue reported here: https://magpcss.org/ceforum/viewtopic.php?f=6&t=20040
+
     bool isFullscreen_;
 
 private:

main.cpp

@@ -391,7 +391,6 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
 #endif
 
     CefInitialize(main_args, cef_settings, app.get(), sandbox_info);
-    LOGGER_DEBUG << "nCmdShow=" << nCmdShow;
     CefRunMessageLoop();
     CefShutdown();