Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84

1 files changed, 0 insertions, 55 deletions

diff --git a/WebCore/platform/haiku/ScrollbarThemeHaiku.h b/WebCore/platform/haiku/ScrollbarThemeHaiku.h
deleted file mode 100644
index 18e2cc0..0000000
--- a/WebCore/platform/haiku/ScrollbarThemeHaiku.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- * Copyright 2009 Maxime Simon <simon.maxime@gmail.com> 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
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef ScrollbarThemeHaiku_h
-#define ScrollbarThemeHaiku_h
-
-#include "ScrollbarThemeComposite.h"
-
-namespace WebCore {
-    class Scrollbar;
-
-    class ScrollbarThemeHaiku : public ScrollbarThemeComposite {
-        public:
-            ScrollbarThemeHaiku();
-            virtual ~ScrollbarThemeHaiku();
-
-            virtual int scrollbarThickness(ScrollbarControlSize = RegularScrollbar);
-
-            virtual bool hasButtons(Scrollbar*);
-            virtual bool hasThumb(Scrollbar*);
-
-            virtual IntRect backButtonRect(Scrollbar*, ScrollbarPart, bool painting);
-            virtual IntRect forwardButtonRect(Scrollbar*, ScrollbarPart, bool painting);
-            virtual IntRect trackRect(Scrollbar*, bool painting);
-
-            virtual void paintScrollbarBackground(GraphicsContext*, Scrollbar*);
-            virtual void paintButton(GraphicsContext*, Scrollbar*, const IntRect&, ScrollbarPart);
-            virtual void paintThumb(GraphicsContext*, Scrollbar*, const IntRect&);
-    };
-
-}
-#endif