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, 80 insertions, 0 deletions

diff --git a/src/com/vaadin/terminal/gwt/server/RequestTimer.java b/src/com/vaadin/terminal/gwt/server/RequestTimer.java
new file mode 100644
index 0000000000..d47f444bef
--- /dev/null
+++ b/src/com/vaadin/terminal/gwt/server/RequestTimer.java
@@ -0,0 +1,80 @@
+/*
+@VaadinApache2LicenseForJavaFiles@
+ */
+
+package com.vaadin.terminal.gwt.server;
+
+import com.vaadin.terminal.WrappedRequest;
+
+/**
+ * Times the handling of requests and stores the information as an attribute in
+ * the request. The timing info is later passed on to the client in the UIDL and
+ * the client provides JavaScript API for accessing this data from e.g.
+ * TestBench.
+ * 
+ * @author Jonatan Kronqvist / Vaadin Ltd
+ */
+public class RequestTimer {
+    public static final String SESSION_ATTR_ID = "REQUESTTIMER";
+
+    private long requestStartTime = 0;
+    private long totalSessionTime = 0;
+    private long lastRequestTime = -1;
+
+    /**
+     * Starts the timing of a request. This should be called before any
+     * processing of the request.
+     * 
+     * @param request
+     *            the request.
+     */
+    public void start(WrappedRequest request) {
+        requestStartTime = System.nanoTime();
+        request.setAttribute("TOTAL", totalSessionTime);
+        request.setAttribute("LASTREQUEST", lastRequestTime);
+    }
+
+    /**
+     * Stops the timing of a request. This should be called when all processing
+     * of a request has finished.
+     */
+    public void stop() {
+        // Measure and store the total handling time. This data can be
+        // used in TestBench 3 tests.
+        long time = (System.nanoTime() - requestStartTime) / 1000000;
+        lastRequestTime = time;
+        totalSessionTime += time;
+    }
+
+    /**
+     * Returns a valid request timer for the specified request. Timers are
+     * session bound.
+     * 
+     * @param request
+     *            the request for which to get a valid timer.
+     * @return a valid timer.
+     */
+    public static RequestTimer get(WrappedRequest request) {
+        RequestTimer timer = (RequestTimer) request
+                .getSessionAttribute(SESSION_ATTR_ID);
+        if (timer == null) {
+            timer = new RequestTimer();
+        }
+        return timer;
+    }
+
+    /**
+     * Associates the specified request timer with the specified request. Since
+     * {@link #get(RequestWrapper)} will, at one point or another, return a new
+     * instance, this method should be called to keep the request <-> timer
+     * association updated.
+     * 
+     * @param request
+     *            the request for which to set the timer.
+     * @param requestTimer
+     *            the timer.
+     */
+    public static void set(WrappedRequest request, RequestTimer requestTimer) {
+        request.setSessionAttribute(RequestTimer.SESSION_ATTR_ID, requestTimer);
+    }
+}