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

Update to Chromium revision 157509. 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@838 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2012-10-03 21:50:01 +00:00
parent ca817dc4cd
commit 13afc1226f
11 changed files with 63 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cef1/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': '153668', 'chromium_revision': '157509',
} }

10
cef1/cef.gyp
View File

@ -165,7 +165,7 @@
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
], ],
}, },
'inputs': [ 'inputs': [
@ -243,7 +243,7 @@
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
], ],
}, },
'inputs': [ 'inputs': [
@ -378,7 +378,7 @@
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
], ],
}, },
'inputs': [ 'inputs': [
@ -445,10 +445,10 @@
'<(DEPTH)/webkit/support/webkit_support.gyp:fileapi', '<(DEPTH)/webkit/support/webkit_support.gyp:fileapi',
'<(DEPTH)/webkit/support/webkit_support.gyp:glue', '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
'<(DEPTH)/webkit/support/webkit_support.gyp:quota', '<(DEPTH)/webkit/support/webkit_support.gyp:quota',
'<(DEPTH)/webkit/support/webkit_support.gyp:user_agent',
'<(DEPTH)/webkit/support/webkit_support.gyp:webkit_gpu', '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_gpu',
'<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources', '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
'<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings', '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
'<(DEPTH)/webkit/support/webkit_support.gyp:webkit_user_agent',
'libcef_static', 'libcef_static',
], ],
'defines': [ 'defines': [
@ -630,10 +630,10 @@
'<(DEPTH)/webkit/support/webkit_support.gyp:fileapi', '<(DEPTH)/webkit/support/webkit_support.gyp:fileapi',
'<(DEPTH)/webkit/support/webkit_support.gyp:glue', '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
'<(DEPTH)/webkit/support/webkit_support.gyp:quota', '<(DEPTH)/webkit/support/webkit_support.gyp:quota',
'<(DEPTH)/webkit/support/webkit_support.gyp:user_agent',
'<(DEPTH)/webkit/support/webkit_support.gyp:webkit_gpu', '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_gpu',
'<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources', '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
'<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings', '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
'<(DEPTH)/webkit/support/webkit_support.gyp:webkit_user_agent',
], ],
'sources': [ 'sources': [
'<@(includes_common)', '<@(includes_common)',

2
cef1/libcef/browser_file_system.cc
View File

@ -281,7 +281,7 @@ bool BrowserFileSystem::HasFilePermission(
FileSystemOperation* BrowserFileSystem::GetNewOperation( FileSystemOperation* BrowserFileSystem::GetNewOperation(
const fileapi::FileSystemURL& url) { const fileapi::FileSystemURL& url) {
return file_system_context_->CreateFileSystemOperation(url); return file_system_context_->CreateFileSystemOperation(url, NULL);
} }
FileSystemOperation::StatusCallback FileSystemOperation::StatusCallback

2
cef1/libcef/browser_file_writer.cc
View File

@ -91,7 +91,7 @@ class BrowserFileWriter::IOThreadProxy
virtual ~IOThreadProxy() {} virtual ~IOThreadProxy() {}
FileSystemOperation* GetNewOperation( const FileSystemURL& url) { FileSystemOperation* GetNewOperation( const FileSystemURL& url) {
return file_system_context_->CreateFileSystemOperation(url); return file_system_context_->CreateFileSystemOperation(url, NULL);
} }
// Returns true if it is not writable. // Returns true if it is not writable.

28
cef1/libcef/browser_request_context.cc
View File

@ -41,7 +41,7 @@
#include "webkit/blob/blob_url_request_job_factory.h" #include "webkit/blob/blob_url_request_job_factory.h"
#include "webkit/fileapi/file_system_context.h" #include "webkit/fileapi/file_system_context.h"
#include "webkit/fileapi/file_system_url_request_job_factory.h" #include "webkit/fileapi/file_system_url_request_job_factory.h"
#include "webkit/glue/webkit_glue.h" #include "webkit/user_agent/user_agent.h"
#if defined(OS_WIN) #if defined(OS_WIN)
#pragma comment(lib, "winhttp.lib") #pragma comment(lib, "winhttp.lib")
@ -233,21 +233,19 @@ void BrowserRequestContext::Init(
cache_path.empty() ? net::MEMORY_CACHE : net::DISK_CACHE, cache_path.empty() ? net::MEMORY_CACHE : net::DISK_CACHE,
cache_path, 0, BrowserResourceLoaderBridge::GetCacheThread()); cache_path, 0, BrowserResourceLoaderBridge::GetCacheThread());
net::HttpCache* cache = net::HttpNetworkSession::Params network_session_params;
new net::HttpCache(host_resolver(), network_session_params.host_resolver = host_resolver();
cert_verifier(), network_session_params.cert_verifier = cert_verifier();
server_bound_cert_service(), network_session_params.server_bound_cert_service =
NULL, /* transport_security_state */ server_bound_cert_service();
proxy_service(), network_session_params.proxy_service = proxy_service();
"", /* ssl_session_cache_shard */ network_session_params.ssl_config_service = ssl_config_service();
ssl_config_service(), network_session_params.http_auth_handler_factory =
http_auth_handler_factory(), http_auth_handler_factory();
NULL, /* network_delegate */ network_session_params.http_server_properties = http_server_properties();
http_server_properties(), network_session_params.host_resolver = host_resolver();
NULL, /* netlog */
backend,
"" /* trusted_spdy_proxy */ );
net::HttpCache* cache = new net::HttpCache(network_session_params, backend);
cache->set_mode(cache_mode); cache->set_mode(cache_mode);
storage_.set_http_transaction_factory(cache); storage_.set_http_transaction_factory(cache);

51
cef1/libcef/browser_resource_loader_bridge.cc
View File

@ -392,7 +392,7 @@ class RequestProxy : public net::URLRequest::Delegate,
peer_->OnDownloadedData(bytes_read); peer_->OnDownloadedData(bytes_read);
} }
void NotifyCompletedRequest(const net::URLRequestStatus& status, void NotifyCompletedRequest(int error_code,
const std::string& security_info, const std::string& security_info,
const base::TimeTicks& complete_time) { const base::TimeTicks& complete_time) {
DCHECK(MessageLoop::current() == owner_loop_); DCHECK(MessageLoop::current() == owner_loop_);
@ -430,7 +430,7 @@ class RequestProxy : public net::URLRequest::Delegate,
} }
if (peer_) { if (peer_) {
peer_->OnCompletedRequest(status, security_info, complete_time); peer_->OnCompletedRequest(error_code, false, security_info, complete_time);
DropPeer(); // ensure no further notifications DropPeer(); // ensure no further notifications
} }
} }
@ -531,9 +531,8 @@ class RequestProxy : public net::URLRequest::Delegate,
if (handled) { if (handled) {
// cancel the resource load // cancel the resource load
OnCompletedRequest( OnCompletedRequest(net::ERR_ABORTED, std::string(),
URLRequestStatus(URLRequestStatus::CANCELED, net::ERR_ABORTED), base::TimeTicks());
std::string(), base::TimeTicks());
} else if (resourceStream.get()) { } else if (resourceStream.get()) {
// load from the provided resource stream // load from the provided resource stream
handled = true; handled = true;
@ -578,11 +577,8 @@ class RequestProxy : public net::URLRequest::Delegate,
handled = true; handled = true;
} }
if (handled) { if (handled)
OnCompletedRequest( OnCompletedRequest(net::OK, std::string(), base::TimeTicks());
URLRequestStatus(URLRequestStatus::HANDLED_EXTERNALLY, net::OK),
std::string(), base::TimeTicks());
}
} }
} }
} }
@ -761,7 +757,7 @@ class RequestProxy : public net::URLRequest::Delegate,
&RequestProxy::NotifyReceivedData, this, bytes_read)); &RequestProxy::NotifyReceivedData, this, bytes_read));
} }
virtual void OnCompletedRequest(const net::URLRequestStatus& status, virtual void OnCompletedRequest(int error_code,
const std::string& security_info, const std::string& security_info,
const base::TimeTicks& complete_time) { const base::TimeTicks& complete_time) {
DCHECK(CefThread::CurrentlyOn(CefThread::IO)); DCHECK(CefThread::CurrentlyOn(CefThread::IO));
@ -770,7 +766,7 @@ class RequestProxy : public net::URLRequest::Delegate,
file_stream_.CloseSync(); file_stream_.CloseSync();
owner_loop_->PostTask(FROM_HERE, base::Bind( owner_loop_->PostTask(FROM_HERE, base::Bind(
&RequestProxy::NotifyCompletedRequest, this, status, security_info, &RequestProxy::NotifyCompletedRequest, this, error_code, security_info,
complete_time)); complete_time));
} }
@ -856,8 +852,7 @@ class RequestProxy : public net::URLRequest::Delegate,
if (resource_stream_.get()) { if (resource_stream_.get()) {
// Resource stream reads always complete successfully // Resource stream reads always complete successfully
OnCompletedRequest(URLRequestStatus(URLRequestStatus::SUCCESS, 0), OnCompletedRequest(0, std::string(), base::TimeTicks());
std::string(), base::TimeTicks());
resource_stream_ = NULL; resource_stream_ = NULL;
} else if (request_.get()) { } else if (request_.get()) {
if (upload_progress_timer_.IsRunning()) { if (upload_progress_timer_.IsRunning()) {
@ -865,7 +860,8 @@ class RequestProxy : public net::URLRequest::Delegate,
upload_progress_timer_.Stop(); upload_progress_timer_.Stop();
} }
DCHECK(request_.get()); DCHECK(request_.get());
OnCompletedRequest(request_->status(), std::string(), base::TimeTicks()); OnCompletedRequest(request_->status().error(), std::string(),
base::TimeTicks());
request_.reset(); // destroy on the io thread request_.reset(); // destroy on the io thread
} }
} }
@ -881,30 +877,29 @@ class RequestProxy : public net::URLRequest::Delegate,
return; return;
} }
// GetContentLengthSync() may perform file IO, but it's ok here, as file net::UploadProgress progress = request_->GetUploadProgress();
// IO is not prohibited in IOThread defined in the file. if (progress.position() == last_upload_position_)
uint64 size = request_->get_upload_mutable()->GetContentLengthSync();
uint64 position = request_->GetUploadProgress();
if (position == last_upload_position_)
return; // no progress made since last time return; // no progress made since last time
const uint64 kHalfPercentIncrements = 200; const uint64 kHalfPercentIncrements = 200;
const base::TimeDelta kOneSecond = base::TimeDelta::FromMilliseconds(1000); const base::TimeDelta kOneSecond = base::TimeDelta::FromMilliseconds(1000);
uint64 amt_since_last = position - last_upload_position_; uint64 amt_since_last = progress.position() - last_upload_position_;
base::TimeDelta time_since_last = base::TimeTicks::Now() - base::TimeDelta time_since_last = base::TimeTicks::Now() -
last_upload_ticks_; last_upload_ticks_;
bool is_finished = (size == position); bool is_finished = (progress.size() == progress.position());
bool enough_new_progress = (amt_since_last > (size / bool enough_new_progress = (amt_since_last > (progress.size() /
kHalfPercentIncrements)); kHalfPercentIncrements));
bool too_much_time_passed = time_since_last > kOneSecond; bool too_much_time_passed = time_since_last > kOneSecond;
if (is_finished || enough_new_progress || too_much_time_passed) { if (is_finished || enough_new_progress || too_much_time_passed) {
owner_loop_->PostTask(FROM_HERE, base::Bind( owner_loop_->PostTask(
&RequestProxy::NotifyUploadProgress, this, position, size)); FROM_HERE,
base::Bind(&RequestProxy::NotifyUploadProgress, this,
progress.position(), progress.size()));
last_upload_ticks_ = base::TimeTicks::Now(); last_upload_ticks_ = base::TimeTicks::Now();
last_upload_position_ = position; last_upload_position_ = progress.position();
} }
} }
@ -1017,7 +1012,7 @@ class SyncRequestProxy : public RequestProxy {
AsyncReadData(); // read more (may recurse) AsyncReadData(); // read more (may recurse)
} }
virtual void OnCompletedRequest(const net::URLRequestStatus& status, virtual void OnCompletedRequest(int error_code,
const std::string& security_info, const std::string& security_info,
const base::TimeTicks& complete_time) { const base::TimeTicks& complete_time) {
DCHECK(CefThread::CurrentlyOn(CefThread::IO)); DCHECK(CefThread::CurrentlyOn(CefThread::IO));
@ -1025,7 +1020,7 @@ class SyncRequestProxy : public RequestProxy {
if (download_to_file_) if (download_to_file_)
file_stream_.CloseSync(); file_stream_.CloseSync();
result_->status = status; result_->error_code = error_code;
event_.Signal(); event_.Signal();
} }

1
cef1/libcef/browser_webkit_glue.cc
View File

@ -23,7 +23,6 @@ MSVC_POP_WARNING();
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
#include "webkit/glue/user_agent.h"
#include "webkit/glue/webkit_glue.h" #include "webkit/glue/webkit_glue.h"
#include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
#include "webkit/gpu/webgraphicscontext3d_in_process_impl.h" #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"

3
cef1/libcef/cef_process_ui_thread.cc
View File

@ -25,9 +25,10 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h"
#include "ui/base/ui_base_paths.h" #include "ui/base/ui_base_paths.h"
#include "ui/gl/gl_implementation.h" #include "ui/gl/gl_implementation.h"
#include "webkit/glue/user_agent.h"
#include "webkit/glue/webkit_glue.h" #include "webkit/glue/webkit_glue.h"
#include "webkit/plugins/npapi/plugin_list.h" #include "webkit/plugins/npapi/plugin_list.h"
#include "webkit/user_agent/user_agent.h"
#include "webkit/user_agent/user_agent_util.h"
#if defined(OS_WIN) #if defined(OS_WIN)
#include <commctrl.h> // NOLINT(build/include_order) #include <commctrl.h> // NOLINT(build/include_order)

11
cef1/libcef/geolocation_client.cc
View File

@ -350,3 +350,14 @@ namespace switches {
const char kExperimentalLocationFeatures[] = "experimental-location-features"; const char kExperimentalLocationFeatures[] = "experimental-location-features";
} // namespace switches } // namespace switches
// Stub implementation of google_apis/google_api_keys.h.
namespace google_apis {
std::string GetAPIKey() {
return std::string();
}
} // namespace google_apis

9
cef1/libcef/simple_clipboard_impl.cc
View File

@ -19,21 +19,14 @@
#include "ui/gfx/size.h" #include "ui/gfx/size.h"
#include "webkit/glue/webkit_glue.h" #include "webkit/glue/webkit_glue.h"
namespace {
base::LazyInstance<ui::Clipboard> clipboard = LAZY_INSTANCE_INITIALIZER;
} // anonymous namespace
SimpleClipboardClient::SimpleClipboardClient() { SimpleClipboardClient::SimpleClipboardClient() {
} }
SimpleClipboardClient::~SimpleClipboardClient() { SimpleClipboardClient::~SimpleClipboardClient() {
} }
ui::Clipboard* SimpleClipboardClient::GetClipboard() { ui::Clipboard* SimpleClipboardClient::GetClipboard() {
return clipboard.Pointer(); return ui::Clipboard::GetForCurrentThread();
} }
uint64 SimpleClipboardClient::GetSequenceNumber(ui::Clipboard::Buffer buffer) { uint64 SimpleClipboardClient::GetSequenceNumber(ui::Clipboard::Buffer buffer) {

4
cef1/patch/patches/tools_gyp.patch
View File

@ -1,8 +1,8 @@
Index: pylib/gyp/input.py Index: pylib/gyp/input.py
=================================================================== ===================================================================
--- pylib/gyp/input.py (revision 1402) --- pylib/gyp/input.py (revision 1501)
+++ pylib/gyp/input.py (working copy) +++ pylib/gyp/input.py (working copy)
@@ -684,7 +684,8 @@ @@ -685,7 +685,8 @@
# that don't load quickly, this can be faster than # that don't load quickly, this can be faster than
# <!(python modulename param eters). Do this in |build_file_dir|. # <!(python modulename param eters). Do this in |build_file_dir|.
oldwd = os.getcwd() # Python doesn't like os.open('.'): no fchdir. oldwd = os.getcwd() # Python doesn't like os.open('.'): no fchdir.