Merge 94107

Source/WebCore/page/FrameView.h

 /*
    Copyright (C) 1997 Martin Jones (mjones@kde.org)
              (C) 1998 Waldo Bastian (bastian@kde.org)
              (C) 1998, 1999 Torben Weis (weis@kde.org)
              (C) 1999 Lars Knoll (knoll@kde.org)
              (C) 1999 Antti Koivisto (koivisto@kde.org)
    Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ skipping 26 matching lines @@
 
 class Color;
 class Event;
 class FloatSize;
 class Frame;
 class FrameActionScheduler;
 class IntRect;
 class KURL;
 class Node;
 class Page;
+class RenderBox;
 class RenderEmbeddedObject;
 class RenderLayer;
 class RenderObject;
 class RenderScrollbarPart;
 
 typedef unsigned long long DOMTimeStamp;
 
 class FrameView : public ScrollView {
 public:
     friend class RenderView;
@@ skipping 222 matching lines @@
 
     virtual IntPoint currentMousePosition() const;
 
     // FIXME: Remove this method once plugin loading is decoupled from layout.
     void flushAnyPendingPostLayoutTasks();
 
     virtual bool shouldSuspendScrollAnimations() const;
 
     void setAnimatorsAreActive();
 
+    void clearOwningRendererForCustomScrollbars(RenderBox*);
+
 protected:
     virtual bool scrollContentsFastPath(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect);
     virtual void scrollContentsSlowPath(const IntRect& updateRect);
 
     virtual bool isVerticalDocument() const;
     virtual bool isFlippedDocument() const;
 
 private:
     FrameView(Frame*);
 
@@ skipping 175 matching lines @@
     m_visuallyNonEmptyPixelCount += size.width() * size.height();
     // Use a threshold value to prevent very small amounts of visible content from triggering didFirstVisuallyNonEmptyLayout
     static const unsigned visualPixelThreshold = 256 * 256;
     if (m_visuallyNonEmptyPixelCount > visualPixelThreshold)
         setIsVisuallyNonEmpty();
 }
 
 } // namespace WebCore
 
 #endif // FrameView_h