Title: [148189] trunk/Source/WebCore
- Revision
- 148189
- Author
- [email protected]
- Date
- 2013-04-11 02:49:05 -0700 (Thu, 11 Apr 2013)
Log Message
[BlackBerry] RenderThemeBlackBerry: upstream missing code
https://bugs.webkit.org/show_bug.cgi?id=114343
Patch by Alberto Garcia <[email protected]> on 2013-04-11
Reviewed by Xan Lopez.
Add implementations of sliderTickSize() and
sliderTickOffsetFromTrackCenter(), as well as a missing header.
* platform/blackberry/RenderThemeBlackBerry.cpp:
(WebCore):
(WebCore::RenderThemeBlackBerry::sliderTickSize):
(WebCore::RenderThemeBlackBerry::sliderTickOffsetFromTrackCenter):
* platform/blackberry/RenderThemeBlackBerry.h:
(RenderThemeBlackBerry):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (148188 => 148189)
--- trunk/Source/WebCore/ChangeLog 2013-04-11 09:17:33 UTC (rev 148188)
+++ trunk/Source/WebCore/ChangeLog 2013-04-11 09:49:05 UTC (rev 148189)
@@ -1,3 +1,20 @@
+2013-04-11 Alberto Garcia <[email protected]>
+
+ [BlackBerry] RenderThemeBlackBerry: upstream missing code
+ https://bugs.webkit.org/show_bug.cgi?id=114343
+
+ Reviewed by Xan Lopez.
+
+ Add implementations of sliderTickSize() and
+ sliderTickOffsetFromTrackCenter(), as well as a missing header.
+
+ * platform/blackberry/RenderThemeBlackBerry.cpp:
+ (WebCore):
+ (WebCore::RenderThemeBlackBerry::sliderTickSize):
+ (WebCore::RenderThemeBlackBerry::sliderTickOffsetFromTrackCenter):
+ * platform/blackberry/RenderThemeBlackBerry.h:
+ (RenderThemeBlackBerry):
+
2013-04-11 Allan Sandfeld Jensen <[email protected]>
HitTestRequest::AllowFrameScrollbars does not test main frame scrollbar
Modified: trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp (148188 => 148189)
--- trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp 2013-04-11 09:17:33 UTC (rev 148188)
+++ trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp 2013-04-11 09:49:05 UTC (rev 148189)
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2006, 2007 Apple Inc.
* Copyright (C) 2009 Google Inc.
- * Copyright (C) 2009, 2010, 2011, 2012 Research In Motion Limited. All rights reserved.
+ * Copyright (C) 2009, 2010, 2011, 2012, 2013 Research In Motion Limited. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -26,6 +26,7 @@
#include "HTMLMediaElement.h"
#include "HostWindow.h"
#include "InputType.h"
+#include "InputTypeNames.h"
#include "MediaControlElements.h"
#include "MediaPlayerPrivateBlackBerry.h"
#include "Page.h"
@@ -1093,4 +1094,16 @@
return type == InputTypeNames::text();
}
+#if ENABLE(DATALIST_ELEMENT)
+IntSize RenderThemeBlackBerry::sliderTickSize() const
+{
+ return IntSize(1, 3);
+}
+
+int RenderThemeBlackBerry::sliderTickOffsetFromTrackCenter() const
+{
+ return -9;
+}
+#endif
+
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.h (148188 => 148189)
--- trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.h 2013-04-11 09:17:33 UTC (rev 148188)
+++ trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.h 2013-04-11 09:49:05 UTC (rev 148189)
@@ -54,6 +54,11 @@
virtual bool paintSliderTrack(RenderObject*, const PaintInfo&, const IntRect&);
virtual bool paintSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
+#if ENABLE(DATALIST_ELEMENT)
+ virtual IntSize sliderTickSize() const OVERRIDE;
+ virtual int sliderTickOffsetFromTrackCenter() const OVERRIDE;
+#endif
+
#if ENABLE(TOUCH_EVENTS)
virtual Color platformTapHighlightColor() const;
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
