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 592551 f9605772a0c9098ed1bcaa98089b2c944ed69e9b
parent 592525 8c7211cc49637cec922b1d4b141a44c7007f9bb6 (current diff)
parent 592414 07b5b1e2ed4b665b6f01fc8a9d98faad65df5c21 (diff)
child 592552 2e3c7c758a3d08ccd58ad4f4359301d4f77af0ba
child 592563 595511de40a48e075194bbcfc3dd7432e79e4609
child 592564 be09f4a23f29b5c7ae506d66e82aeafcf26b3e9d
child 592570 12338631ccc4e25023d5628896d598b4e43af238
child 592585 7eba032317cba9c2f4de4c368051138c0aa70d2f
child 592613 3a1cbc0b96cdbcb5dd9693a08026b7293eb1dc16
child 592625 6a6b15d517843f21b99b0f1f21ecfdf3562419d2
child 592626 05ebb3889b8eed8c4074f6d15f3c2d2e39d48507
child 592630 74a69e001e7b8c26a90fc12fc4dbec3c64c5d789
child 592649 67037603735bdb983c66f85a3508392ba56b4e6d
child 592677 8c26b9a3f7d52bec91275f5f34480f538eea9944
child 592678 0ca833e1bdc0a4c8ac397c3fa5cee4d4c19e408d
child 592687 0c2a86f4b283c30c79457a3074bc6124697f5f92
child 592714 882cadd4041ba6991ce84d7c836cfec168e3320b
child 593355 42e75d50c28ff302624c04a494aa4882590a4441
child 593356 390d3bb992876feac0366bea9e73cd43bddd4d9d
child 593357 81ce070560b8b67493199f21cac0960f1fae04cd
child 593392 bb413d7ef12f2209fe8e7544da8df29bbc5d4b37
child 593399 e5c9a94ae64ce5da0f2b5e94a8ee6dd8a7945d4b
child 593450 309c9610925a5e546014d7444e1b9929a00b5e5a
child 593451 48623af68f7c7a5a767ff30968f2517d9709de7f
child 593452 1499a4da1fd4a7600dcccfb27460ebed951b1567
child 593477 fdf50fab6528112026c93a44e87487cb36490ccb
child 593479 a907fe4b039e0d756c3aa89be59fa8daede488ec
child 593484 e36054b3f62f94508d5bfdb64b415fe00c305aa4
child 593520 901ea4dc48ede305296224dbe3f99f13be1e288c
push id63431
push userbmo:jacheng@mozilla.com
push dateMon, 12 Jun 2017 12:38:14 +0000
reviewersmerge
milestone55.0a1
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();