← Back to branch summary

~saiarcot895/chromium-browser/chromium-browser.precise.dev

« back to all changes in this revision

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

  • Committer: Saikrishna Arcot
  • Date: 2016-05-22 15:32:23 UTC
  • Revision ID: saikrishna@saikrishna-vps-20160522153223-xhrwhn0v7ymcfax2
Tags: 52.0.2729.3-0ubuntu1~ppa6~12.04.1
* Try to bring back support for Precise.
* Add detection code to see if VP9 is available on the target system.

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
 
Index: beta.xenial/build/linux/system.gyp
 
5
Index: dev.xenial/build/linux/system.gyp
6
6
===================================================================
7
 
--- beta.xenial.orig/build/linux/system.gyp
8
 
+++ beta.xenial/build/linux/system.gyp
 
7
--- dev.xenial.orig/build/linux/system.gyp
 
8
+++ dev.xenial/build/linux/system.gyp
9
9
@@ -34,7 +34,12 @@
10
10
       'g_settings_get_boolean',
11
11
       'g_settings_get_int',
19
19
     ],
20
20
     'libpci_functions': [
21
21
       'pci_alloc',
22
 
Index: beta.xenial/ui/views/views.gyp
23
 
===================================================================
24
 
--- beta.xenial.orig/ui/views/views.gyp
25
 
+++ beta.xenial/ui/views/views.gyp
26
 
@@ -736,6 +736,7 @@
 
22
Index: dev.xenial/ui/views/BUILD.gn
 
23
===================================================================
 
24
--- dev.xenial.orig/ui/views/BUILD.gn
 
25
+++ dev.xenial/ui/views/BUILD.gn
 
26
@@ -270,6 +270,7 @@ test("views_unittests") {
 
27
       "//ui/events/devices",
 
28
       "//ui/events/platform/x11",
 
29
       "//ui/gfx/x",
 
30
+      "//build/linux:gio",
 
31
     ]
 
32
   }
 
33
 
 
34
Index: dev.xenial/ui/views/views.gyp
 
35
===================================================================
 
36
--- dev.xenial.orig/ui/views/views.gyp
 
37
+++ dev.xenial/ui/views/views.gyp
 
38
@@ -764,6 +764,7 @@
27
39
           'dependencies': [
28
40
             '../../build/linux/system.gyp:x11',
29
41
             '../../build/linux/system.gyp:xrandr',
30
42
+            '../../build/linux/system.gyp:gio',
31
43
             '../events/devices/events_devices.gyp:events_devices',
32
 
             '../events/platform/x11/x11_events_platform.gyp:x11_events_platform',
33
 
             '../gfx/x/gfx_x11.gyp:gfx_x11',
34
 
Index: beta.xenial/ui/views/widget/desktop_aura/desktop_screen_x11.cc
 
44
             '../events/devices/x11/events_devices_x11.gyp:events_devices_x11',
 
45
             '../events/keycodes/events_keycodes.gyp:keycodes_x11',
 
46
Index: dev.xenial/ui/views/widget/desktop_aura/desktop_screen_x11.cc
35
47
===================================================================
36
 
--- beta.xenial.orig/ui/views/widget/desktop_aura/desktop_screen_x11.cc
37
 
+++ beta.xenial/ui/views/widget/desktop_aura/desktop_screen_x11.cc
 
48
--- dev.xenial.orig/ui/views/widget/desktop_aura/desktop_screen_x11.cc
 
49
+++ dev.xenial/ui/views/widget/desktop_aura/desktop_screen_x11.cc
38
50
@@ -7,7 +7,12 @@
39
51
 #include <X11/extensions/Xrandr.h>
40
52
 #include <X11/Xlib.h>
49
61
 #undef RootWindow
50
62
 
51
63
 #include "base/logging.h"
52
 
@@ -282,6 +287,29 @@ std::vector<gfx::Display> DesktopScreenX
 
64
@@ -298,6 +303,29 @@ std::vector<gfx::Display> DesktopScreenX
53
65
     return GetFallbackDisplayList();
54
66
   }
55
67
 
79
91
   bool has_work_area = false;
80
92
   gfx::Rect work_area_in_pixels;
81
93
   std::vector<int> value;
82
 
@@ -293,7 +321,7 @@ std::vector<gfx::Display> DesktopScreenX
 
94
@@ -309,7 +337,7 @@ std::vector<gfx::Display> DesktopScreenX
83
95
 
84
96
   // As per-display scale factor is not supported right now,
85
97
   // the X11 root window's scale factor is always used.
88
100
   for (int i = 0; i < resources->noutput; ++i) {
89
101
     RROutput output_id = resources->outputs[i];
90
102
     gfx::XScopedPtr<XRROutputInfo,
91
 
@@ -319,7 +347,27 @@ std::vector<gfx::Display> DesktopScreenX
 
103
@@ -336,7 +364,27 @@ std::vector<gfx::Display> DesktopScreenX
92
104
       gfx::Rect crtc_bounds(crtc->x, crtc->y, crtc->width, crtc->height);
93
105
       gfx::Display display(display_id, crtc_bounds);
94
106