diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-12-16 10:40:46 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-16 10:49:02 +0100 |
| commit | df8eff9b1e457fe0783cc6022bf7c21f5381afbb (patch) | |
| tree | 62d282de99c1409d13612cf6ab85972188cb3409 /patches/0001-Hide-the-definition-of-MessagePumpGtk-GetDefaultXDis.patch | |
| parent | 0dd71c40535335affe93bbde0543b81be796f03e (diff) | |
Revert "Update chromium patches to apply on current stable (1650)"
Let's make sure that the submodule integration succeeds first.
This reverts commit 6aa4bb60d7d10e50cb562756ef8210f559b35d1e.
Change-Id: I5c9b81654296b3a8a240118f9af222b12dd2ecc4
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'patches/0001-Hide-the-definition-of-MessagePumpGtk-GetDefaultXDis.patch')
| -rw-r--r-- | patches/0001-Hide-the-definition-of-MessagePumpGtk-GetDefaultXDis.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/0001-Hide-the-definition-of-MessagePumpGtk-GetDefaultXDis.patch b/patches/0001-Hide-the-definition-of-MessagePumpGtk-GetDefaultXDis.patch index 3fdf76b20..20b614d56 100644 --- a/patches/0001-Hide-the-definition-of-MessagePumpGtk-GetDefaultXDis.patch +++ b/patches/0001-Hide-the-definition-of-MessagePumpGtk-GetDefaultXDis.patch @@ -8,10 +8,10 @@ Subject: [PATCH] Hide the definition of MessagePumpGtk::GetDefaultXDisplay. 1 file changed, 4 insertions(+) diff --git a/base/message_loop/message_pump_gtk.cc b/base/message_loop/message_pump_gtk.cc -index 86d2415..6023c11 100644 +index ad65113..af59685 100644 --- a/base/message_loop/message_pump_gtk.cc +++ b/base/message_loop/message_pump_gtk.cc -@@ -79,6 +79,9 @@ void MessagePumpGtk::DispatchEvents(GdkEvent* event) { +@@ -85,6 +85,9 @@ void MessagePumpGtk::DispatchEvents(GdkEvent* event) { DidProcessEvent(event); } @@ -21,14 +21,14 @@ index 86d2415..6023c11 100644 // static Display* MessagePumpGtk::GetDefaultXDisplay() { static GdkDisplay* display = gdk_display_get_default(); -@@ -90,6 +93,7 @@ Display* MessagePumpGtk::GetDefaultXDisplay() { +@@ -96,6 +99,7 @@ Display* MessagePumpGtk::GetDefaultXDisplay() { } return GDK_DISPLAY_XDISPLAY(display); } +*/ - void MessagePumpGtk::AddObserver(MessagePumpGdkObserver* observer) { - observers_.AddObserver(observer); + void MessagePumpGtk::WillProcessEvent(GdkEvent* event) { + FOR_EACH_OBSERVER(MessagePumpObserver, observers(), WillProcessEvent(event)); -- -1.8.4.2 +1.8.4 |