Merge pull request #1035 from laniakea64/v68-regressions-56

v68: regressions from Waterfox 56
BrowserWorks · Jun 24, 2019 · c15a7ea · c15a7ea
2 parents 2d33c8f + d3ae4bd
commit c15a7ea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/dom/encoding/FallbackEncoding.cpp b/dom/encoding/FallbackEncoding.cpp
@@ -71,8 +71,7 @@ NotNull<const Encoding*> FallbackEncoding::Get() {
   // Don't let the user break things by setting the override to unreasonable
   // values via about:config
   auto encoding = Encoding::ForLabel(override);
-  if (!encoding || !encoding->IsAsciiCompatible() ||
-      encoding == UTF_8_ENCODING) {
+  if (!encoding || !encoding->IsAsciiCompatible()) {
     mFallback = nullptr;
   } else {
     mFallback = encoding;

diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
@@ -5293,12 +5293,10 @@ static GdkCursor* get_gtk_cursor(nsCursor aCursor) {
       if (!gdkcursor) newType = MOZ_CURSOR_SPINNING;
       break;
     case eCursor_zoom_in:
-      gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "zoom-in");
-      if (!gdkcursor) newType = MOZ_CURSOR_ZOOM_IN;
+      newType = MOZ_CURSOR_ZOOM_IN;
       break;
     case eCursor_zoom_out:
-      gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "zoom-out");
-      if (!gdkcursor) newType = MOZ_CURSOR_ZOOM_OUT;
+      newType = MOZ_CURSOR_ZOOM_OUT;
       break;
     case eCursor_not_allowed:
       gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "not-allowed");