author | Stacy Yeh <stacy.yeh@oracle.com> |
Tue, 19 Jul 2016 14:15:23 -0700 | |
changeset 6431 | e4667e7df088 |
permissions | -rw-r--r-- |
6431
e4667e7df088
23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
1 |
See Mozilla bug #451007 - Reload page causing problems with |
e4667e7df088
23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
2 |
RealPlayer/Helix plugin. |
e4667e7df088
23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
3 |
We can potentially drop this patch since RealPlayer is no longer being |
e4667e7df088
23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
4 |
supported, but some people may still be using it. |
e4667e7df088
23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
5 |
|
e4667e7df088
23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
6 |
diff --git a/dom/base/nsObjectLoadingContent.cpp b/dom/base/nsObjectLoadingContent.cpp |
e4667e7df088
23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
7 |
--- a/dom/base/nsObjectLoadingContent.cpp |
e4667e7df088
23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
8 |
+++ b/dom/base/nsObjectLoadingContent.cpp |
e4667e7df088
23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
9 |
@@ -2902,7 +2902,8 @@ |
e4667e7df088
23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
10 |
bool aDelayedStop) |
e4667e7df088
23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
11 |
{ |
e4667e7df088
23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
12 |
// Don't delay stopping QuickTime (bug 425157), Flip4Mac (bug 426524), |
e4667e7df088
23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
13 |
- // XStandard (bug 430219), CMISS Zinc (bug 429604). |
e4667e7df088
23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
14 |
+ // XStandard (bug 430219), CMISS Zinc (bug 429604), |
e4667e7df088
23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
15 |
+ // RealPlayer/Helix (bug 451007). |
e4667e7df088
23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
16 |
if (aDelayedStop |
e4667e7df088
23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
17 |
#if !(defined XP_WIN || defined MOZ_X11) |
e4667e7df088
23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
18 |
&& !aInstanceOwner->MatchPluginName("QuickTime") |
e4667e7df088
23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
19 |
@@ -2910,6 +2911,8 @@ |
e4667e7df088
23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
20 |
&& !aInstanceOwner->MatchPluginName("XStandard plugin") |
e4667e7df088
23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
21 |
&& !aInstanceOwner->MatchPluginName("CMISS Zinc Plugin") |
e4667e7df088
23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
22 |
#endif |
e4667e7df088
23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
23 |
+ && !aInstanceOwner->MatchPluginName("RealPlayer") |
e4667e7df088
23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
24 |
+ && !aInstanceOwner->MatchPluginName("Helix") |
e4667e7df088
23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
25 |
) { |
e4667e7df088
23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
26 |
nsCOMPtr<nsIRunnable> evt = |
e4667e7df088
23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
27 |
new nsStopPluginRunnable(aInstanceOwner, aContent); |