[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
aroben at apple.com
aroben at apple.com
Thu Apr 8 02:06:30 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 8738c906169ba94d846344f561816a4a9e393fa3
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Mar 2 16:22:44 2010 +0000
Expose SecurityOrigin::registerURLSchemeAsSecure as WebKit SPI
Fixes <http://webkit.org/b/35580> <rdar://problem/7706407>
Reviewed by Tim Hatcher.
WebCore:
Export SecurityOrigin::registerURLSchemeAsSecure
* WebCore.base.exp: Added symbol, sorted file.
WebKit/mac:
Add -[WebView _registerURLSchemeAsSecure:]
* WebView/WebView.mm:
(+[WebView _registerURLSchemeAsSecure:]):
* WebView/WebViewPrivate.h:
Added. Calls through to SecurityOrigin::registerURLSchemeAsSecure.
WebKit/win:
Add IWebViewPrivate::registerURLSchemeAsSecure
* Interfaces/WebKit.idl: Touched to force a build.
* Interfaces/IWebViewPrivate.idl:
* WebView.cpp:
(WebView::registerURLSchemeAsSecure):
* WebView.h:
Added. Calls through to SecurityOrigin::registerURLSchemeAsSecure.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55408 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4a7faab..a7a3112 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-02 Adam Roben <aroben at apple.com>
+
+ Export SecurityOrigin::registerURLSchemeAsSecure
+
+ Fixes <http://webkit.org/b/35580> <rdar://problem/7706407> Expose
+ SecurityOrigin::registerURLSchemeAsSecure as WebKit SPI
+
+ Reviewed by Tim Hatcher.
+
+ * WebCore.base.exp: Added symbol, sorted file.
+
2010-03-02 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
diff --git a/WebCore/WebCore.base.exp b/WebCore/WebCore.base.exp
index 0d6026a..8ba2ec1 100644
--- a/WebCore/WebCore.base.exp
+++ b/WebCore/WebCore.base.exp
@@ -1,4 +1,3 @@
-
.objc_class_name_DOMAbstractView
.objc_class_name_DOMAttr
.objc_class_name_DOMCDATASection
@@ -301,6 +300,7 @@ __ZN7WebCore14SecurityOrigin16createFromStringERKNS_6StringE
__ZN7WebCore14SecurityOrigin18setLocalLoadPolicyENS0_15LocalLoadPolicyE
__ZN7WebCore14SecurityOrigin18shouldHideReferrerERKNS_4KURLERKNS_6StringE
__ZN7WebCore14SecurityOrigin24registerURLSchemeAsLocalERKNS_6StringE
+__ZN7WebCore14SecurityOrigin25registerURLSchemeAsSecureERKNS_6StringE
__ZN7WebCore14SecurityOrigin25whiteListAccessFromOriginERKS0_RKNS_6StringES5_b
__ZN7WebCore14SecurityOrigin27resetOriginAccessWhiteListsEv
__ZN7WebCore14SecurityOrigin40setDomainRelaxationForbiddenForURLSchemeEbRKNS_6StringE
@@ -702,6 +702,7 @@ __ZN7WebCore9FrameView14setNeedsLayoutEv
__ZN7WebCore9FrameView14setTransparentEb
__ZN7WebCore9FrameView15setMarginHeightEi
__ZN7WebCore9FrameView16adjustPageHeightEPffff
+__ZN7WebCore9FrameView16setPaintBehaviorEj
__ZN7WebCore9FrameView18updateControlTintsEv
__ZN7WebCore9FrameView21flushDeferredRepaintsEv
__ZN7WebCore9FrameView21scrollPositionChangedEv
@@ -711,9 +712,6 @@ __ZN7WebCore9FrameView23updateCanHaveScrollbarsEv
__ZN7WebCore9FrameView29forceLayoutWithPageWidthRangeEffb
__ZN7WebCore9FrameView29setShouldUpdateWhileOffscreenEb
__ZN7WebCore9FrameView29syncCompositingStateRecursiveEv
-__ZNK7WebCore9FrameView20isSoftwareRenderableEv
-__ZN7WebCore9FrameView16setPaintBehaviorEj
-__ZNK7WebCore9FrameView13paintBehaviorEv
__ZN7WebCore9FrameView6createEPNS_5FrameE
__ZN7WebCore9FrameView6createEPNS_5FrameERKNS_7IntSizeE
__ZN7WebCore9HTMLNames10listingTagE
@@ -789,7 +787,6 @@ __ZNK7WebCore11CachedImage5imageEv
__ZNK7WebCore11FrameLoader10isCompleteEv
__ZNK7WebCore11FrameLoader14frameHasLoadedEv
__ZNK7WebCore11FrameLoader15containsPluginsEv
-__ZNK7WebCore19InspectorController15canAttachWindowEv
__ZNK7WebCore11FrameLoader15firstLayoutDoneEv
__ZNK7WebCore11FrameLoader16outgoingReferrerEv
__ZNK7WebCore11FrameLoader16responseMIMETypeEv
@@ -876,6 +873,7 @@ __ZNK7WebCore16VisibleSelection23isContentRichlyEditableEv
__ZNK7WebCore16VisibleSelection5isAllENS_21StayInEditableContentE
__ZNK7WebCore17ResourceErrorBase8lazyInitEv
__ZNK7WebCore19AnimationController24numberOfActiveAnimationsEv
+__ZNK7WebCore19InspectorController15canAttachWindowEv
__ZNK7WebCore19ResourceRequestBase10httpMethodEv
__ZNK7WebCore19ResourceRequestBase3urlEv
__ZNK7WebCore19ResourceRequestBase7isEmptyEv
@@ -996,6 +994,8 @@ __ZNK7WebCore9FrameTree4findERKNS_12AtomicStringE
__ZNK7WebCore9FrameTree5childERKNS_12AtomicStringE
__ZNK7WebCore9FrameTree6parentEb
__ZNK7WebCore9FrameView11needsLayoutEv
+__ZNK7WebCore9FrameView13paintBehaviorEv
+__ZNK7WebCore9FrameView20isSoftwareRenderableEv
__ZNK7WebCore9PageCache10frameCountEv
__ZNK7WebCore9PageCache21autoreleasedPageCountEv
__ZTVN7WebCore12ChromeClientE
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 2aa77af..f914d85 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,17 @@
+2010-03-02 Adam Roben <aroben at apple.com>
+
+ Add -[WebView _registerURLSchemeAsSecure:]
+
+ Fixes <http://webkit.org/b/35580> <rdar://problem/7706407> Expose
+ SecurityOrigin::registerURLSchemeAsSecure as WebKit SPI
+
+ Reviewed by Tim Hatcher.
+
+ * WebView/WebView.mm:
+ (+[WebView _registerURLSchemeAsSecure:]):
+ * WebView/WebViewPrivate.h:
+ Added. Calls through to SecurityOrigin::registerURLSchemeAsSecure.
+
2010-03-01 Jakob Petsovits <jpetsovits at rim.com>
Reviewed by Adam Barth.
diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index 6d8747b..7509234 100644
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -2388,6 +2388,11 @@ static PassOwnPtr<Vector<String> > toStringVector(NSArray* patterns)
SecurityOrigin::setDomainRelaxationForbiddenForURLScheme(forbidden, scheme);
}
++ (void)_registerURLSchemeAsSecure:(NSString *)scheme
+{
+ SecurityOrigin::registerURLSchemeAsSecure(scheme);
+}
+
@end
@implementation _WebSafeForwarder
diff --git a/WebKit/mac/WebView/WebViewPrivate.h b/WebKit/mac/WebView/WebViewPrivate.h
index b0a7039..e888b34 100644
--- a/WebKit/mac/WebView/WebViewPrivate.h
+++ b/WebKit/mac/WebView/WebViewPrivate.h
@@ -517,6 +517,7 @@ Could be worth adding to the API.
- (void)setCSSAnimationsSuspended:(BOOL)suspended;
+ (void)_setDomainRelaxationForbidden:(BOOL)forbidden forURLScheme:(NSString *)scheme;
++ (void)_registerURLSchemeAsSecure:(NSString *)scheme;
@end
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index f135412..9a73cb9 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,20 @@
+2010-03-02 Adam Roben <aroben at apple.com>
+
+ Add IWebViewPrivate::registerURLSchemeAsSecure
+
+ Fixes <http://webkit.org/b/35580> <rdar://problem/7706407> Expose
+ SecurityOrigin::registerURLSchemeAsSecure as WebKit SPI
+
+ Reviewed by Tim Hatcher.
+
+ * Interfaces/WebKit.idl: Touched to force a build.
+
+ * Interfaces/IWebViewPrivate.idl:
+ * WebView.cpp:
+ (WebView::registerURLSchemeAsSecure):
+ * WebView.h:
+ Added. Calls through to SecurityOrigin::registerURLSchemeAsSecure.
+
2010-03-01 Jon Honeycutt <jhoneycutt at apple.com>
Remove Windows line endings from some files.
diff --git a/WebKit/win/Interfaces/IWebViewPrivate.idl b/WebKit/win/Interfaces/IWebViewPrivate.idl
index 7ab2304..3815942 100644
--- a/WebKit/win/Interfaces/IWebViewPrivate.idl
+++ b/WebKit/win/Interfaces/IWebViewPrivate.idl
@@ -226,4 +226,6 @@ interface IWebViewPrivate : IUnknown
HRESULT geolocationDidFailWithError([in] IWebError* error);
HRESULT setDomainRelaxationForbiddenForURLScheme([in] BOOL forbidden, [in] BSTR scheme);
+
+ HRESULT registerURLSchemeAsSecure([in] BSTR scheme);
}
diff --git a/WebKit/win/Interfaces/WebKit.idl b/WebKit/win/Interfaces/WebKit.idl
index c4814a1..910e4f1 100644
--- a/WebKit/win/Interfaces/WebKit.idl
+++ b/WebKit/win/Interfaces/WebKit.idl
@@ -294,3 +294,4 @@ library WebKit
[default] interface IWebGeolocationPosition;
}
}
+
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index 5389d05..2ddcf4d 100644
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -6254,6 +6254,12 @@ HRESULT WebView::setDomainRelaxationForbiddenForURLScheme(BOOL forbidden, BSTR s
return S_OK;
}
+HRESULT WebView::registerURLSchemeAsSecure(BSTR scheme)
+{
+ SecurityOrigin::registerURLSchemeAsSecure(toString(scheme));
+ return S_OK;
+}
+
class EnumTextMatches : public IEnumTextMatches
{
long m_ref;
diff --git a/WebKit/win/WebView.h b/WebKit/win/WebView.h
index 56fb40c..dcf0bcd 100644
--- a/WebKit/win/WebView.h
+++ b/WebKit/win/WebView.h
@@ -779,6 +779,7 @@ public:
virtual HRESULT STDMETHODCALLTYPE geolocationDidFailWithError(IWebError* error);
virtual HRESULT STDMETHODCALLTYPE setDomainRelaxationForbiddenForURLScheme(BOOL forbidden, BSTR scheme);
+ virtual HRESULT STDMETHODCALLTYPE registerURLSchemeAsSecure(BSTR);
// WebView
bool shouldUseEmbeddedView(const WebCore::String& mimeType) const;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list