Commit cfb0e62f authored by Ben Kelly's avatar Ben Kelly
Browse files

Bug 1293277 P5 Switch bindings over to new Client and Clients classes. r=baku

parent 4bede347

dom/bindings/Bindings.conf

+1 −12
Original line number Diff line number Diff line
@@ -149,16 +149,6 @@ DOMInterfaces = { 
    'nativeType': 'mozilla::dom::workers::ChromeWorkerPrivate',

},



'Client': {

    'nativeType': 'mozilla::dom::workers::ServiceWorkerClient',

    'headerFile': 'mozilla/dom/workers/bindings/ServiceWorkerClient.h',

},



'Clients': {

    'nativeType': 'mozilla::dom::workers::ServiceWorkerClients',

    'headerFile': 'mozilla/dom/workers/bindings/ServiceWorkerClients.h',

},



'console': {

    'nativeType': 'mozilla::dom::Console',

},
@@ -1111,8 +1101,7 @@ DOMInterfaces = { 
},



'WindowClient': {

    'nativeType': 'mozilla::dom::workers::ServiceWorkerWindowClient',

    'headerFile': 'mozilla/dom/workers/bindings/ServiceWorkerWindowClient.h',

    'nativeType': 'mozilla::dom::Client',

},



'WebGLActiveInfo': {

dom/clients/api/Client.cpp

+0 −4
Original line number Diff line number Diff line
@@ -76,14 +76,10 @@ Client::GetStorageAccess() const 
JSObject*

Client::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)

{

#if 0

  // TODO: Enable when bindings are updated to point to this class.

  if (mData->info().type() == ClientType::Window) {

    return WindowClientBinding::Wrap(aCx, this, aGivenProto);

  }

  return ClientBinding::Wrap(aCx, this, aGivenProto);

#endif

  return nullptr;

}



nsIGlobalObject*

dom/clients/api/Clients.cpp

+0 −4
Original line number Diff line number Diff line
@@ -44,11 +44,7 @@ Clients::Clients(nsIGlobalObject* aGlobal) 
JSObject*

Clients::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)

{

  // TODO: Enable when bindings are updated to point to this class.

#if 0

  return ClientsBinding::Wrap(aCx, this, aGivenProto);

#endif

  return nullptr;

}



nsIGlobalObject*

dom/webidl/Client.webidl

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ interface Client { 
  readonly attribute USVString url;



  // Remove frameType in bug 1290936

  [BinaryName="GetFrameType"]

  readonly attribute FrameType frameType;



  readonly attribute ClientType type;
@@ -27,6 +28,7 @@ interface Client { 


[Exposed=ServiceWorker]

interface WindowClient : Client {

  [BinaryName="GetVisibilityState"]

  readonly attribute VisibilityState visibilityState;

  readonly attribute boolean focused;

dom/webidl/ServiceWorkerGlobalScope.webidl

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ 
[Global=(Worker,ServiceWorker),

 Exposed=ServiceWorker]

interface ServiceWorkerGlobalScope : WorkerGlobalScope {

  [SameObject] readonly attribute Clients clients;

  [SameObject, BinaryName="GetClients"]

  readonly attribute Clients clients;

  [SameObject] readonly attribute ServiceWorkerRegistration registration;



  [Throws, NewObject]