Update to Chromium revision 176706.
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@988 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
parent
d56fc817d5
commit
3b9cb32e4a
|
@ -17,5 +17,5 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_url': 'http://src.chromium.org/svn/trunk/src',
|
'chromium_url': 'http://src.chromium.org/svn/trunk/src',
|
||||||
'chromium_revision': '173683',
|
'chromium_revision': '176706',
|
||||||
}
|
}
|
||||||
|
|
|
@ -457,7 +457,8 @@ class RequestProxy : public net::URLRequest::Delegate,
|
||||||
if (params->request_body) {
|
if (params->request_body) {
|
||||||
upload_data_stream.reset(
|
upload_data_stream.reset(
|
||||||
params->request_body->ResolveElementsAndCreateUploadDataStream(
|
params->request_body->ResolveElementsAndCreateUploadDataStream(
|
||||||
_Context->request_context()->blob_storage_controller()));
|
_Context->request_context()->blob_storage_controller(),
|
||||||
|
base::MessageLoopProxy::current()));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (browser_.get()) {
|
if (browser_.get()) {
|
||||||
|
|
|
@ -57,7 +57,7 @@ void CefProcessIOThread::CleanUp() {
|
||||||
// Flush any remaining messages. This ensures that any accumulated
|
// Flush any remaining messages. This ensures that any accumulated
|
||||||
// Task objects get destroyed before we exit, which avoids noise in
|
// Task objects get destroyed before we exit, which avoids noise in
|
||||||
// purify leak-test results.
|
// purify leak-test results.
|
||||||
MessageLoop::current()->RunAllPending();
|
MessageLoop::current()->RunUntilIdle();
|
||||||
|
|
||||||
// In reverse order of initialization.
|
// In reverse order of initialization.
|
||||||
BrowserWebBlobRegistryImpl::Cleanup();
|
BrowserWebBlobRegistryImpl::Cleanup();
|
||||||
|
|
|
@ -25,7 +25,7 @@ void CefProcessSubThread::CleanUp() {
|
||||||
// Flush any remaining messages. This ensures that any accumulated
|
// Flush any remaining messages. This ensures that any accumulated
|
||||||
// Task objects get destroyed before we exit, which avoids noise in
|
// Task objects get destroyed before we exit, which avoids noise in
|
||||||
// purify leak-test results.
|
// purify leak-test results.
|
||||||
MessageLoop::current()->RunAllPending();
|
MessageLoop::current()->RunUntilIdle();
|
||||||
|
|
||||||
CefThread::Cleanup();
|
CefThread::Cleanup();
|
||||||
}
|
}
|
||||||
|
|
|
@ -193,7 +193,7 @@ void CefProcessUIThread::CleanUp() {
|
||||||
// Flush any remaining messages. This ensures that any accumulated
|
// Flush any remaining messages. This ensures that any accumulated
|
||||||
// Task objects get destroyed before we exit, which avoids noise in
|
// Task objects get destroyed before we exit, which avoids noise in
|
||||||
// purify leak-test results.
|
// purify leak-test results.
|
||||||
MessageLoop::current()->RunAllPending();
|
MessageLoop::current()->RunUntilIdle();
|
||||||
|
|
||||||
// Tear down the shared StatsTable.
|
// Tear down the shared StatsTable.
|
||||||
base::StatsTable::set_current(NULL);
|
base::StatsTable::set_current(NULL);
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
#include "libcef/cef_thread.h"
|
||||||
#include "libcef/http_header_utils.h"
|
#include "libcef/http_header_utils.h"
|
||||||
|
|
||||||
#include "base/logging.h"
|
#include "base/logging.h"
|
||||||
|
@ -51,6 +52,7 @@ class FileElementReader : public net::UploadFileElementReader {
|
||||||
public:
|
public:
|
||||||
explicit FileElementReader(scoped_ptr<net::UploadElement> element)
|
explicit FileElementReader(scoped_ptr<net::UploadElement> element)
|
||||||
: net::UploadFileElementReader(
|
: net::UploadFileElementReader(
|
||||||
|
CefThread::GetMessageLoopProxyForThread(CefThread::FILE),
|
||||||
element->file_path(),
|
element->file_path(),
|
||||||
element->file_range_offset(),
|
element->file_range_offset(),
|
||||||
element->file_range_length(),
|
element->file_range_length(),
|
||||||
|
|
|
@ -9,11 +9,7 @@
|
||||||
#include "base/string16.h"
|
#include "base/string16.h"
|
||||||
#include "googleurl/src/gurl.h"
|
#include "googleurl/src/gurl.h"
|
||||||
#include "third_party/skia/include/core/SkBitmap.h"
|
#include "third_party/skia/include/core/SkBitmap.h"
|
||||||
#if defined(USE_SYSTEM_ZLIB)
|
|
||||||
#include <zlib.h>
|
|
||||||
#else
|
|
||||||
#include "third_party/zlib/zlib.h"
|
#include "third_party/zlib/zlib.h"
|
||||||
#endif
|
|
||||||
#include "ui/base/clipboard/clipboard.h"
|
#include "ui/base/clipboard/clipboard.h"
|
||||||
#include "ui/gfx/codec/png_codec.h"
|
#include "ui/gfx/codec/png_codec.h"
|
||||||
#include "ui/gfx/size.h"
|
#include "ui/gfx/size.h"
|
||||||
|
|
|
@ -2,14 +2,8 @@
|
||||||
// reserved. Use of this source code is governed by a BSD-style license that can
|
// reserved. Use of this source code is governed by a BSD-style license that can
|
||||||
// be found in the LICENSE file.
|
// be found in the LICENSE file.
|
||||||
|
|
||||||
#include "chrome/browser/diagnostics/sqlite_diagnostics.h"
|
|
||||||
#include "content/public/common/url_constants.h"
|
#include "content/public/common/url_constants.h"
|
||||||
|
|
||||||
// Used by SQLitePersistentCookieStore
|
|
||||||
sql::ErrorDelegate* GetErrorHandlerForCookieDb() {
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
namespace chrome {
|
namespace chrome {
|
||||||
|
|
||||||
// Used by ClearOnExitPolicy
|
// Used by ClearOnExitPolicy
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
Index: pylib/gyp/input.py
|
Index: pylib/gyp/input.py
|
||||||
===================================================================
|
===================================================================
|
||||||
--- pylib/gyp/input.py (revision 1527)
|
--- pylib/gyp/input.py (revision 1556)
|
||||||
+++ pylib/gyp/input.py (working copy)
|
+++ pylib/gyp/input.py (working copy)
|
||||||
@@ -851,7 +851,8 @@
|
@@ -857,7 +857,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.
|
||||||
- os.chdir(build_file_dir)
|
- os.chdir(build_file_dir)
|
||||||
+ if not build_file_dir is None:
|
+ if not build_file_dir is None:
|
||||||
+ os.chdir(build_file_dir)
|
+ os.chdir(build_file_dir)
|
||||||
|
try:
|
||||||
|
|
||||||
parsed_contents = shlex.split(contents)
|
parsed_contents = shlex.split(contents)
|
||||||
py_module = __import__(parsed_contents[0])
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
Index: contrib/minizip/unzip.c
|
Index: contrib/minizip/unzip.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- contrib/minizip/unzip.c (revision 153668)
|
--- contrib/minizip/unzip.c (revision 176706)
|
||||||
+++ contrib/minizip/unzip.c (working copy)
|
+++ contrib/minizip/unzip.c (working copy)
|
||||||
@@ -69,7 +69,7 @@
|
@@ -69,7 +69,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
@ -10,4 +10,4 @@ Index: contrib/minizip/unzip.c
|
||||||
+// #define NOUNCRYPT
|
+// #define NOUNCRYPT
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(USE_SYSTEM_ZLIB)
|
#include "third_party/zlib/zlib.h"
|
||||||
|
|
|
@ -23,10 +23,11 @@ chrome_src = os.path.abspath(os.path.join(cef_dir, os.pardir))
|
||||||
sys.path.insert(0, os.path.join(chrome_src, 'tools', 'gyp', 'pylib'))
|
sys.path.insert(0, os.path.join(chrome_src, 'tools', 'gyp', 'pylib'))
|
||||||
import gyp
|
import gyp
|
||||||
|
|
||||||
# Add paths so that pymod_do_main(grit_info ...) can import files.
|
# Add paths so that pymod_do_main(...) can import files.
|
||||||
sys.path.insert(1, os.path.join(chrome_src, 'tools', 'grit'))
|
sys.path.insert(1, os.path.join(chrome_src, 'tools', 'grit'))
|
||||||
sys.path.insert(1, os.path.join(chrome_src, 'chrome', 'tools', 'build'))
|
sys.path.insert(1, os.path.join(chrome_src, 'chrome', 'tools', 'build'))
|
||||||
|
sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'WebKit',
|
||||||
|
'Source', 'WebCore', 'WebCore.gyp', 'scripts'))
|
||||||
|
|
||||||
# On Windows, Psyco shortens warm runs of build/gyp_chromium by about
|
# On Windows, Psyco shortens warm runs of build/gyp_chromium by about
|
||||||
# 20 seconds on a z600 machine with 12 GB of RAM, from 90 down to 70
|
# 20 seconds on a z600 machine with 12 GB of RAM, from 90 down to 70
|
||||||
|
|
Loading…
Reference in New Issue