diff options
| author | Grant Gayed | 2011-01-12 15:52:03 +0000 |
|---|---|---|
| committer | Grant Gayed | 2011-01-12 15:52:03 +0000 |
| commit | bba1c08ab23ad4b8fbfe85635db041a3505b8374 (patch) | |
| tree | 0fdf001433c1af49111eaa87dba708077bd3efc7 /bundles/org.eclipse.swt/Eclipse SWT Browser | |
| parent | a74f63ac835ea361688e2afeacd56ec17b2e3e64 (diff) | |
| download | eclipse.platform.swt-bba1c08ab23ad4b8fbfe85635db041a3505b8374.tar.gz eclipse.platform.swt-bba1c08ab23ad4b8fbfe85635db041a3505b8374.tar.xz eclipse.platform.swt-bba1c08ab23ad4b8fbfe85635db041a3505b8374.zip | |
334067 - Avoid invoking _getUrl() inside MapUrlToZone callback
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT Browser')
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java | 3 | ||||
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java index c2060c1308..5331e1a489 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java @@ -29,7 +29,7 @@ class IE extends WebBrowser { OleAutomation[] documents = new OleAutomation[0]; boolean back, forward, delaySetText, ignoreDispose, ignoreTraverse, performingInitialNavigate; - boolean installFunctionsOnDocumentComplete, untrustedText, isRefresh; + boolean installFunctionsOnDocumentComplete, untrustedText, isRefresh, isAboutBlank; Point location; Point size; boolean addressBar = true, menuBar = true, statusBar = true, toolBar = true; @@ -599,6 +599,7 @@ public void create(Composite parent, int style) { case NavigateComplete2: { Variant varResult = event.arguments[1]; String url = varResult.getString(); + isAboutBlank = url.startsWith(ABOUT_BLANK); /* * Bug in Acrobat Reader. Opening > MAX_PDF PDF files causes Acrobat to not diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java index c908218957..8bfe470365 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java @@ -496,7 +496,7 @@ int MapUrlToZone(int /*long*/ pwszUrl, int /*long*/ pdwZone, int dwFlags) { * For some reason IE8 invokes this function after the Browser has * been disposed. To detect this case check for ie.auto != null. */ - if (ie.auto != null && ie._getUrl().startsWith(IE.ABOUT_BLANK) && !ie.untrustedText) { + if (ie.auto != null && ie.isAboutBlank && !ie.untrustedText) { COM.MoveMemory(pdwZone, new int[] {IE.URLZONE_INTRANET}, 4); return COM.S_OK; } |