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

Fix svn:eol-style property.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1453@1473 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-10-18 16:59:40 +00:00
parent c384a19748
commit 7ab98f71da
29 changed files with 4230 additions and 4230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
cef3/patch/patches/drag_handler_601.patch
View File

@@ -1,8 +1,8 @@
Index: browser/web_contents/web_drag_dest_gtk.cc
===================================================================
--- browser/web_contents/web_drag_dest_gtk.cc (revision 202711)
+++ browser/web_contents/web_drag_dest_gtk.cc (working copy)
@@ -13,6 +13,7 @@
Index: browser/web_contents/web_drag_dest_gtk.cc
===================================================================
--- browser/web_contents/web_drag_dest_gtk.cc (revision 202711)
+++ browser/web_contents/web_drag_dest_gtk.cc (working copy)
@@ -13,6 +13,7 @@
#include "content/browser/renderer_host/render_view_host_impl.h"
#include "content/browser/web_contents/drag_utils_gtk.h"
#include "content/browser/web_contents/web_contents_impl.h"
@@ -10,7 +10,7 @@ Index: browser/web_contents/web_drag_dest_gtk.cc
#include "content/public/browser/web_drag_dest_delegate.h"
#include "content/public/common/url_constants.h"
#include "net/base/net_util.h"
@@ -53,6 +54,7 @@
@@ -53,6 +54,7 @@
context_(NULL),
data_requests_(0),
delegate_(NULL),
@@ -18,7 +18,7 @@ Index: browser/web_contents/web_drag_dest_gtk.cc
method_factory_(this) {
gtk_drag_dest_set(widget, static_cast<GtkDestDefaults>(0),
NULL, 0,
@@ -143,6 +145,9 @@
@@ -143,6 +145,9 @@
time);
}
} else if (data_requests_ == 0) {
@@ -28,7 +28,7 @@ Index: browser/web_contents/web_drag_dest_gtk.cc
GetRenderViewHost()->DragTargetDragOver(
ui::ClientPoint(widget_),
ui::ScreenPoint(widget_),
@@ -236,6 +241,20 @@
@@ -236,6 +241,20 @@
}
}
@@ -49,7 +49,7 @@ Index: browser/web_contents/web_drag_dest_gtk.cc
// For CHROME_BOOKMARK_ITEM, we have to handle the case where the drag source
// doesn't have any data available for us. In this case we try to synthesize a
// URL bookmark.
@@ -274,6 +293,9 @@
@@ -274,6 +293,9 @@
// as an enter.
context_ = NULL;
@@ -59,11 +59,11 @@ Index: browser/web_contents/web_drag_dest_gtk.cc
// Sometimes we get a drag-leave event before getting a drag-data-received
// event. In that case, we don't want to bother the renderer with a
// DragLeave event.
Index: browser/web_contents/web_drag_dest_gtk.h
===================================================================
--- browser/web_contents/web_drag_dest_gtk.h (revision 202711)
+++ browser/web_contents/web_drag_dest_gtk.h (working copy)
@@ -101,6 +101,9 @@
Index: browser/web_contents/web_drag_dest_gtk.h
===================================================================
--- browser/web_contents/web_drag_dest_gtk.h (revision 202711)
+++ browser/web_contents/web_drag_dest_gtk.h (working copy)
@@ -101,6 +101,9 @@
// A delegate that can receive drag information about drag events.
WebDragDestDelegate* delegate_;
@@ -73,11 +73,11 @@ Index: browser/web_contents/web_drag_dest_gtk.h
base::WeakPtrFactory<WebDragDestGtk> method_factory_;
DISALLOW_COPY_AND_ASSIGN(WebDragDestGtk);
Index: browser/web_contents/web_drag_dest_mac.h
===================================================================
--- browser/web_contents/web_drag_dest_mac.h (revision 202711)
+++ browser/web_contents/web_drag_dest_mac.h (working copy)
@@ -40,6 +40,9 @@
Index: browser/web_contents/web_drag_dest_mac.h
===================================================================
--- browser/web_contents/web_drag_dest_mac.h (revision 202711)
+++ browser/web_contents/web_drag_dest_mac.h (working copy)
@@ -40,6 +40,9 @@
// The data for the current drag, or NULL if none is in progress.
scoped_ptr<WebDropData> dropData_;
@@ -87,11 +87,11 @@ Index: browser/web_contents/web_drag_dest_mac.h
}
// |contents| is the WebContentsImpl representing this tab, used to communicate
Index: browser/web_contents/web_drag_dest_mac.mm
===================================================================
--- browser/web_contents/web_drag_dest_mac.mm (revision 202711)
+++ browser/web_contents/web_drag_dest_mac.mm (working copy)
@@ -9,6 +9,7 @@
Index: browser/web_contents/web_drag_dest_mac.mm
===================================================================
--- browser/web_contents/web_drag_dest_mac.mm (revision 202711)
+++ browser/web_contents/web_drag_dest_mac.mm (working copy)
@@ -9,6 +9,7 @@
#include "base/sys_string_conversions.h"
#include "content/browser/renderer_host/render_view_host_impl.h"
#include "content/browser/web_contents/web_contents_impl.h"
@@ -99,7 +99,7 @@ Index: browser/web_contents/web_drag_dest_mac.mm
#include "content/public/browser/web_drag_dest_delegate.h"
#import "third_party/mozilla/NSPasteboard+Utils.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
@@ -44,6 +45,7 @@
@@ -44,6 +45,7 @@
- (id)initWithWebContentsImpl:(WebContentsImpl*)contents {
if ((self = [super init])) {
webContents_ = contents;
@@ -107,7 +107,7 @@ Index: browser/web_contents/web_drag_dest_mac.mm
}
return self;
}
@@ -103,6 +105,22 @@
@@ -103,6 +105,22 @@
// we need to send a new enter message in draggingUpdated:.
currentRVH_ = webContents_->GetRenderViewHost();
@@ -130,7 +130,7 @@ Index: browser/web_contents/web_drag_dest_mac.mm
if ([self onlyAllowsNavigation]) {
if ([[info draggingPasteboard] containsURLData])
return NSDragOperationCopy;
@@ -114,17 +132,13 @@
@@ -114,17 +132,13 @@
delegate_->OnDragEnter();
}
@@ -149,7 +149,7 @@ Index: browser/web_contents/web_drag_dest_mac.mm
webContents_->GetRenderViewHost()->DragTargetDragEnter(
*dropData_,
gfx::Point(viewPoint.x, viewPoint.y),
@@ -143,6 +157,9 @@
@@ -143,6 +157,9 @@
if (currentRVH_ != webContents_->GetRenderViewHost())
return;
@@ -159,7 +159,7 @@ Index: browser/web_contents/web_drag_dest_mac.mm
if ([self onlyAllowsNavigation])
return;
@@ -159,6 +176,9 @@
@@ -159,6 +176,9 @@
if (currentRVH_ != webContents_->GetRenderViewHost())
[self draggingEntered:info view:view];
@@ -169,11 +169,11 @@ Index: browser/web_contents/web_drag_dest_mac.mm
if ([self onlyAllowsNavigation]) {
if ([[info draggingPasteboard] containsURLData])
return NSDragOperationCopy;
Index: browser/web_contents/web_drag_dest_win.cc
===================================================================
--- browser/web_contents/web_drag_dest_win.cc (revision 202711)
+++ browser/web_contents/web_drag_dest_win.cc (working copy)
@@ -11,6 +11,7 @@
Index: browser/web_contents/web_drag_dest_win.cc
===================================================================
--- browser/web_contents/web_drag_dest_win.cc (revision 202711)
+++ browser/web_contents/web_drag_dest_win.cc (working copy)
@@ -11,6 +11,7 @@
#include "content/browser/renderer_host/render_view_host_impl.h"
#include "content/browser/web_contents/web_drag_utils_win.h"
#include "content/public/browser/web_contents.h"
@@ -181,7 +181,7 @@ Index: browser/web_contents/web_drag_dest_win.cc
#include "content/public/browser/web_drag_dest_delegate.h"
#include "googleurl/src/gurl.h"
#include "net/base/net_util.h"
@@ -108,7 +109,8 @@
@@ -108,7 +109,8 @@
current_rvh_(NULL),
drag_cursor_(WebDragOperationNone),
interstitial_drop_target_(new InterstitialDropTarget(web_contents)),
@@ -191,7 +191,7 @@ Index: browser/web_contents/web_drag_dest_win.cc
}
WebDragDest::~WebDragDest() {
@@ -120,6 +122,24 @@
@@ -120,6 +122,24 @@
DWORD effects) {
current_rvh_ = web_contents_->GetRenderViewHost();
@@ -216,7 +216,7 @@ Index: browser/web_contents/web_drag_dest_win.cc
if (delegate_)
delegate_->DragInitialize(web_contents_);
@@ -129,15 +149,7 @@
@@ -129,15 +149,7 @@
if (web_contents_->ShowingInterstitialPage())
return interstitial_drop_target_->OnDragEnter(data_object, effects);
@@ -233,7 +233,7 @@ Index: browser/web_contents/web_drag_dest_win.cc
drag_cursor_ = WebDragOperationNone;
POINT client_pt = cursor_position;
@@ -164,6 +176,9 @@
@@ -164,6 +176,9 @@
if (current_rvh_ != web_contents_->GetRenderViewHost())
OnDragEnter(data_object, key_state, cursor_position, effects);
@@ -243,7 +243,7 @@ Index: browser/web_contents/web_drag_dest_win.cc
if (web_contents_->ShowingInterstitialPage())
return interstitial_drop_target_->OnDragOver(data_object, effects);
@@ -186,6 +201,9 @@
@@ -186,6 +201,9 @@
if (current_rvh_ != web_contents_->GetRenderViewHost())
return;
@@ -253,11 +253,11 @@ Index: browser/web_contents/web_drag_dest_win.cc
if (web_contents_->ShowingInterstitialPage()) {
interstitial_drop_target_->OnDragLeave(data_object);
} else {
Index: browser/web_contents/web_drag_dest_win.h
===================================================================
--- browser/web_contents/web_drag_dest_win.h (revision 202711)
+++ browser/web_contents/web_drag_dest_win.h (working copy)
@@ -78,6 +78,9 @@
Index: browser/web_contents/web_drag_dest_win.h
===================================================================
--- browser/web_contents/web_drag_dest_win.h (revision 202711)
+++ browser/web_contents/web_drag_dest_win.h (working copy)
@@ -78,6 +78,9 @@
// The data for the current drag, or NULL if |context_| is NULL.
scoped_ptr<WebDropData> drop_data_;
@@ -267,11 +267,11 @@ Index: browser/web_contents/web_drag_dest_win.h
DISALLOW_COPY_AND_ASSIGN(WebDragDest);
};
Index: public/browser/web_contents_delegate.cc
===================================================================
--- public/browser/web_contents_delegate.cc (revision 202711)
+++ public/browser/web_contents_delegate.cc (working copy)
@@ -110,6 +110,13 @@
Index: public/browser/web_contents_delegate.cc
===================================================================
--- public/browser/web_contents_delegate.cc (revision 202711)
+++ public/browser/web_contents_delegate.cc (working copy)
@@ -110,6 +110,13 @@
return false;
}
@@ -285,11 +285,11 @@ Index: public/browser/web_contents_delegate.cc
bool WebContentsDelegate::OnGoToEntryOffset(int offset) {
return true;
}
Index: public/browser/web_contents_delegate.h
===================================================================
--- public/browser/web_contents_delegate.h (revision 202711)
+++ public/browser/web_contents_delegate.h (working copy)
@@ -17,11 +17,13 @@
Index: public/browser/web_contents_delegate.h
===================================================================
--- public/browser/web_contents_delegate.h (revision 202711)
+++ public/browser/web_contents_delegate.h (working copy)
@@ -17,11 +17,13 @@
#include "content/public/common/page_transition_types.h"
#include "content/public/common/window_container_type.h"
#include "third_party/skia/include/core/SkColor.h"
@@ -303,7 +303,7 @@ Index: public/browser/web_contents_delegate.h
namespace base {
class FilePath;
@@ -264,6 +266,13 @@
@@ -264,6 +266,13 @@
virtual void HandleGestureBegin() {}
virtual void HandleGestureEnd() {}