upmerge of buildbreak fix for XSLinker and StandaloneScriptLinker


git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@4505 8db76d5a-ed1c-0410-87a9-c151d255dfc7

dev/core/src/com/google/gwt/core/linker/SingleScriptLinker.java

diff --git a/dev/core/src/com/google/gwt/core/linker/SingleScriptLinker.java b/dev/core/src/com/google/gwt/core/linker/SingleScriptLinker.java
index 7a69716..b31ff09 100644
--- a/dev/core/src/com/google/gwt/core/linker/SingleScriptLinker.java
+++ b/dev/core/src/com/google/gwt/core/linker/SingleScriptLinker.java
@@ -115,7 +115,7 @@
     // Generate the call to tell the bootstrap code that we're ready to go.
     out.newlineOpt();
     out.print("if (" + context.getModuleFunctionName() + ") "
-        + context.getModuleFunctionName() + ".onScriptLoad();");
+        + context.getModuleFunctionName() + ".onScriptLoad(gwtOnLoad);");
     out.newlineOpt();
     out.print("})();");
     out.newlineOpt();

dev/core/src/com/google/gwt/core/linker/XSLinker.java

diff --git a/dev/core/src/com/google/gwt/core/linker/XSLinker.java b/dev/core/src/com/google/gwt/core/linker/XSLinker.java
index 0511b40..6d551fe 100644
--- a/dev/core/src/com/google/gwt/core/linker/XSLinker.java
+++ b/dev/core/src/com/google/gwt/core/linker/XSLinker.java
@@ -97,7 +97,7 @@
     // Generate the call to tell the bootstrap code that we're ready to go.
     out.newlineOpt();
     out.print("if (" + context.getModuleFunctionName() + ") "
-        + context.getModuleFunctionName() + ".onScriptLoad();");
+        + context.getModuleFunctionName() + ".onScriptLoad(gwtOnLoad);");
     out.newlineOpt();
     out.print("})();");
     out.newlineOpt();