bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-16 20:20:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Fix Mac compile errors.

Browse Source 
- Fix GYP configuration errors.
- Only use angle GL implementation on Windows (not supported on other platforms).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@238 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2011-05-20 23:39:33 +00:00
parent f5f2189c63
commit 61be982d09
6 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cef.gyp
View File

@ -719,8 +719,8 @@
'../views/views.gyp:views',
],
'sources': [
'include/cef_types_win.h',
'include/cef_win.h',
'include/internal/cef_types_win.h',
'include/internal/cef_win.h',
'libcef/browser_drag_delegate_win.cc',
'libcef/browser_drag_delegate_win.h',
'libcef/browser_impl_win.cc',
@ -744,8 +744,8 @@
}],
[ 'OS=="mac"', {
'sources': [
'include/cef_types_mac.h',
'include/cef_mac.h',
'include/internal/cef_types_mac.h',
'include/internal/cef_mac.h',
'libcef/browser_impl_mac.mm',
'libcef/browser_webkit_glue_mac.mm',
'libcef/browser_webview_delegate_mac.mm',
@ -761,8 +761,8 @@
}],
[ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
'sources': [
'include/cef_types_linux.h',
'include/cef_linux.h',
'include/internal/cef_types_linux.h',
'include/internal/cef_linux.h',
'libcef/browser_impl_gtk.cc',
'libcef/browser_webkit_glue_gtk.cc',
'libcef/browser_webview_delegate_gtk.cc',

9
libcef/browser_impl_mac.mm
View File

@ -102,9 +102,12 @@ void CefBrowserImpl::UIT_CreateBrowser(const CefString& url)
[newWnd makeKeyAndOrderFront: nil];
}
if(handler_.get()) {
// Notify the handler that we're done creating the new window
handler_->HandleAfterCreated(this);
if (client_.get()) {
CefRefPtr<CefLifeSpanHandler> handler = client_->GetLifeSpanHandler();
if(handler.get()) {
// Notify the handler that we're done creating the new window
handler->OnAfterCreated(this);
}
}
if(url.size() > 0)

4
libcef/cef_process_ui_thread.cc
View File

@ -149,7 +149,11 @@ void CefProcessUIThread::Init() {
WebKit::WebScriptController::registerExtension(
extensions_v8::GCExtension::Get());
#if defined(OS_WIN)
gfx::InitializeGLBindings(gfx::kGLImplementationEGLGLES2);
#else
gfx::InitializeGLBindings(gfx::kGLImplementationDesktopGL);
#endif
net::URLRequest::RegisterProtocolFactory("blob", &BlobURLRequestJobFactory);
net::URLRequest::RegisterProtocolFactory("filesystem",

4
tests/cefclient/client_handler.h
View File

@ -148,8 +148,8 @@ public:
void SendNotification(NotificationType type);
protected:
virtual void SetLoading(bool isLoading);
virtual void SetNavState(bool canGoBack, bool canGoForward);
void SetLoading(bool isLoading);
void SetNavState(bool canGoBack, bool canGoForward);
// The child browser window
CefRefPtr<CefBrowser> m_Browser;

3
tests/cefclient/client_handler_mac.mm
View File

@ -4,6 +4,7 @@
#include "include/cef.h"
#include "include/cef_wrapper.h"
#include "cefclient.h"
#include "client_handler.h"
#include "resource_util.h"
#include "string_util.h"
@ -85,7 +86,7 @@ void ClientHandler::OnAddressChange(CefRefPtr<CefBrowser> browser,
{
REQUIRE_UI_THREAD();
ifm_BrowserHwnd == browser->GetWindowHandle() && frame->IsMain())
if(m_BrowserHwnd == browser->GetWindowHandle() && frame->IsMain())
{
// Set the edit window text
NSTextField* textField = (NSTextField*)m_EditHwnd;

2
tests/cefclient/download_handler.h
View File

@ -8,7 +8,7 @@
#include "include/cef.h"
// Implement this interface to receive download notifications.
class DownloadListener : public CefBase
class DownloadListener : public virtual CefBase
{
public:
// Called when the download is complete.