[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Thu Apr 8 02:18:48 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 216e60d453b2e721ac015d09dd3cead0edbe3c54
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Mar 10 20:06:49 2010 +0000
2010-03-10 Leandro Pereira <leandro at profusion.mobi>
Reviewed by Kenneth Rohde Christiansen.
Add EFL port files to platform/efl.
http://webkit.org/b/35890
* platform/efl/ScrollbarEfl.h: Added.
* platform/efl/ScrollbarThemeEfl.h: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55793 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 46030bc..9809475 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-10 Leandro Pereira <leandro at profusion.mobi>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Add EFL port files to platform/efl.
+ http://webkit.org/b/35890
+
+ * platform/efl/ScrollbarEfl.h: Added.
+ * platform/efl/ScrollbarThemeEfl.h: Added.
+
2010-03-10 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
diff --git a/WebCore/platform/efl/ScrollbarEfl.h b/WebCore/platform/efl/ScrollbarEfl.h
new file mode 100644
index 0000000..cd85888
--- /dev/null
+++ b/WebCore/platform/efl/ScrollbarEfl.h
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2008 INdT - Instituto Nokia de Tecnologia
+ * Copyright (C) 2009-2010 ProFUSION embedded systems
+ * Copyright (C) 2009-2010 Samsung Electronics
+ *
+ * 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 COMPUTER, 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 COMPUTER, 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 ScrollbarEfl_h
+#define ScrollbarEfl_h
+
+#include "Scrollbar.h"
+#include <Evas.h>
+#include <wtf/PassRefPtr.h>
+
+namespace WebCore {
+
+class ScrollbarEfl : public Scrollbar {
+public:
+ friend class Scrollbar;
+
+ virtual ~ScrollbarEfl();
+
+ virtual void setFrameRect(const IntRect&);
+
+ virtual bool handleMouseMoveEvent(const PlatformMouseEvent&) { return false; }
+ virtual bool handleMouseOutEvent(const PlatformMouseEvent&) { return false; }
+ virtual bool handleMousePressEvent(const PlatformMouseEvent&) { return false; }
+ virtual bool handleMouseReleaseEvent(const PlatformMouseEvent&) { return false; }
+
+ virtual void frameRectsChanged();
+
+ virtual void paint(GraphicsContext* context, const IntRect& damageRect);
+
+protected:
+ ScrollbarEfl(ScrollbarClient*, ScrollbarOrientation, ScrollbarControlSize);
+
+ virtual void updateThumbPositionAndProportion();
+ virtual void updateThumbPosition();
+ virtual void updateThumbProportion();
+
+ virtual void setParent(ScrollView* view);
+
+private:
+ int m_lastPos;
+ int m_lastTotalSize;
+ int m_lastVisibleSize;
+};
+
+}
+
+#endif // ScrollbarEfl_h
diff --git a/WebCore/platform/efl/ScrollbarThemeEfl.h b/WebCore/platform/efl/ScrollbarThemeEfl.h
new file mode 100644
index 0000000..0fe1688
--- /dev/null
+++ b/WebCore/platform/efl/ScrollbarThemeEfl.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2008 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2008 INdT - Instituto Nokia de Tecnologia
+ * Copyright (C) 2009-2010 ProFUSION embedded systems
+ * Copyright (C) 2009-2010 Samsung Electronics
+ *
+ * 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 ScrollbarThemeEfl_h
+#define ScrollbarThemeEfl_h
+
+#include "ScrollbarTheme.h"
+
+namespace WebCore {
+
+class ScrollbarThemeEfl : public ScrollbarTheme {
+public:
+ virtual ~ScrollbarThemeEfl();
+
+ virtual int scrollbarThickness(ScrollbarControlSize = RegularScrollbar);
+
+ virtual void registerScrollbar(Scrollbar* scrollbar);
+ virtual void unregisterScrollbar(Scrollbar* scrollbar);
+};
+
+}
+#endif // ScrollbarThemeEfl_h
+
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list