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 213078.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1338 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-07-24 20:15:18 +00:00
parent 6a7353be3e
commit a2a3513620
69 changed files with 510 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
patch/patch.cfg
View File

@ -29,7 +29,7 @@ patches = [
{
# http://code.google.com/p/chromiumembedded/issues/detail?id=933
'name': 'webkit_933',
'path': '../third_party/WebKit/Source/WebKit/chromium/src/',
'path': '../third_party/WebKit/Source/web/',
},
{
# http://code.google.com/p/gyp/issues/detail?id=331

4
patch/patches/message_loop_443.patch
View File

@ -1,8 +1,8 @@
Index: message_loop.cc
===================================================================
--- message_loop.cc (revision 194165)
--- message_loop.cc (revision 213078)
+++ message_loop.cc (working copy)
@@ -191,7 +191,7 @@
@@ -193,7 +193,7 @@
MessageLoop::~MessageLoop() {
DCHECK_EQ(this, current());

6
patch/patches/spi_webcore_364.patch
View File

@ -1,8 +1,8 @@
Index: page/FrameView.cpp
===================================================================
--- page/FrameView.cpp (revision 151551)
--- page/FrameView.cpp (revision 154753)
+++ page/FrameView.cpp (working copy)
@@ -198,10 +198,12 @@
@@ -191,10 +191,12 @@
if (!page)
return;
@ -17,7 +17,7 @@ Index: page/FrameView.cpp
PassRefPtr<FrameView> FrameView::create(Frame* frame)
Index: platform/mac/NSScrollerImpDetails.mm
===================================================================
--- platform/mac/NSScrollerImpDetails.mm (revision 151551)
--- platform/mac/NSScrollerImpDetails.mm (revision 154753)
+++ platform/mac/NSScrollerImpDetails.mm (working copy)
@@ -33,6 +33,7 @@

6
patch/patches/webkit_933.patch
View File

@ -1,13 +1,13 @@
Index: WebNode.cpp
===================================================================
--- WebNode.cpp (revision 146842)
--- WebNode.cpp (revision 154753)
+++ WebNode.cpp (working copy)
@@ -181,7 +181,7 @@
@@ -173,7 +173,7 @@
void WebNode::addEventListener(const WebString& eventType, WebDOMEventListener* listener, bool useCapture)
{
// Please do not add more eventTypes to this list without an API review.
- RELEASE_ASSERT(eventType == "mousedown");
+ //RELEASE_ASSERT(eventType == "mousedown");
+ // RELEASE_ASSERT(eventType == "mousedown");
EventListenerWrapper* listenerWrapper = listener->createEventListenerWrapper(eventType, useCapture, m_private.get());
// The listenerWrapper is only referenced by the actual Node. Once it goes

32
patch/patches/webkit_popups.patch
View File

@ -1,8 +1,8 @@
Index: public/web/WebView.h
===================================================================
--- public/web/WebView.h (revision 152953)
--- public/web/WebView.h (revision 154753)
+++ public/web/WebView.h (working copy)
@@ -421,6 +421,7 @@
@@ -423,6 +423,7 @@
// Sets whether select popup menus should be rendered by the browser.
WEBKIT_EXPORT static void setUseExternalPopupMenus(bool);
@ -10,11 +10,11 @@ Index: public/web/WebView.h
// Visited link state --------------------------------------------------
Index: Source/WebKit/chromium/src/ChromeClientImpl.cpp
Index: Source/web/ChromeClientImpl.cpp
===================================================================
--- Source/WebKit/chromium/src/ChromeClientImpl.cpp (revision 152953)
+++ Source/WebKit/chromium/src/ChromeClientImpl.cpp (working copy)
@@ -895,7 +895,7 @@
--- Source/web/ChromeClientImpl.cpp (revision 154753)
+++ Source/web/ChromeClientImpl.cpp (working copy)
@@ -872,7 +872,7 @@
PassRefPtr<PopupMenu> ChromeClientImpl::createPopupMenu(Frame& frame, PopupMenuClient* client) const
{
@ -23,11 +23,11 @@ Index: Source/WebKit/chromium/src/ChromeClientImpl.cpp
return adoptRef(new ExternalPopupMenu(frame, client, m_webView->client()));
return adoptRef(new PopupMenuChromium(frame, client));
Index: Source/WebKit/chromium/src/WebViewImpl.cpp
Index: Source/web/WebViewImpl.cpp
===================================================================
--- Source/WebKit/chromium/src/WebViewImpl.cpp (revision 152953)
+++ Source/WebKit/chromium/src/WebViewImpl.cpp (working copy)
@@ -393,6 +393,7 @@
--- Source/web/WebViewImpl.cpp (revision 154753)
+++ Source/web/WebViewImpl.cpp (working copy)
@@ -388,6 +388,7 @@
, m_fakeDoubleTapPageScaleFactor(0)
, m_fakeDoubleTapUseAnchor(false)
, m_contextMenuAllowed(false)
@ -35,7 +35,7 @@ Index: Source/WebKit/chromium/src/WebViewImpl.cpp
, m_doingDragAndDrop(false)
, m_ignoreInputEvents(false)
, m_suppressNextKeypressEvent(false)
@@ -3676,9 +3677,14 @@
@@ -3702,9 +3703,14 @@
updateLayerTreeViewport();
}
@ -51,11 +51,11 @@ Index: Source/WebKit/chromium/src/WebViewImpl.cpp
}
void WebViewImpl::setEmulatedTextZoomFactor(float textZoomFactor)
Index: Source/WebKit/chromium/src/WebViewImpl.h
Index: Source/web/WebViewImpl.h
===================================================================
--- Source/WebKit/chromium/src/WebViewImpl.h (revision 152953)
+++ Source/WebKit/chromium/src/WebViewImpl.h (working copy)
@@ -415,7 +415,8 @@
--- Source/web/WebViewImpl.h (revision 154753)
+++ Source/web/WebViewImpl.h (working copy)
@@ -420,7 +420,8 @@
// Returns true if popup menus should be rendered by the browser, false if
// they should be rendered by WebKit (which is the default).
@ -65,7 +65,7 @@ Index: Source/WebKit/chromium/src/WebViewImpl.h
bool contextMenuAllowed() const
{
@@ -733,6 +734,8 @@
@@ -721,6 +722,8 @@
bool m_contextMenuAllowed;