Added fix for mozbz#1497534 - titlebar appearance during D&D, Added fix for mozbz#1502457- disable Contextual Feature Recommender/shield studies by default.

1 files changed, 28 insertions, 0 deletions

diff --git a/mozilla-1497534.patch b/mozilla-1497534.patch
new file mode 100644
index 0000000..066c919
--- /dev/null
+++ b/mozilla-1497534.patch
@@ -0,0 +1,28 @@
+diff --git a/widget/gtk/nsWindow.h b/widget/gtk/nsWindow.h
+--- a/widget/gtk/nsWindow.h
++++ b/widget/gtk/nsWindow.h
+@@ -287,6 +287,7 @@
+     // descendant windows
+     GtkWidget*         GetMozContainerWidget();
+     GdkWindow*         GetGdkWindow() { return mGdkWindow; }
++    GtkWidget*         GetGtkWidget() { return mShell; }
+     bool               IsDestroyed() { return mIsDestroyed; }
+ 
+     void               DispatchDragEvent(mozilla::EventMessage aMsg,
+diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
+--- a/widget/gtk/nsWindow.cpp
++++ b/widget/gtk/nsWindow.cpp
+@@ -7480,5 +7480,10 @@
+       }
+   }
+ 
+-  return (gFocusWindow == window);
+-}
++  GtkWidget* widget = window->GetGtkWidget();
++  if (widget) {
++      return !(gtk_widget_get_state_flags(widget) & GTK_STATE_FLAG_BACKDROP);
++  }
++
++  return false;
++}
+