Merge WebKit at r84325: Initial merge by git.

Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b

1 files changed, 15 insertions, 1 deletions

diff --git a/Tools/Scripts/webkitpy/tool/mocktool.py b/Tools/Scripts/webkitpy/tool/mocktool.py
index 73f55a7..ad03244 100644
--- a/Tools/Scripts/webkitpy/tool/mocktool.py
+++ b/Tools/Scripts/webkitpy/tool/mocktool.py
@@ -458,13 +458,14 @@ class MockSCM(Mock):
 
     fake_checkout_root = os.path.realpath("/tmp") # realpath is needed to allow for Mac OS X's /private/tmp
 
-    def __init__(self):
+    def __init__(self, filesystem=None):
         Mock.__init__(self)
         # FIXME: We should probably use real checkout-root detection logic here.
         # os.getcwd() can't work here because other parts of the code assume that "checkout_root"
         # will actually be the root.  Since getcwd() is wrong, use a globally fake root for now.
         self.checkout_root = self.fake_checkout_root
         self.added_paths = set()
+        self._filesystem = filesystem
 
     def add(self, destination_path, return_exit_code=False):
         self.added_paths.add(destination_path)
@@ -502,6 +503,12 @@ class MockSCM(Mock):
     def svn_revision_from_commit_text(self, commit_text):
         return "49824"
 
+    def delete(self, path):
+        if not self._filesystem:
+            return
+        if self._filesystem.exists(path):
+            self._filesystem.remove(path)
+
 
 class MockDEPS(object):
     def read_variable(self, name):
@@ -686,6 +693,13 @@ class MockPort(Mock):
     def layout_tests_results_path(self):
         return "/mock/results.html"
 
+    def check_webkit_style_command(self):
+        return ["mock-check-webkit-style"]
+
+    def update_webkit_command(self):
+        return ["mock-update-webkit"]
+
+
 class MockTestPort1(object):
 
     def skips_layout_test(self, test_name):