Skip to content

Commit 4167831

Browse files
author
[email protected]
committed
Update to Chromium revision 194165.
git-svn-id: http://chromiumembedded.googlecode.com/svn/trunk/cef1@1232 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
1 parent 6f7a1dc commit 4167831

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+248
-182
lines changed

‎CHROMIUM_BUILD_COMPATIBILITY.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717

1818
{
1919
'chromium_url': 'http://src.chromium.org/svn/trunk/src',
20-
'chromium_revision': '190564',
20+
'chromium_revision': '194165',
2121
}

‎cef.gyp

+2-4
Original file line numberDiff line numberDiff line change
@@ -735,10 +735,8 @@
735735
'libcef/xml_reader_impl.h',
736736
'libcef/zip_reader_impl.cc',
737737
'libcef/zip_reader_impl.h',
738-
'<(DEPTH)/chrome/browser/net/clear_on_exit_policy.cc',
739-
'<(DEPTH)/chrome/browser/net/clear_on_exit_policy.h',
740-
'<(DEPTH)/chrome/browser/net/sqlite_persistent_cookie_store.cc',
741-
'<(DEPTH)/chrome/browser/net/sqlite_persistent_cookie_store.h',
738+
'<(DEPTH)/content/browser/net/sqlite_persistent_cookie_store.cc',
739+
'<(DEPTH)/content/browser/net/sqlite_persistent_cookie_store.h',
742740
# DevTools resource IDs generated by grit
743741
'<(grit_out_dir)/grit/devtools_resources_map.cc',
744742
# Geolocation implementation

‎include/internal/cef_types.h

+1-8
Original file line numberDiff line numberDiff line change
@@ -481,11 +481,6 @@ typedef struct _cef_browser_settings_t {
481481
///
482482
bool accelerated_plugins_disabled;
483483

484-
///
485-
// Set to true (1) to disable developer tools (WebKit inspector).
486-
///
487-
bool developer_tools_disabled;
488-
489484
///
490485
// Set to true (1) to enable fullscreen mode.
491486
///
@@ -1085,9 +1080,7 @@ enum cef_dom_event_category_t {
10851080
DOM_EVENT_CATEGORY_POPSTATE = 0x2000,
10861081
DOM_EVENT_CATEGORY_PROGRESS = 0x4000,
10871082
DOM_EVENT_CATEGORY_XMLHTTPREQUEST_PROGRESS = 0x8000,
1088-
DOM_EVENT_CATEGORY_WEBKIT_ANIMATION = 0x10000,
1089-
DOM_EVENT_CATEGORY_WEBKIT_TRANSITION = 0x20000,
1090-
DOM_EVENT_CATEGORY_BEFORE_LOAD = 0x40000,
1083+
DOM_EVENT_CATEGORY_BEFORE_LOAD = 0x10000,
10911084
};
10921085

10931086
///

‎include/internal/cef_types_wrappers.h

-1
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,6 @@ struct CefBrowserSettingsTraits {
405405
src->accelerated_2d_canvas_disabled;
406406
target->accelerated_filters_disabled = src->accelerated_filters_disabled;
407407
target->accelerated_plugins_disabled = src->accelerated_plugins_disabled;
408-
target->developer_tools_disabled = src->developer_tools_disabled;
409408
target->fullscreen_enabled = src->fullscreen_enabled;
410409
}
411410
};

‎libcef/browser_appcache_system.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ BrowserAppCacheSystem::~BrowserAppCacheSystem() {
393393
void BrowserAppCacheSystem::InitOnUIThread(
394394
const base::FilePath& cache_directory) {
395395
DCHECK(!ui_message_loop_);
396-
ui_message_loop_ = MessageLoop::current();
396+
ui_message_loop_ = base::MessageLoop::current();
397397
cache_directory_ = cache_directory;
398398
}
399399

@@ -403,7 +403,7 @@ void BrowserAppCacheSystem::InitOnIOThread(
403403
return;
404404

405405
DCHECK(!io_message_loop_);
406-
io_message_loop_ = MessageLoop::current();
406+
io_message_loop_ = base::MessageLoop::current();
407407

408408
if (!db_thread_.IsRunning())
409409
db_thread_.Start();

‎libcef/browser_appcache_system.h

+10-6
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,14 @@ class BrowserAppCacheSystem {
9999
GURL* manifest_url);
100100

101101
// Helpers
102-
MessageLoop* io_message_loop() { return io_message_loop_; }
103-
MessageLoop* ui_message_loop() { return ui_message_loop_; }
104-
bool is_io_thread() { return MessageLoop::current() == io_message_loop_; }
105-
bool is_ui_thread() { return MessageLoop::current() == ui_message_loop_; }
102+
base::MessageLoop* io_message_loop() { return io_message_loop_; }
103+
base::MessageLoop* ui_message_loop() { return ui_message_loop_; }
104+
bool is_io_thread() {
105+
return base::MessageLoop::current() == io_message_loop_;
106+
}
107+
bool is_ui_thread() {
108+
return base::MessageLoop::current() == ui_message_loop_;
109+
}
106110
bool is_initialized() {
107111
return io_message_loop_ && is_initailized_on_ui_thread();
108112
}
@@ -111,8 +115,8 @@ class BrowserAppCacheSystem {
111115
}
112116

113117
base::FilePath cache_directory_;
114-
MessageLoop* io_message_loop_;
115-
MessageLoop* ui_message_loop_;
118+
base::MessageLoop* io_message_loop_;
119+
base::MessageLoop* ui_message_loop_;
116120
scoped_refptr<BrowserBackendProxy> backend_proxy_;
117121
scoped_refptr<BrowserFrontendProxy> frontend_proxy_;
118122
appcache::AppCacheFrontendImpl frontend_impl_;

‎libcef/browser_devtools_agent.cc

+4-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ namespace {
2424
class WebKitClientMessageLoopImpl
2525
: public WebKit::WebDevToolsAgentClient::WebKitClientMessageLoop {
2626
public:
27-
WebKitClientMessageLoopImpl() : message_loop_(MessageLoop::current()) { }
27+
WebKitClientMessageLoopImpl()
28+
: message_loop_(base::MessageLoop::current()) { }
2829
virtual ~WebKitClientMessageLoopImpl() {
2930
message_loop_ = NULL;
3031
}
@@ -38,7 +39,7 @@ class WebKitClientMessageLoopImpl
3839
message_loop_->QuitNow();
3940
}
4041
private:
41-
MessageLoop* message_loop_;
42+
base::MessageLoop* message_loop_;
4243
};
4344

4445
} // namespace
@@ -79,7 +80,7 @@ WebKit::WebDevToolsAgentClient::WebKitClientMessageLoop*
7980
}
8081

8182
void BrowserDevToolsAgent::AsyncCall(const BrowserDevToolsCallArgs &args) {
82-
MessageLoop::current()->PostTask(
83+
base::MessageLoop::current()->PostTask(
8384
FROM_HERE,
8485
base::Bind(&BrowserDevToolsAgent::Call, weak_factory_.GetWeakPtr(),
8586
args));

‎libcef/browser_devtools_client.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void BrowserDevToolsClient::undockWindow() {
6868
}
6969

7070
void BrowserDevToolsClient::AsyncCall(const BrowserDevToolsCallArgs &args) {
71-
MessageLoop::current()->PostTask(
71+
base::MessageLoop::current()->PostTask(
7272
FROM_HERE,
7373
base::Bind(&BrowserDevToolsClient::Call, weak_factory_.GetWeakPtr(),
7474
args));

‎libcef/browser_drag_delegate_win.cc

+3-2
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ void BrowserDragDelegate::StartDragging(const WebDropData& drop_data,
140140
DCHECK(!drag_drop_thread_.get());
141141
drag_drop_thread_.reset(new DragDropThread(this));
142142
base::Thread::Options options;
143-
options.message_loop_type = MessageLoop::TYPE_UI;
143+
options.message_loop_type = base::MessageLoop::TYPE_UI;
144144
if (drag_drop_thread_->StartWithOptions(options)) {
145145
drag_drop_thread_->message_loop()->PostTask(
146146
FROM_HERE,
@@ -304,7 +304,8 @@ void BrowserDragDelegate::DoDragging(const WebDropData& drop_data,
304304
// updates while in the system DoDragDrop loop.
305305
DWORD effect;
306306
{
307-
MessageLoop::ScopedNestableTaskAllower allow(MessageLoop::current());
307+
base::MessageLoop::ScopedNestableTaskAllower allow(
308+
base::MessageLoop::current());
308309
DoDragDrop(ui::OSExchangeDataProviderWin::GetIDataObject(data),
309310
drag_source_,
310311
web_drag_utils_win::WebDragOpMaskToWinDragOpMask(ops),

‎libcef/browser_file_system.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ using fileapi::FileSystemTaskRunners;
5555
using fileapi::FileSystemURL;
5656

5757
namespace {
58-
MessageLoop* g_io_thread;
58+
base::MessageLoop* g_io_thread;
5959
webkit_blob::BlobStorageController* g_blob_storage_controller;
6060

6161
void RegisterBlob(const GURL& blob_url, const base::FilePath& file_path) {
@@ -281,7 +281,7 @@ void BrowserFileSystem::createSnapshotFileAndReadMetadata(
281281
// static
282282
void BrowserFileSystem::InitializeOnIOThread(
283283
webkit_blob::BlobStorageController* blob_storage_controller) {
284-
g_io_thread = MessageLoop::current();
284+
g_io_thread = base::MessageLoop::current();
285285
g_blob_storage_controller = blob_storage_controller;
286286
}
287287

‎libcef/browser_impl.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,7 @@ void CefBrowserImpl::UIT_DestroyBrowser() {
748748
if (is_modal_) {
749749
// Exit our own internal modal message loop now.
750750
if (internal_modal_message_loop_is_active_) {
751-
MessageLoop* message_loop = MessageLoop::current();
751+
base::MessageLoop* message_loop = base::MessageLoop::current();
752752
message_loop->QuitNow();
753753
}
754754
}

‎libcef/browser_impl_win.cc

+4-8
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,7 @@ bool CefBrowserImpl::UIT_CreateBrowser(const CefString& url) {
196196
paint_delegate_.reset(new PaintDelegate(this));
197197
}
198198

199-
if (!settings_.developer_tools_disabled)
200-
dev_tools_agent_.reset(new BrowserDevToolsAgent());
199+
dev_tools_agent_.reset(new BrowserDevToolsAgent());
201200

202201
// Add a reference that will be released in UIT_DestroyBrowser().
203202
AddRef();
@@ -217,8 +216,7 @@ bool CefBrowserImpl::UIT_CreateBrowser(const CefString& url) {
217216
if (window_info_.m_bTransparentPainting)
218217
webviewhost_->webview()->setIsTransparent(true);
219218

220-
if (!settings_.developer_tools_disabled)
221-
dev_tools_agent_->SetWebView(webviewhost_->webview());
219+
dev_tools_agent_->SetWebView(webviewhost_->webview());
222220

223221
webviewhost_->SetFrameRate(settings_.animation_frame_rate);
224222

@@ -533,8 +531,8 @@ void CefBrowserImpl::UIT_PrintPages(WebKit::WebFrame* frame) {
533531
page_count = frame->printBegin(printParams);
534532

535533
if (page_count) {
536-
bool old_state = MessageLoop::current()->NestableTasksAllowed();
537-
MessageLoop::current()->SetNestableTasksAllowed(false);
534+
base::MessageLoop::ScopedNestableTaskAllower allow(
535+
base::MessageLoop::current());
538536

539537
if (print_context_.NewDocument(title_) == printing::PrintingContext::OK) {
540538
if (settings.ranges.size() > 0) {
@@ -549,8 +547,6 @@ void CefBrowserImpl::UIT_PrintPages(WebKit::WebFrame* frame) {
549547
}
550548
print_context_.DocumentDone();
551549
}
552-
553-
MessageLoop::current()->SetNestableTasksAllowed(old_state);
554550
}
555551

556552
frame->printEnd();

‎libcef/browser_request_context.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#include "base/thread_task_runner_handle.h"
2121
#include "base/threading/worker_pool.h"
2222
#include "build/build_config.h"
23-
#include "chrome/browser/net/sqlite_persistent_cookie_store.h"
24-
#include "net/base/cert_verifier.h"
23+
#include "content/browser/net/sqlite_persistent_cookie_store.h"
24+
#include "net/cert/cert_verifier.h"
2525
#include "net/cookies/cookie_monster.h"
2626
#include "net/dns/host_resolver.h"
2727
#include "net/ftp/ftp_network_layer.h"
@@ -304,7 +304,7 @@ void BrowserRequestContext::SetCookieStoragePath(const base::FilePath& path) {
304304

305305
base::FilePath new_path = path;
306306

307-
scoped_refptr<SQLitePersistentCookieStore> persistent_store;
307+
scoped_refptr<content::SQLitePersistentCookieStore> persistent_store;
308308
if (!new_path.empty()) {
309309
if (!file_util::PathExists(new_path) &&
310310
!file_util::CreateDirectory(new_path)) {
@@ -314,7 +314,7 @@ void BrowserRequestContext::SetCookieStoragePath(const base::FilePath& path) {
314314
base::FilePath cookie_path =
315315
new_path.Append(FILE_PATH_LITERAL("Cookies"));
316316
persistent_store =
317-
new SQLitePersistentCookieStore(
317+
new content::SQLitePersistentCookieStore(
318318
cookie_path,
319319
CefThread::GetMessageLoopProxyForThread(CefThread::IO),
320320
CefThread::GetMessageLoopProxyForThread(CefThread::FILE),

‎libcef/browser_resource_loader_bridge.cc

+12-12
Original file line numberDiff line numberDiff line change
@@ -214,13 +214,13 @@ class RequestProxy : public net::URLRequest::Delegate,
214214
}
215215

216216
void DropPeer() {
217-
DCHECK(MessageLoop::current() == owner_loop_);
217+
DCHECK(base::MessageLoop::current() == owner_loop_);
218218
peer_ = NULL;
219219
}
220220

221221
void Start(ResourceLoaderBridge::Peer* peer, RequestParams* params) {
222222
peer_ = peer;
223-
owner_loop_ = MessageLoop::current();
223+
owner_loop_ = base::MessageLoop::current();
224224

225225
InitializeParams(params);
226226

@@ -230,7 +230,7 @@ class RequestProxy : public net::URLRequest::Delegate,
230230
}
231231

232232
void Cancel() {
233-
DCHECK(MessageLoop::current() == owner_loop_);
233+
DCHECK(base::MessageLoop::current() == owner_loop_);
234234

235235
if (download_handler_.get()) {
236236
// WebKit will try to cancel the download but we won't allow it.
@@ -243,7 +243,7 @@ class RequestProxy : public net::URLRequest::Delegate,
243243
}
244244

245245
void SetDefersLoading(bool defer) {
246-
DCHECK(MessageLoop::current() == owner_loop_);
246+
DCHECK(base::MessageLoop::current() == owner_loop_);
247247

248248
CefThread::PostTask(CefThread::IO, FROM_HERE, base::Bind(
249249
&RequestProxy::AsyncSetDefersLoading, this, defer));
@@ -268,7 +268,7 @@ class RequestProxy : public net::URLRequest::Delegate,
268268

269269
void NotifyReceivedRedirect(const GURL& new_url,
270270
const ResourceResponseInfo& info) {
271-
DCHECK(MessageLoop::current() == owner_loop_);
271+
DCHECK(base::MessageLoop::current() == owner_loop_);
272272

273273
bool has_new_first_party_for_cookies = false;
274274
GURL new_first_party_for_cookies;
@@ -285,7 +285,7 @@ class RequestProxy : public net::URLRequest::Delegate,
285285

286286
void NotifyReceivedResponse(const ResourceResponseInfo& info,
287287
const GURL& url, bool allow_download) {
288-
DCHECK(MessageLoop::current() == owner_loop_);
288+
DCHECK(base::MessageLoop::current() == owner_loop_);
289289

290290
if (browser_.get() && info.headers.get()) {
291291
CefRefPtr<CefClient> client = browser_->GetClient();
@@ -337,7 +337,7 @@ class RequestProxy : public net::URLRequest::Delegate,
337337
}
338338

339339
void NotifyReceivedData(int bytes_read) {
340-
DCHECK(MessageLoop::current() == owner_loop_);
340+
DCHECK(base::MessageLoop::current() == owner_loop_);
341341

342342
if (!peer_)
343343
return;
@@ -382,7 +382,7 @@ class RequestProxy : public net::URLRequest::Delegate,
382382
}
383383

384384
void NotifyDownloadedData(int bytes_read) {
385-
DCHECK(MessageLoop::current() == owner_loop_);
385+
DCHECK(base::MessageLoop::current() == owner_loop_);
386386

387387
if (!peer_)
388388
return;
@@ -397,7 +397,7 @@ class RequestProxy : public net::URLRequest::Delegate,
397397
void NotifyCompletedRequest(int error_code,
398398
const std::string& security_info,
399399
const base::TimeTicks& complete_time) {
400-
DCHECK(MessageLoop::current() == owner_loop_);
400+
DCHECK(base::MessageLoop::current() == owner_loop_);
401401

402402
// Drain the content filter of all remaining data
403403
if (content_filter_.get()) {
@@ -438,7 +438,7 @@ class RequestProxy : public net::URLRequest::Delegate,
438438
}
439439

440440
void NotifyUploadProgress(uint64 position, uint64 size) {
441-
DCHECK(MessageLoop::current() == owner_loop_);
441+
DCHECK(base::MessageLoop::current() == owner_loop_);
442442

443443
if (peer_)
444444
peer_->OnUploadProgress(position, size);
@@ -598,7 +598,7 @@ class RequestProxy : public net::URLRequest::Delegate,
598598
request_->SetPriority(params->priority);
599599
request_->set_method(params->method);
600600
request_->set_first_party_for_cookies(params->first_party_for_cookies);
601-
request_->set_referrer(params->referrer.spec());
601+
request_->SetReferrer(params->referrer.spec());
602602
webkit_glue::ConfigureURLRequestForReferrerPolicy(
603603
request_.get(), params->referrer_policy);
604604
net::HttpRequestHeaders headers;
@@ -947,7 +947,7 @@ class RequestProxy : public net::URLRequest::Delegate,
947947

948948
CefRefPtr<CefBrowserImpl> browser_;
949949

950-
MessageLoop* owner_loop_;
950+
base::MessageLoop* owner_loop_;
951951

952952
// This is our peer in WebKit (implemented as ResourceHandleInternal). We do
953953
// not manage its lifetime, and we may only access it from the owner's

‎libcef/browser_settings.cc

-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ void BrowserToWebSettings(const CefBrowserSettings& cef, WebPreferences& web) {
109109
web.loads_images_automatically = !cef.image_load_disabled;
110110
web.plugins_enabled = !cef.plugins_disabled;
111111
web.dom_paste_enabled = !cef.dom_paste_disabled;
112-
web.developer_extras_enabled = !cef.developer_tools_disabled;
113112
web.inspector_settings.clear();
114113
web.site_specific_quirks_enabled = !cef.site_specific_quirks_disabled;
115114
web.shrinks_standalone_images_to_fit = cef.shrink_standalone_images_to_fit;

0 commit comments

Comments
 (0)