Merge 120629 - [chromium/mac] Unbreak smooth scrolling.

Tools/ChangeLog

+2012-06-18  Nico Weber  <thakis@chromium.org>
+
+        [chromium/mac] Unbreak smooth scrolling.
+        https://bugs.webkit.org/show_bug.cgi?id=89327
+
+        Reviewed by Dimitri Glazkov.
+
+        Broken by Sam in r115589 / r115591.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (resetDefaultsToConsistentValues):
+        * TestWebKitAPI/mac/InjectedBundleControllerMac.mm:
+        (TestWebKitAPI::InjectedBundleController::platformInitialize):
+        * WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:
+        (WTR::InjectedBundle::platformInitialize):
+
+2012-06-18  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r120541, r120547, and r120548.
+        http://trac.webkit.org/changeset/120541
+        http://trac.webkit.org/changeset/120547
+        http://trac.webkit.org/changeset/120548
+        https://bugs.webkit.org/show_bug.cgi?id=89383
+
+        This approach doesn't work for WebKit2 (Requested by abarth on
+        #webkit).
+
+        * DumpRenderTree/LayoutTestController.cpp:
+        (setBackingScaleFactorCallback):
+        (LayoutTestController::staticFunctions):
+        * DumpRenderTree/LayoutTestController.h:
+        (LayoutTestController):
+        * DumpRenderTree/blackberry/LayoutTestControllerBlackBerry.cpp:
+        (LayoutTestController::setBackingScaleFactor):
+        * DumpRenderTree/efl/LayoutTestControllerEfl.cpp:
+        (LayoutTestController::setBackingScaleFactor):
+        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+        (LayoutTestController::setBackingScaleFactor):
+        * DumpRenderTree/mac/LayoutTestControllerMac.mm:
+        (LayoutTestController::setBackingScaleFactor):
+        * DumpRenderTree/win/LayoutTestControllerWin.cpp:
+        (LayoutTestController::setBackingScaleFactor):
+        * DumpRenderTree/wx/LayoutTestControllerWx.cpp:
+        (LayoutTestController::setBackingScaleFactor):
+        * WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl:
+        * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+        (WTR::InjectedBundle::didReceiveMessage):
+        (WTR::InjectedBundle::postSetBackingScaleFactor):
+        (WTR):
+        * WebKitTestRunner/InjectedBundle/InjectedBundle.h:
+        (InjectedBundle):
+        * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
+        (WTR::LayoutTestController::setBackingScaleFactor):
+        (WTR):
+        (WTR::LayoutTestController::callSetBackingScaleFactorCallback):
+        * WebKitTestRunner/InjectedBundle/LayoutTestController.h:
+        (LayoutTestController):
+        * WebKitTestRunner/TestInvocation.cpp:
+        (WTR::TestInvocation::didReceiveMessageFromInjectedBundle):
+
+2012-06-18  Zan Dobersek  <zandobersek@gmail.com>
+
+        REGRESSION(r120546): It made 3 webkitpy tests fail
+        https://bugs.webkit.org/show_bug.cgi?id=89332
+
+        Reviewed by Adam Barth.
+
+        Update the BaselineOptimizer unittest after r120546.
+
+        * Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py:
+        (BaselineOptimizerTest.test_no_add_mac_future):
+        (BaselineOptimizerTest.test_mac_future):
+        (BaselineOptimizerTest.test_complex_shadowing):
+
+2012-06-18  Dirk Pranke  <dpranke@chromium.org>
+
+        new-run-webkit-tests output gets confused when logging
+        https://bugs.webkit.org/show_bug.cgi?id=63793
+
+        Reviewed by Adam Barth.
+
+        Ship all of the log messages generated in the worker back
+        to the manager; this allows the messages to be properly
+        serialized to stderr and for the meter to flush its output correctly.
+
+        Note however that this will likely result in messages to be
+        logged out of order between workers; I'm not sure that there's
+        an easy way to fix this short of buffering a potentially
+        unbounded amount of data. It might be better to just log through
+        stderr unless we're in 'metering' mode, but it's also worth
+        noting that we already get messages out of order through stderr
+        on Windows.
+
+        * Scripts/webkitpy/layout_tests/controllers/manager.py:
+        (Manager.handle_done):
+        (Manager.handle_finished_test):
+        (Manager._log_messages):
+        * Scripts/webkitpy/layout_tests/controllers/worker.py:
+        (Worker.__init__):
+        (Worker._set_up_logging):
+        (Worker.run):
+        (Worker._run_test):
+        (Worker.cleanup):
+        (Worker.run_single_test):
+        (_WorkerLogHandler):
+        (_WorkerLogHandler.__init__):
+        (_WorkerLogHandler.emit):
+        * Scripts/webkitpy/layout_tests/views/metered_stream.py:
+        (MeteredStream.write):
+        (MeteredStream.writeln):
+        * Scripts/webkitpy/layout_tests/views/printing.py:
+        (Printer.writeln):
+
+2012-06-18  Zan Dobersek  <zandobersek@gmail.com>
+
+        [garden-o-matic] Builder names without underscores cause incorrect BuildSelector behavior
+        https://bugs.webkit.org/show_bug.cgi?id=89362
+
+        Reviewed by Simon Fraser.
+
+        Replace white spaces, braces and dots in the builder name with underscores. This
+        way the JQuery tabs will be properly matched with the according container.
+
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results.js:
+
+2012-06-18  Dirk Pranke  <dpranke@chromium.org>
+
+        nrwt: metered output doesn't handle ^C cleanly
+        https://bugs.webkit.org/show_bug.cgi?id=89249
+
+        Reviewed by Tony Chang.
+
+        If you ctrl-c a running nrwt (w/o --verbose), then all but
+        two characters of the last update are erased, and then we print
+        "interrupted, exiting" as an update, which itself then gets
+        erased. Fix this so that we flush the meter (making the last
+        update persistent, so that we print the ^C for a visual clue),
+        print the interrupt message, and move on ...
+
+        * Scripts/webkitpy/layout_tests/controllers/manager.py:
+        (Manager._run_tests):
+        * Scripts/webkitpy/layout_tests/views/metered_stream.py:
+        (MeteredStream.flush):
+        * Scripts/webkitpy/layout_tests/views/printing.py:
+        (Printer._write):
+        (Printer):
+        (Printer.flush):
+
+2012-06-18  Xianzhu Wang  <wangxianzhu@chromium.org>
+
+        [Chromium] Change back "linuxish" to "linux" and include WebFontRendering.cpp on Android
+        https://bugs.webkit.org/show_bug.cgi?id=89228
+
+        Reviewed by Tony Chang.
+
+        * DumpRenderTree/chromium/LayoutTestController.cpp:
+        * DumpRenderTree/chromium/TestShellAndroid.cpp:
+
 2012-06-18  Mario Sanchez Prada  <msanchez@igalia.com>
 
         [GTK] Get rid of DumpRenderTreeSupportGtk::{in|de}crementAccessibilityValue
         https://bugs.webkit.org/show_bug.cgi?id=89226
 
         Reviewed by Martin Robinson.
 
         Implement increment() and decrement() functions in term of the AtkValue interface,
         instead of using DumpRenderTreeSupportGtk helper class.
 
@@ skipping 4836 matching lines @@
         https://bugs.webkit.org/show_bug.cgi?id=86684
 
         Reviewed by Darin Fisher.
 
         * DumpRenderTree/chromium/LayoutTestController.cpp:
         (LayoutTestController::numberOfPages):
         * DumpRenderTree/chromium/WebViewHost.cpp:
         (WebViewHost::printPage):
 
 == Rolled over to ChangeLog-2012-05-22 ==