Fixes layout test

LayoutTests/transitions/transition-drt-api.html. When I added support
for pauseTransitionAtTimeOnElementWithId I forgot to set the result,
making this test timeout.
I had to rebaseline the test due to font size differences.

BUG=NONE
TEST=layout test

Review URL: http://codereview.chromium.org/17613

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7867 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 16 insertions, 3 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/transitions/transition-drt-api-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/transitions/transition-drt-api-expected.checksum
new file mode 100644
index 0000000..5cd3ad7
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/transitions/transition-drt-api-expected.checksum
@@ -0,0 +1 @@
+25f1a0dc77d006f3985a58c1308a3d07
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/transitions/transition-drt-api-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/transitions/transition-drt-api-expected.png
new file mode 100644
index 0000000..8811a8e
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/transitions/transition-drt-api-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/transitions/transition-drt-api-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/transitions/transition-drt-api-expected.txt
new file mode 100644
index 0000000..1d0620a
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/transitions/transition-drt-api-expected.txt
@@ -0,0 +1,11 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x316
+  RenderBlock {HTML} at (0,0) size 800x316
+    RenderBody {BODY} at (0,21) size 800x295
+      RenderBlock {H1} at (0,0) size 800x74
+        RenderText {#text} at (0,0) size 796x73
+          text run at (0,0) width 796: "Test for DRT pauseTransitionAtTimeOnElementWithId()"
+          text run at (0,37) width 54: "API"
+layer at (125,116) size 200x200
+  RenderBlock (relative positioned) {DIV} at (0,95) size 200x200 [bgcolor=#FF0000]
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 93add26..656b0fa 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1324,7 +1324,8 @@ LayoutTests/fast/dom/cssTarget-crash.html = TIMEOUT
 LayoutTests/security/block-test.html = FAIL
 
 // MERGE 38500:39550: New tests
-LayoutTests/transitions/transition-drt-api.html = TIMEOUT
+// Needs to be rebaselined on linux/mac.
+LINUX MAC : LayoutTests/transitions/transition-drt-api.html = TIMEOUT
 // Missing expected results
 SKIP : LayoutTests/animations/animation-drt-api.html = PASS
 
diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc
index df1a774..3a23546 100644
--- a/webkit/tools/test_shell/layout_test_controller.cc
+++ b/webkit/tools/test_shell/layout_test_controller.cc
@@ -597,8 +597,8 @@ void LayoutTestController::pauseTransitionAtTimeOnElementWithId(
     double time = args[1].ToDouble();
     std::string element_id = args[2].ToString();
 
-    webkit_glue::PauseTransitionAtTimeOnElementWithId(
-        shell_->webView(), property_name, time, element_id);
+    result->Set(webkit_glue::PauseTransitionAtTimeOnElementWithId(
+        shell_->webView(), property_name, time, element_id));
   } else {
     result->Set(false);
   }