Merge 116476

Source/WebCore/rendering/RenderBox.cpp

Index: Source/WebCore/rendering/RenderBox.cpp
===================================================================
--- Source/WebCore/rendering/RenderBox.cpp	(revision 118271)
+++ Source/WebCore/rendering/RenderBox.cpp	(working copy)
@@ -256,11 +256,6 @@
     if (styleToUse) {
         if (RenderView* view = this->view()) {
             if (FrameView* frameView = view->frameView()) {
-                // If this renderer is owning renderer for the FrameView's custom scrollbars,
-                // we need to clear it from the scrollbar. See webkit bug 64737.
-                if (styleToUse->hasPseudoStyle(SCROLLBAR))
-                    frameView->clearOwningRendererForCustomScrollbars(this);
-
                 if (styleToUse->position() == FixedPosition)
                     frameView->removeFixedObject();
             }