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

Update to Chromium revision 160122. 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@844 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2012-10-04 19:17:45 +00:00
parent 163cc7d9cc
commit 167c601f29
4 changed files with 5 additions and 6 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': '157509', 'chromium_revision': '160122',
} }

4
cef1/libcef/browser_impl.cc
View File

@ -295,7 +295,7 @@ void CefBrowserImpl::GetFrameNames(std::vector<CefString>& names) {
WebFrame* it = main_frame; WebFrame* it = main_frame;
do { do {
if (it != main_frame) { if (it != main_frame) {
string16 str = it->name(); string16 str = it->uniqueName();
names.push_back(str); names.push_back(str);
} }
it = it->traverseNext(true); it = it->traverseNext(true);
@ -688,7 +688,7 @@ CefRefPtr<CefFrame> CefBrowserImpl::UIT_GetCefFrame(WebFrame* frame) {
cef_frame = GetMainCefFrame(frame->identifier(), url); cef_frame = GetMainCefFrame(frame->identifier(), url);
} else { } else {
// Locate or create the appropriate reference. // Locate or create the appropriate reference.
CefString name = string16(frame->name()); CefString name = string16(frame->uniqueName());
DCHECK(!name.empty()); DCHECK(!name.empty());
cef_frame = GetOrCreateCefFrame(frame->identifier(), name, url); cef_frame = GetOrCreateCefFrame(frame->identifier(), name, url);
} }

1
cef1/libcef/browser_webkit_init.cc
View File

@ -42,7 +42,6 @@ BrowserWebKitInit::BrowserWebKitInit()
WebKit::WebRuntimeFeatures::enableSockets(true); WebKit::WebRuntimeFeatures::enableSockets(true);
WebKit::WebRuntimeFeatures::enableApplicationCache(true); WebKit::WebRuntimeFeatures::enableApplicationCache(true);
WebKit::WebRuntimeFeatures::enableDatabase(true); WebKit::WebRuntimeFeatures::enableDatabase(true);
WebKit::WebRuntimeFeatures::enablePushState(true);
WebKit::WebRuntimeFeatures::enableIndexedDatabase(true); WebKit::WebRuntimeFeatures::enableIndexedDatabase(true);
WebKit::WebRuntimeFeatures::enableFileSystem(true); WebKit::WebRuntimeFeatures::enableFileSystem(true);
WebKit::WebRuntimeFeatures::enableGeolocation(true); WebKit::WebRuntimeFeatures::enableGeolocation(true);

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 1501) --- pylib/gyp/input.py (revision 1508)
+++ pylib/gyp/input.py (working copy) +++ pylib/gyp/input.py (working copy)
@@ -685,7 +685,8 @@ @@ -824,7 +824,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.