Commit 7f219134 authored by jonas@sicking.cc's avatar jonas@sicking.cc
Browse files

Backing out to try to fix orange

parent 59fdd4c4

content/base/src/nsObjectLoadingContent.cpp

+4 −1
Original line number Diff line number Diff line
@@ -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);

toolkit/components/microformats/src/Microformats.js

+4 −6
Original line number Diff line number Diff line
@@ -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)