diff options
author | Konstantin Tokarev <annulen@yandex.ru> | 2016-09-28 16:39:37 +0300 |
---|---|---|
committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-02-02 12:31:01 +0000 |
commit | 9daf1655d7e4eaaa6ed5f44055a4b4fd399fd25c (patch) | |
tree | 322337ad0acbc75732f916376ec6d36e7ec0e5bc /Tools/TestWebKitAPI | |
parent | 6882a04fb36642862b11efe514251d32070c3d65 (diff) | |
download | qtwebkit-9daf1655d7e4eaaa6ed5f44055a4b4fd399fd25c.tar.gz |
Imported WebKit commit eb954cdcf58f9b915b2fcb6f8e4cb3a60650a4f3
Change-Id: I8dda875c38075d43b76fe3a21acb0ffa102bb82d
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Tools/TestWebKitAPI')
-rw-r--r-- | Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageNullEntries.html | 6 | ||||
-rw-r--r-- | Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageNullEntries.localstorage | bin | 0 -> 12288 bytes | |||
-rw-r--r-- | Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageNullEntries.localstorage-shm | bin | 0 -> 32768 bytes | |||
-rw-r--r-- | Tools/TestWebKitAPI/qt/PlatformUtilitiesQt.cpp | 6 | ||||
-rw-r--r-- | Tools/TestWebKitAPI/qt/PlatformWebViewQt.cpp | 2 |
5 files changed, 10 insertions, 4 deletions
diff --git a/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageNullEntries.html b/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageNullEntries.html new file mode 100644 index 000000000..9878f36ac --- /dev/null +++ b/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageNullEntries.html @@ -0,0 +1,6 @@ +<script> + +window.localStorage.key(0); +window.webkit.messageHandlers.testHandler.postMessage('DONE'); + +</script> diff --git a/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageNullEntries.localstorage b/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageNullEntries.localstorage Binary files differnew file mode 100644 index 000000000..0b41b25c7 --- /dev/null +++ b/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageNullEntries.localstorage diff --git a/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageNullEntries.localstorage-shm b/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageNullEntries.localstorage-shm Binary files differnew file mode 100644 index 000000000..fe9ac2845 --- /dev/null +++ b/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageNullEntries.localstorage-shm diff --git a/Tools/TestWebKitAPI/qt/PlatformUtilitiesQt.cpp b/Tools/TestWebKitAPI/qt/PlatformUtilitiesQt.cpp index b210a4a1d..6b67622b7 100644 --- a/Tools/TestWebKitAPI/qt/PlatformUtilitiesQt.cpp +++ b/Tools/TestWebKitAPI/qt/PlatformUtilitiesQt.cpp @@ -21,9 +21,9 @@ #include "config.h" #include "PlatformUtilities.h" -#include <WebKit2/WKStringQt.h> -#include <WebKit2/WKNativeEvent.h> -#include <WebKit2/WKURLQt.h> +#include <WebKit/WKNativeEvent.h> +#include <WebKit/WKStringQt.h> +#include <WebKit/WKURLQt.h> #include <QCoreApplication> #include <QDir> diff --git a/Tools/TestWebKitAPI/qt/PlatformWebViewQt.cpp b/Tools/TestWebKitAPI/qt/PlatformWebViewQt.cpp index 17c786e8e..553462285 100644 --- a/Tools/TestWebKitAPI/qt/PlatformWebViewQt.cpp +++ b/Tools/TestWebKitAPI/qt/PlatformWebViewQt.cpp @@ -31,7 +31,7 @@ #include "qquickwebpage_p.h" #include "qquickwebview_p.h" -#include <WebKit2/WKRetainPtr.h> +#include <WebKit/WKRetainPtr.h> #include <QCoreApplication> #include <QEventLoop> |