Try to fix the build
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 6 Aug 2015 00:26:43 +0000 (00:26 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 6 Aug 2015 00:26:43 +0000 (00:26 +0000)
* WebIconDatabase.h:

* Modules/webdatabase/Database.cpp:
(WebCore::Database::performOpenAndVerify):
* Modules/webdatabase/Database.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@188010 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/Modules/webdatabase/Database.cpp
Source/WebCore/Modules/webdatabase/Database.h
Source/WebKit/win/ChangeLog
Source/WebKit/win/WebIconDatabase.h

index 8bacfc4..927b3a7 100644 (file)
@@ -1,3 +1,11 @@
+2015-08-05  Tim Horton  <timothy_horton@apple.com>
+
+        Try to fix the build
+
+        * Modules/webdatabase/Database.cpp:
+        (WebCore::Database::performOpenAndVerify):
+        * Modules/webdatabase/Database.h:
+
 2015-08-05  Myles C. Maxfield  <mmaxfield@apple.com>
 
         Delete duplicate forward-declaration
index ce8eac5..8c1208d 100644 (file)
@@ -320,7 +320,7 @@ bool Database::performOpenAndVerify(bool shouldSetVersionInNewDatabase, Database
 #if PLATFORM(IOS)
     {
         // Make sure we wait till the background removal of the empty database files finished before trying to open any database.
-        DeprecatedMutexLocker locker(DatabaseTracker::openDatabaseMutex());
+        MutexLocker locker(DatabaseTracker::openDatabaseMutex());
     }
 #endif
 
index 3ab313e..0a8484e 100644 (file)
@@ -139,7 +139,7 @@ private:
 #endif
 
     Deque<RefPtr<SQLTransactionBackend>> m_transactionQueue;
-    DeprecatedMutex m_transactionInProgressMutex;
+    Mutex m_transactionInProgressMutex;
     bool m_transactionInProgress;
     bool m_isTransactionQueueEnabled;
 
index 0a9b942..9a5ee6f 100644 (file)
@@ -1,3 +1,9 @@
+2015-08-05  Tim Horton  <timothy_horton@apple.com>
+
+        Try to fix the build
+
+        * WebIconDatabase.h:
+
 2015-08-05  Brent Fulgham  <bfulgham@apple.com>
 
         [Win] Allow display of mixed content on Windows by default
index bd97612..ee52b00 100644 (file)
@@ -116,7 +116,7 @@ protected:
     HashMap<IntSize, HBITMAP> m_defaultIconMap;
     HashMap<IntSize, HBITMAP> m_sharedIconMap;
 
-    DeprecatedMutex m_notificationMutex;
+    Mutex m_notificationMutex;
     Vector<String> m_notificationQueue;
     void scheduleNotificationDelivery();
     bool m_deliveryRequested;