Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(173)

Side by Side Diff: third_party/WebKit/WebCore/rendering/RenderListBox.cpp

Issue 27194: Lands the patch for WebKit bug 24171 locally, and rebaselines the necessary l... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * This file is part of the select element renderer in WebCore. 2 * This file is part of the select element renderer in WebCore.
3 * 3 *
4 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. 4 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
5 * 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 5 * 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 10 *
(...skipping 611 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 repaintRectangle(scrollRect); 622 repaintRectangle(scrollRect);
623 } 623 }
624 624
625 PassRefPtr<Scrollbar> RenderListBox::createScrollbar() 625 PassRefPtr<Scrollbar> RenderListBox::createScrollbar()
626 { 626 {
627 RefPtr<Scrollbar> widget; 627 RefPtr<Scrollbar> widget;
628 bool hasCustomScrollbarStyle = style()->hasPseudoStyle(SCROLLBAR); 628 bool hasCustomScrollbarStyle = style()->hasPseudoStyle(SCROLLBAR);
629 if (hasCustomScrollbarStyle) 629 if (hasCustomScrollbarStyle)
630 widget = RenderScrollbar::createCustomScrollbar(this, VerticalScrollbar, this); 630 widget = RenderScrollbar::createCustomScrollbar(this, VerticalScrollbar, this);
631 else 631 else
632 widget = Scrollbar::createNativeScrollbar(this, VerticalScrollbar, Small Scrollbar); 632 widget = Scrollbar::createNativeScrollbar(this, VerticalScrollbar, theme ()->scrollbarControlSizeForPart(ListboxPart));
633 document()->view()->addChild(widget.get()); 633 document()->view()->addChild(widget.get());
634 return widget.release(); 634 return widget.release();
635 } 635 }
636 636
637 void RenderListBox::destroyScrollbar() 637 void RenderListBox::destroyScrollbar()
638 { 638 {
639 if (!m_vBar) 639 if (!m_vBar)
640 return; 640 return;
641 641
642 m_vBar->removeFromParent(); 642 m_vBar->removeFromParent();
(...skipping 15 matching lines...) Expand all
658 m_vBar->styleChanged(); 658 m_vBar->styleChanged();
659 659
660 #if ENABLE(DASHBOARD_SUPPORT) 660 #if ENABLE(DASHBOARD_SUPPORT)
661 // Force an update since we know the scrollbars have changed things. 661 // Force an update since we know the scrollbars have changed things.
662 if (document()->hasDashboardRegions()) 662 if (document()->hasDashboardRegions())
663 document()->setDashboardRegionsDirty(true); 663 document()->setDashboardRegionsDirty(true);
664 #endif 664 #endif
665 } 665 }
666 666
667 } // namespace WebCore 667 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698