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 version 37.0.2062.94.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/2062@1812 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2014-08-28 14:42:25 +00:00
parent 98d5495091
commit fde46734f1
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@ -7,6 +7,6 @@
# https://code.google.com/p/chromiumembedded/wiki/BranchesAndBuilding # https://code.google.com/p/chromiumembedded/wiki/BranchesAndBuilding
{ {
'release_url': 'http://src.chromium.org/svn/releases/37.0.2062.58', 'release_url': 'http://src.chromium.org/svn/releases/37.0.2062.94',
'chromium_checkout': 'refs/tags/37.0.2062.58', 'chromium_checkout': 'refs/tags/37.0.2062.94',
} }

14
patch/patches/renderer_host_1161.patch
View File

@ -1,6 +1,6 @@
Index: compositing_iosurface_layer_mac.mm Index: compositing_iosurface_layer_mac.mm
=================================================================== ===================================================================
--- compositing_iosurface_layer_mac.mm (revision 286351) --- compositing_iosurface_layer_mac.mm (revision 290621)
+++ compositing_iosurface_layer_mac.mm (working copy) +++ compositing_iosurface_layer_mac.mm (working copy)
@@ -202,7 +202,7 @@ @@ -202,7 +202,7 @@
TRACE_EVENT0("browser", "CompositingIOSurfaceLayer::drawInCGLContext"); TRACE_EVENT0("browser", "CompositingIOSurfaceLayer::drawInCGLContext");
@ -13,7 +13,7 @@ Index: compositing_iosurface_layer_mac.mm
} }
Index: compositing_iosurface_mac.mm Index: compositing_iosurface_mac.mm
=================================================================== ===================================================================
--- compositing_iosurface_mac.mm (revision 286351) --- compositing_iosurface_mac.mm (revision 290621)
+++ compositing_iosurface_mac.mm (working copy) +++ compositing_iosurface_mac.mm (working copy)
@@ -350,7 +350,7 @@ @@ -350,7 +350,7 @@
glUseProgram(0); CHECK_AND_SAVE_GL_ERROR(); glUseProgram(0); CHECK_AND_SAVE_GL_ERROR();
@ -26,7 +26,7 @@ Index: compositing_iosurface_mac.mm
Index: compositing_iosurface_shader_programs_mac.cc Index: compositing_iosurface_shader_programs_mac.cc
=================================================================== ===================================================================
--- compositing_iosurface_shader_programs_mac.cc (revision 286351) --- compositing_iosurface_shader_programs_mac.cc (revision 290621)
+++ compositing_iosurface_shader_programs_mac.cc (working copy) +++ compositing_iosurface_shader_programs_mac.cc (working copy)
@@ -11,6 +11,8 @@ @@ -11,6 +11,8 @@
#include "base/debug/trace_event.h" #include "base/debug/trace_event.h"
@ -81,7 +81,7 @@ Index: compositing_iosurface_shader_programs_mac.cc
shader_programs_[which] = shader_programs_[which] =
Index: compositing_iosurface_shader_programs_mac.h Index: compositing_iosurface_shader_programs_mac.h
=================================================================== ===================================================================
--- compositing_iosurface_shader_programs_mac.h (revision 286351) --- compositing_iosurface_shader_programs_mac.h (revision 290621)
+++ compositing_iosurface_shader_programs_mac.h (working copy) +++ compositing_iosurface_shader_programs_mac.h (working copy)
@@ -48,6 +48,8 @@ @@ -48,6 +48,8 @@
return rgb_to_yv12_output_format_; return rgb_to_yv12_output_format_;
@ -94,7 +94,7 @@ Index: compositing_iosurface_shader_programs_mac.h
TransformsRGBToYV12); TransformsRGBToYV12);
Index: render_widget_host_view_aura.cc Index: render_widget_host_view_aura.cc
=================================================================== ===================================================================
--- render_widget_host_view_aura.cc (revision 286351) --- render_widget_host_view_aura.cc (revision 290621)
+++ render_widget_host_view_aura.cc (working copy) +++ render_widget_host_view_aura.cc (working copy)
@@ -1654,8 +1654,14 @@ @@ -1654,8 +1654,14 @@
// For non-opaque windows, we don't draw anything, since we depend on the // For non-opaque windows, we don't draw anything, since we depend on the
@ -115,9 +115,9 @@ Index: render_widget_host_view_aura.cc
void RenderWidgetHostViewAura::OnDeviceScaleFactorChanged( void RenderWidgetHostViewAura::OnDeviceScaleFactorChanged(
Index: render_widget_host_view_mac.mm Index: render_widget_host_view_mac.mm
=================================================================== ===================================================================
--- render_widget_host_view_mac.mm (revision 286351) --- render_widget_host_view_mac.mm (revision 290621)
+++ render_widget_host_view_mac.mm (working copy) +++ render_widget_host_view_mac.mm (working copy)
@@ -473,7 +473,7 @@ @@ -471,7 +471,7 @@
background_layer_.reset([[CALayer alloc] init]); background_layer_.reset([[CALayer alloc] init]);
[background_layer_ [background_layer_

18
patch/patches/webkit_popups.patch
View File

@ -1,8 +1,8 @@
Index: public/web/WebView.h Index: public/web/WebView.h
=================================================================== ===================================================================
--- public/web/WebView.h (revision 179174) --- public/web/WebView.h (revision 180557)
+++ public/web/WebView.h (working copy) +++ public/web/WebView.h (working copy)
@@ -416,6 +416,7 @@ @@ -422,6 +422,7 @@
// Sets whether select popup menus should be rendered by the browser. // Sets whether select popup menus should be rendered by the browser.
BLINK_EXPORT static void setUseExternalPopupMenus(bool); BLINK_EXPORT static void setUseExternalPopupMenus(bool);
@ -12,7 +12,7 @@ Index: public/web/WebView.h
virtual void hidePopups() = 0; virtual void hidePopups() = 0;
Index: Source/web/ChromeClientImpl.cpp Index: Source/web/ChromeClientImpl.cpp
=================================================================== ===================================================================
--- Source/web/ChromeClientImpl.cpp (revision 179174) --- Source/web/ChromeClientImpl.cpp (revision 180557)
+++ Source/web/ChromeClientImpl.cpp (working copy) +++ Source/web/ChromeClientImpl.cpp (working copy)
@@ -727,7 +727,7 @@ @@ -727,7 +727,7 @@
@ -25,9 +25,9 @@ Index: Source/web/ChromeClientImpl.cpp
return adoptRef(new PopupMenuChromium(frame, client)); return adoptRef(new PopupMenuChromium(frame, client));
Index: Source/web/WebViewImpl.cpp Index: Source/web/WebViewImpl.cpp
=================================================================== ===================================================================
--- Source/web/WebViewImpl.cpp (revision 179174) --- Source/web/WebViewImpl.cpp (revision 180557)
+++ Source/web/WebViewImpl.cpp (working copy) +++ Source/web/WebViewImpl.cpp (working copy)
@@ -368,6 +368,7 @@ @@ -370,6 +370,7 @@
, m_fakePageScaleAnimationPageScaleFactor(0) , m_fakePageScaleAnimationPageScaleFactor(0)
, m_fakePageScaleAnimationUseAnchor(false) , m_fakePageScaleAnimationUseAnchor(false)
, m_contextMenuAllowed(false) , m_contextMenuAllowed(false)
@ -35,7 +35,7 @@ Index: Source/web/WebViewImpl.cpp
, m_doingDragAndDrop(false) , m_doingDragAndDrop(false)
, m_ignoreInputEvents(false) , m_ignoreInputEvents(false)
, m_compositorDeviceScaleFactorOverride(0) , m_compositorDeviceScaleFactorOverride(0)
@@ -3673,9 +3674,14 @@ @@ -3709,9 +3710,14 @@
updateLayerTreeViewport(); updateLayerTreeViewport();
} }
@ -53,9 +53,9 @@ Index: Source/web/WebViewImpl.cpp
void WebViewImpl::startDragging(LocalFrame* frame, void WebViewImpl::startDragging(LocalFrame* frame,
Index: Source/web/WebViewImpl.h Index: Source/web/WebViewImpl.h
=================================================================== ===================================================================
--- Source/web/WebViewImpl.h (revision 179174) --- Source/web/WebViewImpl.h (revision 180557)
+++ Source/web/WebViewImpl.h (working copy) +++ Source/web/WebViewImpl.h (working copy)
@@ -353,7 +353,8 @@ @@ -356,7 +356,8 @@
// Returns true if popup menus should be rendered by the browser, false if // Returns true if popup menus should be rendered by the browser, false if
// they should be rendered by WebKit (which is the default). // they should be rendered by WebKit (which is the default).
@ -65,7 +65,7 @@ Index: Source/web/WebViewImpl.h
bool contextMenuAllowed() const bool contextMenuAllowed() const
{ {
@@ -629,6 +630,8 @@ @@ -632,6 +633,8 @@
bool m_contextMenuAllowed; bool m_contextMenuAllowed;