Merge remote branch 'origin/6.8'

Conflicts:
	src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
	src/com/vaadin/terminal/gwt/client/HistoryImplIEVaadin.java
	src/com/vaadin/terminal/gwt/client/Util.java
	src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java
	src/com/vaadin/terminal/gwt/client/ui/UploadIFrameOnloadStrategy.java
	src/com/vaadin/terminal/gwt/client/ui/UploadIFrameOnloadStrategyIE.java
	src/com/vaadin/terminal/gwt/client/ui/VCustomLayout.java
	src/com/vaadin/terminal/gwt/client/ui/VDragAndDropWrapper.java
	src/com/vaadin/terminal/gwt/client/ui/VDragAndDropWrapperIE.java
	src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
	src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
	src/com/vaadin/terminal/gwt/client/ui/VTextField.java
	src/com/vaadin/terminal/gwt/client/ui/VVideo.java
	src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
	src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
	src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
	tests/testbench/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java

1 files changed, 17 insertions, 3 deletions

diff --git a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
index a1a917130f..b780f66a23 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
@@ -691,7 +691,7 @@ public abstract class AbstractCommunicationManager implements Serializable {
             outWriter.print(getSecurityKeyUIDL(request));
         }
 
-        writeUidlResponse(repaintAll, outWriter, root, analyzeLayouts);
+        writeUidlResponse(request, repaintAll, outWriter, root, analyzeLayouts);
 
         closeJsonMessage(outWriter);
 
@@ -735,7 +735,7 @@ public abstract class AbstractCommunicationManager implements Serializable {
     }
 
     @SuppressWarnings("unchecked")
-    public void writeUidlResponse(boolean repaintAll,
+    public void writeUidlResponse(WrappedRequest request, boolean repaintAll,
             final PrintWriter outWriter, Root root, boolean analyzeLayouts)
             throws PaintException {
         ArrayList<ClientConnector> dirtyVisibleConnectors = new ArrayList<ClientConnector>();
@@ -1096,6 +1096,20 @@ public abstract class AbstractCommunicationManager implements Serializable {
         if (dragAndDropService != null) {
             dragAndDropService.printJSONResponse(outWriter);
         }
+
+        writePerformanceDataForTestBench(request, outWriter);
+    }
+
+    /**
+     * Adds the performance timing data used by TestBench 3 to the UIDL
+     * response.
+     */
+    private void writePerformanceDataForTestBench(final WrappedRequest request,
+            final PrintWriter outWriter) {
+        Long totalTime = (Long) request.getAttribute("TOTAL");
+        Long lastRequestTime = (Long) request.getAttribute("LASTREQUEST");
+        outWriter.write(String.format(", \"tbss\":[%d, %d]", totalTime,
+                lastRequestTime));
     }
 
     private void legacyPaint(PaintTarget paintTarget,
@@ -2161,7 +2175,7 @@ public abstract class AbstractCommunicationManager implements Serializable {
         if (isXSRFEnabled(root.getApplication())) {
             pWriter.print(getSecurityKeyUIDL(request));
         }
-        writeUidlResponse(true, pWriter, root, false);
+        writeUidlResponse(request, true, pWriter, root, false);
         pWriter.print("}");
         String initialUIDL = sWriter.toString();
         logger.log(Level.FINE, "Initial UIDL:" + initialUIDL);