Title: [138804] trunk/Source
- Revision
- 138804
- Author
- commit-qu...@webkit.org
- Date
- 2013-01-04 09:16:08 -0800 (Fri, 04 Jan 2013)
Log Message
[Blackberry] Static code analysis warning fixes
https://bugs.webkit.org/show_bug.cgi?id=105679
Patch by Anthony Scian <asc...@rim.com> on 2013-01-04
Reviewed by Rob Buis.
Source/WebCore:
klocwork 1855: fixed by caching page, check against NULL and use cached value
* platform/blackberry/RenderThemeBlackBerry.cpp:
(WebCore::determineFullScreenMultiplier):
Source/WebKit/blackberry:
Klocwork issue 959: check layer against NULL since it is used in both cases
of the subsequent if-stmt
* Api/InRegionScroller.cpp:
(BlackBerry::WebKit::InRegionScrollerPrivate::calculateInRegionScrollableAreasForPoint):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (138803 => 138804)
--- trunk/Source/WebCore/ChangeLog 2013-01-04 17:14:20 UTC (rev 138803)
+++ trunk/Source/WebCore/ChangeLog 2013-01-04 17:16:08 UTC (rev 138804)
@@ -1,3 +1,15 @@
+2013-01-04 Anthony Scian <asc...@rim.com>
+
+ [Blackberry] Static code analysis warning fixes
+ https://bugs.webkit.org/show_bug.cgi?id=105679
+
+ Reviewed by Rob Buis.
+
+ klocwork 1855: fixed by caching page, check against NULL and use cached value
+
+ * platform/blackberry/RenderThemeBlackBerry.cpp:
+ (WebCore::determineFullScreenMultiplier):
+
2013-01-04 Hans Muller <hmul...@adobe.com>
[CSS Exclusions] The ExclusionPolygon classes should allow more than one type of "Edge" class
Modified: trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp (138803 => 138804)
--- trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp 2013-01-04 17:14:20 UTC (rev 138803)
+++ trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp 2013-01-04 17:16:08 UTC (rev 138804)
@@ -167,17 +167,19 @@
float fullScreenMultiplier = 1.0;
#if ENABLE(FULLSCREEN_API) && ENABLE(VIDEO)
if (element && element->document()->webkitIsFullScreen() && element->document()->webkitCurrentFullScreenElement() == toParentMediaElement(element)) {
- if (element->document()->page()->deviceScaleFactor() < scaleFactorThreshold)
- fullScreenMultiplier = fullScreenEnlargementFactor;
+ if (Page* page = element->document()->page()) {
+ if (page->deviceScaleFactor() < scaleFactorThreshold)
+ fullScreenMultiplier = fullScreenEnlargementFactor;
- // The way the BlackBerry port implements the FULLSCREEN_API for media elements
- // might result in the controls being oversized, proportionally to the current page
- // scale. That happens because the fullscreen element gets sized to be as big as the
- // viewport size, and the viewport size might get outstretched to fit to the screen dimensions.
- // To fix that, lets strips out the Page scale factor from the media controls multiplier.
- float scaleFactor = element->document()->view()->hostWindow()->platformPageClient()->currentZoomFactor();
- float scaleFactorFudge = 1 / element->document()->page()->deviceScaleFactor();
- fullScreenMultiplier /= scaleFactor * scaleFactorFudge;
+ // The way the BlackBerry port implements the FULLSCREEN_API for media elements
+ // might result in the controls being oversized, proportionally to the current page
+ // scale. That happens because the fullscreen element gets sized to be as big as the
+ // viewport size, and the viewport size might get outstretched to fit to the screen dimensions.
+ // To fix that, lets strips out the Page scale factor from the media controls multiplier.
+ float scaleFactor = element->document()->view()->hostWindow()->platformPageClient()->currentZoomFactor();
+ float scaleFactorFudge = 1 / page->deviceScaleFactor();
+ fullScreenMultiplier /= scaleFactor * scaleFactorFudge;
+ }
}
#endif
return fullScreenMultiplier;
Modified: trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp (138803 => 138804)
--- trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp 2013-01-04 17:14:20 UTC (rev 138803)
+++ trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp 2013-01-04 17:16:08 UTC (rev 138804)
@@ -259,8 +259,10 @@
InRegionScrollableArea* curr = static_cast<InRegionScrollableArea*>(*rit);
RenderLayer* layer = curr->layer();
+ if (!layer)
+ continue;
- if (layer && layer->renderer()->isRenderView()) { // #document case
+ if (layer->renderer()->isRenderView()) { // #document case
FrameView* view = toRenderView(layer->renderer())->frameView();
ASSERT(view);
ASSERT(canScrollInnerFrame(view->frame()));
Modified: trunk/Source/WebKit/blackberry/ChangeLog (138803 => 138804)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-01-04 17:14:20 UTC (rev 138803)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-01-04 17:16:08 UTC (rev 138804)
@@ -1,3 +1,16 @@
+2013-01-04 Anthony Scian <asc...@rim.com>
+
+ [Blackberry] Static code analysis warning fixes
+ https://bugs.webkit.org/show_bug.cgi?id=105679
+
+ Reviewed by Rob Buis.
+
+ Klocwork issue 959: check layer against NULL since it is used in both cases
+ of the subsequent if-stmt
+
+ * Api/InRegionScroller.cpp:
+ (BlackBerry::WebKit::InRegionScrollerPrivate::calculateInRegionScrollableAreasForPoint):
+
2013-01-02 Jacky Jiang <zhaji...@rim.com>
[BlackBerry] file:/// pages don't get correct scales after several rotations and history navigations
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
