Bug 1259590 - Remove B2G ACL code. r=khuey

iaxat · Apr 7, 2016 · 7bbb04c · 7bbb04c
1 parent 8987d39
commit 7bbb04c
Show file tree

Hide file tree

Showing 31 changed files with 22 additions and 387 deletions.
diff --git a/dom/apps/PermissionsTable.jsm b/dom/apps/PermissionsTable.jsm
@@ -487,11 +487,6 @@ this.PermissionsTable =  { geolocation: {
                              privileged: DENY_ACTION,
                              certified: ALLOW_ACTION
                            },
-                           "external-app": {
-                             app: DENY_ACTION,
-                             privileged: ALLOW_ACTION,
-                             certified: ALLOW_ACTION
-                           },
                            "system-update": {
                              app: DENY_ACTION,
                              privileged: DENY_ACTION,

diff --git a/dom/base/nsGkAtomList.h b/dom/base/nsGkAtomList.h
@@ -371,7 +371,6 @@ GK_ATOM(excludeResultPrefixes, "exclude-result-prefixes")
 GK_ATOM(excludes, "excludes")
 GK_ATOM(expr, "expr")
 GK_ATOM(expectingSystemMessage, "expecting-system-message")
-GK_ATOM(extapp, "extapp")
 GK_ATOM(extends, "extends")
 GK_ATOM(extensionElementPrefixes, "extension-element-prefixes")
 GK_ATOM(face, "face")

diff --git a/dom/html/HTMLExtAppElement.cpp b/dom/html/HTMLExtAppElement.cpp
diff --git a/dom/html/HTMLExtAppElement.h b/dom/html/HTMLExtAppElement.h
diff --git a/dom/html/HTMLMediaElement.h b/dom/html/HTMLMediaElement.h
@@ -225,7 +225,7 @@ class HTMLMediaElement : public nsGenericHTMLElement,
 
   // Called by the media decoder and the video frame to get the
   // ImageContainer containing the video data.
-  B2G_ACL_EXPORT virtual VideoFrameContainer* GetVideoFrameContainer() final override;
+  virtual VideoFrameContainer* GetVideoFrameContainer() final override;
   layers::ImageContainer* GetImageContainer();
 
   // From PrincipalChangeObserver<DOMMediaStream>.

diff --git a/dom/html/HTMLSummaryElement.cpp b/dom/html/HTMLSummaryElement.cpp
@@ -8,6 +8,7 @@
 #include "mozilla/dom/HTMLDetailsElement.h"
 #include "mozilla/dom/HTMLElementBinding.h"
 #include "mozilla/dom/HTMLUnknownElement.h"
+#include "mozilla/EventDispatcher.h"
 #include "mozilla/MouseEvents.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/TextEvents.h"

diff --git a/dom/html/moz.build b/dom/html/moz.build
@@ -58,7 +58,6 @@ EXPORTS.mozilla.dom += [
     'HTMLDataListElement.h',
     'HTMLDetailsElement.h',
     'HTMLDivElement.h',
-    'HTMLExtAppElement.h',
     'HTMLFieldSetElement.h',
     'HTMLFontElement.h',
     'HTMLFormControlsCollection.h',
@@ -138,7 +137,6 @@ UNIFIED_SOURCES += [
     'HTMLDetailsElement.cpp',
     'HTMLDivElement.cpp',
     'HTMLElement.cpp',
-    'HTMLExtAppElement.cpp',
     'HTMLFieldSetElement.cpp',
     'HTMLFontElement.cpp',
     'HTMLFormControlsCollection.cpp',

diff --git a/dom/html/nsFormSubmission.cpp b/dom/html/nsFormSubmission.cpp
@@ -40,7 +40,9 @@
 #include "mozilla/dom/File.h"
 
 using namespace mozilla;
+using mozilla::dom::Blob;
 using mozilla::dom::EncodingUtils;
+using mozilla::dom::File;
 
 static void
 SendJSWarning(nsIDocument* aDocument,

diff --git a/dom/html/nsGenericHTMLElement.h b/dom/html/nsGenericHTMLElement.h
@@ -1772,7 +1772,6 @@ NS_DECLARE_NS_NEW_HTML_ELEMENT(Data)
 NS_DECLARE_NS_NEW_HTML_ELEMENT(DataList)
 NS_DECLARE_NS_NEW_HTML_ELEMENT(Details)
 NS_DECLARE_NS_NEW_HTML_ELEMENT(Div)
-NS_DECLARE_NS_NEW_HTML_ELEMENT(ExtApp)
 NS_DECLARE_NS_NEW_HTML_ELEMENT(FieldSet)
 NS_DECLARE_NS_NEW_HTML_ELEMENT(Font)
 NS_DECLARE_NS_NEW_HTML_ELEMENT(Form)

diff --git a/dom/html/test/mochitest.ini b/dom/html/test/mochitest.ini
@@ -599,7 +599,6 @@ support-files = file_bug871161-1.html file_bug871161-2.html
 skip-if = buildapp == 'b2g' || (e10s && debug && os == 'win') # bug 1129014
 [test_img_complete.html]
 [test_viewport_resize.html]
-[test_extapp.html]
 [test_image_clone_load.html]
 [test_bug1203668.html]
 [test_bug1166138.html]

diff --git a/dom/html/test/test_extapp.html b/dom/html/test/test_extapp.html
diff --git a/dom/media/VideoFrameContainer.h b/dom/media/VideoFrameContainer.h
@@ -31,7 +31,7 @@ class HTMLMediaElement;
  * confusing.
  */
 class VideoFrameContainer {
-  B2G_ACL_EXPORT ~VideoFrameContainer();
+  ~VideoFrameContainer();
 
 public:
   typedef layers::ImageContainer ImageContainer;
@@ -50,7 +50,7 @@ class VideoFrameContainer {
   // aFrameID is ignored if aPrincipalHandle already is our pending principalHandle.
   void UpdatePrincipalHandleForFrameID(const PrincipalHandle& aPrincipalHandle,
                                        const ImageContainer::FrameID& aFrameID);
-  B2G_ACL_EXPORT void SetCurrentFrame(const gfx::IntSize& aIntrinsicSize, Image* aImage,
+  void SetCurrentFrame(const gfx::IntSize& aIntrinsicSize, Image* aImage,
                        const TimeStamp& aTargetTime);
   void SetCurrentFrames(const gfx::IntSize& aIntrinsicSize,
                         const nsTArray<ImageContainer::NonOwningImage>& aImages);
@@ -82,8 +82,8 @@ class VideoFrameContainer {
     INVALIDATE_FORCE
   };
   void Invalidate() { InvalidateWithFlags(INVALIDATE_DEFAULT); }
-  B2G_ACL_EXPORT void InvalidateWithFlags(uint32_t aFlags);
-  B2G_ACL_EXPORT ImageContainer* GetImageContainer();
+  void InvalidateWithFlags(uint32_t aFlags);
+  ImageContainer* GetImageContainer();
   void ForgetElement() { mElement = nullptr; }
 
   uint32_t GetDroppedImageCount() { return mImageContainer->GetDroppedImageCount(); }