Bug 1263991 part 1: Remove some properties that are not needed right now. r=djvj
☠☠ backed out by c010252e1bc4 ☠ ☠
authorJonas Sicking <jonas@sicking.cc>
Tue, 07 Jun 2016 02:46:03 -0700
changeset 300867 555091dfb391300553724f15a9b74d8558ea2a66
parent 300866 7eda97fe3aa797647ba580696b61903e56aa2695
child 300868 65e49149fbccaf79a131ec82cc4180207c3ef603
push id19599
push usercbook@mozilla.com
push dateWed, 08 Jun 2016 10:16:21 +0000
treeherderfx-team@81f4cc3f6f4c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdjvj
bugs1263991
milestone50.0a1
Bug 1263991 part 1: Remove some properties that are not needed right now. r=djvj
dom/bindings/Bindings.conf
dom/flyweb/FlyWebPublishedServer.cpp
dom/flyweb/FlyWebPublishedServer.h
dom/webidl/FlyWebPublish.webidl
--- a/dom/bindings/Bindings.conf
+++ b/dom/bindings/Bindings.conf
@@ -495,22 +495,20 @@ DOMInterfaces = {
 },
 
 'FileReaderSync': {
     'wrapperCache': False,
 },
 
 'FlyWebFetchEvent': {
     'headerFile': 'FlyWebServerEvents.h',
-    'nativeType': 'mozilla::dom::FlyWebFetchEvent',
 },
 
 'FlyWebWebSocketEvent': {
     'headerFile': 'FlyWebServerEvents.h',
-    'nativeType': 'mozilla::dom::FlyWebWebSocketEvent',
 },
 
 'FontFaceSet': {
     'implicitJSContext': [ 'load' ],
 },
 
 'FontFaceSetIterator': {
     'wrapperCache': False,
--- a/dom/flyweb/FlyWebPublishedServer.cpp
+++ b/dom/flyweb/FlyWebPublishedServer.cpp
@@ -26,26 +26,19 @@ NS_IMPL_ISUPPORTS_INHERITED0(FlyWebPubli
 FlyWebPublishedServer::FlyWebPublishedServer(nsPIDOMWindowInner* aOwner,
                                              const nsAString& aName,
                                              const FlyWebPublishOptions& aOptions,
                                              Promise* aPublishPromise)
   : mozilla::DOMEventTargetHelper(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);
 }
 
 FlyWebPublishedServer::~FlyWebPublishedServer()
 {
   // Make sure to unregister to avoid dangling pointers
   Close();
--- a/dom/flyweb/FlyWebPublishedServer.h
+++ b/dom/flyweb/FlyWebPublishedServer.h
@@ -58,31 +58,16 @@ public:
   {
     aName = mName;
   }
   nsAString& Name()
   {
     return mName;
   }
 
-  void GetCategory(nsAString& aCategory)
-  {
-    aCategory = mCategory;
-  }
-
-  bool Http()
-  {
-    return mHttp;
-  }
-
-  bool Message()
-  {
-    return mMessage;
-  }
-
   void GetUiUrl(nsAString& aUiUrl)
   {
     aUiUrl = mUiUrl;
   }
 
   void OnFetchResponse(InternalRequest* aRequest,
                        InternalResponse* aResponse);
   already_AddRefed<WebSocket>
@@ -115,19 +100,16 @@ private:
   ~FlyWebPublishedServer();
 
   uint64_t mOwnerWindowID;
   RefPtr<HttpServer> mHttpServer;
   RefPtr<Promise> mPublishPromise;
   nsCOMPtr<nsICancelable> mMDNSCancelRegister;
 
   nsString mName;
-  nsString mCategory;
-  bool mHttp;
-  bool mMessage;
   nsString mUiUrl;
 
   bool mIsRegistered;
 };
 
 } // namespace dom
 } // namespace mozilla
 
--- a/dom/webidl/FlyWebPublish.webidl
+++ b/dom/webidl/FlyWebPublish.webidl
@@ -2,28 +2,22 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 [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();
 
   attribute EventHandler onclose;
   attribute EventHandler onfetch;
   attribute EventHandler onwebsocket;
 };
 
 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.
 };