Update to Chromium revision 234212

- The CefBrowserSettings.user_style_sheet_location option is no longer supported in Blink.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1516 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-11-11 17:29:52 +00:00
parent 81f336f4bb
commit 7e1fbaca6a
8 changed files with 9 additions and 40 deletions

View File

@@ -1,8 +1,8 @@
Index: public/web/WebView.h
===================================================================
--- public/web/WebView.h (revision 161588)
--- public/web/WebView.h (revision 161696)
+++ public/web/WebView.h (working copy)
@@ -443,6 +443,7 @@
@@ -441,6 +441,7 @@
// Sets whether select popup menus should be rendered by the browser.
BLINK_EXPORT static void setUseExternalPopupMenus(bool);
@@ -12,7 +12,7 @@ Index: public/web/WebView.h
// Visited link state --------------------------------------------------
Index: Source/web/ChromeClientImpl.cpp
===================================================================
--- Source/web/ChromeClientImpl.cpp (revision 161588)
--- Source/web/ChromeClientImpl.cpp (revision 161696)
+++ Source/web/ChromeClientImpl.cpp (working copy)
@@ -871,7 +871,7 @@
@@ -25,9 +25,9 @@ Index: Source/web/ChromeClientImpl.cpp
return adoptRef(new PopupMenuChromium(frame, client));
Index: Source/web/WebViewImpl.cpp
===================================================================
--- Source/web/WebViewImpl.cpp (revision 161588)
--- Source/web/WebViewImpl.cpp (revision 161696)
+++ Source/web/WebViewImpl.cpp (working copy)
@@ -403,6 +403,7 @@
@@ -390,6 +390,7 @@
, m_fakePageScaleAnimationPageScaleFactor(0)
, m_fakePageScaleAnimationUseAnchor(false)
, m_contextMenuAllowed(false)
@@ -35,7 +35,7 @@ Index: Source/web/WebViewImpl.cpp
, m_doingDragAndDrop(false)
, m_ignoreInputEvents(false)
, m_compositorDeviceScaleFactorOverride(0)
@@ -3714,9 +3715,14 @@
@@ -3693,9 +3694,14 @@
updateLayerTreeViewport();
}
@@ -53,7 +53,7 @@ Index: Source/web/WebViewImpl.cpp
void WebViewImpl::startDragging(Frame* frame,
Index: Source/web/WebViewImpl.h
===================================================================
--- Source/web/WebViewImpl.h (revision 161588)
--- Source/web/WebViewImpl.h (revision 161696)
+++ Source/web/WebViewImpl.h (working copy)
@@ -414,7 +414,8 @@