Changeset 117460 in webkit


Ignore:
Timestamp:
May 17, 2012 10:27:50 AM (12 years ago)
Author:
mitz@apple.com
Message:

REGRESSION (r117428): WebKit API/SPI was removed
​https://bugs.webkit.org/show_bug.cgi?id=86748

Reverted r117428.

.:

  • Source/autotools/symbols.filter:

Source/WebCore:

  • testing/InternalSettings.cpp:

(WebCore::InternalSettings::setMediaPlaybackRequiresUserGesture):

  • testing/InternalSettings.h:

(InternalSettings):

  • testing/InternalSettings.idl:

Source/WebKit/chromium:

  • public/WebView.h:
  • src/WebViewImpl.cpp:

(WebKit::WebViewImpl::setDomainRelaxationForbidden):
(WebKit):

  • src/WebViewImpl.h:

(WebViewImpl):

Source/WebKit/gtk:

  • WebCoreSupport/DumpRenderTreeSupportGtk.cpp:

(DumpRenderTreeSupportGtk::setDomainRelaxationForbiddenForURLScheme):

  • WebCoreSupport/DumpRenderTreeSupportGtk.h:

(DumpRenderTreeSupportGtk):

Source/WebKit/mac:

  • WebKit.order:
  • WebView/WebView.mm:

(+[WebView _setDomainRelaxationForbidden:forURLScheme:]):

  • WebView/WebViewPrivate.h:

Source/WebKit/qt:

  • WebCoreSupport/DumpRenderTreeSupportQt.cpp:

(DumpRenderTreeSupportQt::setDomainRelaxationForbiddenForURLScheme):

  • WebCoreSupport/DumpRenderTreeSupportQt.h:

Source/WebKit/win:

  • Interfaces/IWebViewPrivate.idl:
  • WebView.cpp:

(WebView::setDomainRelaxationForbiddenForURLScheme):

  • WebView.h:

(WebView):

Source/WebKit2:

  • win/WebKit2.def:

Tools:

  • DumpRenderTree/LayoutTestController.cpp:

(setDomainRelaxationForbiddenForURLSchemeCallback):
(LayoutTestController::staticFunctions):

  • DumpRenderTree/LayoutTestController.h:

(LayoutTestController):

  • DumpRenderTree/blackberry/LayoutTestControllerBlackBerry.cpp:

(LayoutTestController::setDomainRelaxationForbiddenForURLScheme):

  • DumpRenderTree/chromium/LayoutTestController.cpp:

(LayoutTestController::LayoutTestController):
(LayoutTestController::setDomainRelaxationForbiddenForURLScheme):

  • DumpRenderTree/chromium/LayoutTestController.h:

(LayoutTestController):

  • DumpRenderTree/efl/LayoutTestControllerEfl.cpp:

(LayoutTestController::setDomainRelaxationForbiddenForURLScheme):

  • DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:

(LayoutTestController::setDomainRelaxationForbiddenForURLScheme):

  • DumpRenderTree/mac/LayoutTestControllerMac.mm:

(LayoutTestController::setDomainRelaxationForbiddenForURLScheme):

  • DumpRenderTree/qt/LayoutTestControllerQt.cpp:

(LayoutTestController::setDomainRelaxationForbiddenForURLScheme):

  • DumpRenderTree/qt/LayoutTestControllerQt.h:

(LayoutTestController):

  • DumpRenderTree/win/LayoutTestControllerWin.cpp:

(LayoutTestController::setDomainRelaxationForbiddenForURLScheme):

  • DumpRenderTree/wx/LayoutTestControllerWx.cpp:

(LayoutTestController::setDomainRelaxationForbiddenForURLScheme):

LayoutTests:

  • http/tests/security/setDomainRelaxationForbiddenForURLScheme.html:
Location:
trunk
Files:
41 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r117459 r117460  
     12012-05-17  Dan Bernstein  <mitz@apple.com>
     2
     3        REGRESSION (r117428): WebKit API/SPI was removed
     4        https://bugs.webkit.org/show_bug.cgi?id=86748
     5
     6        Reverted r117428.
     7
     8        * Source/autotools/symbols.filter:
     9
    1102012-05-17  Thiago Marcos P. Santos  <thiago.santos@intel.com>
    211

  • trunk/LayoutTests/ChangeLog

    r117457 r117460  
     12012-05-17  Dan Bernstein  <mitz@apple.com>
     2
     3        REGRESSION (r117428): WebKit API/SPI was removed
     4        https://bugs.webkit.org/show_bug.cgi?id=86748
     5
     6        Reverted r117428.
     7
     8        * http/tests/security/setDomainRelaxationForbiddenForURLScheme.html:
     9
    1102012-05-17  Zan Dobersek  <zandobersek@gmail.com>
    211

  • trunk/LayoutTests/http/tests/security/setDomainRelaxationForbiddenForURLScheme.html

    r117428 r117460  
    3737        log("Forbidding domain relaxation for the http: scheme");
    3838
    39         if (window.internals)
    40             internals.settings.setDomainRelaxationForbiddenForURLScheme(true, "http");
     39        if (window.layoutTestController)
     40            layoutTestController.setDomainRelaxationForbiddenForURLScheme(true, "http");
    4141
    4242        var exception;
    … …  
    5454        domainShouldBe("0.0.1");
    5555
    56         if (window.internals)
    57             internals.settings.setDomainRelaxationForbiddenForURLScheme(false, "http");
     56        if (window.layoutTestController)
     57            layoutTestController.setDomainRelaxationForbiddenForURLScheme(false, "http");
    5858
    5959        log("Allowing domain relaxation for the http: scheme");
    … …  
    6464        log("Forbidding domain relaxation for the not-http: scheme");
    6565
    66         if (window.internals)
    67             internals.settings.setDomainRelaxationForbiddenForURLScheme(true, "not-http");
     66        if (window.layoutTestController)
     67            layoutTestController.setDomainRelaxationForbiddenForURLScheme(true, "not-http");
    6868
    6969        document.domain = "1";
    … …  
    7272        log("Allowing domain relaxation for the not-http: scheme");
    7373
    74         if (window.internals)
    75             internals.settings.setDomainRelaxationForbiddenForURLScheme(false, "not-http");
     74        if (window.layoutTestController)
     75            layoutTestController.setDomainRelaxationForbiddenForURLScheme(false, "not-http");
    7676    </script>
    7777</body>

  • trunk/Source/WebCore/ChangeLog

    r117455 r117460  
     12012-05-17  Dan Bernstein  <mitz@apple.com>
     2
     3        REGRESSION (r117428): WebKit API/SPI was removed
     4        https://bugs.webkit.org/show_bug.cgi?id=86748
     5
     6        Reverted r117428.
     7
     8        * testing/InternalSettings.cpp:
     9        (WebCore::InternalSettings::setMediaPlaybackRequiresUserGesture):
     10        * testing/InternalSettings.h:
     11        (InternalSettings):
     12        * testing/InternalSettings.idl:
     13
    1142012-05-17  Pavel Feldman  <pfeldman@chromium.org>
    215

  • trunk/Source/WebCore/testing/InternalSettings.cpp

    r117428 r117460  
    3737#include "Page.h"
    3838#include "RuntimeEnabledFeatures.h"
    39 #include "SchemeRegistry.h"
    4039#include "Settings.h"
    4140
    … …  
    330329    settings()->setMediaPlaybackRequiresUserGesture(enabled);
    331330}
    332    
    333 void InternalSettings::setDomainRelaxationForbiddenForURLScheme(bool forbidden, const String& urlScheme, ExceptionCode&)
    334 {
    335     SchemeRegistry::setDomainRelaxationForbiddenForURLScheme(forbidden, urlScheme);
    336 }
    337 
    338 }
     331
     332}

  • trunk/Source/WebCore/testing/InternalSettings.h

    r117428 r117460  
    7575    void setCSSExclusionsEnabled(bool enabled, ExceptionCode&);
    7676    void setMediaPlaybackRequiresUserGesture(bool, ExceptionCode&);
    77     void setDomainRelaxationForbiddenForURLScheme(bool forbidden, const String& urlScheme, ExceptionCode&);
    7877
    7978    void restoreTo(Settings*);

  • trunk/Source/WebCore/testing/InternalSettings.idl

    r117428 r117460  
    5454        void setCSSExclusionsEnabled(in boolean enabled) raises(DOMException);
    5555        void setMediaPlaybackRequiresUserGesture(in boolean enabled) raises(DOMException);
    56         void setDomainRelaxationForbiddenForURLScheme(in boolean forbidden, in DOMString urlScheme) raises(DOMException);
    5756    };
    5857}

  • trunk/Source/WebKit/chromium/ChangeLog

    r117428 r117460  
     12012-05-17  Dan Bernstein  <mitz@apple.com>
     2
     3        REGRESSION (r117428): WebKit API/SPI was removed
     4        https://bugs.webkit.org/show_bug.cgi?id=86748
     5
     6        Reverted r117428.
     7
     8        * public/WebView.h:
     9        * src/WebViewImpl.cpp:
     10        (WebKit::WebViewImpl::setDomainRelaxationForbidden):
     11        (WebKit):
     12        * src/WebViewImpl.h:
     13        (WebViewImpl):
     14
    1152012-05-17  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
    216

  • trunk/Source/WebKit/chromium/public/WebView.h

    r117428 r117460  
    142142    virtual void setIsActive(bool) = 0;
    143143
     144    // Allows disabling domain relaxation.
     145    virtual void setDomainRelaxationForbidden(bool, const WebString& scheme) = 0;
     146
    144147
    145148    // Closing -------------------------------------------------------------

  • trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

    r117428 r117460  
    29502950}
    29512951
     2952void WebViewImpl::setDomainRelaxationForbidden(bool forbidden, const WebString& scheme)
     2953{
     2954    SchemeRegistry::setDomainRelaxationForbiddenForURLScheme(forbidden, String(scheme));
     2955}
     2956
    29522957void WebViewImpl::setScrollbarColors(unsigned inactiveColor,
    29532958                                     unsigned activeColor,

  • trunk/Source/WebKit/chromium/src/WebViewImpl.h

    r117428 r117460  
    178178    virtual bool isActive() const;
    179179    virtual void setIsActive(bool value);
     180    virtual void setDomainRelaxationForbidden(bool, const WebString& scheme);
    180181    virtual bool dispatchBeforeUnloadEvent();
    181182    virtual void dispatchUnloadEvent();

  • trunk/Source/WebKit/gtk/ChangeLog

    r117428 r117460  
     12012-05-17  Dan Bernstein  <mitz@apple.com>
     2
     3        REGRESSION (r117428): WebKit API/SPI was removed
     4        https://bugs.webkit.org/show_bug.cgi?id=86748
     5
     6        Reverted r117428.
     7
     8        * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
     9        (DumpRenderTreeSupportGtk::setDomainRelaxationForbiddenForURLScheme):
     10        * WebCoreSupport/DumpRenderTreeSupportGtk.h:
     11        (DumpRenderTreeSupportGtk):
     12
    1132012-05-17  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
    214

  • trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp

    r117428 r117460  
    5757#include "RenderTreeAsText.h"
    5858#include "RenderView.h"
     59#include "SchemeRegistry.h"
    5960#include "SecurityOrigin.h"
    6061#include "SecurityPolicy.h"
    … …  
    880881#endif
    881882}
     883
     884void DumpRenderTreeSupportGtk::setDomainRelaxationForbiddenForURLScheme(bool forbidden, const char* urlScheme)
     885{
     886    SchemeRegistry::setDomainRelaxationForbiddenForURLScheme(forbidden, String::fromUTF8(urlScheme));
     887}

  • trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h

    r117428 r117460  
    127127
    128128    static void deliverAllMutationsIfNecessary();
     129    static void setDomainRelaxationForbiddenForURLScheme(bool forbidden, const char* urlScheme);
    129130
    130131private:

  • trunk/Source/WebKit/mac/ChangeLog

    r117428 r117460  
     12012-05-17  Dan Bernstein  <mitz@apple.com>
     2
     3        REGRESSION (r117428): WebKit API/SPI was removed
     4        https://bugs.webkit.org/show_bug.cgi?id=86748
     5
     6        Reverted r117428.
     7
     8        * WebKit.order:
     9        * WebView/WebView.mm:
     10        (+[WebView _setDomainRelaxationForbidden:forURLScheme:]):
     11        * WebView/WebViewPrivate.h:
     12
    1132012-05-17  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
    214

  • trunk/Source/WebKit/mac/WebKit.order

    r117428 r117460  
    5656_WebLocalizedString
    5757+[WebView(WebPrivate) _registerURLSchemeAsSecure:]
     58+[WebView(WebPrivate) _setDomainRelaxationForbidden:forURLScheme:]
    5859-[WebPreferences(WebPrivate) setDeveloperExtrasEnabled:]
    5960-[WebPreferences _setBoolValue:forKey:]

  • trunk/Source/WebKit/mac/WebView/WebView.mm

    r117428 r117460  
    27072707}
    27082708
     2709+ (void)_setDomainRelaxationForbidden:(BOOL)forbidden forURLScheme:(NSString *)scheme
     2710{
     2711    SchemeRegistry::setDomainRelaxationForbiddenForURLScheme(forbidden, scheme);
     2712}
     2713
    27092714+ (void)_registerURLSchemeAsSecure:(NSString *)scheme
    27102715{

  • trunk/Source/WebKit/mac/WebView/WebViewPrivate.h

    r117428 r117460  
    551551- (void)setCSSAnimationsSuspended:(BOOL)suspended;
    552552
     553+ (void)_setDomainRelaxationForbidden:(BOOL)forbidden forURLScheme:(NSString *)scheme;
    553554+ (void)_registerURLSchemeAsSecure:(NSString *)scheme;
    554555+ (void)_registerURLSchemeAsAllowingLocalStorageAccessInPrivateBrowsing:(NSString *)scheme;

  • trunk/Source/WebKit/qt/ChangeLog

    r117440 r117460  
     12012-05-17  Dan Bernstein  <mitz@apple.com>
     2
     3        REGRESSION (r117428): WebKit API/SPI was removed
     4        https://bugs.webkit.org/show_bug.cgi?id=86748
     5
     6        Reverted r117428.
     7
     8        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
     9        (DumpRenderTreeSupportQt::setDomainRelaxationForbiddenForURLScheme):
     10        * WebCoreSupport/DumpRenderTreeSupportQt.h:
     11
    1122012-05-17  Tsarko Yaroslav  <eriktsarko@googlemail.com>
    213

  • trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp

    r117428 r117460  
    7272#include "RenderListItem.h"
    7373#include "RenderTreeAsText.h"
     74#include "SchemeRegistry.h"
    7475#include "ScriptController.h"
    7576#include "ScriptSourceCode.h"
    … …  
    483484{
    484485    SecurityPolicy::resetOriginAccessWhitelists();
     486}
     487
     488void DumpRenderTreeSupportQt::setDomainRelaxationForbiddenForURLScheme(bool forbidden, const QString& scheme)
     489{
     490    SchemeRegistry::setDomainRelaxationForbiddenForURLScheme(forbidden, scheme);
    485491}
    486492

  • trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h

    r117428 r117460  
    116116    static void resumeActiveDOMObjects(QWebFrame* frame);
    117117
     118    static void setDomainRelaxationForbiddenForURLScheme(bool forbidden, const QString& scheme);
    118119    static void setFrameFlatteningEnabled(QWebPage*, bool);
    119120    static void setCaretBrowsingEnabled(QWebPage* page, bool value);

  • trunk/Source/WebKit/win/ChangeLog

    r117428 r117460  
     12012-05-17  Dan Bernstein  <mitz@apple.com>
     2
     3        REGRESSION (r117428): WebKit API/SPI was removed
     4        https://bugs.webkit.org/show_bug.cgi?id=86748
     5
     6        Reverted r117428.
     7
     8        * Interfaces/IWebViewPrivate.idl:
     9        * WebView.cpp:
     10        (WebView::setDomainRelaxationForbiddenForURLScheme):
     11        * WebView.h:
     12        (WebView):
     13
    1142012-05-17  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
    215

  • trunk/Source/WebKit/win/Interfaces/IWebViewPrivate.idl

    r117428 r117460  
    228228    HRESULT geolocationDidFailWithError([in] IWebError* error);
    229229
     230    HRESULT setDomainRelaxationForbiddenForURLScheme([in] BOOL forbidden, [in] BSTR scheme);
     231
    230232    HRESULT registerURLSchemeAsSecure([in] BSTR scheme);
    231233

  • trunk/Source/WebKit/win/WebView.cpp

    r117428 r117460  
    66076607}
    66086608
     6609HRESULT WebView::setDomainRelaxationForbiddenForURLScheme(BOOL forbidden, BSTR scheme)
     6610{
     6611    SchemeRegistry::setDomainRelaxationForbiddenForURLScheme(forbidden, String(scheme, SysStringLen(scheme)));
     6612    return S_OK;
     6613}
     6614
    66096615HRESULT WebView::registerURLSchemeAsSecure(BSTR scheme)
    66106616{

  • trunk/Source/WebKit/win/WebView.h

    r117428 r117460  
    825825    virtual HRESULT STDMETHODCALLTYPE geolocationDidFailWithError(IWebError* error);
    826826
     827    virtual HRESULT STDMETHODCALLTYPE setDomainRelaxationForbiddenForURLScheme(BOOL forbidden, BSTR scheme);
    827828    virtual HRESULT STDMETHODCALLTYPE registerURLSchemeAsSecure(BSTR);
    828829    virtual HRESULT STDMETHODCALLTYPE registerURLSchemeAsAllowingLocalStorageAccessInPrivateBrowsing(BSTR);

  • trunk/Source/WebKit2/ChangeLog

    r117428 r117460  
     12012-05-17  Dan Bernstein  <mitz@apple.com>
     2
     3        REGRESSION (r117428): WebKit API/SPI was removed
     4        https://bugs.webkit.org/show_bug.cgi?id=86748
     5
     6        Reverted r117428.
     7
     8        * win/WebKit2.def:
     9
    1102012-05-17  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
    211

  • trunk/Source/WebKit2/win/WebKit2.def

    r117428 r117460  
    257257        ?suspendAnimations@AnimationController@WebCore@@QAEXXZ
    258258        ?resumeAnimations@AnimationController@WebCore@@QAEXXZ
    259         ?setDomainRelaxationForbiddenForURLScheme@SchemeRegistry@WebCore@@SAX_NABVString@WTF@@@Z

  • trunk/Source/autotools/symbols.filter

    r117428 r117460  
    145145_ZN7WebCore8Document35webkitWillEnterFullScreenForElementEPNS_7ElementE;
    146146_ZN7WebCore17JSDOMGlobalObject6s_infoE;
    147 _ZN7WebCore14SchemeRegistry40setDomainRelaxationForbiddenForURLSchemeEbRKN3WTF6StringE;
    148147local:
    149148_Z*;

  • trunk/Tools/ChangeLog

    r117446 r117460  
     12012-05-17  Dan Bernstein  <mitz@apple.com>
     2
     3        REGRESSION (r117428): WebKit API/SPI was removed
     4        https://bugs.webkit.org/show_bug.cgi?id=86748
     5
     6        Reverted r117428.
     7
     8        * DumpRenderTree/LayoutTestController.cpp:
     9        (setDomainRelaxationForbiddenForURLSchemeCallback):
     10        (LayoutTestController::staticFunctions):
     11        * DumpRenderTree/LayoutTestController.h:
     12        (LayoutTestController):
     13        * DumpRenderTree/blackberry/LayoutTestControllerBlackBerry.cpp:
     14        (LayoutTestController::setDomainRelaxationForbiddenForURLScheme):
     15        * DumpRenderTree/chromium/LayoutTestController.cpp:
     16        (LayoutTestController::LayoutTestController):
     17        (LayoutTestController::setDomainRelaxationForbiddenForURLScheme):
     18        * DumpRenderTree/chromium/LayoutTestController.h:
     19        (LayoutTestController):
     20        * DumpRenderTree/efl/LayoutTestControllerEfl.cpp:
     21        (LayoutTestController::setDomainRelaxationForbiddenForURLScheme):
     22        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
     23        (LayoutTestController::setDomainRelaxationForbiddenForURLScheme):
     24        * DumpRenderTree/mac/LayoutTestControllerMac.mm:
     25        (LayoutTestController::setDomainRelaxationForbiddenForURLScheme):
     26        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
     27        (LayoutTestController::setDomainRelaxationForbiddenForURLScheme):
     28        * DumpRenderTree/qt/LayoutTestControllerQt.h:
     29        (LayoutTestController):
     30        * DumpRenderTree/win/LayoutTestControllerWin.cpp:
     31        (LayoutTestController::setDomainRelaxationForbiddenForURLScheme):
     32        * DumpRenderTree/wx/LayoutTestControllerWx.cpp:
     33        (LayoutTestController::setDomainRelaxationForbiddenForURLScheme):
     34
    1352012-05-17  Li Yin  <li.yin@intel.com>
    236

  • trunk/Tools/DumpRenderTree/LayoutTestController.cpp

    r117428 r117460  
    12281228    LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
    12291229    controller->setDefersLoading(JSValueToBoolean(context, arguments[0]));
     1230
     1231    return JSValueMakeUndefined(context);
     1232}
     1233
     1234static JSValueRef setDomainRelaxationForbiddenForURLSchemeCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
     1235{
     1236    // Has Mac and Windows implementation
     1237    if (argumentCount < 2)
     1238        return JSValueMakeUndefined(context);
     1239
     1240    LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
     1241
     1242    bool forbidden = JSValueToBoolean(context, arguments[0]);
     1243    JSRetainPtr<JSStringRef> scheme(Adopt, JSValueToStringCopy(context, arguments[1], 0));
     1244    controller->setDomainRelaxationForbiddenForURLScheme(forbidden, scheme.get());
    12301245
    12311246    return JSValueMakeUndefined(context);
    … …  
    23602375        { "setDeferMainResourceDataLoad", setDeferMainResourceDataLoadCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    23612376        { "setDefersLoading", setDefersLoadingCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
     2377        { "setDomainRelaxationForbiddenForURLScheme", setDomainRelaxationForbiddenForURLSchemeCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    23622378        { "setEditingBehavior", setEditingBehaviorCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    23632379        { "setFrameFlatteningEnabled", setFrameFlatteningEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },

  • trunk/Tools/DumpRenderTree/LayoutTestController.h

    r117428 r117460  
    9797    void setCustomPolicyDelegate(bool setDelegate, bool permissive);
    9898    void setDatabaseQuota(unsigned long long quota);
     99    void setDomainRelaxationForbiddenForURLScheme(bool forbidden, JSStringRef scheme);
    99100    void setDefersLoading(bool);
    100101    void setIconDatabaseEnabled(bool iconDatabaseEnabled);

  • trunk/Tools/DumpRenderTree/blackberry/LayoutTestControllerBlackBerry.cpp

    r117428 r117460  
    3939#include "Page.h"
    4040#include "RenderTreeAsText.h"
     41#include "SchemeRegistry.h"
    4142#include "SecurityOrigin.h"
    4243#include "SecurityPolicy.h"
    … …  
    221222
    222223    WebCore::DatabaseTracker::tracker().setQuota(mainFrame->document()->securityOrigin(), quota);
     224}
     225
     226void LayoutTestController::setDomainRelaxationForbiddenForURLScheme(bool forbidden, JSStringRef scheme)
     227{
     228    WebCore::SchemeRegistry::setDomainRelaxationForbiddenForURLScheme(forbidden, jsStringRefToWebCoreString(scheme));
    223229}
    224230

  • trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp

    r117428 r117460  
    191191    bindMethod("setDatabaseQuota", &LayoutTestController::setDatabaseQuota);
    192192    bindMethod("setDeferMainResourceDataLoad", &LayoutTestController::setDeferMainResourceDataLoad);
     193    bindMethod("setDomainRelaxationForbiddenForURLScheme", &LayoutTestController::setDomainRelaxationForbiddenForURLScheme);
    193194    bindMethod("setEditingBehavior", &LayoutTestController::setEditingBehavior);
    194195    bindMethod("setAudioData", &LayoutTestController::setAudioData);
    … …  
    11921193}
    11931194#endif
     1195
     1196void LayoutTestController::setDomainRelaxationForbiddenForURLScheme(const CppArgumentList& arguments, CppVariant* result)
     1197{
     1198    if (arguments.size() != 2 || !arguments[0].isBool() || !arguments[1].isString())
     1199        return;
     1200    m_shell->webView()->setDomainRelaxationForbidden(cppVariantToBool(arguments[0]), cppVariantToWebString(arguments[1]));
     1201}
    11941202
    11951203void LayoutTestController::setDeferMainResourceDataLoad(const CppArgumentList& arguments, CppVariant* result)

  • trunk/Tools/DumpRenderTree/chromium/LayoutTestController.h

    r117428 r117460  
    256256#endif
    257257
     258    void setDomainRelaxationForbiddenForURLScheme(const CppArgumentList&, CppVariant*);
    258259    void setDeferMainResourceDataLoad(const CppArgumentList&, CppVariant*);
    259260    void setEditingBehavior(const CppArgumentList&, CppVariant*);

  • trunk/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp

    r117428 r117460  
    615615}
    616616
     617void LayoutTestController::setDomainRelaxationForbiddenForURLScheme(bool, JSStringRef)
     618{
     619    notImplemented();
     620}
     621
    617622void LayoutTestController::goBack()
    618623{

  • trunk/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp

    r117428 r117460  
    738738{
    739739    // FIXME: implement
     740}
     741
     742void LayoutTestController::setDomainRelaxationForbiddenForURLScheme(bool forbidden, JSStringRef scheme)
     743{
     744    GOwnPtr<gchar> urlScheme(JSStringCopyUTF8CString(scheme));
     745    DumpRenderTreeSupportGtk::setDomainRelaxationForbiddenForURLScheme(forbidden, urlScheme.get());
    740746}
    741747

  • trunk/Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm

    r117428 r117460  
    493493}
    494494
     495void LayoutTestController::setDomainRelaxationForbiddenForURLScheme(bool forbidden, JSStringRef scheme)
     496{
     497    RetainPtr<CFStringRef> schemeCFString(AdoptCF, JSStringCopyCFString(kCFAllocatorDefault, scheme));
     498    [WebView _setDomainRelaxationForbidden:forbidden forURLScheme:(NSString *)schemeCFString.get()];
     499}
     500
    495501void LayoutTestController::setMockDeviceOrientation(bool canProvideAlpha, double alpha, bool canProvideBeta, double beta, bool canProvideGamma, double gamma)
    496502{

  • trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

    r117428 r117460  
    721721}
    722722
     723void LayoutTestController::setDomainRelaxationForbiddenForURLScheme(bool forbidden, const QString& scheme)
     724{
     725    DumpRenderTreeSupportQt::setDomainRelaxationForbiddenForURLScheme(forbidden, scheme);
     726}
     727
    723728int LayoutTestController::workerThreadCount()
    724729{

  • trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.h

    r117428 r117460  
    212212    void setUserStyleSheetLocation(const QString& url);
    213213    void setUserStyleSheetEnabled(bool enabled);
     214    void setDomainRelaxationForbiddenForURLScheme(bool forbidden, const QString& scheme);
    214215    int workerThreadCount();
    215216    int pageNumberForElementById(const QString& id, float width = 0, float height = 0);

  • trunk/Tools/DumpRenderTree/win/LayoutTestControllerWin.cpp

    r117428 r117460  
    10441044}
    10451045
     1046void LayoutTestController::setDomainRelaxationForbiddenForURLScheme(bool forbidden, JSStringRef scheme)
     1047{
     1048    COMPtr<IWebViewPrivate> webView;
     1049    if (FAILED(WebKitCreateInstance(__uuidof(WebView), 0, __uuidof(webView), reinterpret_cast<void**>(&webView))))
     1050        return;
     1051
     1052    BSTR schemeBSTR = JSStringCopyBSTR(scheme);
     1053    webView->setDomainRelaxationForbiddenForURLScheme(forbidden, schemeBSTR);
     1054    SysFreeString(schemeBSTR);
     1055}
     1056
    10461057void LayoutTestController::setAppCacheMaximumSize(unsigned long long size)
    10471058{

  • trunk/Tools/DumpRenderTree/wx/LayoutTestControllerWx.cpp

    r117428 r117460  
    298298}
    299299
     300void LayoutTestController::setDomainRelaxationForbiddenForURLScheme(bool, JSStringRef)
     301{
     302    // FIXME: implement
     303}
     304
    300305void LayoutTestController::setAppCacheMaximumSize(unsigned long long size)
    301306{
Note: See TracChangeset for help on using the changeset viewer.