← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/gsettings-display-scaling

  • 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/gsettings-display-scaling
2
2
Author: Chad MILLER <chad.miller@canonical.com>
3
3
Forwarded: yes
4
4
 
 
5
--- a/build/linux/system.gyp
 
6
+++ b/build/linux/system.gyp
 
7
@@ -42,7 +42,12 @@
 
8
       'g_settings_get_boolean',
 
9
       'g_settings_get_int',
 
10
       'g_settings_get_strv',
 
11
+      'g_settings_new_full',
 
12
       'g_settings_list_schemas',
 
13
+      'g_settings_schema_source_get_default',
 
14
+      'g_settings_schema_source_lookup',
 
15
+      'g_settings_get',
 
16
+      'g_variant_lookup',
 
17
     ],
 
18
     'libpci_functions': [
 
19
       'pci_alloc',
5
20
--- a/ui/views/widget/desktop_aura/desktop_screen_x11.cc
6
21
+++ b/ui/views/widget/desktop_aura/desktop_screen_x11.cc
7
22
@@ -7,7 +7,12 @@
17
32
+// It clashes with our RootWindow.
18
33
 #undef RootWindow
19
34
 
20
 
 #include "base/debug/trace_event.h"
 
35
 #include "base/logging.h"
21
36
@@ -266,6 +271,29 @@ std::vector<gfx::Display> DesktopScreenX
22
37
     return GetFallbackDisplayList();
23
38
   }