Bug 577450. Replicated fixed-pos frames should have the right style. r=roc, a=roc

2011-01-14 10:34:39 -05:00 · 2011-01-14 10:34:39 -05:00 · 160107e244
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@ -8791,9 +8791,29 @@ nsCSSFrameConstructor::ReplicateFixedFrames(nsPageContentFrame* aParentFrame)
    nsIFrame* prevPlaceholder = mPresShell->FrameManager()->GetPlaceholderFrameFor(fixed);
    if (prevPlaceholder &&
        nsLayoutUtils::IsProperAncestorFrame(prevCanvasFrame, prevPlaceholder)) {
-      nsresult rv = ConstructFrame(state, fixed->GetContent(),
-                                   canvasFrame, fixedPlaceholders);
-      NS_ENSURE_SUCCESS(rv, rv);
+      // We want to use the same style as the primary style frame for
+      // our content
+      nsIContent* content = fixed->GetContent();
+      nsStyleContext* styleContext =
+        nsLayoutUtils::GetStyleFrame(content->GetPrimaryFrame())->
+          GetStyleContext();
+      FrameConstructionItemList items;
+      AddFrameConstructionItemsInternal(state, content, canvasFrame,
+                                        content->Tag(),
+                                        content->GetNameSpaceID(),
+                                        PR_TRUE,
+                                        styleContext,
+                                        ITEM_ALLOW_XBL_BASE |
+                                          ITEM_ALLOW_PAGE_BREAK,
+                                        items);
+      for (FCItemIterator iter(items); !iter.IsDone(); iter.Next()) {
+        NS_ASSERTION(iter.item().DesiredParentType() ==
+                       GetParentType(canvasFrame),
+                     "This is not going to work");
+        nsresult rv =
+          ConstructFramesFromItem(state, iter, canvasFrame, fixedPlaceholders);
+        NS_ENSURE_SUCCESS(rv, rv);
+      }
    }
  }

--- a/layout/reftests/printing/577450-1-ref.html
+++ b/layout/reftests/printing/577450-1-ref.html
@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html class="reftest-print">
+  <body>
+    <div style="position: fixed; color: green; font-size: 2em">Big green text</div>
+    <!-- force two pages -->
+    <div style="height: 3in; width: 2in"></div>
+  </body>
+</html>
--- a/layout/reftests/printing/577450-1.html
+++ b/layout/reftests/printing/577450-1.html
@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html class="reftest-print">
+  <body style="color: green; font-size: 2em">
+    <div style="position: fixed">Big green text</div>
+    <!-- force two pages -->
+    <div style="height: 3in; width: 2in"></div>
+  </body>
+</html>
--- a/layout/reftests/printing/reftest.list
+++ b/layout/reftests/printing/reftest.list
@ -9,3 +9,4 @@
 == test-async-print.html 272830-1-ref.html
 == 129941-1a.html 129941-1-ref.html
 == 129941-1b.html 129941-1-ref.html
+== 577450-1.html 577450-1-ref.html