mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 03:15:11 +00:00
Backed out changeset 555091dfb391 (bug 1263991) for bustage on a CLOSED TREE
This commit is contained in:
parent
038912c550
commit
f70103867d
@ -500,10 +500,12 @@ DOMInterfaces = {
|
|||||||
|
|
||||||
'FlyWebFetchEvent': {
|
'FlyWebFetchEvent': {
|
||||||
'headerFile': 'FlyWebServerEvents.h',
|
'headerFile': 'FlyWebServerEvents.h',
|
||||||
|
'nativeType': 'mozilla::dom::FlyWebFetchEvent',
|
||||||
},
|
},
|
||||||
|
|
||||||
'FlyWebWebSocketEvent': {
|
'FlyWebWebSocketEvent': {
|
||||||
'headerFile': 'FlyWebServerEvents.h',
|
'headerFile': 'FlyWebServerEvents.h',
|
||||||
|
'nativeType': 'mozilla::dom::FlyWebWebSocketEvent',
|
||||||
},
|
},
|
||||||
|
|
||||||
'FontFaceSet': {
|
'FontFaceSet': {
|
||||||
|
@ -31,9 +31,16 @@ FlyWebPublishedServer::FlyWebPublishedServer(nsPIDOMWindowInner* aOwner,
|
|||||||
, mOwnerWindowID(aOwner ? aOwner->WindowID() : 0)
|
, mOwnerWindowID(aOwner ? aOwner->WindowID() : 0)
|
||||||
, mPublishPromise(aPublishPromise)
|
, mPublishPromise(aPublishPromise)
|
||||||
, mName(aName)
|
, mName(aName)
|
||||||
|
, mCategory(aOptions.mCategory)
|
||||||
|
, mHttp(aOptions.mHttp)
|
||||||
|
, mMessage(aOptions.mMessage)
|
||||||
, mUiUrl(aOptions.mUiUrl)
|
, mUiUrl(aOptions.mUiUrl)
|
||||||
, mIsRegistered(true) // Registered by the FlyWebService
|
, mIsRegistered(true) // Registered by the FlyWebService
|
||||||
{
|
{
|
||||||
|
if (mCategory.IsEmpty()) {
|
||||||
|
mCategory.SetIsVoid(true);
|
||||||
|
}
|
||||||
|
|
||||||
mHttpServer = new HttpServer();
|
mHttpServer = new HttpServer();
|
||||||
mHttpServer->Init(-1, Preferences::GetBool("flyweb.use-tls", false), this);
|
mHttpServer->Init(-1, Preferences::GetBool("flyweb.use-tls", false), this);
|
||||||
}
|
}
|
||||||
|
@ -63,6 +63,21 @@ public:
|
|||||||
return mName;
|
return mName;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GetCategory(nsAString& aCategory)
|
||||||
|
{
|
||||||
|
aCategory = mCategory;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Http()
|
||||||
|
{
|
||||||
|
return mHttp;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Message()
|
||||||
|
{
|
||||||
|
return mMessage;
|
||||||
|
}
|
||||||
|
|
||||||
void GetUiUrl(nsAString& aUiUrl)
|
void GetUiUrl(nsAString& aUiUrl)
|
||||||
{
|
{
|
||||||
aUiUrl = mUiUrl;
|
aUiUrl = mUiUrl;
|
||||||
@ -105,6 +120,9 @@ private:
|
|||||||
nsCOMPtr<nsICancelable> mMDNSCancelRegister;
|
nsCOMPtr<nsICancelable> mMDNSCancelRegister;
|
||||||
|
|
||||||
nsString mName;
|
nsString mName;
|
||||||
|
nsString mCategory;
|
||||||
|
bool mHttp;
|
||||||
|
bool mMessage;
|
||||||
nsString mUiUrl;
|
nsString mUiUrl;
|
||||||
|
|
||||||
bool mIsRegistered;
|
bool mIsRegistered;
|
||||||
|
@ -7,6 +7,9 @@
|
|||||||
[Pref="dom.flyweb.enabled"]
|
[Pref="dom.flyweb.enabled"]
|
||||||
interface FlyWebPublishedServer : EventTarget {
|
interface FlyWebPublishedServer : EventTarget {
|
||||||
readonly attribute DOMString name;
|
readonly attribute DOMString name;
|
||||||
|
readonly attribute DOMString? category;
|
||||||
|
readonly attribute boolean http;
|
||||||
|
readonly attribute boolean message;
|
||||||
readonly attribute DOMString? uiUrl;
|
readonly attribute DOMString? uiUrl;
|
||||||
|
|
||||||
void close();
|
void close();
|
||||||
@ -17,6 +20,9 @@ interface FlyWebPublishedServer : EventTarget {
|
|||||||
};
|
};
|
||||||
|
|
||||||
dictionary FlyWebPublishOptions {
|
dictionary FlyWebPublishOptions {
|
||||||
|
DOMString category = "";
|
||||||
|
boolean http = false;
|
||||||
|
boolean message = false;
|
||||||
DOMString? uiUrl = null; // URL to user interface. Can be different server. Makes
|
DOMString? uiUrl = null; // URL to user interface. Can be different server. Makes
|
||||||
// endpoint show up in browser's "local services" UI.
|
// endpoint show up in browser's "local services" UI.
|
||||||
// If relative, resolves against the root of the server.
|
// If relative, resolves against the root of the server.
|
||||||
|
Loading…
Reference in New Issue
Block a user