Merge pull request #22 from mzmiric5/osx-cef-update

Update OS X build to support newer CEF and new features added to windows version

Author: OsirisNL

CMakeLists.txt

@@ -44,10 +44,7 @@ set(obs-browser_SOURCES
 	obs-browser/main.cpp
 	obs-browser/main-source.cpp
 	shared/browser-source.cpp
-	shared/base64.cpp
-	obs-browser/browser-load-handler.cpp
-	shared/browser-scheme.cpp
-)
+	shared/base64.cpp)
 
 set(obs-browser_HEADERS
 	shared/browser-manager.hpp
@@ -56,8 +53,6 @@ set(obs-browser_HEADERS
 	shared/browser-settings.hpp
 	shared/browser-types.h
 	shared/base64.hpp
-	obs-browser/browser-load-handler.hpp
-	shared/browser-scheme.hpp
 	shared/browser-types.h)
 
 if (APPLE)
@@ -94,7 +89,9 @@ else (APPLE)
 		obs-browser/browser-source-listener-base.cpp
 		obs-browser/browser-manager-base.cpp
 		obs-browser/browser-render-handler.cpp
-		obs-browser/browser-source-base.cpp)
+		obs-browser/browser-source-base.cpp
+		obs-browser/browser-load-handler.cpp
+		shared/browser-scheme.cpp)
 
 	list(APPEND obs-browser_HEADERS
 		shared/browser-client.hpp
@@ -103,7 +100,9 @@ else (APPLE)
 		obs-browser/browser-source-listener-base.hpp
 		obs-browser/browser-manager-base.hpp
 		obs-browser/browser-render-handler.hpp
-		obs-browser/browser-source-base.hpp)
+		obs-browser/browser-source-base.hpp
+		obs-browser/browser-load-handler.hpp
+		shared/browser-scheme.hpp)
 
 endif(APPLE)
 
@@ -164,7 +163,9 @@ if(APPLE)
 		shared/browser-client.cpp
 		shared/browser-task.cpp
 		shared/browser-app.cpp
-		shared/browser-scheme.cpp)
+		shared/browser-scheme.cpp
+		shared/base64.cpp
+		obs-browser/browser-load-handler.cpp)
 
 	set(cef-isolation_HEADERS
 		shared-apple/cef-logging.h
@@ -178,6 +179,8 @@ if(APPLE)
 		shared/browser-client.hpp
 		shared/browser-task.hpp
 		shared/browser-app.hpp
+		shared/base64.hpp
+		obs-browser/browser-load-handler.hpp
 		shared/browser-scheme.hpp
 		shared/browser-types.h
 		shared-apple/browser-bridges.h)
@@ -256,20 +259,26 @@ if (APPLE)
 		MACOSX_BUNDLE_GUI_IDENTIFIER "org.catchexception.cef.cef-bootstrap")
 
 
+	add_custom_command(TARGET obs-browser POST_BUILD
+		COMMAND install_name_tool -change "@executable_path/Chromium Embedded Framework" "@rpath/CEF.app/Contents/Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" "$<TARGET_FILE:obs-browser>"
+		)
+
 	add_custom_command(TARGET cef-isolation
 		# Disable taskbar visibility
-		COMMAND defaults write "$<TARGET_FILE_DIR:cef-isolation>/../Info.plist" "LSUIElement" true)
+		COMMAND defaults write "$<TARGET_FILE_DIR:cef-isolation>/../Info.plist" "LSUIElement" true
+		)
 
 	add_custom_command(TARGET cef-bootstrap POST_BUILD
 		# Remember if you change this but don't cause a recompile it will not rename it successfully
 		COMMAND install_name_tool -change "@executable_path/Chromium Embedded Framework" "@rpath/Chromium Embedded Framework.framework/Chromium Embedded Framework" "$<TARGET_FILE:cef-bootstrap>"
 
 		# Disable taskbar visibility
-		COMMAND defaults write "$<TARGET_FILE_DIR:cef-bootstrap>/../Info.plist" "LSUIElement" true)
+		COMMAND defaults write "$<TARGET_FILE_DIR:cef-bootstrap>/../Info.plist" "LSUIElement" true
+		)
 
 	add_custom_command(TARGET cef-isolation POST_BUILD
 		# Remember if you change this but don't cause a recompile in the shared object it will not rename it successfully
-		COMMAND install_name_tool -change "@executable_path/Chromium Embedded Framework" "@rpath/Chromium Embedded Framework.framework/Chromium Embedded Framework" "$<TARGET_FILE:cef-isolation>"
+		COMMAND install_name_tool -change "@executable_path/Chromium Embedded Framework" "@rpath/Chromium Embedded Framework.framework/Chromium Embedded Framework" "$<TARGET_FILE:cef-isolation>"		
 
 		# Make a Frameworks directory
 		COMMAND mkdir -p "$<TARGET_FILE_DIR:cef-isolation>/../Frameworks"
@@ -280,8 +289,8 @@ if (APPLE)
 		# Setup the helper apps
 		COMMAND rm -rf "$<TARGET_FILE_DIR:cef-isolation>/../Frameworks/CEF Helper.app"
 		COMMAND cp -Rf "$<TARGET_FILE_DIR:cef-bootstrap>/../../../CEF Helper.app" "$<TARGET_FILE_DIR:cef-isolation>/../Frameworks"
-		COMMAND "BUILT_PRODUCTS_DIR=$<TARGET_FILE_DIR:cef-isolation>/../../.." "CONTENTS_FOLDER_PATH=CEF.app/Contents" "${CEF_ROOT_DIR}/tools/make_more_helpers.sh" "Frameworks" "CEF")
-
+		)
+		
 endif(APPLE)
 
 if(APPLE)

cef-isolation/cef-isolated-client.mm

@@ -31,6 +31,7 @@
 
 #include "browser-handle.h"
 #include "browser-render-handler.hpp"
+#include "obs-browser/browser-load-handler.hpp"
 
 #import "cef-isolated-client.h"
 
@@ -76,9 +77,12 @@ new BrowserHandle(browserSettings.width,
 
 		CefRefPtr<BrowserRenderHandler> browserRenderHandler =
 				new BrowserRenderHandler(browserHandle);
+				
+		CefRefPtr<BrowserLoadHandler> loadHandler =
+				new BrowserLoadHandler(std::string([browserSettings.css UTF8String]));
 
 		CefRefPtr<BrowserClient> browserClient =
-				new BrowserClient(browserRenderHandler.get());
+				new BrowserClient(browserRenderHandler.get(),loadHandler);
 
 		CefWindowInfo windowInfo;
 		windowInfo.view = nullptr;

obs-browser/browser-load-handler.hpp

@@ -21,8 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <include/cef_load_handler.h>
 
-#include <obs-module.h>
-
 class BrowserListener;
 
 class BrowserLoadHandler : public CefLoadHandler
@@ -35,7 +33,7 @@ class BrowserLoadHandler : public CefLoadHandler
 
 public: /* CefLoadHandler overrides */
 
-	virtual void BrowserLoadHandler::OnLoadEnd(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int httpStatusCode) OVERRIDE;
+	virtual void OnLoadEnd(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int httpStatusCode) OVERRIDE;
 
 private:
 	const std::string css;

shared-apple/browser-bridges.h

@@ -29,6 +29,7 @@ struct obs_key_event;
 @property (readonly)unsigned int width;
 @property (readonly)unsigned int height;
 @property (readonly)unsigned int fps;
+@property (readonly)NSString *css;
 
 + (id)fromBrowserSettings: (const BrowserSettings &)browserSettings;
 

shared-apple/browser-bridges.mm

@@ -29,6 +29,8 @@ - (id)initWithBrowserSettings:(const BrowserSettings &)browserSettings
 		_width = browserSettings.width;
 		_height = browserSettings.height;
 		_fps = browserSettings.fps;
+		_css = [NSString stringWithUTF8String:
+				browserSettings.css.c_str()];
 	}
 	return self;
 }

shared/browser-scheme.cpp

@@ -68,6 +68,11 @@ void BrowserSchemeHandler::GetResponseHeaders(CefRefPtr<CefResponse> response,
 
 	std::string fileExtension = fileName.substr(
 		fileName.find_last_of(".") + 1);
+	
+	if (fileExtension == "woff2") {
+		fileExtension = "woff";
+	}
+	
 	std::transform(fileExtension.begin(), fileExtension.end(),
 			fileExtension.begin(), ::tolower);