Title: [206768] trunk/Source/WebKit2
- Revision
- 206768
- Author
- [email protected]
- Date
- 2016-10-04 06:49:38 -0700 (Tue, 04 Oct 2016)
Log Message
Unreviewed GTK+ build fix.
* UIProcess/API/C/WKPage.cpp:
(WKPageSetPageNavigationClient): Guard the call to getDefaultWebCryptoMasterKey()
with ENABLE(SUBTLE_CRYPTO), since the same guard is used for the definition. Fixes
GTK+ production builds where the feature is disabled.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (206767 => 206768)
--- trunk/Source/WebKit2/ChangeLog 2016-10-04 09:19:48 UTC (rev 206767)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-04 13:49:38 UTC (rev 206768)
@@ -1,3 +1,12 @@
+2016-10-04 Zan Dobersek <[email protected]>
+
+ Unreviewed GTK+ build fix.
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageNavigationClient): Guard the call to getDefaultWebCryptoMasterKey()
+ with ENABLE(SUBTLE_CRYPTO), since the same guard is used for the definition. Fixes
+ GTK+ production builds where the feature is disabled.
+
2016-10-03 Keith Rollin <[email protected]>
More logging to diagnose "WebKit encountered an internal error" messages
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (206767 => 206768)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2016-10-04 09:19:48 UTC (rev 206767)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2016-10-04 13:49:38 UTC (rev 206768)
@@ -2327,8 +2327,10 @@
return adoptRef(toImpl(m_client.copyWebCryptoMasterKey(toAPI(&page), m_client.base.clientInfo)));
Vector<uint8_t> masterKey;
+#if ENABLE(SUBTLE_CRYPTO)
if (!getDefaultWebCryptoMasterKey(masterKey))
return nullptr;
+#endif
return API::Data::create(masterKey.data(), masterKey.size());
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
