[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[ojan at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 19019863b3f1330f4613647e580aaf2e178ab95c
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 15 23:59:48 2010 +0000

    2010-12-15  Adam Roben  <aroben at apple.com>
    
            Teach check-webkit-style to check .vcproj and .vsprops files for XML
            syntax errors
    
            Fixes <http://webkit.org/b/51103> check-webkit-style should check for
            XML syntax errors in .vcproj/.vsprops files
    
            Reviewed by Dave Levin.
    
            * Scripts/webkitpy/style/checker.py: Added lists of file extensions
            that should be treated as XML and that should be allowed to contain
            carriage returns. (These lists happen to be identical currently.)
            (FileType): Added a new XML type.
            (CheckerDispatcher.should_check_and_strip_carriage_returns): Added.
            Just does a simple file extension check.
            (CheckerDispatcher._file_type): Added a case for XML files.
            (CheckerDispatcher._create_checker): Ditto. We use XMLChecker for XML
            files (surprise!).
            (StyleProcessor.process): Ask the dispatcher whether we should pass the
            lines through the carriage checker.
    
            * Scripts/webkitpy/style/checker_unittest.py:
            (CheckerDispatcherCarriageReturnTest.test_should_check_and_strip_carriage_returns):
            Added. Checks a few file names to see if carriage returns are allowed
            or not.
            (CheckerDispatcherDispatchTest.assert_checker_xml): Added. Similar to
            other assert_checker_* functions.
            (CheckerDispatcherDispatchTest.test_xml_paths): Added. Similar to other
            test_*_paths functions.
            (CheckerDispatcherDispatchTest.test_xml_paths): Added. Similar to other
            test_*_paths functions.
            (CheckerDispatcherDispatchTest.test_none_paths): Removed the vcproj
            file from this test case, as vcproj files now have a type.
            (StyleProcessor_CodeCoverageTest.MockDispatcher.should_check_and_strip_carriage_returns):
            Added. Similar to the other should_* functions.
            (StyleProcessor_CodeCoverageTest.test_process__carriage_returns_not_stripped):
            Added. Checks that carriage returns aren't checked for or stripped for
            allowed files.
    
            * Scripts/webkitpy/style/checkers/xml.py: Added.
            (XMLChecker.__init__): Simple init method.
            (XMLChecker.check): Pass each line through the expat parser, and record
            a style error for any errors thrown by the parser.
    
            * Scripts/webkitpy/style/checkers/xml_unittest.py: Added.
            (XMLCheckerTest.assert_no_error): Checks that the given XML does not
            produce a style error.
            (XMLCheckerTest.assert_error): Checks that the given XML produces an
            error of the given category on the given line.
            (XMLCheckerTest.mock_handle_style_error): Does nothing. Used for
            checking that the XMLChecker constructor works properly.
            (XMLCheckerTest.test_conflict_marker): Tests that conflict markers
            cause a style error (see, e.g., r73887).
            (XMLCheckerTest.test_extra_closing_tag): Tests that extra closing tags
            cause a style error (see, e.g., r73773).
            (XMLCheckerTest.test_init): Tests that the XMLChecker constructor works
            properly.
            (XMLCheckerTest.test_missing_closing_tag): Tests that missing closing
            tags cause a style error (see, e.g., r72795).
            (XMLCheckerTest.test_no_error): Tests that valid XML does not cause a
            style error.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74158 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 8f67ea1..e8aa202 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -141,6 +141,15 @@
 
         Reviewed by Adam Barth.
 
+        make status-bubble white-space:nowrap so we can measure it's width without wrapping
+        https://bugs.webkit.org/show_bug.cgi?id=51149
+
+        * QueueStatusServer/templates/statusbubble.html:
+
+2010-12-15  Ojan Vafai  <ojan at chromium.org>
+
+        Reviewed by Adam Barth.
+
         have the statusbubble postMessage it's metrics so that embedders can properly size the iframe
         https://bugs.webkit.org/show_bug.cgi?id=51125
 
diff --git a/WebKitTools/QueueStatusServer/templates/statusbubble.html b/WebKitTools/QueueStatusServer/templates/statusbubble.html
index 0de6d33..5a723e7 100644
--- a/WebKitTools/QueueStatusServer/templates/statusbubble.html
+++ b/WebKitTools/QueueStatusServer/templates/statusbubble.html
@@ -8,7 +8,8 @@ body {
     padding: 0px;
 }
 #bubbleContainer {
-    display:inline-block;
+    display: inline-block;
+    white-space: nowrap;
 }
 .status {
     display: block;

-- 
WebKit Debian packaging