Author: svasilyev Date: 2007-08-20 11:42:56 -0400 (Mon, 20 Aug 2007) New Revision: 3234 Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java Log: Merge the branch "jbosstools_xulrunner" with HEAD Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java =================================================================== --- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java 2007-08-20 14:43:55 UTC (rev 3233) +++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java 2007-08-20 15:42:56 UTC (rev 3234) @@ -68,7 +68,7 @@ * xpcom flasher component which used to draw lines */ private inIFlasher iFlasher; - + private nsIDocShell docShell = null; //flasher contact id private static final String FLASHER_CIID="(a)mozilla.org/inspector/flasher;1"; @@ -138,8 +138,12 @@ } public nsIDocShell getDocShell() { - nsIInterfaceRequestor interfaceRequestor = (nsIInterfaceRequestor) getWebBrowser().queryInterface(nsIInterfaceRequestor.NS_IINTERFACEREQUESTOR_IID); - return (nsIDocShell) interfaceRequestor.getInterface(nsIDocShell.NS_IDOCSHELL_IID); + if (docShell == null) { + nsIInterfaceRequestor interfaceRequestor = (nsIInterfaceRequestor) getWebBrowser().queryInterface(nsIInterfaceRequestor.NS_IINTERFACEREQUESTOR_IID); + docShell = (nsIDocShell) interfaceRequestor.getInterface(nsIDocShell.NS_IDOCSHELL_IID); + } + + return docShell; } public nsIDOMDocument getDOMDocument() {