[BlackBerry] RenderThemeBlackBerry: upstream missing code
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 11 Apr 2013 09:49:05 +0000 (09:49 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 11 Apr 2013 09:49:05 +0000 (09:49 +0000)
https://bugs.webkit.org/show_bug.cgi?id=114343

Patch by Alberto Garcia <agarcia@igalia.com> 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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@148189 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp
Source/WebCore/platform/blackberry/RenderThemeBlackBerry.h

index 4bc231ce9caeb5ddea80e5da61e8a68d2517c7a1..64dca2a1ce916b4989fa08fe343ae5b1a27a48b3 100644 (file)
@@ -1,3 +1,20 @@
+2013-04-11  Alberto Garcia  <agarcia@igalia.com>
+
+        [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  <allan.jensen@digia.com>
 
         HitTestRequest::AllowFrameScrollbars does not test main frame scrollbar
index fc24bc5cfecb2ce23797a8e9d6aa2be8faa05c32..61e57eb42aaeea501117fdb072f428dbc25daa8b 100644 (file)
@@ -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 @@ bool RenderThemeBlackBerry::supportsDataListUI(const AtomicString& type) const
     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
index 91ed272a47014a814dbbc41cfeed42572534ac85..da27d4a818e06c7abbcafbebe6441ce859138c87 100644 (file)
@@ -54,6 +54,11 @@ public:
     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