Title: [104228] branches/safari-534.54-branch/Source/WebKit/win
Diff
Modified: branches/safari-534.54-branch/Source/WebKit/win/ChangeLog (104227 => 104228)
--- branches/safari-534.54-branch/Source/WebKit/win/ChangeLog 2012-01-05 22:55:24 UTC (rev 104227)
+++ branches/safari-534.54-branch/Source/WebKit/win/ChangeLog 2012-01-05 22:58:30 UTC (rev 104228)
@@ -1,3 +1,23 @@
+2011-1-5 Lucas Forschler <[email protected]>
+
+ Merge 103479
+
+ 2011-12-21 Jessie Berlin <[email protected]>
+
+ Expose to Windows the way to allow a scheme access to Local Storage and Databases while
+ Private Browsing is enabled.
+ https://bugs.webkit.org/show_bug.cgi?id=75056
+
+ Reviewed by Sam Weinig.
+
+ Add the Windows WebKit API that corresponds to the Mac one added in r99439.
+
+ * WebView.cpp:
+ (WebView::registerURLSchemeAsSecure):
+ (WebView::registerURLSchemeAsAllowingLocalStorageAccessInPrivateBrowsing):
+ (WebView::registerURLSchemeAsAllowingDatabaseAccessInPrivateBrowsing):
+ * WebView.h:
+
2011-12-21 Oliver Hunt <[email protected]>
Merged _javascript_Core and related changes from r99898-r102985
Modified: branches/safari-534.54-branch/Source/WebKit/win/WebView.cpp (104227 => 104228)
--- branches/safari-534.54-branch/Source/WebKit/win/WebView.cpp 2012-01-05 22:55:24 UTC (rev 104227)
+++ branches/safari-534.54-branch/Source/WebKit/win/WebView.cpp 2012-01-05 22:58:30 UTC (rev 104228)
@@ -6586,6 +6586,18 @@
return S_OK;
}
+HRESULT WebView::registerURLSchemeAsAllowingLocalStorageAccessInPrivateBrowsing(BSTR scheme)
+{
+ SchemeRegistry::registerURLSchemeAsAllowingLocalStorageAccessInPrivateBrowsing(toString(scheme));
+ return S_OK;
+}
+
+HRESULT WebView::registerURLSchemeAsAllowingDatabaseAccessInPrivateBrowsing(BSTR scheme)
+{
+ SchemeRegistry::registerURLSchemeAsAllowingDatabaseAccessInPrivateBrowsing(toString(scheme));
+ return S_OK;
+}
+
HRESULT WebView::nextDisplayIsSynchronous()
{
m_nextDisplayIsSynchronous = true;
Modified: branches/safari-534.54-branch/Source/WebKit/win/WebView.h (104227 => 104228)
--- branches/safari-534.54-branch/Source/WebKit/win/WebView.h 2012-01-05 22:55:24 UTC (rev 104227)
+++ branches/safari-534.54-branch/Source/WebKit/win/WebView.h 2012-01-05 22:58:30 UTC (rev 104228)
@@ -826,6 +826,8 @@
virtual HRESULT STDMETHODCALLTYPE setDomainRelaxationForbiddenForURLScheme(BOOL forbidden, BSTR scheme);
virtual HRESULT STDMETHODCALLTYPE registerURLSchemeAsSecure(BSTR);
+ virtual HRESULT STDMETHODCALLTYPE registerURLSchemeAsAllowingLocalStorageAccessInPrivateBrowsing(BSTR);
+ virtual HRESULT STDMETHODCALLTYPE registerURLSchemeAsAllowingDatabaseAccessInPrivateBrowsing(BSTR);
virtual HRESULT STDMETHODCALLTYPE nextDisplayIsSynchronous();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
