Backed out changeset 555091dfb391 (bug 1263991) for bustage on a CLOSED TREE

This commit is contained in:
Carsten "Tomcat" Book 2016-06-07 12:10:43 +02:00
parent 038912c550
commit f70103867d
4 changed files with 33 additions and 0 deletions

View File

@ -500,10 +500,12 @@ DOMInterfaces = {
'FlyWebFetchEvent': {
'headerFile': 'FlyWebServerEvents.h',
'nativeType': 'mozilla::dom::FlyWebFetchEvent',
},
'FlyWebWebSocketEvent': {
'headerFile': 'FlyWebServerEvents.h',
'nativeType': 'mozilla::dom::FlyWebWebSocketEvent',
},
'FontFaceSet': {

View File

@ -31,9 +31,16 @@ FlyWebPublishedServer::FlyWebPublishedServer(nsPIDOMWindowInner* aOwner,
, mOwnerWindowID(aOwner ? aOwner->WindowID() : 0)
, mPublishPromise(aPublishPromise)
, mName(aName)
, mCategory(aOptions.mCategory)
, mHttp(aOptions.mHttp)
, mMessage(aOptions.mMessage)
, mUiUrl(aOptions.mUiUrl)
, mIsRegistered(true) // Registered by the FlyWebService
{
if (mCategory.IsEmpty()) {
mCategory.SetIsVoid(true);
}
mHttpServer = new HttpServer();
mHttpServer->Init(-1, Preferences::GetBool("flyweb.use-tls", false), this);
}

View File

@ -63,6 +63,21 @@ public:
return mName;
}
void GetCategory(nsAString& aCategory)
{
aCategory = mCategory;
}
bool Http()
{
return mHttp;
}
bool Message()
{
return mMessage;
}
void GetUiUrl(nsAString& aUiUrl)
{
aUiUrl = mUiUrl;
@ -105,6 +120,9 @@ private:
nsCOMPtr<nsICancelable> mMDNSCancelRegister;
nsString mName;
nsString mCategory;
bool mHttp;
bool mMessage;
nsString mUiUrl;
bool mIsRegistered;

View File

@ -7,6 +7,9 @@
[Pref="dom.flyweb.enabled"]
interface FlyWebPublishedServer : EventTarget {
readonly attribute DOMString name;
readonly attribute DOMString? category;
readonly attribute boolean http;
readonly attribute boolean message;
readonly attribute DOMString? uiUrl;
void close();
@ -17,6 +20,9 @@ interface FlyWebPublishedServer : EventTarget {
};
dictionary FlyWebPublishOptions {
DOMString category = "";
boolean http = false;
boolean message = false;
DOMString? uiUrl = null; // URL to user interface. Can be different server. Makes
// endpoint show up in browser's "local services" UI.
// If relative, resolves against the root of the server.