mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Fix svn:eol-style property.
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1470 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@ -1,8 +1,8 @@
|
||||
Index: browser/devtools/devtools_http_handler_impl.cc
|
||||
===================================================================
|
||||
--- browser/devtools/devtools_http_handler_impl.cc (revision 228917)
|
||||
+++ browser/devtools/devtools_http_handler_impl.cc (working copy)
|
||||
@@ -542,9 +542,17 @@
|
||||
Index: browser/devtools/devtools_http_handler_impl.cc
|
||||
===================================================================
|
||||
--- browser/devtools/devtools_http_handler_impl.cc (revision 228917)
|
||||
+++ browser/devtools/devtools_http_handler_impl.cc (working copy)
|
||||
@@ -542,9 +542,17 @@
|
||||
|
||||
DevToolsTarget* DevToolsHttpHandlerImpl::GetTarget(const std::string& id) {
|
||||
TargetMap::const_iterator it = target_map_.find(id);
|
||||
@ -23,11 +23,11 @@ Index: browser/devtools/devtools_http_handler_impl.cc
|
||||
}
|
||||
|
||||
void DevToolsHttpHandlerImpl::OnThumbnailRequestUI(
|
||||
Index: public/browser/devtools_http_handler_delegate.h
|
||||
===================================================================
|
||||
--- public/browser/devtools_http_handler_delegate.h (revision 228917)
|
||||
+++ public/browser/devtools_http_handler_delegate.h (working copy)
|
||||
@@ -39,6 +39,13 @@
|
||||
Index: public/browser/devtools_http_handler_delegate.h
|
||||
===================================================================
|
||||
--- public/browser/devtools_http_handler_delegate.h (revision 228917)
|
||||
+++ public/browser/devtools_http_handler_delegate.h (working copy)
|
||||
@@ -39,6 +39,13 @@
|
||||
// Creates new inspectable target.
|
||||
virtual scoped_ptr<DevToolsTarget> CreateNewTarget() = 0;
|
||||
|
||||
|
@ -1,8 +1,8 @@
|
||||
Index: WebNode.cpp
|
||||
===================================================================
|
||||
--- WebNode.cpp (revision 158192)
|
||||
+++ WebNode.cpp (working copy)
|
||||
@@ -175,7 +175,7 @@
|
||||
Index: WebNode.cpp
|
||||
===================================================================
|
||||
--- WebNode.cpp (revision 158192)
|
||||
+++ WebNode.cpp (working copy)
|
||||
@@ -175,7 +175,7 @@
|
||||
void WebNode::addEventListener(const WebString& eventType, WebDOMEventListener* listener, bool useCapture)
|
||||
{
|
||||
// Please do not add more eventTypes to this list without an API review.
|
||||
|
@ -1,8 +1,8 @@
|
||||
Index: public/web/WebView.h
|
||||
===================================================================
|
||||
--- public/web/WebView.h (revision 159695)
|
||||
+++ public/web/WebView.h (working copy)
|
||||
@@ -447,6 +447,7 @@
|
||||
Index: public/web/WebView.h
|
||||
===================================================================
|
||||
--- public/web/WebView.h (revision 159695)
|
||||
+++ public/web/WebView.h (working copy)
|
||||
@@ -447,6 +447,7 @@
|
||||
|
||||
// Sets whether select popup menus should be rendered by the browser.
|
||||
BLINK_EXPORT static void setUseExternalPopupMenus(bool);
|
||||
@ -10,11 +10,11 @@ Index: public/web/WebView.h
|
||||
|
||||
|
||||
// Visited link state --------------------------------------------------
|
||||
Index: Source/web/ChromeClientImpl.cpp
|
||||
===================================================================
|
||||
--- Source/web/ChromeClientImpl.cpp (revision 159695)
|
||||
+++ Source/web/ChromeClientImpl.cpp (working copy)
|
||||
@@ -875,7 +875,7 @@
|
||||
Index: Source/web/ChromeClientImpl.cpp
|
||||
===================================================================
|
||||
--- Source/web/ChromeClientImpl.cpp (revision 159695)
|
||||
+++ Source/web/ChromeClientImpl.cpp (working copy)
|
||||
@@ -875,7 +875,7 @@
|
||||
|
||||
PassRefPtr<PopupMenu> ChromeClientImpl::createPopupMenu(Frame& frame, PopupMenuClient* client) const
|
||||
{
|
||||
@ -23,11 +23,11 @@ Index: Source/web/ChromeClientImpl.cpp
|
||||
return adoptRef(new ExternalPopupMenu(frame, client, m_webView->client()));
|
||||
|
||||
return adoptRef(new PopupMenuChromium(frame, client));
|
||||
Index: Source/web/WebViewImpl.cpp
|
||||
===================================================================
|
||||
--- Source/web/WebViewImpl.cpp (revision 159695)
|
||||
+++ Source/web/WebViewImpl.cpp (working copy)
|
||||
@@ -411,6 +411,7 @@
|
||||
Index: Source/web/WebViewImpl.cpp
|
||||
===================================================================
|
||||
--- Source/web/WebViewImpl.cpp (revision 159695)
|
||||
+++ Source/web/WebViewImpl.cpp (working copy)
|
||||
@@ -411,6 +411,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)
|
||||
@@ -3751,9 +3752,14 @@
|
||||
@@ -3751,9 +3752,14 @@
|
||||
updateLayerTreeViewport();
|
||||
}
|
||||
|
||||
@ -51,11 +51,11 @@ Index: Source/web/WebViewImpl.cpp
|
||||
}
|
||||
|
||||
void WebViewImpl::startDragging(Frame* frame,
|
||||
Index: Source/web/WebViewImpl.h
|
||||
===================================================================
|
||||
--- Source/web/WebViewImpl.h (revision 159695)
|
||||
+++ Source/web/WebViewImpl.h (working copy)
|
||||
@@ -424,7 +424,8 @@
|
||||
Index: Source/web/WebViewImpl.h
|
||||
===================================================================
|
||||
--- Source/web/WebViewImpl.h (revision 159695)
|
||||
+++ Source/web/WebViewImpl.h (working copy)
|
||||
@@ -424,7 +424,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
|
||||
{
|
||||
@@ -727,6 +728,8 @@
|
||||
@@ -727,6 +728,8 @@
|
||||
|
||||
bool m_contextMenuAllowed;
|
||||
|
||||
|
Reference in New Issue
Block a user