merge mozilla-inbound to mozilla-central a=merge FIREFOX_BETA_55_BASE
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 12 Jun 2017 13:16:36 +0200
changeset 363444 f9605772a0c9
parent 363439 8c7211cc4963 (current diff)
parent 363443 07b5b1e2ed4b (diff)
child 363445 3a1cbc0b96cd
push id32012
push usercbook@mozilla.com
push date2017-06-12 11:16 +0000
treeherdermozilla-central@f9605772a0c9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
merge mozilla-inbound to mozilla-central a=merge
--- a/netwerk/cookie/nsCookieService.cpp
+++ b/netwerk/cookie/nsCookieService.cpp
@@ -1469,20 +1469,16 @@ nsCookieService::TryInitDB(bool aRecreat
 
         rv = CreateTable();
         NS_ENSURE_SUCCESS(rv, RESULT_RETRY);
       }
       break;
     }
   }
 
-  // make operations on the table asynchronous, for performance
-  mDefaultDBState->dbConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
-    "PRAGMA synchronous = OFF"));
-
   // Use write-ahead-logging for performance. We cap the autocheckpoint limit at
   // 16 pages (around 500KB).
   mDefaultDBState->dbConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
     MOZ_STORAGE_UNIQUIFY_QUERY_STR "PRAGMA journal_mode = WAL"));
   mDefaultDBState->dbConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
     "PRAGMA wal_autocheckpoint = 16"));
 
   // cache frequently used statements (for insertion, deletion, and updating)
--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
@@ -5237,16 +5237,20 @@ nsWindow::ProcessMessage(UINT msg, WPARA
         clientRect->top +=
           NSToIntRound((mCaptionHeight - mNonClientOffset.top) * scale);
         clientRect->left +=
           NSToIntRound((mHorResizeMargin - mNonClientOffset.left) * scale);
         clientRect->right -=
           NSToIntRound((mHorResizeMargin - mNonClientOffset.right) * scale);
         clientRect->bottom -=
           NSToIntRound((mVertResizeMargin - mNonClientOffset.bottom) * scale);
+        // Make client rect's width and height more than 0 to
+        // avoid problems of webrender and angle.
+        clientRect->right = std::max(clientRect->right, clientRect->left + 1);
+        clientRect->bottom = std::max(clientRect->bottom, clientRect->top + 1);
 
         result = true;
         *aRetValue = 0;
       }
       break;
     }
 
     case WM_NCHITTEST:
@@ -5392,16 +5396,17 @@ nsWindow::ProcessMessage(UINT msg, WPARA
     case WM_CLOSE: // close request
       if (mWidgetListener)
         mWidgetListener->RequestWindowClose(this);
       result = true; // abort window closure
       break;
 
     case WM_DESTROY:
       // clean up.
+      DestroyLayerManager();
       OnDestroy();
       result = true;
       break;
 
     case WM_PAINT:
       if (CleartypeSettingChanged()) {
         ForceFontUpdate();
         gfxFontCache *fc = gfxFontCache::GetCache();