diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-11 17:01:47 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-11 18:21:02 +0100 |
| commit | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch) | |
| tree | 2943df35f62d885c89d01063cc528dd73b480fea /WebCore/rendering/RenderScrollbar.cpp | |
| parent | 7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff) | |
| download | external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2 | |
Merge in WebKit r47029.
Diffstat (limited to 'WebCore/rendering/RenderScrollbar.cpp')
| -rw-r--r-- | WebCore/rendering/RenderScrollbar.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/WebCore/rendering/RenderScrollbar.cpp b/WebCore/rendering/RenderScrollbar.cpp index db24a06..b3c5369 100644 --- a/WebCore/rendering/RenderScrollbar.cpp +++ b/WebCore/rendering/RenderScrollbar.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008 Apple Inc. All Rights Reserved. + * 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 @@ -25,6 +25,7 @@ #include "config.h" #include "RenderScrollbar.h" + #include "RenderScrollbarPart.h" #include "RenderScrollbarTheme.h" @@ -173,9 +174,14 @@ static PseudoId pseudoForScrollbarPart(ScrollbarPart part) return SCROLLBAR_THUMB; case TrackBGPart: return SCROLLBAR_TRACK; - default: + case ScrollbarBGPart: return SCROLLBAR; + case NoPart: + case AllParts: + break; } + ASSERT_NOT_REACHED(); + return SCROLLBAR; } void RenderScrollbar::updateScrollbarPart(ScrollbarPart partType, bool destroy) |