bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 115322.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@435 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2011-12-21 18:35:55 +00:00
parent ec797bafe5
commit bdb588b77a
29 changed files with 119 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patch/patches/base.patch
View File

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

6
patch/patches/spi_webcore_364.patch
View File

@ -1,8 +1,8 @@
Index: page/FrameView.cpp
===================================================================
--- page/FrameView.cpp (revision 97950)
--- page/FrameView.cpp (revision 103399)
+++ page/FrameView.cpp (working copy)
@@ -152,10 +152,12 @@
@@ -176,10 +176,12 @@
m_page = page;
m_page->addScrollableArea(this);
@ -17,7 +17,7 @@ Index: page/FrameView.cpp
}
Index: platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm
===================================================================
--- platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm (revision 97950)
--- platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm (revision 101144)
+++ platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm (working copy)
@@ -356,9 +356,13 @@

4
patch/patches/tools_gyp.patch
View File

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

6
patch/patches/webcore_cachedresource.patch
View File

@ -1,14 +1,14 @@
Index: CachedResource.cpp
===================================================================
--- CachedResource.cpp (revision 100508)
--- CachedResource.cpp (revision 103399)
+++ CachedResource.cpp (working copy)
@@ -365,6 +365,9 @@
@@ -366,6 +366,9 @@
void CachedResource::addClient(CachedResourceClient* client)
{
+ if (isPurgeable())
+ makePurgeable(false);
+
+
addClientToSet(client);
didAddClient(client);
}

6
patch/patches/webcore_v8_custom.patch
View File

@ -1,8 +1,8 @@
Index: V8DOMWindowCustom.cpp
===================================================================
--- V8DOMWindowCustom.cpp (revision 101876)
--- V8DOMWindowCustom.cpp (revision 103399)
+++ V8DOMWindowCustom.cpp (working copy)
@@ -289,8 +289,11 @@
@@ -297,8 +297,11 @@
static v8::Handle<v8::Value> handlePostMessageCallback(const v8::Arguments& args, bool extendedTransfer)
{
DOMWindow* window = V8DOMWindow::toNative(args.Holder());
@ -14,4 +14,4 @@ Index: V8DOMWindowCustom.cpp
+ DOMWindow* source = frame->domWindow();
ASSERT(source->frame());
// This function has variable arguments and can either be:
// This function has variable arguments and can be: