Title: [149809] trunk/Source/WebKit/blackberry
- Revision
- 149809
- Author
- [email protected]
- Date
- 2013-05-09 08:35:07 -0700 (Thu, 09 May 2013)
Log Message
[BlackBerry] Style updates required based on new check-webkit-style
https://bugs.webkit.org/show_bug.cgi?id=115857
Reviewed by Rob Buis.
Update FatFingers to match check-webkit-style updates.
* WebKitSupport/FatFingers.cpp:
(BlackBerry::WebKit::FatFingers::checkFingerIntersection):
(BlackBerry::WebKit::FatFingers::checkForClickableElement):
* WebKitSupport/FatFingers.h:
(FatFingersResult):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (149808 => 149809)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-05-09 15:26:03 UTC (rev 149808)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-05-09 15:35:07 UTC (rev 149809)
@@ -5,6 +5,21 @@
Reviewed by Rob Buis.
+ Update FatFingers to match check-webkit-style updates.
+
+ * WebKitSupport/FatFingers.cpp:
+ (BlackBerry::WebKit::FatFingers::checkFingerIntersection):
+ (BlackBerry::WebKit::FatFingers::checkForClickableElement):
+ * WebKitSupport/FatFingers.h:
+ (FatFingersResult):
+
+2013-05-09 Mike Fenton <[email protected]>
+
+ [BlackBerry] Style updates required based on new check-webkit-style
+ https://bugs.webkit.org/show_bug.cgi?id=115857
+
+ Reviewed by Rob Buis.
+
Update InRegionScrollableArea, TileIndexHash
and TouchEventHandler to match check-webkit-style updates.
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/FatFingers.cpp (149808 => 149809)
--- trunk/Source/WebKit/blackberry/WebKitSupport/FatFingers.cpp 2013-05-09 15:26:03 UTC (rev 149808)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/FatFingers.cpp 2013-05-09 15:35:07 UTC (rev 149809)
@@ -242,8 +242,7 @@
// 'remainingFingerRegion' and 'intersectingRegions' will always be in main frame contents
// coordinates.
// Thus, before comparing, we need to map the former to main frame contents coordinates.
-bool FatFingers::checkFingerIntersection(const IntRectRegion& region, const IntRectRegion& remainingFingerRegion,
- Node* node, Vector<IntersectingRegion>& intersectingRegions)
+bool FatFingers::checkFingerIntersection(const IntRectRegion& region, const IntRectRegion& remainingFingerRegion, Node* node, Vector<IntersectingRegion>& intersectingRegions)
{
ASSERT(node);
@@ -347,10 +346,7 @@
return foundOne;
}
-bool FatFingers::checkForClickableElement(Element* curElement,
- Vector<IntersectingRegion>& intersectingRegions,
- IntRectRegion& remainingFingerRegion,
- RenderLayer*& lowestPositionedEnclosingLayerSoFar)
+bool FatFingers::checkForClickableElement(Element* curElement, Vector<IntersectingRegion>& intersectingRegions, IntRectRegion& remainingFingerRegion, RenderLayer*& lowestPositionedEnclosingLayerSoFar)
{
ASSERT(curElement);
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/FatFingers.h (149808 => 149809)
--- trunk/Source/WebKit/blackberry/WebKitSupport/FatFingers.h 2013-05-09 15:26:03 UTC (rev 149808)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/FatFingers.h 2013-05-09 15:35:07 UTC (rev 149809)
@@ -76,22 +76,22 @@
typedef HashMap<RefPtr<WebCore::Document>, ListHashSet<RefPtr<WebCore::Node> > > CachedRectHitTestResults;
bool checkFingerIntersection(const Platform::IntRectRegion&,
- const Platform::IntRectRegion& remainingFingerRegion,
- WebCore::Node*,
- Vector<IntersectingRegion>& intersectingRegions);
+ const Platform::IntRectRegion& remainingFingerRegion,
+ WebCore::Node*,
+ Vector<IntersectingRegion>& intersectingRegions);
bool findIntersectingRegions(WebCore::Document*,
- Vector<IntersectingRegion>& intersectingRegions,
- Platform::IntRectRegion& remainingFingerRegion);
+ Vector<IntersectingRegion>& intersectingRegions,
+ Platform::IntRectRegion& remainingFingerRegion);
bool checkForClickableElement(WebCore::Element*,
- Vector<IntersectingRegion>& intersectingRegions,
- Platform::IntRectRegion& remainingFingerRegion,
- WebCore::RenderLayer*& lowestPositionedEnclosingLayerSoFar);
+ Vector<IntersectingRegion>& intersectingRegions,
+ Platform::IntRectRegion& remainingFingerRegion,
+ WebCore::RenderLayer*& lowestPositionedEnclosingLayerSoFar);
bool checkForText(WebCore::Node*,
- Vector<IntersectingRegion>& intersectingRegions,
- Platform::IntRectRegion& fingerRegion);
+ Vector<IntersectingRegion>& intersectingRegions,
+ Platform::IntRectRegion& fingerRegion);
void setSuccessfulFatFingersResult(FatFingersResult&, WebCore::Node*, const WebCore::IntPoint&);
@@ -189,8 +189,7 @@
WebCore::IntPoint m_adjustedPosition; // Main frame contents coordinates.
FatFingers::TargetType m_targetType;
bool m_positionWasAdjusted;
- bool m_isTextInput; // Check if the element under the touch point will require a VKB be displayed so that
- // the touch down can be suppressed.
+ bool m_isTextInput; // Check if the element under the touch point will require a VKB be displayed so that the touch down can be suppressed.
bool m_isValid;
RefPtr<WebCore::Node> m_nodeUnderFatFinger;
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
