author | Olli Pettay <Olli.Pettay@helsinki.fi> |
Thu, 28 Feb 2013 20:53:04 +0200 (2013-02-28) | |
changeset 123371 | 7cde774aa6655d25cd928f85fa960d10ca7be24b |
parent 123370 | 8db79d56a4b10681d5b02507bce3acc7ae0bb3a6 |
child 123372 | 31fce81d3394ba49559f7a4a9a370d75311d85b8 |
push id | 23798 |
push user | opettay@mozilla.com |
push date | Thu, 28 Feb 2013 19:11:37 +0000 (2013-02-28) |
treeherder | mozilla-inbound@7cde774aa665 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | sicking |
bugs | 845631 |
milestone | 22.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/b2g/installer/package-manifest.in +++ b/b2g/installer/package-manifest.in @@ -207,17 +207,16 @@ @BINPATH@/components/dom_storage.xpt @BINPATH@/components/dom_stylesheets.xpt @BINPATH@/components/dom_threads.xpt @BINPATH@/components/dom_traversal.xpt @BINPATH@/components/dom_views.xpt @BINPATH@/components/dom_xbl.xpt @BINPATH@/components/dom_xpath.xpt @BINPATH@/components/dom_xul.xpt -@BINPATH@/components/dom_loadsave.xpt @BINPATH@/components/dom_time.xpt @BINPATH@/components/downloads.xpt @BINPATH@/components/editor.xpt @BINPATH@/components/embed_base.xpt @BINPATH@/components/extensions.xpt @BINPATH@/components/exthandler.xpt @BINPATH@/components/exthelper.xpt @BINPATH@/components/fastfind.xpt
--- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -206,17 +206,16 @@ @BINPATH@/components/dom_mobilemessage.xpt @BINPATH@/components/dom_sms.xpt @BINPATH@/components/dom_storage.xpt @BINPATH@/components/dom_stylesheets.xpt @BINPATH@/components/dom_traversal.xpt @BINPATH@/components/dom_xbl.xpt @BINPATH@/components/dom_xpath.xpt @BINPATH@/components/dom_xul.xpt -@BINPATH@/components/dom_loadsave.xpt @BINPATH@/components/downloads.xpt @BINPATH@/components/editor.xpt @BINPATH@/components/embed_base.xpt @BINPATH@/components/extensions.xpt @BINPATH@/components/exthandler.xpt @BINPATH@/components/exthelper.xpt @BINPATH@/components/fastfind.xpt @BINPATH@/components/feeds.xpt
--- a/content/base/public/nsDeprecatedOperationList.h +++ b/content/base/public/nsDeprecatedOperationList.h @@ -14,18 +14,16 @@ DEPRECATED_OPERATION(SetAttributeNodeNS) DEPRECATED_OPERATION(RemoveAttributeNode) DEPRECATED_OPERATION(CreateAttribute) DEPRECATED_OPERATION(CreateAttributeNS) DEPRECATED_OPERATION(Specified) DEPRECATED_OPERATION(OwnerElement) DEPRECATED_OPERATION(NodeValue) DEPRECATED_OPERATION(TextContent) DEPRECATED_OPERATION(EnablePrivilege) -DEPRECATED_OPERATION(Position) -DEPRECATED_OPERATION(TotalSize) DEPRECATED_OPERATION(InputEncoding) DEPRECATED_OPERATION(MozBeforePaint) DEPRECATED_OPERATION(DOMExceptionCode) DEPRECATED_OPERATION(NoExposedProps) DEPRECATED_OPERATION(MutationEvent) DEPRECATED_OPERATION(MozSlice) DEPRECATED_OPERATION(Components) DEPRECATED_OPERATION(PrefixedVisibilityAPI)
--- a/content/base/src/nsXMLHttpRequest.cpp +++ b/content/base/src/nsXMLHttpRequest.cpp @@ -382,17 +382,16 @@ NS_IMPL_RELEASE_INHERITED(nsXMLHttpReque ///////////////////////////////////////////// nsXMLHttpRequest::nsXMLHttpRequest() : mResponseBodyDecodedPos(0), mResponseType(XML_HTTP_RESPONSE_TYPE_DEFAULT), mRequestObserver(nullptr), mState(XML_HTTP_REQUEST_UNSENT), mUploadTransferred(0), mUploadTotal(0), mUploadComplete(true), mProgressSinceLastProgressEvent(false), - mUploadProgress(0), mUploadProgressMax(0), mRequestSentTime(0), mTimeoutMilliseconds(0), mErrorLoad(false), mWaitingForOnStopRequest(false), mProgressTimerIsActive(false), mProgressEventWasDelayed(false), mIsHtml(false), mWarnAboutMultipartHtml(false), mWarnAboutSyncHtml(false), mLoadLengthComputable(false), mLoadTotal(0), mIsSystem(false), @@ -1539,33 +1538,31 @@ nsXMLHttpRequest::CreateReadystatechange (*aDOMEvent)->SetTrusted(true); return NS_OK; } void nsXMLHttpRequest::DispatchProgressEvent(nsDOMEventTargetHelper* aTarget, const nsAString& aType, - bool aUseLSEventWrapper, bool aLengthComputable, - uint64_t aLoaded, uint64_t aTotal, - uint64_t aPosition, uint64_t aTotalSize) + uint64_t aLoaded, uint64_t aTotal) { NS_ASSERTION(aTarget, "null target"); NS_ASSERTION(!aType.IsEmpty(), "missing event type"); if (NS_FAILED(CheckInnerWindowCorrectness()) || (!AllowUploadProgress() && aTarget == mUpload)) { return; } bool dispatchLoadend = aType.EqualsLiteral(LOAD_STR) || - aType.EqualsLiteral(ERROR_STR) || - aType.EqualsLiteral(TIMEOUT_STR) || - aType.EqualsLiteral(ABORT_STR); + aType.EqualsLiteral(ERROR_STR) || + aType.EqualsLiteral(TIMEOUT_STR) || + aType.EqualsLiteral(ABORT_STR); nsCOMPtr<nsIDOMEvent> event; nsresult rv = NS_NewDOMProgressEvent(getter_AddRefs(event), nullptr, nullptr); if (NS_FAILED(rv)) { return; } @@ -1574,27 +1571,21 @@ nsXMLHttpRequest::DispatchProgressEvent( return; } progress->InitProgressEvent(aType, false, false, aLengthComputable, aLoaded, (aTotal == UINT64_MAX) ? 0 : aTotal); event->SetTrusted(true); - if (aUseLSEventWrapper) { - nsCOMPtr<nsIDOMProgressEvent> xhrprogressEvent = - new nsXMLHttpProgressEvent(progress, aPosition, aTotalSize, GetOwner()); - event = xhrprogressEvent; - } aTarget->DispatchDOMEvent(nullptr, event, nullptr, nullptr); - + if (dispatchLoadend) { DispatchProgressEvent(aTarget, NS_LITERAL_STRING(LOADEND_STR), - aUseLSEventWrapper, aLengthComputable, - aLoaded, aTotal, aPosition, aTotalSize); + aLengthComputable, aLoaded, aTotal); } } already_AddRefed<nsIHttpChannel> nsXMLHttpRequest::GetCurrentHttpChannel() { nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(mReadRequest); if (!httpChannel) { @@ -2804,18 +2795,16 @@ nsXMLHttpRequest::Send(nsIVariant* aVari mUploadTransferred = 0; mUploadTotal = 0; // By default we don't have any upload, so mark upload complete. mUploadComplete = true; mErrorLoad = false; mLoadLengthComputable = false; mLoadTotal = 0; - mUploadProgress = 0; - mUploadProgressMax = 0; if ((aVariant || !aBody.IsNull()) && httpChannel && !method.EqualsLiteral("GET")) { nsAutoCString charset; nsAutoCString defaultContentType; nsCOMPtr<nsIInputStream> postDataStream; rv = GetRequestBody(aVariant, aBody, getter_AddRefs(postDataStream), @@ -3642,32 +3631,30 @@ nsXMLHttpRequest::MaybeDispatchProgressE StartProgressEventTimer(); } // We're uploading if our state is XML_HTTP_REQUEST_OPENED or // XML_HTTP_REQUEST_SENT if ((XML_HTTP_REQUEST_OPENED | XML_HTTP_REQUEST_SENT) & mState) { if (aFinalProgress) { mUploadTotal = mUploadTransferred; - mUploadProgressMax = mUploadProgress; } if (mUpload && !mUploadComplete) { DispatchProgressEvent(mUpload, NS_LITERAL_STRING(PROGRESS_STR), - true, mUploadLengthComputable, mUploadTransferred, - mUploadTotal, mUploadProgress, - mUploadProgressMax); + mUploadLengthComputable, mUploadTransferred, + mUploadTotal); } } else { if (aFinalProgress) { mLoadTotal = mLoadTransferred; } mInLoadProgressEvent = true; DispatchProgressEvent(this, NS_LITERAL_STRING(PROGRESS_STR), - true, mLoadLengthComputable, mLoadTransferred, - mLoadTotal, mLoadTransferred, mLoadTotal); + mLoadLengthComputable, mLoadTransferred, + mLoadTotal); mInLoadProgressEvent = false; if (mResponseType == XML_HTTP_RESPONSE_TYPE_CHUNKED_TEXT || mResponseType == XML_HTTP_RESPONSE_TYPE_CHUNKED_ARRAYBUFFER) { mResponseBody.Truncate(); mResponseText.Truncate(); mResultArrayBuffer = nullptr; } } @@ -3696,18 +3683,16 @@ nsXMLHttpRequest::OnProgress(nsIRequest uint64_t total = aProgressMax; if (lengthComputable) { uint64_t headerSize = aProgressMax - mUploadTotal; loaded -= headerSize; total -= headerSize; } mUploadLengthComputable = lengthComputable; mUploadTransferred = loaded; - mUploadProgress = aProgress; - mUploadProgressMax = aProgressMax; mProgressSinceLastProgressEvent = true; MaybeDispatchProgressEvents(false); } else { mLoadLengthComputable = lengthComputable; mLoadTotal = lengthComputable ? aProgressMax : 0; // Don't dispatch progress events here. OnDataAvailable will take care @@ -4004,91 +3989,16 @@ nsHeaderVisitor::VisitHeader(const nsACS mHeaders.Append(header); mHeaders.Append(": "); mHeaders.Append(value); mHeaders.Append("\r\n"); } return NS_OK; } -// DOM event class to handle progress notifications -nsXMLHttpProgressEvent::nsXMLHttpProgressEvent(nsIDOMProgressEvent* aInner, - uint64_t aCurrentProgress, - uint64_t aMaxProgress, - nsPIDOMWindow* aWindow) - : mWindow(aWindow) -{ - mInner = aInner; - mCurProgress = aCurrentProgress; - mMaxProgress = aMaxProgress; -} - -nsXMLHttpProgressEvent::~nsXMLHttpProgressEvent() -{} - -DOMCI_DATA(XMLHttpProgressEvent, nsXMLHttpProgressEvent) - -// QueryInterface implementation for nsXMLHttpProgressEvent -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXMLHttpProgressEvent) - NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMProgressEvent) - NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIDOMEvent, nsIDOMProgressEvent) - NS_INTERFACE_MAP_ENTRY(nsIDOMProgressEvent) - NS_INTERFACE_MAP_ENTRY(nsIDOMLSProgressEvent) - NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(XMLHttpProgressEvent) -NS_INTERFACE_MAP_END - -NS_IMPL_CYCLE_COLLECTING_ADDREF(nsXMLHttpProgressEvent) -NS_IMPL_CYCLE_COLLECTING_RELEASE(nsXMLHttpProgressEvent) - -NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsXMLHttpProgressEvent) - NS_IMPL_CYCLE_COLLECTION_UNLINK(mInner); - NS_IMPL_CYCLE_COLLECTION_UNLINK(mWindow); -NS_IMPL_CYCLE_COLLECTION_UNLINK_END - -NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsXMLHttpProgressEvent) - NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mInner) - NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mWindow); -NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END - -NS_IMETHODIMP nsXMLHttpProgressEvent::GetInput(nsIDOMLSInput * *aInput) -{ - *aInput = nullptr; - return NS_ERROR_NOT_IMPLEMENTED; -} - -void -nsXMLHttpProgressEvent::WarnAboutLSProgressEvent(nsIDocument::DeprecatedOperations aOperation) -{ - if (!mWindow) { - return; - } - nsCOMPtr<nsIDocument> document = - do_QueryInterface(mWindow->GetExtantDocument()); - if (!document) { - return; - } - document->WarnOnceAbout(aOperation); -} - -NS_IMETHODIMP nsXMLHttpProgressEvent::GetPosition(uint32_t *aPosition) -{ - WarnAboutLSProgressEvent(nsIDocument::ePosition); - // XXX can we change the iface? - *aPosition = uint32_t(mCurProgress); - return NS_OK; -} - -NS_IMETHODIMP nsXMLHttpProgressEvent::GetTotalSize(uint32_t *aTotalSize) -{ - WarnAboutLSProgressEvent(nsIDocument::eTotalSize); - // XXX can we change the iface? - *aTotalSize = uint32_t(mMaxProgress); - return NS_OK; -} - // nsXMLHttpRequestXPCOMifier implementation NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXMLHttpRequestXPCOMifier) NS_INTERFACE_MAP_ENTRY(nsIStreamListener) NS_INTERFACE_MAP_ENTRY(nsIRequestObserver) NS_INTERFACE_MAP_ENTRY(nsIChannelEventSink) NS_INTERFACE_MAP_ENTRY(nsIProgressEventSink) NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor) NS_INTERFACE_MAP_ENTRY(nsITimerCallback)
--- a/content/base/src/nsXMLHttpRequest.h +++ b/content/base/src/nsXMLHttpRequest.h @@ -21,17 +21,16 @@ #include "nsIChannelEventSink.h" #include "nsIAsyncVerifyRedirectCallback.h" #include "nsIInterfaceRequestor.h" #include "nsIHttpHeaderVisitor.h" #include "nsIProgressEventSink.h" #include "nsCOMArray.h" #include "nsJSUtils.h" #include "nsTArray.h" -#include "nsIDOMLSProgressEvent.h" #include "nsITimer.h" #include "nsIDOMProgressEvent.h" #include "nsDOMEventTargetHelper.h" #include "nsDOMFile.h" #include "nsDOMBlobBuilder.h" #include "nsIPrincipal.h" #include "nsIScriptObjectPrincipal.h" #include "nsISizeOfEventTarget.h" @@ -445,39 +444,20 @@ public: } // We need a GetInterface callable from JS for chrome JS JS::Value GetInterface(JSContext* aCx, nsIJSID* aIID, ErrorResult& aRv); // This creates a trusted readystatechange event, which is not cancelable and // doesn't bubble. static nsresult CreateReadystatechangeEvent(nsIDOMEvent** aDOMEvent); - // For backwards compatibility aPosition should contain the headers for upload - // and aTotalSize is UINT64_MAX when unknown. Both those values are - // used by nsXMLHttpProgressEvent. Normal progress event should not use - // headers in aLoaded and aTotal is 0 when unknown. - void DispatchProgressEvent(nsDOMEventTargetHelper* aTarget, - const nsAString& aType, - // Whether to use nsXMLHttpProgressEvent, - // which implements LS Progress Event. - bool aUseLSEventWrapper, - bool aLengthComputable, - // For Progress Events - uint64_t aLoaded, uint64_t aTotal, - // For LS Progress Events - uint64_t aPosition, uint64_t aTotalSize); void DispatchProgressEvent(nsDOMEventTargetHelper* aTarget, const nsAString& aType, bool aLengthComputable, - uint64_t aLoaded, uint64_t aTotal) - { - DispatchProgressEvent(aTarget, aType, false, - aLengthComputable, aLoaded, aTotal, - aLoaded, aLengthComputable ? aTotal : UINT64_MAX); - } + uint64_t aLoaded, uint64_t aTotal); // Dispatch the "progress" event on the XHR or XHR.upload object if we've // received data since the last "progress" event. Also dispatches // "uploadprogress" as needed. void MaybeDispatchProgressEvents(bool aFinalProgress); // This is called by the factory constructor. nsresult Init(); @@ -636,18 +616,16 @@ protected: uint32_t mState; nsRefPtr<nsXMLHttpRequestUpload> mUpload; uint64_t mUploadTransferred; uint64_t mUploadTotal; bool mUploadLengthComputable; bool mUploadComplete; bool mProgressSinceLastProgressEvent; - uint64_t mUploadProgress; // For legacy - uint64_t mUploadProgressMax; // For legacy // Timeout support PRTime mRequestSentTime; uint32_t mTimeoutMilliseconds; nsCOMPtr<nsITimer> mTimeoutTimer; void StartTimeoutTimer(); void HandleTimeoutCallback(); @@ -732,43 +710,16 @@ class nsXMLHttpRequestXPCOMifier MOZ_FIN NS_FORWARD_NSITIMERCALLBACK(mXHR->) NS_DECL_NSIINTERFACEREQUESTOR private: nsRefPtr<nsXMLHttpRequest> mXHR; }; -// helper class to expose a progress DOM Event - -class nsXMLHttpProgressEvent : public nsIDOMProgressEvent, - public nsIDOMLSProgressEvent -{ -public: - nsXMLHttpProgressEvent(nsIDOMProgressEvent* aInner, - uint64_t aCurrentProgress, - uint64_t aMaxProgress, - nsPIDOMWindow* aWindow); - virtual ~nsXMLHttpProgressEvent(); - - NS_DECL_CYCLE_COLLECTING_ISUPPORTS - NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsXMLHttpProgressEvent, nsIDOMProgressEvent) - NS_FORWARD_NSIDOMEVENT(mInner->) - NS_FORWARD_NSIDOMPROGRESSEVENT(mInner->) - NS_DECL_NSIDOMLSPROGRESSEVENT - -protected: - void WarnAboutLSProgressEvent(nsIDocument::DeprecatedOperations); - - nsCOMPtr<nsIDOMProgressEvent> mInner; - nsCOMPtr<nsPIDOMWindow> mWindow; - uint64_t mCurProgress; - uint64_t mMaxProgress; -}; - class nsXHRParseEndListener : public nsIDOMEventListener { public: NS_DECL_ISUPPORTS NS_IMETHOD HandleEvent(nsIDOMEvent *event) { nsCOMPtr<nsIXMLHttpRequest> xhr = do_QueryReferent(mXHR); if (xhr) {
--- a/dom/base/nsDOMClassInfo.cpp +++ b/dom/base/nsDOMClassInfo.cpp @@ -152,17 +152,16 @@ #include "nsAutoPtr.h" #include "nsMemory.h" // Tranformiix #include "nsIDOMXPathEvaluator.h" #include "nsIXSLTProcessor.h" #include "nsIXSLTProcessorPrivate.h" -#include "nsIDOMLSProgressEvent.h" #include "nsXMLHttpRequest.h" #include "nsIDOMSettingsManager.h" #include "nsIDOMContactManager.h" #include "nsIDOMPermissionSettings.h" #include "nsIDOMApplicationRegistry.h" #ifdef MOZ_B2G_RIL #include "nsIWifi.h" @@ -197,17 +196,16 @@ #include "nsIDOMHTMLCanvasElement.h" #include "nsIDOMHTMLEmbedElement.h" #include "nsIDOMHTMLIFrameElement.h" #include "nsIDOMHTMLInputElement.h" #include "nsIDOMHTMLObjectElement.h" #include "nsIDOMTimeRanges.h" #include "nsIDOMHTMLVideoElement.h" #include "nsIDOMHTMLAudioElement.h" -#include "nsIDOMProgressEvent.h" #include "nsIDOMCSSCharsetRule.h" #include "nsIDOMCSSImportRule.h" #include "nsIDOMCSSMediaRule.h" #include "nsIDOMCSSFontFaceRule.h" #include "nsIDOMCSSMozDocumentRule.h" #include "nsIDOMCSSSupportsRule.h" #include "nsIDOMMozCSSKeyframeRule.h" #include "nsIDOMMozCSSKeyframesRule.h" @@ -924,19 +922,16 @@ static nsDOMClassInfoData sClassInfoData nsIXPCScriptable::WANT_GETPROPERTY | nsIXPCScriptable::WANT_SETPROPERTY | nsIXPCScriptable::WANT_DELPROPERTY | nsIXPCScriptable::DONT_ENUM_STATIC_PROPS | nsIXPCScriptable::WANT_NEWENUMERATE) NS_DEFINE_CLASSINFO_DATA(StorageItem, nsDOMGenericSH, DOM_DEFAULT_SCRIPTABLE_FLAGS) - NS_DEFINE_CLASSINFO_DATA(XMLHttpProgressEvent, nsDOMGenericSH, - DOM_DEFAULT_SCRIPTABLE_FLAGS) - NS_DEFINE_CLASSINFO_DATA(ClientRect, nsDOMGenericSH, DOM_DEFAULT_SCRIPTABLE_FLAGS) NS_DEFINE_CLASSINFO_DATA(XULCommandEvent, nsDOMGenericSH, DOM_DEFAULT_SCRIPTABLE_FLAGS) NS_DEFINE_CLASSINFO_DATA(CommandEvent, nsDOMGenericSH, DOM_DEFAULT_SCRIPTABLE_FLAGS) @@ -2493,22 +2488,16 @@ nsDOMClassInfo::Init() DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorage) DOM_CLASSINFO_MAP_END DOM_CLASSINFO_MAP_BEGIN(StorageItem, nsIDOMStorageItem) DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageItem) DOM_CLASSINFO_MAP_ENTRY(nsIDOMToString) DOM_CLASSINFO_MAP_END - DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(XMLHttpProgressEvent, nsIDOMEvent) - DOM_CLASSINFO_MAP_ENTRY(nsIDOMLSProgressEvent) - DOM_CLASSINFO_MAP_ENTRY(nsIDOMProgressEvent) - DOM_CLASSINFO_EVENT_MAP_ENTRIES - DOM_CLASSINFO_MAP_END - DOM_CLASSINFO_MAP_BEGIN(XULCommandEvent, nsIDOMXULCommandEvent) DOM_CLASSINFO_MAP_ENTRY(nsIDOMXULCommandEvent) DOM_CLASSINFO_UI_EVENT_MAP_ENTRIES DOM_CLASSINFO_MAP_END DOM_CLASSINFO_MAP_BEGIN(CommandEvent, nsIDOMCommandEvent) DOM_CLASSINFO_MAP_ENTRY(nsIDOMCommandEvent) DOM_CLASSINFO_EVENT_MAP_ENTRIES
--- a/dom/base/nsDOMClassInfoClasses.h +++ b/dom/base/nsDOMClassInfoClasses.h @@ -174,19 +174,16 @@ DOMCI_CLASS(XPathExpression) DOMCI_CLASS(XPathNSResolver) DOMCI_CLASS(XPathResult) // WhatWG WebApps Objects DOMCI_CLASS(StorageObsolete) DOMCI_CLASS(Storage) DOMCI_CLASS(StorageItem) -// XMLHttpRequest -DOMCI_CLASS(XMLHttpProgressEvent) - DOMCI_CLASS(ClientRect) DOMCI_CLASS(XULCommandEvent) DOMCI_CLASS(CommandEvent) DOMCI_CLASS(OfflineResourceList) DOMCI_CLASS(Blob) DOMCI_CLASS(File)
deleted file mode 100644 --- a/dom/interfaces/load-save/Makefile.in +++ /dev/null @@ -1,24 +0,0 @@ -# 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/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -MODULE = dom -XPIDL_MODULE = dom_loadsave - -XPIDLSRCS = \ - nsIDOMLSProgressEvent.idl \ - $(NULL) - -include $(topsrcdir)/config/rules.mk - -XPIDL_FLAGS += \ - -I$(topsrcdir)/dom/interfaces/base \ - -I$(topsrcdir)/dom/interfaces/events \ - $(NULL)
deleted file mode 100644 --- a/dom/interfaces/load-save/moz.build +++ /dev/null @@ -1,5 +0,0 @@ -# vim: set filetype=python: -# 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/. -
deleted file mode 100644 --- a/dom/interfaces/load-save/nsIDOMLSProgressEvent.idl +++ /dev/null @@ -1,16 +0,0 @@ -/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* 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/. */ - -#include "nsIDOMEvent.idl" - -interface nsIDOMLSInput; - -[scriptable, builtinclass, uuid(5343c259-78c1-4f20-a81f-5ddce4f0188e)] -interface nsIDOMLSProgressEvent : nsIDOMEvent -{ - readonly attribute nsIDOMLSInput input; - readonly attribute unsigned long position; - readonly attribute unsigned long totalSize; -};
--- a/dom/locales/en-US/chrome/dom/dom.properties +++ b/dom/locales/en-US/chrome/dom/dom.properties @@ -55,18 +55,16 @@ SetAttributeNodeNSWarning=Use of setAttr RemoveAttributeNodeWarning=Use of removeAttributeNode() is deprecated. Use removeAttribute() instead. CreateAttributeWarning=Use of document.createAttribute() is deprecated. Use element.setAttribute() instead. CreateAttributeNSWarning=Use of document.createAttributeNS() is deprecated. Use element.setAttributeNS() instead. SpecifiedWarning=Use of attributes' specified attribute is deprecated. It always returns true. OwnerElementWarning=Use of attributes' ownerElement attribute is deprecated. NodeValueWarning=Use of attributes' nodeValue attribute is deprecated. Use value instead. TextContentWarning=Use of attributes' textContent attribute is deprecated. Use value instead. EnablePrivilegeWarning=Use of enablePrivilege is deprecated. Please use code that runs with the system principal (e.g. an extension) instead. -PositionWarning=Use of XMLHttpRequest's progress events' position attribute is deprecated. -TotalSizeWarning=Use of XMLHttpRequest's progress events' totalSize attribute is deprecated. nsIJSONDecodeDeprecatedWarning=nsIJSON.decode is deprecated. Please use JSON.parse instead. nsIJSONEncodeDeprecatedWarning=nsIJSON.encode is deprecated. Please use JSON.stringify instead. nsIDOMWindowInternalWarning=Use of nsIDOMWindowInternal is deprecated. Use nsIDOMWindow instead. InputEncodingWarning=Use of inputEncoding is deprecated. # LOCALIZATION NOTE: Do not translate "MozBeforePaint" and "mozRequestAnimationFrame" MozBeforePaintWarning=MozBeforePaint events are no longer supported. mozRequestAnimationFrame must be passed a non-null callback argument. FullScreenDeniedBlocked=Request for full-screen was denied because this domain has been blocked from full-screen by user. FullScreenDeniedDisabled=Request for full-screen was denied because full-screen API is disabled by user preference.
--- a/dom/moz.build +++ b/dom/moz.build @@ -14,17 +14,16 @@ interfaces = [ 'settings', 'stylesheets', 'sidebar', 'css', 'traversal', 'range', 'xbl', 'xpath', - 'load-save', 'xul', 'storage', 'json', 'offline', 'geolocation', 'notification', 'permission', 'svg',
--- a/js/xpconnect/src/dom_quickstubs.qsconf +++ b/js/xpconnect/src/dom_quickstubs.qsconf @@ -142,18 +142,16 @@ members = [ 'nsIDOMHTMLCanvasElement.width', 'nsIDOMHTMLCanvasElement.height', 'nsIDOMHTMLCanvasElement.getContext', 'nsIDOMHTMLCanvasElement.toDataURL', # dom/interfaces/json - None. # All methods of nsIJSON call GetCurrentNativeCallContext. - # dom/interfaces/load-save - None. - # dom/interfaces/offline - None. # dom/interfaces/range 'nsIDOMRange.*', # dom/interfaces/sidebar - None. # dom/interfaces/smil - None.
--- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -137,17 +137,16 @@ @BINPATH@/components/dom_stylesheets.xpt @BINPATH@/components/dom_system.xpt @BINPATH@/components/dom_threads.xpt @BINPATH@/components/dom_traversal.xpt @BINPATH@/components/dom_views.xpt @BINPATH@/components/dom_xbl.xpt @BINPATH@/components/dom_xpath.xpt @BINPATH@/components/dom_xul.xpt -@BINPATH@/components/dom_loadsave.xpt @BINPATH@/components/downloads.xpt @BINPATH@/components/editor.xpt @BINPATH@/components/embed_base.xpt @BINPATH@/components/extensions.xpt @BINPATH@/components/exthandler.xpt @BINPATH@/components/exthelper.xpt @BINPATH@/components/fastfind.xpt @BINPATH@/components/feeds.xpt
--- a/mobile/xul/installer/package-manifest.in +++ b/mobile/xul/installer/package-manifest.in @@ -186,17 +186,16 @@ @BINPATH@/components/dom_sms.xpt @BINPATH@/components/dom_stylesheets.xpt @BINPATH@/components/dom_threads.xpt @BINPATH@/components/dom_traversal.xpt @BINPATH@/components/dom_views.xpt @BINPATH@/components/dom_xbl.xpt @BINPATH@/components/dom_xpath.xpt @BINPATH@/components/dom_xul.xpt -@BINPATH@/components/dom_loadsave.xpt @BINPATH@/components/downloads.xpt @BINPATH@/components/editor.xpt @BINPATH@/components/embed_base.xpt @BINPATH@/components/extensions.xpt @BINPATH@/components/exthandler.xpt @BINPATH@/components/exthelper.xpt @BINPATH@/components/fastfind.xpt @BINPATH@/components/feeds.xpt