Title: [127028] trunk/Tools
- Revision
- 127028
- Author
- jon...@apple.com
- Date
- 2012-08-29 12:23:45 -0700 (Wed, 29 Aug 2012)
Log Message
WTR build fixes.
* WebKitTestRunner/CMakeLists.txt:
* WebKitTestRunner/GNUmakefile.am:
* WebKitTestRunner/Target.pri:
* WebKitTestRunner/WebNotificationProvider.cpp:
(WTR::WebNotificationProvider::showWebNotification): Make ML happier.
* WebKitTestRunner/win/WebKitTestRunner.vcproj:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (127027 => 127028)
--- trunk/Tools/ChangeLog 2012-08-29 19:16:14 UTC (rev 127027)
+++ trunk/Tools/ChangeLog 2012-08-29 19:23:45 UTC (rev 127028)
@@ -1,5 +1,16 @@
2012-08-29 Jon Lee <jon...@apple.com>
+ WTR build fixes.
+
+ * WebKitTestRunner/CMakeLists.txt:
+ * WebKitTestRunner/GNUmakefile.am:
+ * WebKitTestRunner/Target.pri:
+ * WebKitTestRunner/WebNotificationProvider.cpp:
+ (WTR::WebNotificationProvider::showWebNotification): Make ML happier.
+ * WebKitTestRunner/win/WebKitTestRunner.vcproj:
+
+2012-08-29 Jon Lee <jon...@apple.com>
+
[WK2] Basic WTR support for web notifications
https://bugs.webkit.org/show_bug.cgi?id=95154
<rdar://problem/12184492>
Modified: trunk/Tools/WebKitTestRunner/CMakeLists.txt (127027 => 127028)
--- trunk/Tools/WebKitTestRunner/CMakeLists.txt 2012-08-29 19:16:14 UTC (rev 127027)
+++ trunk/Tools/WebKitTestRunner/CMakeLists.txt 2012-08-29 19:23:45 UTC (rev 127028)
@@ -8,6 +8,7 @@
${WEBKIT_TESTRUNNER_DIR}/PixelDumpSupport.cpp
${WEBKIT_TESTRUNNER_DIR}/TestController.cpp
${WEBKIT_TESTRUNNER_DIR}/TestInvocation.cpp
+ ${WEBKIT_TESTRUNNER_DIR}/WebNotificationProvider.cpp
)
SET(WebKitTestRunner_LIBRARIES
Modified: trunk/Tools/WebKitTestRunner/GNUmakefile.am (127027 => 127028)
--- trunk/Tools/WebKitTestRunner/GNUmakefile.am 2012-08-29 19:16:14 UTC (rev 127027)
+++ trunk/Tools/WebKitTestRunner/GNUmakefile.am 2012-08-29 19:23:45 UTC (rev 127028)
@@ -27,6 +27,8 @@
Tools/WebKitTestRunner/TestController.h \
Tools/WebKitTestRunner/TestInvocation.cpp \
Tools/WebKitTestRunner/TestInvocation.h \
+ Tools/WebKitTestRunner/WebNotificationProvider.cpp \
+ Tools/WebKitTestRunner/WebNotificationProvider.h \
Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h
Programs_WebKitTestRunner_CPPFLAGS = \
Modified: trunk/Tools/WebKitTestRunner/Target.pri (127027 => 127028)
--- trunk/Tools/WebKitTestRunner/Target.pri 2012-08-29 19:16:14 UTC (rev 127027)
+++ trunk/Tools/WebKitTestRunner/Target.pri 2012-08-29 19:23:45 UTC (rev 127028)
@@ -13,7 +13,8 @@
PlatformWebView.h \
StringFunctions.h \
TestController.h \
- TestInvocation.h
+ TestInvocation.h \
+ WebNotificationProvider.h
SOURCES += \
$${ROOT_WEBKIT_DIR}/Tools/DumpRenderTree/qt/QtInitializeTestFonts.cpp \
@@ -23,7 +24,8 @@
qt/TestControllerQt.cpp \
qt/TestInvocationQt.cpp \
TestController.cpp \
- TestInvocation.cpp
+ TestInvocation.cpp \
+ WebNotificationProvider.cpp
DESTDIR = $${ROOT_BUILD_DIR}/bin
Modified: trunk/Tools/WebKitTestRunner/WebNotificationProvider.cpp (127027 => 127028)
--- trunk/Tools/WebKitTestRunner/WebNotificationProvider.cpp 2012-08-29 19:16:14 UTC (rev 127027)
+++ trunk/Tools/WebKitTestRunner/WebNotificationProvider.cpp 2012-08-29 19:23:45 UTC (rev 127028)
@@ -85,8 +85,8 @@
return;
uint64_t id = WKNotificationGetID(notification);
- HashSet<uint64_t>::AddResult result = m_shownNotifications.add(id);
- ASSERT(result.isNewEntry);
+ ASSERT(!m_shownNotifications.contains(id));
+ m_shownNotifications.add(id);
WKNotificationManagerProviderDidShowNotification(m_notificationManager.get(), WKNotificationGetID(notification));
}
Modified: trunk/Tools/WebKitTestRunner/win/WebKitTestRunner.vcproj (127027 => 127028)
--- trunk/Tools/WebKitTestRunner/win/WebKitTestRunner.vcproj 2012-08-29 19:16:14 UTC (rev 127027)
+++ trunk/Tools/WebKitTestRunner/win/WebKitTestRunner.vcproj 2012-08-29 19:23:45 UTC (rev 127028)
@@ -507,6 +507,14 @@
>
</File>
<File
+ RelativePath="..\WebNotificationProvider.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\WebNotificationProvider.h"
+ >
+ </File>
+ <File
RelativePath="..\WebKitTestRunnerPrefix.h"
>
</File>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
