backout Bug 893117 for mochitest failure

This commit is contained in:
David Zbarsky
2013-08-01 01:54:09 -07:00
parent d4abe1681a
commit f49349041b
55 changed files with 1464 additions and 135 deletions

View File

@@ -5,6 +5,7 @@
#include "nsProgressFrame.h"
#include "nsIDOMHTMLProgressElement.h"
#include "nsIContent.h"
#include "nsPresContext.h"
#include "nsGkAtoms.h"
@@ -19,11 +20,9 @@
#include "nsContentList.h"
#include "nsFontMetrics.h"
#include "mozilla/dom/Element.h"
#include "mozilla/dom/HTMLProgressElement.h"
#include "nsContentList.h"
#include <algorithm>
using namespace mozilla::dom;
nsIFrame*
NS_NewProgressFrame(nsIPresShell* aPresShell, nsStyleContext* aContext)
@@ -158,7 +157,10 @@ nsProgressFrame::ReflowBarFrame(nsIFrame* aBarFrame,
nscoord xoffset = aReflowState.mComputedBorderPadding.left;
nscoord yoffset = aReflowState.mComputedBorderPadding.top;
double position = static_cast<HTMLProgressElement*>(mContent)->Position();
double position;
nsCOMPtr<nsIDOMHTMLProgressElement> progressElement =
do_QueryInterface(mContent);
progressElement->GetPosition(&position);
// Force the bar's size to match the current progress.
// When indeterminate, the progress' size will be 100%.