Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)

New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes

5 files changed, 65 insertions, 22 deletions

diff --git a/Tools/Scripts/webkitpy/common/config/committers.py b/Tools/Scripts/webkitpy/common/config/committers.py
index e98b25936..1c231d37a 100644
--- a/Tools/Scripts/webkitpy/common/config/committers.py
+++ b/Tools/Scripts/webkitpy/common/config/committers.py
@@ -108,18 +108,17 @@ watchers_who_are_not_contributors = [
 
 contributors_who_are_not_committers = [
     Contributor("Aharon Lanin", "aharon@google.com"),
-    Contributor("Alan Stearns", "stearns@adobe.com", 'astearns'),
+    Contributor("Alan Stearns", "stearns@adobe.com", "astearns"),
     Contributor("Alexey Marinichev", ["amarinichev@chromium.org", "amarinichev@google.com"], "amarinichev"),
     Contributor("Andras Piroska", "pandras@inf.u-szeged.hu", "andris88"),
     Contributor("Andrei Bucur", "abucur@adobe.com", "abucur"),
     Contributor("Anne van Kesteren", "annevankesteren+webkit@gmail.com", "annevk"),
     Contributor("Annie Sullivan", "sullivan@chromium.org", "annie"),
     Contributor("Aryeh Gregor", "ayg@aryeh.name", "AryehGregor"),
-    Contributor("Balazs Ankes", "bank@inf.u-szeged.hu", 'abalazs'),
+    Contributor("Balazs Ankes", "bank@inf.u-szeged.hu", "abalazs"),
     Contributor("Brian Salomon", "bsalomon@google.com"),
     Contributor("Commit Queue", "commit-queue@webkit.org"),
     Contributor("Daniel Sievers", "sievers@chromium.org"),
-    Contributor("David Barr", "davidbarr@chromium.org", "barrbrain"),
     Contributor("David Dorwin", "ddorwin@chromium.org", "ddorwin"),
     Contributor("David Reveman", "reveman@chromium.org", "reveman"),
     Contributor("Dongsung Huang", "luxtella@company100.net", "Huang"),
@@ -136,8 +135,8 @@ contributors_who_are_not_committers = [
     Contributor("Gregg Tavares", ["gman@google.com", "gman@chromium.org"], "gman"),
     Contributor("Hao Zheng", "zhenghao@chromium.org"),
     Contributor("Ian Hickson", "ian@hixie.ch", "hixie"),
-    Contributor("Janos Badics", "jbadics@inf.u-szeged.hu", 'dicska'),
-    Contributor("Jonathan Backer", "backer@chromium.org", 'backer'),
+    Contributor("Janos Badics", "jbadics@inf.u-szeged.hu", "dicska"),
+    Contributor("Jonathan Backer", "backer@chromium.org", "backer"),
     Contributor("Jeff Timanus", ["twiz@chromium.org", "twiz@google.com"], "twiz"),
     Contributor("Jing Zhao", "jingzhao@chromium.org"),
     Contributor("John Bates", ["jbates@google.com", "jbates@chromium.org"], "jbates"),
@@ -151,7 +150,7 @@ contributors_who_are_not_committers = [
     Contributor("Oliver Varga", ["voliver@inf.u-szeged.hu", "Varga.Oliver@stud.u-szeged.hu"], "TwistO"),
     Contributor("Peter Gal", "galpeter@inf.u-szeged.hu", "elecro"),
     Contributor("Peter Linss", "peter.linss@hp.com", "plinss"),
-    Contributor("Pravin D", "pravind.2k4@gmail.com", 'pravind'),
+    Contributor("Pravin D", "pravind.2k4@gmail.com", "pravind"),
     Contributor("Radar WebKit Bug Importer", "webkit-bug-importer@group.apple.com"),
     Contributor("Raul Hudea", "rhudea@adobe.com", "rhudea"),
     Contributor("Roland Takacs", "rtakacs@inf.u-szeged.hu", "rtakacs"),
@@ -179,7 +178,7 @@ contributors_who_are_not_committers = [
 committers_unable_to_review = [
     Committer("Aaron Boodman", "aa@chromium.org", "aboodman"),
     Committer("Adam Bergkvist", "adam.bergkvist@ericsson.com", "adambe"),
-    Committer("Adam Kallai", "kadam@inf.u-szeged.hu", 'kadam'),
+    Committer("Adam Kallai", "kadam@inf.u-szeged.hu", "kadam"),
     Committer("Adam Klein", "adamk@chromium.org", "aklein"),
     Committer("Adam Langley", "agl@chromium.org", "agl"),
     Committer("Ademar de Souza Reis Jr", ["ademar.reis@gmail.com", "ademar@webkit.org"], "ademar"),
@@ -216,7 +215,6 @@ committers_unable_to_review = [
     Committer("Benjamin Otte", ["otte@gnome.org", "otte@webkit.org"], "otte"),
     Committer("Bill Budge", ["bbudge@chromium.org", "bbudge@gmail.com"], "bbudge"),
     Committer("Brett Wilson", "brettw@chromium.org", "brettx"),
-    Committer("Caio Marcelo de Oliveira Filho", ["cmarcelo@webkit.org", "caio.oliveira@openbossa.org"], "cmarcelo"),
     Committer("Cameron McCormack", ["cam@mcc.id.au", "cam@webkit.org"], "heycam"),
     Committer("Carol Szabo", ["carol@webkit.org", "carol.szabo@nokia.com"], "cszabo1"),
     Committer("Cary Clark", ["caryclark@google.com", "caryclark@chromium.org"], "caryclark"),
@@ -233,9 +231,11 @@ committers_unable_to_review = [
     Committer("Daniel Cheng", "dcheng@chromium.org", "dcheng"),
     Committer("Dave Barton", "dbarton@mathscribe.com", "dbarton"),
     Committer("Dave Tharp", "dtharp@codeaurora.org", "dtharp"),
+    Committer("David Michael Barr", ["davidbarr@chromium.org", "davidbarr@google.com", "b@rr-dav.id.au"], "barrbrain"),
     Committer("David Grogan", ["dgrogan@chromium.org", "dgrogan@google.com"], "dgrogan"),
     Committer("David Smith", ["catfish.man@gmail.com", "dsmith@webkit.org"], "catfishman"),
     Committer("Diego Gonzalez", ["diegohcg@webkit.org", "diego.gonzalez@openbossa.org"], "diegohcg"),
+    Committer("Dinu Jacob", "dinu.s.jacob@intel.com", "dsjacob"),
     Committer("Dmitry Lomov", ["dslomov@google.com", "dslomov@chromium.org"], "dslomov"),
     Committer("Dominic Cooney", ["dominicc@chromium.org", "dominicc@google.com"], "dominicc"),
     Committer("Dominic Mazzoni", ["dmazzoni@google.com", "dmazzoni@chromium.org"], "dmazzoni"),
@@ -243,7 +243,6 @@ committers_unable_to_review = [
     Committer("Drew Wilson", "atwilson@chromium.org", "atwilson"),
     Committer("Eli Fidler", ["eli@staikos.net", "efidler@rim.com"], "efidler"),
     Committer("Elliot Poger", "epoger@chromium.org", "epoger"),
-    Committer("Emil A Eklund", "eae@chromium.org", "eae"),
     Committer("Erik Arvidsson", "arv@chromium.org", "arv"),
     Committer("Eric Roman", "eroman@chromium.org", "eroman"),
     Committer("Eric Uhrhane", "ericu@chromium.org", "ericu"),
@@ -299,6 +298,7 @@ committers_unable_to_review = [
     Committer("Joshua Bell", ["jsbell@chromium.org", "jsbell@google.com"], "jsbell"),
     Committer("Julie Parent", ["jparent@google.com", "jparent@chromium.org"], "jparent"),
     Committer("Jungshik Shin", "jshin@chromium.org"),
+    Committer("Justin Novosad", ["junov@google.com", "junov@chromium.org"], "junov"),
     Committer("Justin Schuh", "jschuh@chromium.org", "jschuh"),
     Committer("Kaustubh Atrawalkar", ["kaustubh@motorola.com"], "silverroots"),
     Committer("Keishi Hattori", "keishi@webkit.org", "keishi"),
@@ -378,6 +378,7 @@ committers_unable_to_review = [
     Committer("Siddharth Mathur", "siddharth.mathur@nokia.com", "simathur"),
     Committer("Stephen Chenney", "schenney@chromium.org", "schenney"),
     Committer("Steve Lacey", "sjl@chromium.org", "stevela"),
+    Committer("Taiju Tsuiki", "tzik@chromium.org", "tzik"),
     Committer("Takashi Toyoshima", "toyoshim@chromium.org", "toyoshim"),
     Committer("Thomas Sepez", "tsepez@chromium.org", "tsepez"),
     Committer("Tom Hudson", ["tomhudson@google.com", "tomhudson@chromium.org"], "tomhudson"),
@@ -441,6 +442,7 @@ reviewers_list = [
     Reviewer("Brady Eidson", "beidson@apple.com", "bradee-oh"),
     Reviewer("Brent Fulgham", "bfulgham@webkit.org", "bfulgham"),
     Reviewer("Brian Weinstein", "bweinstein@apple.com", "bweinstein"),
+    Reviewer("Caio Marcelo de Oliveira Filho", ["cmarcelo@webkit.org", "caio.oliveira@openbossa.org"], "cmarcelo"),
     Reviewer("Cameron Zwarich", ["zwarich@apple.com", "cwzwarich@apple.com", "cwzwarich@webkit.org"]),
     Reviewer("Carlos Garcia Campos", ["cgarcia@igalia.com", "carlosgc@gnome.org", "carlosgc@webkit.org"], "KaL"),
     Reviewer("Chang Shu", ["cshu@webkit.org", "c.shu@sisa.samsung.com"], "cshu"),
@@ -465,6 +467,7 @@ reviewers_list = [
     Reviewer("Dmitry Titov", "dimich@chromium.org", "dimich"),
     Reviewer("Don Melton", "gramps@apple.com", "gramps"),
     Reviewer("Dumitru Daniliuc", "dumi@chromium.org", "dumi"),
+    Reviewer("Emil A Eklund", "eae@chromium.org", "eae"),
     Reviewer("Enrica Casucci", "enrica@apple.com", "enrica"),
     Reviewer("Eric Carlson", "eric.carlson@apple.com", "eric_carlson"),
     Reviewer("Eric Seidel", "eric@webkit.org", "eseidel"),
@@ -497,7 +500,7 @@ reviewers_list = [
     Reviewer("Kevin McCullough", "kmccullough@apple.com", "maculloch"),
     Reviewer("Kevin Ollivier", ["kevino@theolliviers.com", "kevino@webkit.org"], "kollivier"),
     Reviewer("Lars Knoll", ["lars@trolltech.com", "lars@kde.org", "lars.knoll@nokia.com"], "lars"),
-    Reviewer("Laszlo Gombos", "laszlo.1.gombos@nokia.com", "lgombos"),
+    Reviewer("Laszlo Gombos", ["laszlo.gombos@webkit.org", "l.gombos@samsung.com", "laszlo.1.gombos@nokia.com"], "lgombos"),
     Reviewer("Levi Weintraub", ["leviw@chromium.org", "leviw@google.com", "lweintraub@apple.com"], "leviw"),
     Reviewer("Luiz Agostini", ["luiz@webkit.org", "luiz.agostini@openbossa.org"], "lca"),
     Reviewer("Maciej Stachowiak", "mjs@apple.com", "othermaciej"),
diff --git a/Tools/Scripts/webkitpy/common/config/watchlist b/Tools/Scripts/webkitpy/common/config/watchlist
index 2ab16b0c2..0f3dd65a1 100755
--- a/Tools/Scripts/webkitpy/common/config/watchlist
+++ b/Tools/Scripts/webkitpy/common/config/watchlist
@@ -56,6 +56,15 @@
         "webkitpy": {
             "filename": r"Tools/Scripts/webkitpy/",
         },
+        "webkitperl": {
+            "filename": r"Tools/Scripts/webkitperl/"
+                        r"|Tools/Scripts/webkitdirs.pm"
+                        r"|Tools/Scripts/VCSUtils.pm"
+                        r"|Tools/Scripts/test-webkitperl",
+        },
+        "SVNScripts": {
+            "filename": r"Tools/Scripts/svn-.*",
+        },
         "TestFailures": {
             "filename": r"Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/",
         },
@@ -64,6 +73,9 @@
             "less": r"[Ss]ecurityOrigin(?!\.(h|cpp))",
             "filename": r"XSS|[Ss]ecurity",
         },
+        "XSS": {
+            "filename": r".*XSS",
+        },
         "SkiaGraphics": {
             "filename": r"Source/WebCore/platform/graphics/skia/"
                         r"|Source/WebCore/platform/graphics/filters/skia/",
@@ -103,8 +115,8 @@
         },
         "QtGraphics": {
             "filename": r"Source/WebCore/platform/graphics/qt/"
-                        r"|Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/"
-                        r"|Source/WebKit2/UIProcess/WebLayerTreeRenderer(?!\.(h|cpp))",
+                        r"|Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/"
+                        r"|Source/WebKit2/UIProcess/CoordinatedGraphics",
         },
         "TextureMapper": {
             "filename": r"Source/WebCore/platform/graphics/texmap/",
@@ -232,10 +244,27 @@
                         r"|Source/WebCore/svg/graphics/filters"
                         r"|Source/WebCore/svg/graphics/.*Filter.*",
         },
+        "TouchAdjustment": {
+            "filename": r"Source/WebCore/page/TouchAdjustment.*"
+                        r"|LayoutTests/touchadjustment"
+                        r"|Source/WebKit/blackberry/WebKitSupport/FatFingers.*",
+        },
         "SVG": {
             "filename": r"Source/WebCore/svg"
                         r"|Source/WebCore/rendering/svg",
         },
+        "WebInspectorProtocol": {
+            "filename": r"Source/WebCore/inspector/Inspector.json",
+        },
+        "WebSocket": {
+            "filename": r"Source/WebCore/Modules/websockets"
+                        r"|Source/WebCore/platform/network/(|.+/)SocketStream.*",
+        },
+        "MediaStream": {
+            "filename": r"Source/WebCore/Modules/mediastream"
+                        r"|Source/WebCore/platform/mediastream"
+                        r"|LayoutTests/fast/mediastream",
+        },
     },
     "CC_RULES": {
         # Note: All email addresses listed must be registered with bugzilla.
@@ -243,9 +272,9 @@
         # two different accounts as far as bugzilla is concerned.
         "AppleMacPublicApi": [ "timothy@apple.com" ],
         "Battery": [ "gyuyoung.kim@samsung.com" ],
-        "BlackBerry": [ "mifenton@rim.com", "rwlbuis@gmail.com" ],
+        "BlackBerry": [ "mifenton@rim.com", "rwlbuis@gmail.com", "tonikitoo@webkit.org" ],
         "CMake": [ "rakuco@webkit.org", "gyuyoung.kim@samsung.com" ],
-        "CSS": [ "alexis@webkit.org", "macpherson@chromium.org", "cmarcelo@webkit.org" ],
+        "CSS": [ "alexis@webkit.org", "macpherson@chromium.org", "cmarcelo@webkit.org", "allan.jensen@digia.com" ],
         "ChromiumGraphics": [ "jamesr@chromium.org", "cc-bugs@chromium.org" ],
         "ChromiumPublicApi": [ "abarth@webkit.org", "dglazkov@chromium.org", "fishd@chromium.org", "jamesr@chromium.org", "tkent+wkapi@chromium.org" ],
         "DOMAttributes": [ "cmarcelo@webkit.org", ],
@@ -261,29 +290,36 @@
         "Loader": [ "japhet@chromium.org" ],
         "MathML": [ "dbarton@mathscribe.com" ],
         "Media": [ "feature-media-reviews@chromium.org", "eric.carlson@apple.com" ],
+        "MediaStream": [ "tommyw@google.com" ],
         "NetworkInfo": [ "gyuyoung.kim@samsung.com" ],
         "OpenGL" : [ "noam.rosenthal@nokia.com", "dino@apple.com" ],
-        "SkiaGraphics": [ "senorblanco@chromium.org" ],
         "QtBuildSystem" : [ "vestbo@webkit.org", "abecsi@webkit.org" ],
         "QtGraphics" : [ "noam.rosenthal@nokia.com" ],
-        "QtWebKit2PlatformSpecific": [ "alexis@webkit.org", "zoltan@webkit.org", "cmarcelo@webkit.org", "abecsi@webkit.org" ],
-        "QtWebKit2PublicAPI": [ "alexis@webkit.org", "zoltan@webkit.org", "cmarcelo@webkit.org", "abecsi@webkit.org" ],
+        "QtWebKit2PlatformSpecific": [ "alexis@webkit.org", "cmarcelo@webkit.org", "abecsi@webkit.org" ],
+        "QtWebKit2PublicAPI": [ "alexis@webkit.org", "cmarcelo@webkit.org", "abecsi@webkit.org" ],
         "Rendering": [ "eric@webkit.org" ],
+        "SVG": ["schenney@chromium.org", "pdr@google.com", "fmalita@chromium.org" ],
+        "SVNScripts": [ "dbates@webkit.org" ],
         "ScrollingCoordinator": [ "andersca@apple.com", "jamesr@chromium.org", "tonikitoo@webkit.org" ],
         "SecurityCritical": [ "abarth@webkit.org" ],
+        "SkiaGraphics": [ "senorblanco@chromium.org" ],
         "SoupNetwork": [ "rakuco@webkit.org", "gns@gnome.org", "mrobinson@webkit.org", "danw@gnome.org" ],
         "StyleChecker": [ "levin@chromium.org", ],
-        "SVG": ["schenney@chromium.org", "pdr@google.com", "fmalita@chromium.org" ],
         "TestFailures": [ "abarth@webkit.org", "dglazkov@chromium.org" ],
         "TextureMapper" : [ "noam.rosenthal@nokia.com" ],
         "ThreadingFiles|ThreadingUsage": [ "levin+threading@chromium.org", ],
+        "TouchAdjustment" : [ "allan.jensen@digia.com" ],
         "V8Bindings|BindingsScripts": [ "abarth@webkit.org", "japhet@chromium.org", "haraken@chromium.org" ],
+        "WTF": [ "benjamin@webkit.org",],
         "WatchListScript": [ "levin+watchlist@chromium.org", ],
         "WebGL": [ "dino@apple.com" ],
         "WebIDL": [ "abarth@webkit.org", "ojan@chromium.org" ],
+        "WebInspectorProtocol": [ "timothy@apple.com", ],
         "WebKitGTKTranslations": [ "gns@gnome.org", "mrobinson@webkit.org" ],
+        "WebSocket": [ "yutak@chromium.org" ],
+        "XSS": [ "dbates@webkit.org" ],
+        "webkitperl": [ "dbates@webkit.org" ],
         "webkitpy": [ "abarth@webkit.org", "ojan@chromium.org", "dpranke@chromium.org" ],
-        "WTF": [ "benjamin@webkit.org",],
     },
     "MESSAGE_RULES": {
         "ChromiumPublicApi": [ "Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, "
diff --git a/Tools/Scripts/webkitpy/common/host.py b/Tools/Scripts/webkitpy/common/host.py
index 53889657b..7dd5ad024 100644
--- a/Tools/Scripts/webkitpy/common/host.py
+++ b/Tools/Scripts/webkitpy/common/host.py
@@ -125,7 +125,7 @@ class Host(SystemHost):
             except OSError, e:
                 _log.debug('Failed to engage git.bat Windows hack.')
 
-    def _initialize_scm(self, patch_directories=None):
+    def initialize_scm(self, patch_directories=None):
         if sys.platform == "win32":
             self._engage_awesome_windows_hacks()
         detector = SCMDetector(self.filesystem, self.executive)
diff --git a/Tools/Scripts/webkitpy/common/host_mock.py b/Tools/Scripts/webkitpy/common/host_mock.py
index ca4f78eb3..8b508bf8f 100644
--- a/Tools/Scripts/webkitpy/common/host_mock.py
+++ b/Tools/Scripts/webkitpy/common/host_mock.py
@@ -50,7 +50,7 @@ class MockHost(MockSystemHost):
         # FIXME: we should never initialize the SCM by default, since the real
         # object doesn't either. This has caused at least one bug (see bug 89498).
         if initialize_scm_by_default:
-            self._initialize_scm()
+            self.initialize_scm()
         self.bugs = MockBugzilla()
         self.buildbot = MockBuildBot()
         self._chromium_buildbot = MockBuildBot()
@@ -61,7 +61,7 @@ class MockHost(MockSystemHost):
 
         self._watch_list = MockWatchList()
 
-    def _initialize_scm(self, patch_directories=None):
+    def initialize_scm(self, patch_directories=None):
         self._scm = MockSCM(filesystem=self.filesystem, executive=self.executive)
         # Various pieces of code (wrongly) call filesystem.chdir(checkout_root).
         # Making the checkout_root exist in the mock filesystem makes that chdir not raise.
diff --git a/Tools/Scripts/webkitpy/common/system/executive_unittest.py b/Tools/Scripts/webkitpy/common/system/executive_unittest.py
index 8a322e480..57c557369 100644
--- a/Tools/Scripts/webkitpy/common/system/executive_unittest.py
+++ b/Tools/Scripts/webkitpy/common/system/executive_unittest.py
@@ -162,6 +162,10 @@ class ExecutiveTest(unittest.TestCase):
             # FIXME: https://bugs.webkit.org/show_bug.cgi?id=54790
             # We seem to get either 0 or 1 here for some reason.
             self.assertTrue(process.wait() in (0, 1))
+        elif sys.platform == "cygwin":
+            # FIXME: https://bugs.webkit.org/show_bug.cgi?id=98196
+            # cygwin seems to give us either SIGABRT or SIGKILL
+            self.assertTrue(process.wait() in (-signal.SIGABRT, -signal.SIGKILL))
         else:
             expected_exit_code = -signal.SIGKILL
             self.assertEqual(process.wait(), expected_exit_code)