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 fea84635 (#321386)

Browse Source 
- Use a separate utility process for V8 proxy resolution (see http://crbug.com/11746).
This commit is contained in:
Marshall Greenblatt
2015-03-19 18:06:16 -04:00
parent aaab7bdb35
commit d7f7c61ddd
34 changed files with 137 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
patch/patches/views_widget_180.patch
View File

@@ -43,11 +43,11 @@ index b54a643..5a589e5 100644
if (input_method)
input_method->OnBlur();
diff --git desktop_aura/desktop_window_tree_host_x11.cc desktop_aura/desktop_window_tree_host_x11.cc
index c6fc3d7..40b9b10 100644
index 1316b8b..588e591 100644
--- desktop_aura/desktop_window_tree_host_x11.cc
+++ desktop_aura/desktop_window_tree_host_x11.cc
@@ -154,7 +154,8 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
window_shape_(NULL),
@@ -153,7 +153,8 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
window_parent_(NULL),
custom_window_shape_(false),
urgency_hint_set_(false),
- close_widget_factory_(this) {
@@ -56,7 +56,7 @@ index c6fc3d7..40b9b10 100644
}
DesktopWindowTreeHostX11::~DesktopWindowTreeHostX11() {
@@ -356,7 +357,8 @@ void DesktopWindowTreeHostX11::CloseNow() {
@@ -353,7 +354,8 @@ void DesktopWindowTreeHostX11::CloseNow() {
// Actually free our native resources.
if (ui::PlatformEventSource::GetInstance())
ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this);
@@ -66,7 +66,7 @@ index c6fc3d7..40b9b10 100644
xwindow_ = None;
desktop_native_widget_aura_->OnHostClosed();
@@ -455,6 +457,8 @@ void DesktopWindowTreeHostX11::GetWindowPlacement(
@@ -452,6 +454,8 @@ void DesktopWindowTreeHostX11::GetWindowPlacement(
}
gfx::Rect DesktopWindowTreeHostX11::GetWindowBoundsInScreen() const {
@@ -75,7 +75,7 @@ index c6fc3d7..40b9b10 100644
return ToDIPRect(bounds_in_pixels_);
}
@@ -887,6 +891,8 @@ void DesktopWindowTreeHostX11::Hide() {
@@ -894,6 +898,8 @@ void DesktopWindowTreeHostX11::Hide() {
}
gfx::Rect DesktopWindowTreeHostX11::GetBounds() const {
@@ -84,7 +84,7 @@ index c6fc3d7..40b9b10 100644
return bounds_in_pixels_;
}
@@ -943,6 +949,8 @@ void DesktopWindowTreeHostX11::SetBounds(
@@ -950,6 +956,8 @@ void DesktopWindowTreeHostX11::SetBounds(
}
gfx::Point DesktopWindowTreeHostX11::GetLocationOnNativeScreen() const {
@@ -93,7 +93,7 @@ index c6fc3d7..40b9b10 100644
return bounds_in_pixels_.origin();
}
@@ -1063,9 +1071,13 @@ void DesktopWindowTreeHostX11::InitX11Window(
@@ -1070,9 +1078,13 @@ void DesktopWindowTreeHostX11::InitX11Window(
}
}
@@ -108,7 +108,7 @@ index c6fc3d7..40b9b10 100644
bounds_in_pixels_.y(), bounds_in_pixels_.width(),
bounds_in_pixels_.height(),
0, // border width
@@ -1718,6 +1730,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
@@ -1717,6 +1729,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
}
break;
}
@@ -120,10 +120,10 @@ index c6fc3d7..40b9b10 100644
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 8f00d3c..a465bed 100644
index 94d4b1b..2609f46 100644
--- desktop_aura/desktop_window_tree_host_x11.h
+++ desktop_aura/desktop_window_tree_host_x11.h
@@ -85,6 +85,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
@@ -86,6 +86,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
// Deallocates the internal list of open windows.
static void CleanUpWindowList();
@@ -132,7 +132,7 @@ index 8f00d3c..a465bed 100644
protected:
// Overridden from DesktopWindowTreeHost:
void Init(aura::Window* content_window,
@@ -264,6 +266,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
@@ -265,6 +267,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
// The bounds of |xwindow_|.
gfx::Rect bounds_in_pixels_;
@@ -142,7 +142,7 @@ index 8f00d3c..a465bed 100644
// Whenever the bounds are set, we keep the previous set of bounds around so
// we can have a better chance of getting the real
// |restored_bounds_in_pixels_|. Window managers tend to send a Configure
@@ -349,6 +354,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
@@ -351,6 +356,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_;
@@ -153,7 +153,7 @@ index 8f00d3c..a465bed 100644
};
diff --git widget.cc widget.cc
index 7d237c8..8778686 100644
index 15b810a..2f01d9e 100644
--- widget.cc
+++ widget.cc
@@ -110,6 +110,7 @@ Widget::InitParams::InitParams()
@@ -196,7 +196,7 @@ index 7d237c8..8778686 100644
// This must come after SetContentsView() or it might not be able to find
// the correct NativeTheme (on Linux). See http://crbug.com/384492
diff --git widget.h widget.h
index 06bd491..ed3893e 100644
index 2f6030b..fdf4172 100644
--- widget.h
+++ widget.h
@@ -235,6 +235,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,