[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[evan at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit fb37c8aa7398c90f031ebd197c615efce1bd497b
Author: evan at chromium.org <evan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 24 01:19:00 2010 +0000

    2010-12-23  Evan Martin  <evan at chromium.org>
    
            Reviewed by Ryosuke Niwa.
    
            [chromium] LayoutTestController warning in float->int conversion
            https://bugs.webkit.org/show_bug.cgi?id=51553
    
            Rather than reading an int, converting to a float, then getting a compiler
            warning on passing the float to something that expects an int, instead
            just pass around ints.
    
            No tests, fixes a compiler warning.
    
            * DumpRenderTree/chromium/LayoutTestController.cpp:
            (parsePageSizeParameters):
            (LayoutTestController::pageNumberForElementById):
            (LayoutTestController::numberOfPages):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74598 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 7861dc0..94a1e23 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,21 @@
+2010-12-23  Evan Martin  <evan at chromium.org>
+
+        Reviewed by Ryosuke Niwa.
+
+        [chromium] LayoutTestController warning in float->int conversion
+        https://bugs.webkit.org/show_bug.cgi?id=51553
+
+        Rather than reading an int, converting to a float, then getting a compiler
+        warning on passing the float to something that expects an int, instead
+        just pass around ints.
+
+        No tests, fixes a compiler warning.
+
+        * DumpRenderTree/chromium/LayoutTestController.cpp:
+        (parsePageSizeParameters):
+        (LayoutTestController::pageNumberForElementById):
+        (LayoutTestController::numberOfPages):
+
 2010-12-23  Lucas Forschler  <lforschler at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/Tools/DumpRenderTree/chromium/LayoutTestController.cpp b/Tools/DumpRenderTree/chromium/LayoutTestController.cpp
index e3af738..83e2389 100644
--- a/Tools/DumpRenderTree/chromium/LayoutTestController.cpp
+++ b/Tools/DumpRenderTree/chromium/LayoutTestController.cpp
@@ -1379,8 +1379,8 @@ void LayoutTestController::counterValueForElementById(const CppArgumentList& arg
 
 static bool parsePageSizeParameters(const CppArgumentList& arguments,
                                     int argOffset,
-                                    float* pageWidthInPixels,
-                                    float* pageHeightInPixels)
+                                    int* pageWidthInPixels,
+                                    int* pageHeightInPixels)
 {
     // WebKit is using the window width/height of DumpRenderTree as the
     // default value of the page size.
@@ -1391,8 +1391,8 @@ static bool parsePageSizeParameters(const CppArgumentList& arguments,
     case 2:
         if (!arguments[argOffset].isNumber() || !arguments[1 + argOffset].isNumber())
             return false;
-        *pageWidthInPixels = static_cast<float>(arguments[argOffset].toInt32());
-        *pageHeightInPixels = static_cast<float>(arguments[1 + argOffset].toInt32());
+        *pageWidthInPixels = arguments[argOffset].toInt32();
+        *pageHeightInPixels = arguments[1 + argOffset].toInt32();
         // fall through.
     case 0:
         break;
@@ -1405,8 +1405,8 @@ static bool parsePageSizeParameters(const CppArgumentList& arguments,
 void LayoutTestController::pageNumberForElementById(const CppArgumentList& arguments, CppVariant* result)
 {
     result->setNull();
-    float pageWidthInPixels = 0;
-    float pageHeightInPixels = 0;
+    int pageWidthInPixels = 0;
+    int pageHeightInPixels = 0;
     if (!parsePageSizeParameters(arguments, 1,
                                  &pageWidthInPixels, &pageHeightInPixels))
         return;
@@ -1416,14 +1416,15 @@ void LayoutTestController::pageNumberForElementById(const CppArgumentList& argum
     if (!frame)
         return;
     result->set(frame->pageNumberForElementById(cppVariantToWebString(arguments[0]),
-                                                pageWidthInPixels, pageHeightInPixels));
+                                                static_cast<float>(pageWidthInPixels),
+                                                static_cast<float>(pageHeightInPixels)));
 }
 
 void LayoutTestController::numberOfPages(const CppArgumentList& arguments, CppVariant* result)
 {
     result->setNull();
-    float pageWidthInPixels = 0;
-    float pageHeightInPixels = 0;
+    int pageWidthInPixels = 0;
+    int pageHeightInPixels = 0;
     if (!parsePageSizeParameters(arguments, 0, &pageWidthInPixels, &pageHeightInPixels))
         return;
 

-- 
WebKit Debian packaging