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

Browse Source 
- Pass popup window attributes to CefLifeSpanHandler::OnBeforePopup (issue #520).
- Windows: Add manifest files for all binary targets and include compatibility manifest in *.exe targets.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1367 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-08-15 19:38:55 +00:00
parent 0a452addf0
commit cdd7333b76
22 changed files with 188 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patch/patches/gyp_331.patch
View File

@@ -1,8 +1,8 @@
Index: gyp/generator/ninja.py
===================================================================
--- gyp/generator/ninja.py (revision 1651)
--- gyp/generator/ninja.py (revision 1693)
+++ gyp/generator/ninja.py (working copy)
@@ -669,7 +669,16 @@
@@ -705,7 +705,16 @@
for path in copy['files']:
# Normalize the path so trailing slashes don't confuse us.
path = os.path.normpath(path)

4
patch/patches/message_loop_443.patch
View File

@@ -1,8 +1,8 @@
Index: message_loop.cc
===================================================================
--- message_loop.cc (revision 213078)
--- message_loop.cc (revision 217791)
+++ message_loop.cc (working copy)
@@ -193,7 +193,7 @@
@@ -197,7 +197,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 154753)
--- page/FrameView.cpp (revision 156144)
+++ page/FrameView.cpp (working copy)
@@ -191,10 +191,12 @@
@@ -189,10 +189,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 154753)
--- platform/mac/NSScrollerImpDetails.mm (revision 156144)
+++ platform/mac/NSScrollerImpDetails.mm (working copy)
@@ -33,6 +33,7 @@

4
patch/patches/webkit_933.patch
View File

@@ -1,8 +1,8 @@
Index: WebNode.cpp
===================================================================
--- WebNode.cpp (revision 154753)
--- WebNode.cpp (revision 156144)
+++ WebNode.cpp (working copy)
@@ -173,7 +173,7 @@
@@ -176,7 +176,7 @@
void WebNode::addEventListener(const WebString& eventType, WebDOMEventListener* listener, bool useCapture)
{
// Please do not add more eventTypes to this list without an API review.

24
patch/patches/webkit_popups.patch
View File

@@ -1,8 +1,8 @@
Index: public/web/WebView.h
===================================================================
--- public/web/WebView.h (revision 154753)
--- public/web/WebView.h (revision 156144)
+++ public/web/WebView.h (working copy)
@@ -423,6 +423,7 @@
@@ -439,6 +439,7 @@
// Sets whether select popup menus should be rendered by the browser.
WEBKIT_EXPORT static void setUseExternalPopupMenus(bool);
@@ -12,9 +12,9 @@ Index: public/web/WebView.h
// Visited link state --------------------------------------------------
Index: Source/web/ChromeClientImpl.cpp
===================================================================
--- Source/web/ChromeClientImpl.cpp (revision 154753)
--- Source/web/ChromeClientImpl.cpp (revision 156144)
+++ Source/web/ChromeClientImpl.cpp (working copy)
@@ -872,7 +872,7 @@
@@ -880,7 +880,7 @@
PassRefPtr<PopupMenu> ChromeClientImpl::createPopupMenu(Frame& frame, PopupMenuClient* client) const
{
@@ -25,17 +25,17 @@ Index: Source/web/ChromeClientImpl.cpp
return adoptRef(new PopupMenuChromium(frame, client));
Index: Source/web/WebViewImpl.cpp
===================================================================
--- Source/web/WebViewImpl.cpp (revision 154753)
--- Source/web/WebViewImpl.cpp (revision 156144)
+++ Source/web/WebViewImpl.cpp (working copy)
@@ -388,6 +388,7 @@
, m_fakeDoubleTapPageScaleFactor(0)
, m_fakeDoubleTapUseAnchor(false)
@@ -393,6 +393,7 @@
, m_fakePageScaleAnimationPageScaleFactor(0)
, m_fakePageScaleAnimationUseAnchor(false)
, m_contextMenuAllowed(false)
+ , m_shouldUseExternalPopupMenus(shouldUseExternalPopupMenus)
, m_doingDragAndDrop(false)
, m_ignoreInputEvents(false)
, m_suppressNextKeypressEvent(false)
@@ -3702,9 +3703,14 @@
@@ -3636,9 +3637,14 @@
updateLayerTreeViewport();
}
@@ -53,9 +53,9 @@ Index: Source/web/WebViewImpl.cpp
void WebViewImpl::setEmulatedTextZoomFactor(float textZoomFactor)
Index: Source/web/WebViewImpl.h
===================================================================
--- Source/web/WebViewImpl.h (revision 154753)
--- Source/web/WebViewImpl.h (revision 156144)
+++ Source/web/WebViewImpl.h (working copy)
@@ -420,7 +420,8 @@
@@ -422,7 +422,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/web/WebViewImpl.h
bool contextMenuAllowed() const
{
@@ -721,6 +722,8 @@
@@ -723,6 +724,8 @@
bool m_contextMenuAllowed;