Merge changes Ide388898,Ic49f367c,I1158a808,Iacb6ca5d,I2100dd3a,I5c1abe54,Ib0ef9902,I31dbc523,I570314b3

* changes:
  Merge WebKit at r75315: Update WebKit version
  Merge WebKit at r75315: Add FrameLoaderClient PageCache stubs
  Merge WebKit at r75315: Stub out AXObjectCache::remove()
  Merge WebKit at r75315: Fix ImageBuffer
  Merge WebKit at r75315: Fix PluginData::initPlugins()
  Merge WebKit at r75315: Fix conflicts
  Merge WebKit at r75315: Fix Makefiles
  Merge WebKit at r75315: Move Android-specific WebCore files to Source
  Merge WebKit at r75315: Initial merge by git.

1 files changed, 80 insertions, 0 deletions

diff --git a/Source/JavaScriptCore/tests/mozilla/ecma/browser.js b/Source/JavaScriptCore/tests/mozilla/ecma/browser.js
new file mode 100644
index 0000000..5bbdf7c
--- /dev/null
+++ b/Source/JavaScriptCore/tests/mozilla/ecma/browser.js
@@ -0,0 +1,80 @@
+/*
+* The contents of this file are subject to the Netscape Public
+* License Version 1.1 (the "License"); you may not use this file
+* except in compliance with the License. You may obtain a copy of
+* the License at http://www.mozilla.org/NPL/
+*
+* Software distributed under the License is distributed on an "AS
+* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+* implied. See the License for the specific language governing
+* rights and limitations under the License.
+*
+* The Original Code is mozilla.org code.
+*
+* The Initial Developer of the Original Code is Netscape
+* Communications Corporation.  Portions created by Netscape are
+* Copyright (C) 1998 Netscape Communications Corporation. All
+* Rights Reserved.
+*
+* Contributor(s): 
+*/
+
+/*
+ * JavaScript test library shared functions file for running the tests
+ * in the browser.  Overrides the shell's print function with document.write
+ * and make everything HTML pretty.
+ *
+ * To run the tests in the browser, use the mkhtml.pl script to generate
+ * html pages that include the shell.js, browser.js (this file), and the
+ * test js file in script tags.
+ *
+ * The source of the page that is generated should look something like this:
+ *      <script src="./../shell.js"></script>
+ *      <script src="./../browser.js"></script>
+ *      <script src="./mytest.js"></script>
+ */
+
+onerror = err;
+
+function startTest() {
+    if ( BUGNUMBER ) {
+        writeLineToLog ("BUGNUMBER: " + BUGNUMBER );
+    }
+
+    testcases = new Array();
+    tc = 0;
+}
+
+function writeLineToLog( string ) {
+    document.write( string + "<br>\n");
+}
+function writeHeaderToLog( string ) {
+    document.write( "<h2>" + string + "</h2>" );
+}
+function stopTest() {
+    var gc;
+    if ( gc != undefined ) {
+        gc();
+    }
+    document.write( "<hr>" );
+}
+function writeFormattedResult( expect, actual, string, passed ) {
+    var s = "<tt>"+ string ;
+    s += "<b>" ;
+    s += ( passed ) ? "<font color=#009900> &nbsp;" + PASSED
+                    : "<font color=#aa0000>&nbsp;" +  FAILED + expect + "</tt>";
+    writeLineToLog( s + "</font></b></tt>" );
+    return passed;
+}
+function err( msg, page, line ) {
+    writeLineToLog( "Test failed with the message: " + msg );
+
+    testcases[tc].actual = "error";
+    testcases[tc].reason = msg;
+    writeTestCaseResult( testcases[tc].expect,
+                         testcases[tc].actual,
+                         testcases[tc].description +" = "+ testcases[tc].actual +
+                         ": " + testcases[tc].reason );
+    stopTest();
+    return true;
+}