← Back to branch summary

~jconti/ubuntu/oneiric/webkit/fix_doc_path

« back to all changes in this revision

Viewing changes to WebCore/page/FrameView.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2010-10-18 20:17:09 UTC
  • mfrom: (1.5.15 upstream)
  • Revision ID: james.westby@ubuntu.com-20101018201709-dkathefl8vvl2uxe
Tags: 1.2.5-0ubuntu1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
WebCore/page/FrameView.cpp
260
260
        return;
261
261
 
262
262
    Scrollbar* horizontalBar = horizontalScrollbar();
263
 
    if (horizontalBar && horizontalBar->isCustomScrollbar() && !toRenderScrollbar(horizontalBar)->owningRenderer()->isRenderPart())
 
263
    if (horizontalBar && horizontalBar->isCustomScrollbar())
264
264
        setHasHorizontalScrollbar(false);
265
265
 
266
266
    Scrollbar* verticalBar = verticalScrollbar();
267
 
    if (verticalBar && verticalBar->isCustomScrollbar() && !toRenderScrollbar(verticalBar)->owningRenderer()->isRenderPart())
 
267
    if (verticalBar && verticalBar->isCustomScrollbar())
268
268
        setHasVerticalScrollbar(false);
269
269
 
270
270
    if (m_scrollCorner) {