Changeset 147973 in webkit

Timestamp:

Apr 8, 2013 6:34:05 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] WebPage: fix build due to type mismatches
​https://bugs.webkit.org/show_bug.cgi?id=114148

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

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebPage.cpp (modified) (3 diffs)
• ChangeLog (modified) (1 diff)

trunk/Source/WebKit/blackberry/Api/WebPage.cpp

@@ -2737 +2737 @@
         int yOffset = 0;
         while (!renderBlock->isRoot()) {
-            xOffset += renderBlock->x();
-            yOffset += renderBlock->y();
+            xOffset += renderBlock->x().toInt();
+            yOffset += renderBlock->y().toInt();
             renderBlock = renderBlock->containingBlock();
         }
@@ -2745 +2745 @@
         blockRect = IntRect(xOffset + linesBox.x(), yOffset + linesBox.y(), linesBox.width(), linesBox.height());
     } else
-        blockRect = renderer->absoluteClippedOverflowRect();
+        blockRect = IntRect(renderer->absoluteClippedOverflowRect());
 
     if (renderer->isText()) {
@@ -2754 +2754 @@
         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);

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-04-08  Alberto Garcia  <agarcia@igalia.com>
+
+        [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  <jrogers@rim.com>