Mercurial Mercurial > upstream > oracle > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/songbird-06-donot-delay-stopping-realplayer.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 18110 93461edb1490
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
18110
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     1
 
--- firefox/layout/generic/nsObjectFrame.cpp.orig	2008-08-19 18:05:29.971589219 +0800
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     2
 
+++ firefox/layout/generic/nsObjectFrame.cpp	2008-08-19 18:02:21.477682134 +0800
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     3
 
@@ -1772,10 +1772,13 @@
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     4
 
 static PRBool
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     5
 
 DoDelayedStop(nsPluginInstanceOwner *aInstanceOwner, PRBool aDelayedStop)
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     6
 
 {
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     7
 
-  // Don't delay stopping QuickTime (bug 425157), Flip4Mac (bug 426524).
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     8
 
+  // Don't delay stopping QuickTime (bug 425157), Flip4Mac (bug 426524),
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     9
 
+  // RealPlayer/Helix (bug 451007).
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    10
 
   if (aDelayedStop &&
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    11
 
       !::MatchPluginName(aInstanceOwner, "QuickTime") &&
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    12
 
-      !::MatchPluginName(aInstanceOwner, "Flip4Mac")) {
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    13
 
+      !::MatchPluginName(aInstanceOwner, "Flip4Mac") &&
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    14
 
+      !::MatchPluginName(aInstanceOwner, "RealPlayer") &&
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    15
 
+      !::MatchPluginName(aInstanceOwner, "Helix")) {
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    16
 
     nsCOMPtr<nsIRunnable> evt = new nsStopPluginRunnable(aInstanceOwner);
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    17
 
     NS_DispatchToCurrentThread(evt);
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    18
 
     return PR_TRUE;
upstream/oracle/spec-files