Update to Chromium revision 29.0.1547.80.
git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1547@1457 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
parent
586fa3b487
commit
e3436da7a5
|
@ -16,5 +16,5 @@
|
|||
# http://dev.chromium.org/developers/how-tos/get-the-code
|
||||
|
||||
{
|
||||
'release_url': 'http://src.chromium.org/svn/releases/29.0.1547.59',
|
||||
'release_url': 'http://src.chromium.org/svn/releases/29.0.1547.80',
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
Index: public/web/WebView.h
|
||||
===================================================================
|
||||
--- public/web/WebView.h (revision 152953)
|
||||
--- public/web/WebView.h (revision 157967)
|
||||
+++ public/web/WebView.h (working copy)
|
||||
@@ -421,6 +421,7 @@
|
||||
|
||||
|
@ -12,7 +12,7 @@ Index: public/web/WebView.h
|
|||
// Visited link state --------------------------------------------------
|
||||
Index: Source/WebKit/chromium/src/ChromeClientImpl.cpp
|
||||
===================================================================
|
||||
--- Source/WebKit/chromium/src/ChromeClientImpl.cpp (revision 152953)
|
||||
--- Source/WebKit/chromium/src/ChromeClientImpl.cpp (revision 157967)
|
||||
+++ Source/WebKit/chromium/src/ChromeClientImpl.cpp (working copy)
|
||||
@@ -895,7 +895,7 @@
|
||||
|
||||
|
@ -25,7 +25,7 @@ Index: Source/WebKit/chromium/src/ChromeClientImpl.cpp
|
|||
return adoptRef(new PopupMenuChromium(frame, client));
|
||||
Index: Source/WebKit/chromium/src/WebViewImpl.cpp
|
||||
===================================================================
|
||||
--- Source/WebKit/chromium/src/WebViewImpl.cpp (revision 152953)
|
||||
--- Source/WebKit/chromium/src/WebViewImpl.cpp (revision 157967)
|
||||
+++ Source/WebKit/chromium/src/WebViewImpl.cpp (working copy)
|
||||
@@ -393,6 +393,7 @@
|
||||
, m_fakeDoubleTapPageScaleFactor(0)
|
||||
|
@ -35,7 +35,7 @@ Index: Source/WebKit/chromium/src/WebViewImpl.cpp
|
|||
, m_doingDragAndDrop(false)
|
||||
, m_ignoreInputEvents(false)
|
||||
, m_suppressNextKeypressEvent(false)
|
||||
@@ -3676,9 +3677,14 @@
|
||||
@@ -3707,9 +3708,14 @@
|
||||
updateLayerTreeViewport();
|
||||
}
|
||||
|
||||
|
@ -53,9 +53,9 @@ Index: Source/WebKit/chromium/src/WebViewImpl.cpp
|
|||
void WebViewImpl::setEmulatedTextZoomFactor(float textZoomFactor)
|
||||
Index: Source/WebKit/chromium/src/WebViewImpl.h
|
||||
===================================================================
|
||||
--- Source/WebKit/chromium/src/WebViewImpl.h (revision 152953)
|
||||
--- Source/WebKit/chromium/src/WebViewImpl.h (revision 157967)
|
||||
+++ Source/WebKit/chromium/src/WebViewImpl.h (working copy)
|
||||
@@ -415,7 +415,8 @@
|
||||
@@ -417,7 +417,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 @@
|
||||
@@ -739,6 +740,8 @@
|
||||
|
||||
bool m_contextMenuAllowed;
|
||||
|
||||
|
|
Loading…
Reference in New Issue