← Back to branch summary

~chromium-team/chromium-browser/artful-beta

« back to all changes in this revision

Viewing changes to debian/patches/3-chrome-xid.patch

  • Committer: Chad MILLER
  • Date: 2015-04-17 00:17:26 UTC
  • Revision ID: chad.miller@canonical.com-20150417001726-dszj422xuq86ob42
* Upstream release 42.0.2311.90:
  - CVE-2015-1235: Cross-origin-bypass in HTML parser.
  - CVE-2015-1236: Cross-origin-bypass in Blink.
  - CVE-2015-1237: Use-after-free in IPC.
  - CVE-2015-1238: Out-of-bounds write in Skia.
  - CVE-2015-1240: Out-of-bounds read in WebGL.
  - CVE-2015-1241: Tap-Jacking.
  - CVE-2015-1242: Type confusion in V8.
  - CVE-2015-1244: HSTS bypass in WebSockets.
  - CVE-2015-1245: Use-after-free in PDFium.
  - CVE-2015-1247: Scheme issues in OpenSearch.
  - CVE-2015-1248: SafeBrowsing bypass.
* Upstream release 41.0.2272.118:
  - CVE-2015-1233: A special thanks to Anonymous for a combination of V8,
    Gamepad and IPC bugs that can lead to remote code execution outside of
    the sandbox. 
  - CVE-2015-1234: Buffer overflow via race condition in GPU.
* debian/chromium-browser-etc-customizations-flash-staleness: Ask sudo users
  to update flash player.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/3-chrome-xid.patch
1
1
--- a/chrome/browser/ui/views/frame/browser_frame.cc
2
2
+++ b/chrome/browser/ui/views/frame/browser_frame.cc
3
 
@@ -28,6 +28,7 @@
 
3
@@ -27,6 +27,7 @@
4
4
 #include "ui/gfx/screen.h"
5
5
 #include "ui/views/controls/menu/menu_runner.h"
6
6
 #include "ui/views/widget/native_widget.h"
8
8
 
9
9
 #if defined(OS_CHROMEOS)
10
10
 #include "ash/session/session_state_delegate.h"
11
 
@@ -133,6 +134,8 @@ views::View* BrowserFrame::GetFrameView(
 
11
@@ -126,6 +127,8 @@ views::View* BrowserFrame::GetFrameView(
12
12
   return browser_frame_view_;
13
13
 }
14
14
 
15
15
+void BrowserFrame::SendSessionIdToWindow() { }
16
16
+
17
17
 bool BrowserFrame::UseCustomFrame() const {
18
 
   return use_custom_frame_pref_.GetValue() &&
19
 
       browser_view_->IsBrowserTypeNormal();
 
18
   return native_browser_frame_->UseCustomFrame();
 
19
 }
20
20
--- a/chrome/browser/ui/views/frame/browser_frame.h
21
21
+++ b/chrome/browser/ui/views/frame/browser_frame.h
22
 
@@ -95,6 +95,8 @@ class BrowserFrame
 
22
@@ -94,6 +94,8 @@ class BrowserFrame
23
23
   void GetWindowPlacement(gfx::Rect* bounds,
24
24
                           ui::WindowShowState* show_state) const;
25
25
 
30
30
   views::NonClientFrameView* CreateNonClientFrameView() override;
31
31
--- a/chrome/browser/ui/views/frame/browser_view.cc
32
32
+++ b/chrome/browser/ui/views/frame/browser_view.cc
33
 
@@ -692,6 +692,7 @@ void BrowserView::Show() {
 
33
@@ -698,6 +698,7 @@ void BrowserView::Show() {
34
34
   force_location_bar_focus_ = false;
35
35
 
36
36
   browser()->OnWindowDidShow();
70
70
 }  // namespace client
71
71
--- a/ui/aura/window_tree_host_x11.cc
72
72
+++ b/ui/aura/window_tree_host_x11.cc
73
 
@@ -478,6 +478,26 @@ gfx::AcceleratedWidget WindowTreeHostX11
 
73
@@ -479,6 +479,26 @@ gfx::AcceleratedWidget WindowTreeHostX11
74
74
   return xwindow_;
75
75
 }
76
76
 
154
154
+
155
155
 #include "base/basictypes.h"
156
156
 #include "base/command_line.h"
157
 
 #include "base/debug/trace_event.h"
158
 
@@ -104,6 +106,7 @@ const char* kAtomsToCache[] = {
 
157
 #include "base/strings/stringprintf.h"
 
158
@@ -105,6 +107,7 @@ const char* kAtomsToCache[] = {
159
159
   "_NET_WM_WINDOW_TYPE_NORMAL",
160
160
   "_NET_WM_WINDOW_TYPE_NOTIFICATION",
161
161
   "_NET_WM_WINDOW_TYPE_TOOLTIP",
163
163
   "XdndActionAsk",
164
164
   "XdndActionCopy"
165
165
   "XdndActionLink",
166
 
@@ -1339,6 +1342,22 @@ void DesktopWindowTreeHostX11::UpdateMin
 
166
@@ -1341,6 +1344,22 @@ void DesktopWindowTreeHostX11::UpdateMin
167
167
   XSetWMNormalHints(xdisplay_, xwindow_, &hints);
168
168
 }
169
169