Title: [129789] trunk/Source/WebKit2
- Revision
- 129789
- Author
- ma...@webkit.org
- Date
- 2012-09-27 12:24:13 -0700 (Thu, 27 Sep 2012)
Log Message
[WK2] IconDatabase: Add a way to notify when icon data is available
https://bugs.webkit.org/show_bug.cgi?id=63945
Rubber stamped by Anders Carlsson.
Update version of WKIconDatabaseClient and API traits.
* Shared/APIClientTraits.cpp:
(WebKit):
* Shared/APIClientTraits.h:
* UIProcess/API/C/WKIconDatabase.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (129788 => 129789)
--- trunk/Source/WebKit2/ChangeLog 2012-09-27 19:24:09 UTC (rev 129788)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-27 19:24:13 UTC (rev 129789)
@@ -1,3 +1,17 @@
+2012-09-27 Mario Sanchez Prada <msanc...@igalia.com>
+
+ [WK2] IconDatabase: Add a way to notify when icon data is available
+ https://bugs.webkit.org/show_bug.cgi?id=63945
+
+ Rubber stamped by Anders Carlsson.
+
+ Update version of WKIconDatabaseClient and API traits.
+
+ * Shared/APIClientTraits.cpp:
+ (WebKit):
+ * Shared/APIClientTraits.h:
+ * UIProcess/API/C/WKIconDatabase.h:
+
2012-09-27 Balazs Kelemen <kbal...@webkit.org>
[Qt][WK2] REGRESSION(r128980): It broke all QRawWebView API test
Modified: trunk/Source/WebKit2/Shared/APIClientTraits.cpp (129788 => 129789)
--- trunk/Source/WebKit2/Shared/APIClientTraits.cpp 2012-09-27 19:24:09 UTC (rev 129788)
+++ trunk/Source/WebKit2/Shared/APIClientTraits.cpp 2012-09-27 19:24:13 UTC (rev 129789)
@@ -86,4 +86,9 @@
sizeof(WKContextInjectedBundleClient)
};
+const size_t APIClientTraits<WKIconDatabaseClient>::interfaceSizesByVersion[] = {
+ offsetof(WKIconDatabaseClient, iconDataReadyForPageURL),
+ sizeof(WKIconDatabaseClient)
+};
+
} // namespace WebKit
Modified: trunk/Source/WebKit2/Shared/APIClientTraits.h (129788 => 129789)
--- trunk/Source/WebKit2/Shared/APIClientTraits.h 2012-09-27 19:24:09 UTC (rev 129788)
+++ trunk/Source/WebKit2/Shared/APIClientTraits.h 2012-09-27 19:24:13 UTC (rev 129789)
@@ -29,6 +29,7 @@
#include "WKBundle.h"
#include "WKBundlePage.h"
#include "WKContext.h"
+#include "WKIconDatabase.h"
#include "WKPage.h"
namespace WebKit {
@@ -78,6 +79,10 @@
static const size_t interfaceSizesByVersion[2];
};
+template<> struct APIClientTraits<WKIconDatabaseClient> {
+ static const size_t interfaceSizesByVersion[2];
+};
+
} // namespace WebKit
#endif // APIClientTraits_h
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.h (129788 => 129789)
--- trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.h 2012-09-27 19:24:09 UTC (rev 129788)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.h 2012-09-27 19:24:13 UTC (rev 129789)
@@ -40,13 +40,17 @@
struct WKIconDatabaseClient {
int version;
const void * clientInfo;
+
+ // Version 0
WKIconDatabaseDidChangeIconForPageURLCallback didChangeIconForPageURL;
WKIconDatabaseDidRemoveAllIconsCallback didRemoveAllIcons;
+
+ // Version 1
WKIconDatabaseIconDataReadyForPageURLCallback iconDataReadyForPageURL;
};
typedef struct WKIconDatabaseClient WKIconDatabaseClient;
-enum { kWKIconDatabaseClientCurrentVersion = 0 };
+enum { kWKIconDatabaseClientCurrentVersion = 1 };
WK_EXPORT WKTypeID WKIconDatabaseGetTypeID();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes