Title: [188010] trunk/Source
- Revision
- 188010
- Author
- timothy_hor...@apple.com
- Date
- 2015-08-05 17:26:43 -0700 (Wed, 05 Aug 2015)
Log Message
Try to fix the build
* WebIconDatabase.h:
* Modules/webdatabase/Database.cpp:
(WebCore::Database::performOpenAndVerify):
* Modules/webdatabase/Database.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (188009 => 188010)
--- trunk/Source/WebCore/ChangeLog 2015-08-06 00:02:55 UTC (rev 188009)
+++ trunk/Source/WebCore/ChangeLog 2015-08-06 00:26:43 UTC (rev 188010)
@@ -1,3 +1,11 @@
+2015-08-05 Tim Horton <timothy_hor...@apple.com>
+
+ Try to fix the build
+
+ * Modules/webdatabase/Database.cpp:
+ (WebCore::Database::performOpenAndVerify):
+ * Modules/webdatabase/Database.h:
+
2015-08-05 Myles C. Maxfield <mmaxfi...@apple.com>
Delete duplicate forward-declaration
Modified: trunk/Source/WebCore/Modules/webdatabase/Database.cpp (188009 => 188010)
--- trunk/Source/WebCore/Modules/webdatabase/Database.cpp 2015-08-06 00:02:55 UTC (rev 188009)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.cpp 2015-08-06 00:26:43 UTC (rev 188010)
@@ -320,7 +320,7 @@
#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
Modified: trunk/Source/WebCore/Modules/webdatabase/Database.h (188009 => 188010)
--- trunk/Source/WebCore/Modules/webdatabase/Database.h 2015-08-06 00:02:55 UTC (rev 188009)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.h 2015-08-06 00:26:43 UTC (rev 188010)
@@ -139,7 +139,7 @@
#endif
Deque<RefPtr<SQLTransactionBackend>> m_transactionQueue;
- DeprecatedMutex m_transactionInProgressMutex;
+ Mutex m_transactionInProgressMutex;
bool m_transactionInProgress;
bool m_isTransactionQueueEnabled;
Modified: trunk/Source/WebKit/win/ChangeLog (188009 => 188010)
--- trunk/Source/WebKit/win/ChangeLog 2015-08-06 00:02:55 UTC (rev 188009)
+++ trunk/Source/WebKit/win/ChangeLog 2015-08-06 00:26:43 UTC (rev 188010)
@@ -1,3 +1,9 @@
+2015-08-05 Tim Horton <timothy_hor...@apple.com>
+
+ Try to fix the build
+
+ * WebIconDatabase.h:
+
2015-08-05 Brent Fulgham <bfulg...@apple.com>
[Win] Allow display of mixed content on Windows by default
Modified: trunk/Source/WebKit/win/WebIconDatabase.h (188009 => 188010)
--- trunk/Source/WebKit/win/WebIconDatabase.h 2015-08-06 00:02:55 UTC (rev 188009)
+++ trunk/Source/WebKit/win/WebIconDatabase.h 2015-08-06 00:26:43 UTC (rev 188010)
@@ -116,7 +116,7 @@
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;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
