bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 110703. 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@388 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2011-11-18 22:10:53 +00:00
parent 48d5da7827
commit 3279ee3adf
16 changed files with 88 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@ -17,5 +17,5 @@
{ {
'chromium_url': 'http://src.chromium.org/svn/trunk/src', 'chromium_url': 'http://src.chromium.org/svn/trunk/src',
'chromium_revision': '109626', 'chromium_revision': '110703',
} }

2
cef.gyp
View File

@ -368,6 +368,7 @@
'../webkit/support/webkit_support.gyp:glue', '../webkit/support/webkit_support.gyp:glue',
'../webkit/support/webkit_support.gyp:quota', '../webkit/support/webkit_support.gyp:quota',
'../webkit/support/webkit_support.gyp:webkit_gpu', '../webkit/support/webkit_support.gyp:webkit_gpu',
'../webkit/support/webkit_support.gyp:webkit_media',
'../webkit/support/webkit_support.gyp:webkit_resources', '../webkit/support/webkit_support.gyp:webkit_resources',
'../webkit/support/webkit_support.gyp:webkit_strings', '../webkit/support/webkit_support.gyp:webkit_strings',
'libcef_static', 'libcef_static',
@ -645,6 +646,7 @@
'../webkit/support/webkit_support.gyp:glue', '../webkit/support/webkit_support.gyp:glue',
'../webkit/support/webkit_support.gyp:quota', '../webkit/support/webkit_support.gyp:quota',
'../webkit/support/webkit_support.gyp:webkit_gpu', '../webkit/support/webkit_support.gyp:webkit_gpu',
'../webkit/support/webkit_support.gyp:webkit_media',
'../webkit/support/webkit_support.gyp:webkit_resources', '../webkit/support/webkit_support.gyp:webkit_resources',
'../webkit/support/webkit_support.gyp:webkit_strings', '../webkit/support/webkit_support.gyp:webkit_strings',
], ],

74
libcef/browser_database_system.cc
View File

@ -5,6 +5,8 @@
#include "browser_database_system.h" #include "browser_database_system.h"
#include "base/auto_reset.h" #include "base/auto_reset.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/file_util.h" #include "base/file_util.h"
#include "base/message_loop.h" #include "base/message_loop.h"
#include "base/message_loop_proxy.h" #include "base/message_loop_proxy.h"
@ -45,9 +47,10 @@ BrowserDatabaseSystem::BrowserDatabaseSystem()
BrowserDatabaseSystem::~BrowserDatabaseSystem() { BrowserDatabaseSystem::~BrowserDatabaseSystem() {
base::WaitableEvent done_event(false, false); base::WaitableEvent done_event(false, false);
db_thread_proxy_->PostTask(FROM_HERE, db_thread_proxy_->PostTask(
NewRunnableMethod(this, &BrowserDatabaseSystem::ThreadCleanup, FROM_HERE,
&done_event)); base::Bind(&BrowserDatabaseSystem::ThreadCleanup,
base::Unretained(this), &done_event));
done_event.Wait(); done_event.Wait();
instance_ = NULL; instance_ = NULL;
} }
@ -56,8 +59,10 @@ void BrowserDatabaseSystem::databaseOpened(const WebKit::WebDatabase& database)
string16 origin_identifier = database.securityOrigin().databaseIdentifier(); string16 origin_identifier = database.securityOrigin().databaseIdentifier();
string16 database_name = database.name(); string16 database_name = database.name();
open_connections_->AddOpenConnection(origin_identifier, database_name); open_connections_->AddOpenConnection(origin_identifier, database_name);
db_thread_proxy_->PostTask(FROM_HERE, db_thread_proxy_->PostTask(
NewRunnableMethod(this, &BrowserDatabaseSystem::DatabaseOpened, FROM_HERE,
base::Bind(&BrowserDatabaseSystem::DatabaseOpened,
base::Unretained(this),
origin_identifier, origin_identifier,
database_name, database.displayName(), database_name, database.displayName(),
database.estimatedSize())); database.estimatedSize()));
@ -65,8 +70,10 @@ void BrowserDatabaseSystem::databaseOpened(const WebKit::WebDatabase& database)
void BrowserDatabaseSystem::databaseModified( void BrowserDatabaseSystem::databaseModified(
const WebKit::WebDatabase& database) { const WebKit::WebDatabase& database) {
db_thread_proxy_->PostTask(FROM_HERE, db_thread_proxy_->PostTask(
NewRunnableMethod(this, &BrowserDatabaseSystem::DatabaseModified, FROM_HERE,
base::Bind(&BrowserDatabaseSystem::DatabaseModified,
base::Unretained(this),
database.securityOrigin().databaseIdentifier(), database.securityOrigin().databaseIdentifier(),
database.name())); database.name()));
} }
@ -74,17 +81,20 @@ void BrowserDatabaseSystem::databaseModified(
void BrowserDatabaseSystem::databaseClosed(const WebKit::WebDatabase& database) { void BrowserDatabaseSystem::databaseClosed(const WebKit::WebDatabase& database) {
string16 origin_identifier = database.securityOrigin().databaseIdentifier(); string16 origin_identifier = database.securityOrigin().databaseIdentifier();
string16 database_name = database.name(); string16 database_name = database.name();
db_thread_proxy_->PostTask(FROM_HERE, db_thread_proxy_->PostTask(
NewRunnableMethod(this, &BrowserDatabaseSystem::DatabaseClosed, FROM_HERE,
origin_identifier, database_name)); base::Bind(&BrowserDatabaseSystem::DatabaseClosed,
base::Unretained(this), origin_identifier, database_name));
} }
base::PlatformFile BrowserDatabaseSystem::OpenFile( base::PlatformFile BrowserDatabaseSystem::OpenFile(
const string16& vfs_file_name, int desired_flags) { const string16& vfs_file_name, int desired_flags) {
base::PlatformFile result = base::kInvalidPlatformFileValue; base::PlatformFile result = base::kInvalidPlatformFileValue;
base::WaitableEvent done_event(false, false); base::WaitableEvent done_event(false, false);
db_thread_proxy_->PostTask(FROM_HERE, db_thread_proxy_->PostTask(
NewRunnableMethod(this, &BrowserDatabaseSystem::VfsOpenFile, FROM_HERE,
base::Bind(&BrowserDatabaseSystem::VfsOpenFile,
base::Unretained(this),
vfs_file_name, desired_flags, vfs_file_name, desired_flags,
&result, &done_event)); &result, &done_event));
done_event.Wait(); done_event.Wait();
@ -95,8 +105,10 @@ int BrowserDatabaseSystem::DeleteFile(
const string16& vfs_file_name, bool sync_dir) { const string16& vfs_file_name, bool sync_dir) {
int result = SQLITE_OK; int result = SQLITE_OK;
base::WaitableEvent done_event(false, false); base::WaitableEvent done_event(false, false);
db_thread_proxy_->PostTask(FROM_HERE, db_thread_proxy_->PostTask(
NewRunnableMethod(this, &BrowserDatabaseSystem::VfsDeleteFile, FROM_HERE,
base::Bind(&BrowserDatabaseSystem::VfsDeleteFile,
base::Unretained(this),
vfs_file_name, sync_dir, vfs_file_name, sync_dir,
&result, &done_event)); &result, &done_event));
done_event.Wait(); done_event.Wait();
@ -106,9 +118,10 @@ int BrowserDatabaseSystem::DeleteFile(
uint32 BrowserDatabaseSystem::GetFileAttributes(const string16& vfs_file_name) { uint32 BrowserDatabaseSystem::GetFileAttributes(const string16& vfs_file_name) {
uint32 result = 0; uint32 result = 0;
base::WaitableEvent done_event(false, false); base::WaitableEvent done_event(false, false);
db_thread_proxy_->PostTask(FROM_HERE, db_thread_proxy_->PostTask(
NewRunnableMethod(this, &BrowserDatabaseSystem::VfsGetFileAttributes, FROM_HERE,
vfs_file_name, &result, &done_event)); base::Bind(&BrowserDatabaseSystem::VfsGetFileAttributes,
base::Unretained(this), vfs_file_name, &result, &done_event));
done_event.Wait(); done_event.Wait();
return result; return result;
} }
@ -116,9 +129,10 @@ uint32 BrowserDatabaseSystem::GetFileAttributes(const string16& vfs_file_name) {
int64 BrowserDatabaseSystem::GetFileSize(const string16& vfs_file_name) { int64 BrowserDatabaseSystem::GetFileSize(const string16& vfs_file_name) {
int64 result = 0; int64 result = 0;
base::WaitableEvent done_event(false, false); base::WaitableEvent done_event(false, false);
db_thread_proxy_->PostTask(FROM_HERE, db_thread_proxy_->PostTask(
NewRunnableMethod(this, &BrowserDatabaseSystem::VfsGetFileSize, FROM_HERE,
vfs_file_name, &result, &done_event)); base::Bind(&BrowserDatabaseSystem::VfsGetFileSize,
base::Unretained(this), vfs_file_name, &result, &done_event));
done_event.Wait(); done_event.Wait();
return result; return result;
} }
@ -127,24 +141,28 @@ int64 BrowserDatabaseSystem::GetSpaceAvailable(
const string16& origin_identifier) { const string16& origin_identifier) {
int64 result = 0; int64 result = 0;
base::WaitableEvent done_event(false, false); base::WaitableEvent done_event(false, false);
db_thread_proxy_->PostTask(FROM_HERE, db_thread_proxy_->PostTask(
NewRunnableMethod(this, &BrowserDatabaseSystem::VfsGetSpaceAvailable, FROM_HERE,
origin_identifier, &result, &done_event)); base::Bind(&BrowserDatabaseSystem::VfsGetSpaceAvailable,
base::Unretained(this), origin_identifier,
&result, &done_event));
done_event.Wait(); done_event.Wait();
return result; return result;
} }
void BrowserDatabaseSystem::ClearAllDatabases() { void BrowserDatabaseSystem::ClearAllDatabases() {
open_connections_->WaitForAllDatabasesToClose(); open_connections_->WaitForAllDatabasesToClose();
db_thread_proxy_->PostTask(FROM_HERE, db_thread_proxy_->PostTask(
NewRunnableMethod(this, &BrowserDatabaseSystem::ResetTracker)); FROM_HERE,
base::Bind(&BrowserDatabaseSystem::ResetTracker, base::Unretained(this)));
} }
void BrowserDatabaseSystem::SetDatabaseQuota(int64 quota) { void BrowserDatabaseSystem::SetDatabaseQuota(int64 quota) {
if (!db_thread_proxy_->BelongsToCurrentThread()) { if (!db_thread_proxy_->BelongsToCurrentThread()) {
db_thread_proxy_->PostTask(FROM_HERE, db_thread_proxy_->PostTask(
NewRunnableMethod(this, &BrowserDatabaseSystem::SetDatabaseQuota, FROM_HERE,
quota)); base::Bind(&BrowserDatabaseSystem::SetDatabaseQuota,
base::Unretained(this), quota));
return; return;
} }
quota_per_origin_ = quota; quota_per_origin_ = quota;

12
libcef/browser_database_system.h
View File

@ -12,7 +12,6 @@
#include "base/scoped_temp_dir.h" #include "base/scoped_temp_dir.h"
#include "base/string16.h" #include "base/string16.h"
#include "base/synchronization/lock.h" #include "base/synchronization/lock.h"
#include "base/task.h"
#include "base/threading/thread.h" #include "base/threading/thread.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabaseObserver.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabaseObserver.h"
#include "webkit/database/database_connections.h" #include "webkit/database/database_connections.h"
@ -39,7 +38,7 @@ class BrowserDatabaseSystem : public webkit_database::DatabaseTracker::Observer,
virtual void databaseClosed(const WebKit::WebDatabase& database); virtual void databaseClosed(const WebKit::WebDatabase& database);
// SQLite VFS related methods, these are called on webcore's // SQLite VFS related methods, these are called on webcore's
// background database threads via the WebKitClient impl. // background database threads via the WebKitPlatformSupport impl.
base::PlatformFile OpenFile(const string16& vfs_file_name, int desired_flags); base::PlatformFile OpenFile(const string16& vfs_file_name, int desired_flags);
int DeleteFile(const string16& vfs_file_name, bool sync_dir); int DeleteFile(const string16& vfs_file_name, bool sync_dir);
uint32 GetFileAttributes(const string16& vfs_file_name); uint32 GetFileAttributes(const string16& vfs_file_name);
@ -64,9 +63,10 @@ class BrowserDatabaseSystem : public webkit_database::DatabaseTracker::Observer,
// DatabaseTracker::Observer implementation // DatabaseTracker::Observer implementation
virtual void OnDatabaseSizeChanged(const string16& origin_identifier, virtual void OnDatabaseSizeChanged(const string16& origin_identifier,
const string16& database_name, const string16& database_name,
int64 database_size); int64 database_size) OVERRIDE;
virtual void OnDatabaseScheduledForDeletion(const string16& origin_identifier, virtual void OnDatabaseScheduledForDeletion(
const string16& database_name); const string16& origin_identifier,
const string16& database_name) OVERRIDE;
// Used by our public SQLite VFS methods, only called on the db_thread. // Used by our public SQLite VFS methods, only called on the db_thread.
void VfsOpenFile(const string16& vfs_file_name, int desired_flags, void VfsOpenFile(const string16& vfs_file_name, int desired_flags,
@ -101,6 +101,4 @@ class BrowserDatabaseSystem : public webkit_database::DatabaseTracker::Observer,
static BrowserDatabaseSystem* instance_; static BrowserDatabaseSystem* instance_;
}; };
DISABLE_RUNNABLE_METHOD_REFCOUNT(BrowserDatabaseSystem);
#endif // _BROWSER_DATABASE_SYSTEM_H #endif // _BROWSER_DATABASE_SYSTEM_H

3
libcef/browser_devtools_agent.h
View File

@ -5,6 +5,8 @@
#ifndef _BROWSER_DEVTOOLS_AGENT_H #ifndef _BROWSER_DEVTOOLS_AGENT_H
#define _BROWSER_DEVTOOLS_AGENT_H #define _BROWSER_DEVTOOLS_AGENT_H
#include <string>
#include "base/memory/weak_ptr.h" #include "base/memory/weak_ptr.h"
#include "base/task.h" #include "base/task.h"
@ -14,7 +16,6 @@ namespace WebKit {
class WebDevToolsAgent; class WebDevToolsAgent;
class WebView; class WebView;
struct WebDevToolsMessageData;
} // namespace WebKit } // namespace WebKit

1
libcef/browser_devtools_client.h
View File

@ -14,7 +14,6 @@
namespace WebKit { namespace WebKit {
class WebDevToolsFrontend; class WebDevToolsFrontend;
struct WebDevToolsMessageData;
} // namespace WebKit } // namespace WebKit

11
libcef/browser_persistent_cookie_store.cc
View File

@ -164,8 +164,7 @@ class BrowserPersistentCookieStore::Backend
PendingOperationsList::size_type num_pending_; PendingOperationsList::size_type num_pending_;
// True if the persistent store should be deleted upon destruction. // True if the persistent store should be deleted upon destruction.
bool clear_local_state_on_exit_; bool clear_local_state_on_exit_;
// Guard |cookies_|, |pending_|, |num_pending_| and // Guard |cookies_|, |pending_|, |num_pending_|, |clear_local_state_on_exit_|
// |clear_local_state_on_exit_|.
base::Lock lock_; base::Lock lock_;
// Temporary buffer for cookies loaded from DB. Accumulates cookies to reduce // Temporary buffer for cookies loaded from DB. Accumulates cookies to reduce
@ -540,12 +539,12 @@ void BrowserPersistentCookieStore::Backend::BatchOperation(
// We've gotten our first entry for this batch, fire off the timer. // We've gotten our first entry for this batch, fire off the timer.
CefThread::PostDelayedTask( CefThread::PostDelayedTask(
CefThread::FILE, FROM_HERE, CefThread::FILE, FROM_HERE,
NewRunnableMethod(this, &Backend::Commit), kCommitIntervalMs); base::Bind(&Backend::Commit, this), kCommitIntervalMs);
} else if (num_pending == kCommitAfterBatchSize) { } else if (num_pending == kCommitAfterBatchSize) {
// We've reached a big enough batch, fire off a commit now. // We've reached a big enough batch, fire off a commit now.
CefThread::PostTask( CefThread::PostTask(
CefThread::FILE, FROM_HERE, CefThread::FILE, FROM_HERE,
NewRunnableMethod(this, &Backend::Commit)); base::Bind(&Backend::Commit, this));
} }
} }
@ -639,7 +638,7 @@ void BrowserPersistentCookieStore::Backend::Commit() {
void BrowserPersistentCookieStore::Backend::Flush(Task* completion_task) { void BrowserPersistentCookieStore::Backend::Flush(Task* completion_task) {
DCHECK(!CefThread::CurrentlyOn(CefThread::FILE)); DCHECK(!CefThread::CurrentlyOn(CefThread::FILE));
CefThread::PostTask( CefThread::PostTask(
CefThread::FILE, FROM_HERE, NewRunnableMethod(this, &Backend::Commit)); CefThread::FILE, FROM_HERE, base::Bind(&Backend::Commit, this));
if (completion_task) { if (completion_task) {
// We want the completion task to run immediately after Commit() returns. // We want the completion task to run immediately after Commit() returns.
// Posting it from here means there is less chance of another task getting // Posting it from here means there is less chance of another task getting
@ -658,7 +657,7 @@ void BrowserPersistentCookieStore::Backend::Close() {
// Must close the backend on the background thread. // Must close the backend on the background thread.
CefThread::PostTask( CefThread::PostTask(
CefThread::FILE, FROM_HERE, CefThread::FILE, FROM_HERE,
NewRunnableMethod(this, &Backend::InternalBackgroundClose)); base::Bind(&Backend::InternalBackgroundClose, this));
} }
} }

14
libcef/browser_webview_delegate.cc
View File

@ -61,11 +61,11 @@
#include "ui/gfx/point.h" #include "ui/gfx/point.h"
#include "webkit/appcache/web_application_cache_host_impl.h" #include "webkit/appcache/web_application_cache_host_impl.h"
#include "webkit/glue/glue_serialize.h" #include "webkit/glue/glue_serialize.h"
#include "webkit/glue/media/video_renderer_impl.h"
#include "webkit/glue/webpreferences.h" #include "webkit/glue/webpreferences.h"
#include "webkit/glue/webkit_glue.h" #include "webkit/glue/webkit_glue.h"
#include "webkit/glue/webmediaplayer_impl.h"
#include "webkit/glue/window_open_disposition.h" #include "webkit/glue/window_open_disposition.h"
#include "webkit/media/video_renderer_impl.h"
#include "webkit/media/webmediaplayer_impl.h"
#include "webkit/plugins/npapi/plugin_list.h" #include "webkit/plugins/npapi/plugin_list.h"
#include "webkit/plugins/npapi/webplugin_delegate_impl.h" #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
#include "webkit/plugins/npapi/webplugin_impl.h" #include "webkit/plugins/npapi/webplugin_impl.h"
@ -634,17 +634,17 @@ WebMediaPlayer* BrowserWebViewDelegate::createMediaPlayer(
scoped_ptr<media::FilterCollection> collection( scoped_ptr<media::FilterCollection> collection(
new media::FilterCollection()); new media::FilterCollection());
scoped_refptr<webkit_glue::VideoRendererImpl> video_renderer( scoped_refptr<webkit_media::VideoRendererImpl> video_renderer(
new webkit_glue::VideoRendererImpl(false)); new webkit_media::VideoRendererImpl(false));
collection->AddVideoRenderer(video_renderer); collection->AddVideoRenderer(video_renderer);
// Add the audio renderer. // Add the audio renderer.
collection->AddAudioRenderer(new media::ReferenceAudioRenderer()); collection->AddAudioRenderer(new media::ReferenceAudioRenderer());
scoped_ptr<webkit_glue::WebMediaPlayerImpl> result( scoped_ptr<webkit_media::WebMediaPlayerImpl> result(
new webkit_glue::WebMediaPlayerImpl( new webkit_media::WebMediaPlayerImpl(
client, client,
base::WeakPtr<webkit_glue::WebMediaPlayerDelegate>(), base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
collection.release(), collection.release(),
message_loop_factory.release(), message_loop_factory.release(),
NULL, NULL,

2
libcef/browser_webview_delegate.h
View File

@ -206,7 +206,7 @@ class BrowserWebViewDelegate : public WebKit::WebViewClient,
virtual void DidStopLoadingForPlugin() OVERRIDE {} virtual void DidStopLoadingForPlugin() OVERRIDE {}
virtual WebKit::WebCookieJar* GetCookieJar() OVERRIDE; virtual WebKit::WebCookieJar* GetCookieJar() OVERRIDE;
BrowserWebViewDelegate(CefBrowserImpl* browser); explicit BrowserWebViewDelegate(CefBrowserImpl* browser);
virtual ~BrowserWebViewDelegate(); virtual ~BrowserWebViewDelegate();
void Reset(); void Reset();

2
libcef/scheme_impl.cc
View File

@ -583,7 +583,7 @@ private:
DISALLOW_EVIL_CONSTRUCTORS(CefUrlRequestManager); DISALLOW_EVIL_CONSTRUCTORS(CefUrlRequestManager);
}; };
base::LazyInstance<CefUrlRequestManager> g_manager(base::LINKER_INITIALIZED); base::LazyInstance<CefUrlRequestManager> g_manager = LAZY_INSTANCE_INITIALIZER;
CefUrlRequestManager* CefUrlRequestManager::GetInstance() CefUrlRequestManager* CefUrlRequestManager::GetInstance()
{ {

2
libcef/simple_clipboard_impl.cc
View File

@ -29,7 +29,7 @@ ScopedClipboardWriterGlue::~ScopedClipboardWriterGlue() {
namespace webkit_glue { namespace webkit_glue {
base::LazyInstance<ui::Clipboard> clipboard(base::LINKER_INITIALIZED); base::LazyInstance<ui::Clipboard> clipboard = LAZY_INSTANCE_INITIALIZER;
ui::Clipboard* ClipboardGetClipboard() { ui::Clipboard* ClipboardGetClipboard() {
return clipboard.Pointer(); return clipboard.Pointer();

2
libcef/tracker.h
View File

@ -73,7 +73,7 @@ private:
// removed by explicit calls to the Destroy() method will be removed when the // removed by explicit calls to the Destroy() method will be removed when the
// manager object is destroyed. A manager object can be created as either a // manager object is destroyed. A manager object can be created as either a
// member variable of another class or by using lazy initialization: // member variable of another class or by using lazy initialization:
// base::LazyInstance<CefTrackManager> g_singleton(base::LINKER_INITIALIZED); // base::LazyInstance<CefTrackManager> g_singleton = LAZY_INSTANCE_INITIALIZER;
class CefTrackManager : public CefBase class CefTrackManager : public CefBase
{ {
public: public:

2
libcef/v8_impl.cc
View File

@ -32,7 +32,7 @@ static const char kCefUserData[] = "Cef::UserData";
// Memory manager. // Memory manager.
base::LazyInstance<CefTrackManager> g_v8_tracker(base::LINKER_INITIALIZED); base::LazyInstance<CefTrackManager> g_v8_tracker = LAZY_INSTANCE_INITIALIZER;
class TrackBase : public CefTrackObject class TrackBase : public CefTrackObject
{ {

2
libcef_dll/ctocpp/command_line_ctocpp.cc
View File

@ -22,7 +22,7 @@ CefRefPtr<CefCommandLine> CefCommandLine::CreateCommandLine()
int build_revision = cef_build_revision(); int build_revision = cef_build_revision();
if (build_revision != CEF_REVISION) { if (build_revision != CEF_REVISION) {
// The libcef build revision does not match the CEF API revision. // The libcef build revision does not match the CEF API revision.
DCHECK(FALSE); DCHECK(false);
return NULL; return NULL;
} }

2
libcef_dll/wrapper/libcef_dll_wrapper.cc
View File

@ -42,7 +42,7 @@ bool CefInitialize(const CefSettings& settings)
int build_revision = cef_build_revision(); int build_revision = cef_build_revision();
if (build_revision != CEF_REVISION) { if (build_revision != CEF_REVISION) {
// The libcef build revision does not match the CEF API revision. // The libcef build revision does not match the CEF API revision.
DCHECK(FALSE); DCHECK(false);
return false; return false;
} }

8
patch/patches/base.patch
View File

@ -1,8 +1,8 @@
Index: message_loop.cc Index: message_loop.cc
=================================================================== ===================================================================
--- message_loop.cc (revision 108684) --- message_loop.cc (revision 110703)
+++ message_loop.cc (working copy) +++ message_loop.cc (working copy)
@@ -403,9 +403,13 @@ @@ -404,9 +404,13 @@
} }
void MessageLoop::AssertIdle() const { void MessageLoop::AssertIdle() const {
@ -19,9 +19,9 @@ Index: message_loop.cc
bool MessageLoop::is_running() const { bool MessageLoop::is_running() const {
Index: message_loop.h Index: message_loop.h
=================================================================== ===================================================================
--- message_loop.h (revision 108684) --- message_loop.h (revision 110703)
+++ message_loop.h (working copy) +++ message_loop.h (working copy)
@@ -366,6 +366,9 @@ @@ -363,6 +363,9 @@
// Asserts that the MessageLoop is "idle". // Asserts that the MessageLoop is "idle".
void AssertIdle() const; void AssertIdle() const;