bug 514732 - fix bustage for shared lib builds r=bz

docshell/base/nsDocShell.cpp

@@ -6957,7 +6957,8 @@ nsDocShell::RestoreFromHistory()
 #endif
             mContentViewer->SetBounds(newBounds);
         } else {
-            nsIScrollableFrame *rootScrollFrame = do_QueryFrame(shell->GetRootScrollFrame());
+            nsIScrollableFrame *rootScrollFrame =
+              shell->GetRootScrollFrameAsScrollableExternal();
             if (rootScrollFrame) {
                 rootScrollFrame->PostScrolledAreaEventForCurrentArea();
             }

layout/base/nsIPresShell.h

@@ -124,8 +124,8 @@ typedef struct CapturingContentInfo {
 
 // eed2ef56-133f-4696-9eee-5fc45d816be8
 #define NS_IPRESSHELL_IID     \
-{ 0xeed2ef56, 0x133f, 0x4696, \
-  { 0x9e, 0xee, 0x5f, 0xc4, 0x5d, 0x81, 0x6b, 0xe8 } }
+{ 0x8ceb97da, 0x5075, 0x4bdd, \
+  { 0xb1, 0xd5, 0x4e, 0x1e, 0xf2, 0x88, 0x0b, 0x5e } }
 
 // Constants for ScrollContentIntoView() function
 #define NS_PRESSHELL_SCROLL_TOP      0
@@ -345,6 +345,12 @@ public:
    */
   nsIScrollableFrame* GetRootScrollFrameAsScrollable() const;
 
+  /*
+   * The same as GetRootScrollFrame, but returns an nsIScrollableFrame.
+   * Can be called by code not linked into gklayout.
+   */
+  virtual nsIScrollableFrame* GetRootScrollFrameAsScrollableExternal() const;
+
   /**
    * Returns the page sequence frame associated with the frame hierarchy.
    * Returns NULL if not a paginated view.

layout/base/nsPresShell.cpp

@@ -3205,6 +3205,12 @@ nsIPresShell::GetRootScrollFrameAsScrollable() const
   return scrollableFrame;
 }
 
+nsIScrollableFrame*
+nsIPresShell::GetRootScrollFrameAsScrollableExternal() const
+{
+  return GetRootScrollFrameAsScrollable();
+}
+
 NS_IMETHODIMP
 PresShell::GetPageSequenceFrame(nsIPageSequenceFrame** aResult) const
 {