wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backing out to try to fix orange

Browse Source
This commit is contained in:
jonas@sicking.cc 2008-05-01 12:03:48 -07:00
parent ebfb75f423
commit 727cd3dafb
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
content/base/src/nsObjectLoadingContent.cpp
View File

@ -1075,8 +1075,11 @@ nsObjectLoadingContent::LoadObject(nsIURI* aURI,
nsCAutoString overrideType;
if ((caps & eOverrideServerType) &&
((!aTypeHint.IsEmpty() && IsSupportedPlugin(aTypeHint)) ||
(!aTypeHint.IsEmpty() ||
(aURI && IsPluginEnabledByExtension(aURI, overrideType)))) {
NS_ASSERTION(aTypeHint.IsEmpty() ^ overrideType.IsEmpty(),
"Exactly one of aTypeHint and overrideType should be empty!");
ObjectType newType;
if (overrideType.IsEmpty()) {
newType = GetTypeOfContent(aTypeHint);

10
toolkit/components/microformats/src/Microformats.js
View File

@ -16,8 +16,7 @@ var Microformats = {
* @param name The name of the microformat (required)
* @param rootElement The DOM element at which to start searching (required)
* @param options Literal object with the following options:
* recurseExternalFrames - Whether or not to search child frames
* that reference external pages (with a src attribute)
* recurseFrames - Whether or not to search child frames
* for microformats (optional - defaults to true)
* showHidden - Whether or not to add hidden microformat
* (optional - defaults to false)
@ -49,8 +48,8 @@ var Microformats = {
var defaultView = rootElement.defaultView || rootElement.ownerDocument.defaultView;
var rootDocument = rootElement.ownerDocument || rootElement;
/* If recurseExternalFrames is undefined or true, look through all child frames for microformats */
if (!options || !options.hasOwnProperty("recurseExternalFrames") || options.recurseExternalFrames) {
/* If recurseFrames is undefined or true, look through all child frames for microformats */
if (!options || !options.hasOwnProperty("recurseFrames") || options.recurseFrames) {
if (defaultView && defaultView.frames.length > 0) {
for (let i=0; i < defaultView.frames.length; i++) {
if (isAncestor(rootDocument, defaultView.frames[i].frameElement)) {
@ -119,8 +118,7 @@ var Microformats = {
* @param name The name of the microformat (required)
* @param rootElement The DOM element at which to start searching (required)
* @param options Literal object with the following options:
* recurseExternalFrames - Whether or not to search child frames
* that reference external pages (with a src attribute)
* recurseFrames - Whether or not to search child frames
* for microformats (optional - defaults to true)
* showHidden - Whether or not to add hidden microformat
* (optional - defaults to false)