Title: [147973] trunk/Source/WebKit/blackberry
- Revision
- 147973
- Author
- [email protected]
- Date
- 2013-04-08 18:34:05 -0700 (Mon, 08 Apr 2013)
Log Message
[BlackBerry] WebPage: fix build due to type mismatches
https://bugs.webkit.org/show_bug.cgi?id=114148
Patch by Alberto Garcia <[email protected]> on 2013-04-08
Reviewed by Darin Adler.
Add explicit conversions between LayoutUnit and int, and between
LayoutRect and IntRect.
* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::rectForNode):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (147972 => 147973)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-04-09 01:27:49 UTC (rev 147972)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-04-09 01:34:05 UTC (rev 147973)
@@ -2736,15 +2736,15 @@
int xOffset = 0;
int yOffset = 0;
while (!renderBlock->isRoot()) {
- xOffset += renderBlock->x();
- yOffset += renderBlock->y();
+ xOffset += renderBlock->x().toInt();
+ yOffset += renderBlock->y().toInt();
renderBlock = renderBlock->containingBlock();
}
const RenderText* renderText = toRenderText(renderer);
IntRect linesBox = renderText->linesBoundingBox();
blockRect = IntRect(xOffset + linesBox.x(), yOffset + linesBox.y(), linesBox.width(), linesBox.height());
} else
- blockRect = renderer->absoluteClippedOverflowRect();
+ blockRect = IntRect(renderer->absoluteClippedOverflowRect());
if (renderer->isText()) {
RenderBlock* rb = renderer->containingBlock();
@@ -2753,7 +2753,7 @@
int blockWidth = 0;
int lineCount = rb->lineCount();
for (int i = 0; i < lineCount; i++)
- blockWidth = max(blockWidth, rb->availableLogicalWidthForLine(i, false));
+ blockWidth = max(blockWidth, rb->availableLogicalWidthForLine(i, false).toInt());
blockRect.setWidth(blockWidth);
blockRect.setX(blockRect.x() + rb->logicalLeftOffsetForLine(1, false));
Modified: trunk/Source/WebKit/blackberry/ChangeLog (147972 => 147973)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-04-09 01:27:49 UTC (rev 147972)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-04-09 01:34:05 UTC (rev 147973)
@@ -1,3 +1,16 @@
+2013-04-08 Alberto Garcia <[email protected]>
+
+ [BlackBerry] WebPage: fix build due to type mismatches
+ https://bugs.webkit.org/show_bug.cgi?id=114148
+
+ Reviewed by Darin Adler.
+
+ Add explicit conversions between LayoutUnit and int, and between
+ LayoutRect and IntRect.
+
+ * Api/WebPage.cpp:
+ (BlackBerry::WebKit::WebPagePrivate::rectForNode):
+
2013-04-08 Jeff Rogers <[email protected]>
[BlackBerry] Update BlackBerry _javascript_ API
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
