Merge WebKit at r66666 : Initial merge by git.

Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f

4 files changed, 40 insertions, 0 deletions

diff --git a/LayoutTests/http/tests/resources/network-simulator.php b/LayoutTests/http/tests/resources/network-simulator.php
index 3f1201f..4860028 100644
--- a/LayoutTests/http/tests/resources/network-simulator.php
+++ b/LayoutTests/http/tests/resources/network-simulator.php
@@ -120,6 +120,38 @@ function handleGetResourceCountCommand($path)
     }
 }
 
+function handleStartResourceRequestsLog()
+{
+    $resourceLogFile = sys_get_temp_dir() . "/resource-log";
+    file_put_contents($resourceLogFile,  "");
+}
+
+function handleClearResourceRequestsLog()
+{
+    $resourceLogFile = sys_get_temp_dir() . "/resource-log";
+    file_put_contents($resourceLogFile, "");
+}
+
+function handleGetResourceRequestsLog()
+{
+    $resourceLogFile = sys_get_temp_dir() . "/resource-log";
+
+    generateNoCacheHTTPHeader();
+    header("Content-Type: text/plain");
+
+    print file_get_contents($resourceLogFile);
+}
+
+function handleLogResourceRequest($path)
+{
+    $resourceLogFile = sys_get_temp_dir() . "/resource-log";
+    
+    $newData = "\n".$path;
+    // Documentation says that appends are atomic.
+    file_put_contents($resourceLogFile, $newData, FILE_APPEND);
+    generateResponse($path);
+}
+
 $stateFile = sys_get_temp_dir() . "/network-simulator-state";
 $command = $_GET['command'];
 if ($command) {
@@ -133,6 +165,14 @@ if ($command) {
         handleResetResourceCountCommand();
     else if ($command == "get-resource-count")
         handleGetResourceCountCommand($_GET['path']);
+    else if ($command == "start-resource-request-log")
+        handleStartResourceRequestsLog();
+    else if ($command == "clear-resource-request-log")
+        handleClearResourceRequestsLog();
+    else if ($command == "get-resource-request-log")
+        handleGetResourceRequestsLog();
+    else if ($command == "log-resource-request")
+        handleLogResourceRequest($_GET['path']);
     else
         echo "Unknown command: " . $command . "\n";
     exit();
diff --git a/LayoutTests/http/tests/resources/silence.mpg b/LayoutTests/http/tests/resources/silence.mpg
deleted file mode 100644
index b6bbf20..0000000
--- a/LayoutTests/http/tests/resources/silence.mpg
+++ /dev/null
diff --git a/LayoutTests/http/tests/resources/test.mp4 b/LayoutTests/http/tests/resources/test.mp4
new file mode 100644
index 0000000..d278c8a
--- /dev/null
+++ b/LayoutTests/http/tests/resources/test.mp4
diff --git a/LayoutTests/http/tests/resources/test.ogv b/LayoutTests/http/tests/resources/test.ogv
new file mode 100644
index 0000000..c9ee910
--- /dev/null
+++ b/LayoutTests/http/tests/resources/test.ogv