Backing out bug 525608 and bug 525952

2009-12-10 18:28:08 -08:00
parent d39d628663
commit e28191d463
48 changed files with 1030 additions and 1650 deletions
--- a/layout/forms/nsButtonFrameRenderer.cpp
+++ b/layout/forms/nsButtonFrameRenderer.cpp
@@ -385,16 +385,14 @@ nsButtonFrameRenderer::ReResolveStyles(nsPresContext* aPresContext)
  nsStyleSet *styleSet = aPresContext->StyleSet();

  // style for the inner such as a dotted line (Windows)
-  mInnerFocusStyle =
-    styleSet->ProbePseudoElementStyle(mFrame->GetContent(),
-                                      nsCSSPseudoElements::ePseudo_mozFocusInner,
-                                      context);
+  mInnerFocusStyle = styleSet->ProbePseudoStyleFor(mFrame->GetContent(),
+                                                   nsCSSPseudoElements::mozFocusInner,
+                                                   context);

  // style for outer focus like a ridged border (MAC).
-  mOuterFocusStyle =
-    styleSet->ProbePseudoElementStyle(mFrame->GetContent(),
-                                      nsCSSPseudoElements::ePseudo_mozFocusOuter,
-                                      context);
+  mOuterFocusStyle = styleSet->ProbePseudoStyleFor(mFrame->GetContent(),
+                                                   nsCSSPseudoElements::mozFocusOuter,
+                                                   context);
 }

 nsStyleContext*