1036694 - merge nsIMarkupDocumentViewer into nsIContentViewer

Status: RESOLVED FIXED

(Core :: Document Navigation, defect)

Comment 1

[Trevor Saunders (:tbsaunde)]

Attachment: merge nsIMarkupDocumentViewer into nsIContentViewer

Comment 2

[Olli Pettay [:smaug]]

Comment on attachment 8453433 [details] [diff] [review]
merge nsIMarkupDocumentViewer into nsIContentViewer

> [scriptable, builtinclass, uuid(0cb321bd-5b38-4586-8fcd-d43b366886fb)]
> interface nsIContentViewer : nsISupports
update uuid

>@@ -190,9 +192,86 @@ interface nsIContentViewer : nsISupports
>    * case, if mParentWidget is null then this document should not even
>    * be displayed.
>    */
>   [noscript,notxpcom,nostdcall] nsViewPtr findContainerView();
>   /**
>    * Set collector for navigation timing data (load, unload events).
>    */
>   [noscript,notxpcom,nostdcall] void setNavigationTiming(in nsDOMNavigationTimingPtr aTiming);
>+	/*
>+	Scrolls to a given DOM content node. 
>+	*/
>+	void scrollToNode(in nsIDOMNode node);
>+
>+	/** The amount by which to scale all text. Default is 1.0. */
>+	attribute float textZoom;
>+
>+	/** The amount by which to scale all lengths. Default is 1.0. */
>+	attribute float fullZoom;
>+
>+	/** Disable entire author style level (including HTML presentation hints) */
>+	attribute boolean authorStyleDisabled;
>+
>+	/**
>+	 * XXX comm-central only: bug 829543. Not the Character Encoding menu in 
>+     * browser!
>+	 */
>+	attribute ACString forceCharacterSet;
>+
>+	/**
>+	 * XXX comm-central only: bug 829543.
>+	 */
>+	attribute ACString hintCharacterSet;
>+
>+	/**
>+	 * XXX comm-central only: bug 829543.
>+	 */
>+	attribute int32_t hintCharacterSetSource;
You have tabs here. Uses spaces, and make sure indentation is right above

Comment 3

[Trevor Saunders (:tbsaunde)]

Attachment: fixup js users of nsIMarkupDocument

Comment 4

[Olli Pettay [:smaug]]

Comment on attachment 8454091 [details] [diff] [review]
fixup js users of nsIMarkupDocument

> function getCurrentZoom() {
>   var contViewer = toolbox.frame.docShell.contentViewer;
>-  var docViewer = contViewer.QueryInterface(Ci.nsIMarkupDocumentViewer);
>+  var docViewer = contViewer;
>   return docViewer.fullZoom;
Just drop docViewer and do
return contViewer.fullZoom;

>   setZoom: function(zoomValue) {
>     // cap zoom value
>     zoomValue = Math.max(zoomValue, MIN_ZOOM);
>     zoomValue = Math.min(zoomValue, MAX_ZOOM);
> 
>     let contViewer = this.frame.docShell.contentViewer;
>-    let docViewer = contViewer.QueryInterface(Ci.nsIMarkupDocumentViewer);
>+    let docViewer = contViewer;
> 
>     docViewer.fullZoom = zoomValue;

similar here.

Comment 5

[Trevor Saunders (:tbsaunde)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/b88aab9f4e80

Comment 6

[Trevor Saunders (:tbsaunde)]

fixup landed as https://hg.mozilla.org/integration/mozilla-inbound/rev/7ce6d4ccc804

Comment 7

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/b88aab9f4e80
https://hg.mozilla.org/mozilla-central/rev/7ce6d4ccc804

Comment 8

[Kris Maglione [:kmag]]

A quick MXR search shows at least 20 AMO add-ons that use this interface. A deprecation path would have been nice.

Comment 9

[Olli Pettay [:smaug]]

Trevor, could you perhaps add a dummy nsIMarkupDocumentViewer interface, which just inherits nsIContentViewer.

Comment 10

[Davode Rossi]

What about fixing the online documentation (such as https://developer.mozilla.org/en/Full_page_zoom)?

Comment 11

[Olli Pettay [:smaug]]

MDN is a wiki, feel free to fix incorrect information there.

(But yes, should probably check always if patches change something documented in MDN.)

Comment 12

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/6520f949f61c
merge nsIMarkupDocumentViewer into nsIContentViewer r=smaug