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 revision 272007.

Browse Source 
- Remove CefSettings.accelerated_compositing option (see https://crbug.com/363772).
- Remove experimental x-webkit-speech support (see https://crbug.com/223198).
- Execute CefGeolocationHandler callbacks on the UI thread (see https://crbug.com/304341#c212).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1711 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2014-05-29 17:15:34 +00:00
parent 79bd4dd93c
commit 74b35c30eb
66 changed files with 232 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patch/patches/build.patch
View File

@@ -1,7 +1,7 @@
diff --git common.gypi common.gypi
index c87ec63..45bb14e 100644
--- common.gypi
+++ common.gypi
Index: common.gypi
===================================================================
--- common.gypi (revision 272007)
+++ common.gypi (working copy)
@@ -9,6 +9,9 @@
# Variables expected to be overriden on the GYP command line (-D) or by
# ~/.gyp/include.gypi.
@@ -12,11 +12,11 @@ index c87ec63..45bb14e 100644
# Putting a variables dict inside another variables dict looks kind of
# weird. This is done so that 'host_arch', 'chromeos', etc are defined as
# variables within the outer variables dict here. This is necessary
diff --git mac/strip_save_dsym mac/strip_save_dsym
index c9cf226..0dedbe3 100755
--- mac/strip_save_dsym
+++ mac/strip_save_dsym
@@ -48,7 +48,7 @@ def macho_archs(macho):
Index: mac/strip_save_dsym
===================================================================
--- mac/strip_save_dsym (revision 272007)
+++ mac/strip_save_dsym (working copy)
@@ -48,7 +48,7 @@
"bundle"]
macho_types_re = "Mach-O (?:64-bit )?(?:" + "|".join(macho_types) + ")"

14
patch/patches/content_nav_1129.patch
View File

@@ -1,6 +1,6 @@
Index: public/renderer/content_renderer_client.cc
===================================================================
--- public/renderer/content_renderer_client.cc (revision 263053)
--- public/renderer/content_renderer_client.cc (revision 272007)
+++ public/renderer/content_renderer_client.cc (working copy)
@@ -92,7 +92,6 @@
return false;
@@ -20,9 +20,9 @@ Index: public/renderer/content_renderer_client.cc
const GURL& url,
Index: public/renderer/content_renderer_client.h
===================================================================
--- public/renderer/content_renderer_client.h (revision 263053)
--- public/renderer/content_renderer_client.h (revision 272007)
+++ public/renderer/content_renderer_client.h (working copy)
@@ -175,7 +175,6 @@
@@ -176,7 +176,6 @@
// Returns true if a popup window should be allowed.
virtual bool AllowPopup();
@@ -30,7 +30,7 @@ Index: public/renderer/content_renderer_client.h
// TODO(sgurun) This callback is deprecated and will be removed as soon
// as android webview completes implementation of a resource throttle based
// shouldoverrideurl implementation. See crbug.com/325351
@@ -190,7 +189,6 @@
@@ -191,7 +190,6 @@
blink::WebNavigationType type,
blink::WebNavigationPolicy default_policy,
bool is_redirect);
@@ -40,9 +40,9 @@ Index: public/renderer/content_renderer_client.h
// If |send_referrer| is set to false (which is the default), no referrer
Index: renderer/render_frame_impl.cc
===================================================================
--- renderer/render_frame_impl.cc (revision 263053)
--- renderer/render_frame_impl.cc (revision 272007)
+++ renderer/render_frame_impl.cc (working copy)
@@ -2870,7 +2870,6 @@
@@ -3084,7 +3084,6 @@
WebNavigationType type,
WebNavigationPolicy default_policy,
bool is_redirect) {
@@ -50,7 +50,7 @@ Index: renderer/render_frame_impl.cc
// The handlenavigation API is deprecated and will be removed once
// crbug.com/325351 is resolved.
if (request.url() != GURL(kSwappedOutURL) &&
@@ -2885,7 +2884,6 @@
@@ -3099,7 +3098,6 @@
is_redirect)) {
return blink::WebNavigationPolicyIgnore;
}

2
patch/patches/gritsettings.patch
View File

@@ -1,6 +1,6 @@
Index: resource_ids
===================================================================
--- resource_ids (revision 263053)
--- resource_ids (revision 272007)
+++ resource_ids (working copy)
@@ -16,6 +16,12 @@
{

2
patch/patches/gyp_331.patch
View File

@@ -1,6 +1,6 @@
Index: gyp/generator/ninja.py
===================================================================
--- gyp/generator/ninja.py (revision 1892)
--- gyp/generator/ninja.py (revision 1921)
+++ gyp/generator/ninja.py (working copy)
@@ -738,7 +738,16 @@
for path in copy['files']:

4
patch/patches/message_loop_443.patch
View File

@@ -1,8 +1,8 @@
Index: message_loop.cc
===================================================================
--- message_loop.cc (revision 263053)
--- message_loop.cc (revision 272007)
+++ message_loop.cc (working copy)
@@ -144,7 +144,7 @@
@@ -154,7 +154,7 @@
MessageLoop::~MessageLoop() {
DCHECK_EQ(this, current());

8
patch/patches/prefs_content_1161.patch
View File

@@ -1,8 +1,8 @@
Index: public/common/common_param_traits_macros.h
===================================================================
--- public/common/common_param_traits_macros.h (revision 263053)
--- public/common/common_param_traits_macros.h (revision 272007)
+++ public/common/common_param_traits_macros.h (working copy)
@@ -181,6 +181,7 @@
@@ -175,6 +175,7 @@
IPC_STRUCT_TRAITS_MEMBER(initialize_at_minimum_page_scale)
IPC_STRUCT_TRAITS_MEMBER(smart_insert_delete_enabled)
IPC_STRUCT_TRAITS_MEMBER(compositor_touch_hit_testing)
@@ -12,9 +12,9 @@ Index: public/common/common_param_traits_macros.h
IPC_STRUCT_TRAITS_MEMBER(spatial_navigation_enabled)
Index: renderer/web_preferences.cc
===================================================================
--- renderer/web_preferences.cc (revision 263053)
--- renderer/web_preferences.cc (revision 272007)
+++ renderer/web_preferences.cc (working copy)
@@ -171,6 +171,8 @@
@@ -165,6 +165,8 @@
settings->setJavaEnabled(prefs.java_enabled);

8
patch/patches/prefs_webkit_1161.patch
View File

@@ -1,8 +1,8 @@
Index: common/webpreferences.cc
===================================================================
--- common/webpreferences.cc (revision 263053)
--- common/webpreferences.cc (revision 272007)
+++ common/webpreferences.cc (working copy)
@@ -120,6 +120,7 @@
@@ -114,6 +114,7 @@
use_solid_color_scrollbars(false),
compositor_touch_hit_testing(true),
navigate_on_drag_drop(true),
@@ -12,9 +12,9 @@ Index: common/webpreferences.cc
#if defined(OS_ANDROID)
Index: common/webpreferences.h
===================================================================
--- common/webpreferences.h (revision 263053)
--- common/webpreferences.h (revision 272007)
+++ common/webpreferences.h (working copy)
@@ -155,6 +155,7 @@
@@ -149,6 +149,7 @@
bool use_solid_color_scrollbars;
bool compositor_touch_hit_testing;
bool navigate_on_drag_drop;

8
patch/patches/public_browser_1161.patch
View File

@@ -1,8 +1,8 @@
Index: content_browser_client.cc
===================================================================
--- content_browser_client.cc (revision 263053)
--- content_browser_client.cc (revision 272007)
+++ content_browser_client.cc (working copy)
@@ -255,6 +255,10 @@
@@ -253,6 +253,10 @@
return true;
}
@@ -15,7 +15,7 @@ Index: content_browser_client.cc
}
Index: content_browser_client.h
===================================================================
--- content_browser_client.h (revision 263053)
--- content_browser_client.h (revision 272007)
+++ content_browser_client.h (working copy)
@@ -22,6 +22,7 @@
#include "net/base/mime_util.h"
@@ -25,7 +25,7 @@ Index: content_browser_client.h
#include "third_party/WebKit/public/web/WebNotificationPresenter.h"
#include "ui/base/window_open_disposition.h"
#include "webkit/browser/fileapi/file_system_context.h"
@@ -542,6 +543,9 @@
@@ -535,6 +536,9 @@
// Clears browser cookies.
virtual void ClearCookies(RenderViewHost* rvh) {}

69
patch/patches/renderer_host_1161.patch
View File

@@ -1,11 +1,11 @@
Index: compositing_iosurface_layer_mac.mm
===================================================================
--- compositing_iosurface_layer_mac.mm (revision 263053)
--- compositing_iosurface_layer_mac.mm (revision 272007)
+++ compositing_iosurface_layer_mac.mm (working copy)
@@ -117,7 +117,7 @@
(context_ && context_->cgl_context() != glContext) ||
@@ -133,7 +133,7 @@
!renderWidgetHostView_ ||
!renderWidgetHostView_->compositing_iosurface_) {
!renderWidgetHostView_->compositing_iosurface_ ||
!renderWidgetHostView_->compositing_iosurface_->HasIOSurface()) {
- glClearColor(1, 1, 1, 1);
+ glClearColor(0, 0, 0, 0);
glClear(GL_COLOR_BUFFER_BIT);
@@ -13,7 +13,7 @@ Index: compositing_iosurface_layer_mac.mm
}
Index: compositing_iosurface_mac.mm
===================================================================
--- compositing_iosurface_mac.mm (revision 263053)
--- compositing_iosurface_mac.mm (revision 272007)
+++ compositing_iosurface_mac.mm (working copy)
@@ -360,7 +360,7 @@
glUseProgram(0); CHECK_AND_SAVE_GL_ERROR();
@@ -26,7 +26,7 @@ Index: compositing_iosurface_mac.mm
Index: compositing_iosurface_shader_programs_mac.cc
===================================================================
--- compositing_iosurface_shader_programs_mac.cc (revision 263053)
--- compositing_iosurface_shader_programs_mac.cc (revision 272007)
+++ compositing_iosurface_shader_programs_mac.cc (working copy)
@@ -11,6 +11,8 @@
#include "base/debug/trace_event.h"
@@ -81,7 +81,7 @@ Index: compositing_iosurface_shader_programs_mac.cc
shader_programs_[which] =
Index: compositing_iosurface_shader_programs_mac.h
===================================================================
--- compositing_iosurface_shader_programs_mac.h (revision 263053)
--- compositing_iosurface_shader_programs_mac.h (revision 272007)
+++ compositing_iosurface_shader_programs_mac.h (working copy)
@@ -48,6 +48,8 @@
return rgb_to_yv12_output_format_;
@@ -94,30 +94,30 @@ Index: compositing_iosurface_shader_programs_mac.h
TransformsRGBToYV12);
Index: render_widget_host_view_aura.cc
===================================================================
--- render_widget_host_view_aura.cc (revision 263053)
--- render_widget_host_view_aura.cc (revision 272007)
+++ render_widget_host_view_aura.cc (working copy)
@@ -2284,8 +2284,14 @@
// For non-opaque windows, we don't draw anything, since we depend on the
// canvas coming from the compositor to already be initialized as
// transparent.
- if (window_->layer()->fills_bounds_opaquely())
- canvas->DrawColor(SK_ColorWHITE);
+ if (window_->layer()->fills_bounds_opaquely()) {
+ if (host_->IsRenderView()) {
+ canvas->DrawColor(GetContentClient()->browser()->GetBaseBackgroundColor(
+ RenderViewHost::From(host_)));
+ } else {
+ canvas->DrawColor(SK_ColorWHITE);
+ }
@@ -1602,8 +1602,14 @@
// For non-opaque windows, we don't draw anything, since we depend on the
// canvas coming from the compositor to already be initialized as
// transparent.
- if (window_->layer()->fills_bounds_opaquely())
- canvas->DrawColor(SK_ColorWHITE);
+ if (window_->layer()->fills_bounds_opaquely()) {
+ if (host_->IsRenderView()) {
+ canvas->DrawColor(GetContentClient()->browser()->GetBaseBackgroundColor(
+ RenderViewHost::From(host_)));
+ } else {
+ canvas->DrawColor(SK_ColorWHITE);
+ }
}
+ }
}
void RenderWidgetHostViewAura::OnDeviceScaleFactorChanged(
Index: render_widget_host_view_mac.mm
===================================================================
--- render_widget_host_view_mac.mm (revision 263053)
--- render_widget_host_view_mac.mm (revision 272007)
+++ render_widget_host_view_mac.mm (working copy)
@@ -440,7 +440,7 @@
@@ -498,7 +498,7 @@
use_core_animation_ = true;
background_layer_.reset([[CALayer alloc] init]);
[background_layer_
@@ -126,7 +126,7 @@ Index: render_widget_host_view_mac.mm
[cocoa_view_ setLayer:background_layer_];
[cocoa_view_ setWantsLayer:YES];
}
@@ -3097,7 +3097,7 @@
@@ -3304,7 +3304,7 @@
NSRect r = [self flipRectToNSRect:gfx::Rect(x, y, width, height)];
CGContextSetFillColorWithColor(context,
@@ -135,7 +135,7 @@ Index: render_widget_host_view_mac.mm
CGContextFillRect(context, NSRectToCGRect(r));
}
if (damagedRect.bottom() > rect.bottom()) {
@@ -3119,7 +3119,7 @@
@@ -3326,7 +3326,7 @@
NSRect r = [self flipRectToNSRect:gfx::Rect(x, y, width, height)];
CGContextSetFillColorWithColor(context,
@@ -144,7 +144,7 @@ Index: render_widget_host_view_mac.mm
CGContextFillRect(context, NSRectToCGRect(r));
}
}
@@ -3269,7 +3269,7 @@
@@ -3465,7 +3465,7 @@
}
} else {
CGContextSetFillColorWithColor(context,
@@ -153,21 +153,12 @@ Index: render_widget_host_view_mac.mm
CGContextFillRect(context, dirtyRect);
if (renderWidgetHostView_->whiteout_start_time_.is_null())
renderWidgetHostView_->whiteout_start_time_ = base::TimeTicks::Now();
@@ -4276,7 +4276,7 @@
if (self = [super init]) {
renderWidgetHostView_ = r;
@@ -4420,7 +4420,7 @@
- (id)init {
if (self = [super init]) {
- [self setBackgroundColor:CGColorGetConstantColor(kCGColorWhite)];
+ [self setBackgroundColor:CGColorGetConstantColor(kCGColorClear)];
[self setAnchorPoint:CGPointMake(0, 0)];
// Setting contents gravity is necessary to prevent the layer from being
// scaled during dyanmic resizes (especially with devtools open).
@@ -4305,7 +4305,7 @@
inContext:context];
} else {
CGContextSetFillColorWithColor(context,
- CGColorGetConstantColor(kCGColorWhite));
+ CGColorGetConstantColor(kCGColorClear));
CGContextFillRect(context, clipRect);
}
}

8
patch/patches/spi_webcore_364.patch
View File

@@ -1,9 +1,9 @@
Index: core/frame/FrameView.cpp
===================================================================
--- core/frame/FrameView.cpp (revision 171269)
--- core/frame/FrameView.cpp (revision 174434)
+++ core/frame/FrameView.cpp (working copy)
@@ -162,8 +162,10 @@
if (!isMainFrame())
@@ -165,8 +165,10 @@
if (!m_frame->isMainFrame())
return;
+#if 0
@@ -15,7 +15,7 @@ Index: core/frame/FrameView.cpp
PassRefPtr<FrameView> FrameView::create(LocalFrame* frame)
Index: platform/scroll/ScrollbarThemeMacCommon.mm
===================================================================
--- platform/scroll/ScrollbarThemeMacCommon.mm (revision 171269)
--- platform/scroll/ScrollbarThemeMacCommon.mm (revision 174434)
+++ platform/scroll/ScrollbarThemeMacCommon.mm (working copy)
@@ -358,10 +358,14 @@
// static

2
patch/patches/underlay_1051.patch
View File

@@ -1,6 +1,6 @@
Index: underlay_opengl_hosting_window.h
===================================================================
--- underlay_opengl_hosting_window.h (revision 263053)
--- underlay_opengl_hosting_window.h (revision 272007)
+++ underlay_opengl_hosting_window.h (working copy)
@@ -12,7 +12,7 @@
// Common base class for windows that host a OpenGL surface that renders under

90
patch/patches/views_widget_180.patch
View File

@@ -1,8 +1,8 @@
diff --git desktop_aura/desktop_screen_win.cc desktop_aura/desktop_screen_win.cc
index c5edf76..9389662 100644
--- desktop_aura/desktop_screen_win.cc
+++ desktop_aura/desktop_screen_win.cc
@@ -54,6 +54,8 @@ gfx::Display DesktopScreenWin::GetDisplayMatching(
Index: desktop_aura/desktop_screen_win.cc
===================================================================
--- desktop_aura/desktop_screen_win.cc (revision 272007)
+++ desktop_aura/desktop_screen_win.cc (working copy)
@@ -54,6 +54,8 @@
}
HWND DesktopScreenWin::GetHWNDFromNativeView(gfx::NativeView window) const {
@@ -11,11 +11,11 @@ index c5edf76..9389662 100644
aura::WindowTreeHost* host = window->GetHost();
return host ? host->GetAcceleratedWidget() : NULL;
}
diff --git desktop_aura/desktop_window_tree_host_win.cc desktop_aura/desktop_window_tree_host_win.cc
index 2fc499b..6fa63b5 100644
--- desktop_aura/desktop_window_tree_host_win.cc
+++ desktop_aura/desktop_window_tree_host_win.cc
@@ -130,7 +130,9 @@ void DesktopWindowTreeHostWin::Init(aura::Window* content_window,
Index: desktop_aura/desktop_window_tree_host_win.cc
===================================================================
--- desktop_aura/desktop_window_tree_host_win.cc (revision 272007)
+++ desktop_aura/desktop_window_tree_host_win.cc (working copy)
@@ -129,7 +129,9 @@
native_widget_delegate_);
HWND parent_hwnd = NULL;
@@ -26,33 +26,21 @@ index 2fc499b..6fa63b5 100644
parent_hwnd = params.parent->GetHost()->GetAcceleratedWidget();
message_handler_->set_remove_standard_frame(params.remove_standard_frame);
diff --git desktop_aura/desktop_window_tree_host_win.h desktop_aura/desktop_window_tree_host_win.h
index dc8a218..84680cf 100644
--- desktop_aura/desktop_window_tree_host_win.h
+++ desktop_aura/desktop_window_tree_host_win.h
@@ -214,6 +214,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
LPARAM l_param) OVERRIDE;
virtual bool HandleScrollEvent(const ui::ScrollEvent& event) OVERRIDE;
+ public:
Widget* GetWidget();
const Widget* GetWidget() const;
HWND GetHWND() const;
diff --git desktop_aura/desktop_window_tree_host_x11.cc desktop_aura/desktop_window_tree_host_x11.cc
index 028b6f5..e8b4bd2 100644
--- desktop_aura/desktop_window_tree_host_x11.cc
+++ desktop_aura/desktop_window_tree_host_x11.cc
@@ -138,7 +138,8 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
content_window_(NULL),
Index: desktop_aura/desktop_window_tree_host_x11.cc
===================================================================
--- desktop_aura/desktop_window_tree_host_x11.cc (revision 272007)
+++ desktop_aura/desktop_window_tree_host_x11.cc (working copy)
@@ -143,7 +143,8 @@
window_parent_(NULL),
custom_window_shape_(NULL),
window_shape_(NULL),
custom_window_shape_(false),
- urgency_hint_set_(false) {
+ urgency_hint_set_(false),
+ xwindow_destroyed_(false) {
}
DesktopWindowTreeHostX11::~DesktopWindowTreeHostX11() {
@@ -315,7 +316,8 @@ void DesktopWindowTreeHostX11::CloseNow() {
@@ -332,7 +333,8 @@
// Actually free our native resources.
if (ui::PlatformEventSource::GetInstance())
ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this);
@@ -62,9 +50,9 @@ index 028b6f5..e8b4bd2 100644
xwindow_ = None;
desktop_native_widget_aura_->OnHostClosed();
@@ -968,9 +970,13 @@ void DesktopWindowTreeHostX11::InitX11Window(
if (swa.override_redirect)
attribute_mask |= CWOverrideRedirect;
@@ -998,9 +1000,13 @@
}
}
+ gfx::AcceleratedWidget parent_widget = params.parent_widget;
+ if (parent_widget == gfx::kNullAcceleratedWidget)
@@ -77,7 +65,7 @@ index 028b6f5..e8b4bd2 100644
bounds_.x(), bounds_.y(),
bounds_.width(), bounds_.height(),
0, // border width
@@ -1378,6 +1384,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
@@ -1503,6 +1509,10 @@
}
break;
}
@@ -88,11 +76,11 @@ index 028b6f5..e8b4bd2 100644
case FocusOut:
if (xev->xfocus.mode != NotifyGrab) {
ReleaseCapture();
diff --git desktop_aura/desktop_window_tree_host_x11.h desktop_aura/desktop_window_tree_host_x11.h
index bc20464..63527ae 100644
--- desktop_aura/desktop_window_tree_host_x11.h
+++ desktop_aura/desktop_window_tree_host_x11.h
@@ -299,6 +299,9 @@ private:
Index: desktop_aura/desktop_window_tree_host_x11.h
===================================================================
--- desktop_aura/desktop_window_tree_host_x11.h (revision 272007)
+++ desktop_aura/desktop_window_tree_host_x11.h (working copy)
@@ -319,6 +319,9 @@
// the frame when |xwindow_| gains focus or handles a mouse button event.
bool urgency_hint_set_;
@@ -102,11 +90,11 @@ index bc20464..63527ae 100644
DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11);
};
diff --git widget.cc widget.cc
index e05db49..a936235 100644
--- widget.cc
+++ widget.cc
@@ -122,6 +122,7 @@ Widget::InitParams::InitParams()
Index: widget.cc
===================================================================
--- widget.cc (revision 272007)
+++ widget.cc (working copy)
@@ -116,6 +116,7 @@
show_state(ui::SHOW_STATE_DEFAULT),
double_buffer(false),
parent(NULL),
@@ -114,7 +102,7 @@ index e05db49..a936235 100644
native_widget(NULL),
desktop_window_tree_host(NULL),
top_level(false),
@@ -148,6 +149,7 @@ Widget::InitParams::InitParams(Type type)
@@ -141,6 +142,7 @@
show_state(ui::SHOW_STATE_DEFAULT),
double_buffer(false),
parent(NULL),
@@ -122,7 +110,7 @@ index e05db49..a936235 100644
native_widget(NULL),
desktop_window_tree_host(NULL),
top_level(false),
@@ -386,7 +388,12 @@ void Widget::Init(const InitParams& in_params) {
@@ -398,7 +400,12 @@
Minimize();
} else if (params.delegate) {
SetContentsView(params.delegate->GetContentsView());
@@ -136,11 +124,11 @@ index e05db49..a936235 100644
}
native_widget_initialized_ = true;
}
diff --git widget.h widget.h
index 640b140..43feff7 100644
--- widget.h
+++ widget.h
@@ -200,6 +200,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
Index: widget.h
===================================================================
--- widget.h (revision 272007)
+++ widget.h (working copy)
@@ -213,6 +213,7 @@
// Should the widget be double buffered? Default is false.
bool double_buffer;
gfx::NativeView parent;

64
patch/patches/web_contents_1262.patch
View File

@@ -1,64 +0,0 @@
Index: web_contents_view_aura.cc
===================================================================
--- web_contents_view_aura.cc (revision 263053)
+++ web_contents_view_aura.cc (working copy)
@@ -1417,17 +1417,25 @@
// WebContentsViewAura, aura::client::DragDropDelegate implementation:
void WebContentsViewAura::OnDragEntered(const ui::DropTargetEvent& event) {
- if (drag_dest_delegate_)
- drag_dest_delegate_->DragInitialize(web_contents_);
-
+ current_rvh_for_drag_ = web_contents_->GetRenderViewHost();
current_drop_data_.reset(new DropData());
PrepareDropData(current_drop_data_.get(), event.data());
blink::WebDragOperationsMask op = ConvertToWeb(event.source_operations());
+ // Give the delegate an opportunity to cancel the drag.
+ if (!web_contents_->GetDelegate()->CanDragEnter(web_contents_,
+ *current_drop_data_.get(),
+ op)) {
+ current_drop_data_.reset(NULL);
+ return;
+ }
+
+ if (drag_dest_delegate_)
+ drag_dest_delegate_->DragInitialize(web_contents_);
+
gfx::Point screen_pt =
gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint();
- current_rvh_for_drag_ = web_contents_->GetRenderViewHost();
web_contents_->GetRenderViewHost()->DragTargetDragEnter(
*current_drop_data_.get(), event.location(), screen_pt, op,
ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
@@ -1443,6 +1451,9 @@
if (current_rvh_for_drag_ != web_contents_->GetRenderViewHost())
OnDragEntered(event);
+ if (!current_drop_data_)
+ return ui::DragDropTypes::DRAG_NONE;
+
blink::WebDragOperationsMask op = ConvertToWeb(event.source_operations());
gfx::Point screen_pt =
gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint();
@@ -1461,6 +1472,9 @@
if (current_rvh_for_drag_ != web_contents_->GetRenderViewHost())
return;
+ if (!current_drop_data_)
+ return;
+
web_contents_->GetRenderViewHost()->DragTargetDragLeave();
if (drag_dest_delegate_)
drag_dest_delegate_->OnDragLeave();
@@ -1473,6 +1487,9 @@
if (current_rvh_for_drag_ != web_contents_->GetRenderViewHost())
OnDragEntered(event);
+ if (!current_drop_data_)
+ return ui::DragDropTypes::DRAG_NONE;
+
web_contents_->GetRenderViewHost()->DragTargetDrop(
event.location(),
gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(),

2
patch/patches/webkit_933.patch
View File

@@ -1,6 +1,6 @@
Index: WebNode.cpp
===================================================================
--- WebNode.cpp (revision 171269)
--- WebNode.cpp (revision 174434)
+++ WebNode.cpp (working copy)
@@ -172,7 +172,7 @@
void WebNode::addEventListener(const WebString& eventType, WebDOMEventListener* listener, bool useCapture)

16
patch/patches/wtf_vector_377942.patch Normal file
View File

@@ -0,0 +1,16 @@
Index: Vector.h
===================================================================
--- Vector.h (revision 174434)
+++ Vector.h (working copy)
@@ -221,7 +221,10 @@
{
static bool compare(const T* a, const T* b, size_t size)
{
- return std::equal(a, a + size, b);
+ for (size_t i = 0; i < size; ++i)
+ if (!(a[i] == b[i]))
+ return false;
+ return true;
}
};

2
patch/patches/zlib.patch
View File

@@ -1,6 +1,6 @@
Index: contrib/minizip/unzip.c
===================================================================
--- contrib/minizip/unzip.c (revision 263053)
--- contrib/minizip/unzip.c (revision 272007)
+++ contrib/minizip/unzip.c (working copy)
@@ -69,7 +69,7 @@
#include <string.h>