Merge 94107

Source/WebCore/rendering/RenderScrollbar.cpp

 /*
  * Copyright (C) 2008, 2009 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 131 matching lines @@
     return s_styleResolveScrollbar;
 }
 
 ScrollbarPart RenderScrollbar::partForStyleResolve()
 {
     return s_styleResolvePart;
 }
 
 PassRefPtr<RenderStyle> RenderScrollbar::getScrollbarPseudoStyle(ScrollbarPart partType, PseudoId pseudoId)
 {
-    if (!m_owner)
+    if (!owningRenderer())
         return 0;
 
     s_styleResolvePart = partType;
     s_styleResolveScrollbar = this;
     RefPtr<RenderStyle> result = owningRenderer()->getUncachedPseudoStyle(pseudoId, owningRenderer()->style());
     s_styleResolvePart = NoPart;
     s_styleResolveScrollbar = 0;
 
     // Scrollbars for root frames should always have background color 
     // unless explicitly specified as transparent. So we force it.
@@ skipping 194 matching lines @@
 int RenderScrollbar::minimumThumbLength()
 {
     RenderScrollbarPart* partRenderer = m_parts.get(ThumbPart);
     if (!partRenderer)
         return 0;    
     partRenderer->layout();
     return orientation() == HorizontalScrollbar ? partRenderer->width() : partRenderer->height();
 }
 
 }