Merge changes from origin/7.1

4f3e81a Use <code> instead of {@code} for sample containing { and } (#12311)
c7a48ae Delay sending DateField popup value to server until popup is closed #6252
dc491a4 Reset waitingForFilteringResponse flag to false inside onBlur (#12325)
4fb775a Fixed a typo in FieldGroup.isModified() JavaDoc. (#12172)
aa47197 Add a chapter on installing IvyDE (for #12359)
eaec281 GWT requires max 1.6 compiler compliance level currently - #12345
f72be69 Terminate JVM if server.close() has no effect (#12363)
36413cb Make sure that no fileIds are replayed to the client (#12330)
7182665 Fix scrollbar for Window under WebKit browsers (#11994)
61dbe9c Search only remaining message for delimiter (#12404)
b5a212a Report min and max times from Profiler (#12409)
7220ca8 Fixed DragAndDropWrapper using wrong drop target in IE8 #12406
c87772b Escape markup in CustomLayout's JavaDoc (#12410)
f5b67af Optimize ComputedStyle.getIntProperty() (#12411)
0473036 Add more detailed profiling for some client side hotspots (#12418)
7dfe5ae Fixed test broken by fixes to drag&drop #12406
234ed1c Fixed test broken by PopupDateField communication change #6252
c7a8c3f Fixed failing TabKeyboardNavigation test #12433
fac9ff6 Optimize resetting of state when detaching components (#10899, #11284)
af995de Optimize large Vertical/HorizontalLayout client side (#12420, #10899)
39fd5fc Fix bug for spacing on first widget (#12420)
bd4442b Fixed broken test due to changes in drop position by #12406
b83240f Optimize CssLayout hierarchy update (#11284)
a52b286 Added controlDirective to ifContentStatement. Fixes ticket #12105.
8ce45c7 Disable slow sanity check when not in debug mode (#12463)
232eb42 Enable use of profiler without debug window (#12465)
6dc46c5 Use the add() path of CssLayout only when appending to the end (#11284)
bea7fa3 Only consider caption tooltips for own slots (#12469)
dce63d1 Allow creating session for Portlet UI init request (#12473)
ad669c3 Adds junit to the ide configuration for the theme-compiler module.

Change-Id: Icd734d6849cc4f4014e1268f4fabe1ed92f72e38

1 files changed, 76 insertions, 0 deletions

diff --git a/uitest/src/com/vaadin/tests/browserfeatures/WebkitScrollbarTest.java b/uitest/src/com/vaadin/tests/browserfeatures/WebkitScrollbarTest.java
new file mode 100644
index 0000000000..a031fb0c7a
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/browserfeatures/WebkitScrollbarTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2000-2013 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.vaadin.tests.browserfeatures;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.ListSelect;
+import com.vaadin.ui.UI;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+
+@SuppressWarnings("serial")
+public class WebkitScrollbarTest extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        final VerticalLayout uiLayout = new VerticalLayout();
+        uiLayout.setMargin(true);
+        setContent(uiLayout);
+
+        final VerticalLayout windowLayout = new VerticalLayout();
+
+        final Window testWindow = new Window("WebKitFail", windowLayout);
+        testWindow.setWidth(300, Unit.PIXELS);
+
+        GridLayout gl = new GridLayout();
+        gl.setHeight(null);
+        gl.setWidth(100, Unit.PERCENTAGE);
+        windowLayout.addComponent(gl);
+
+        ListSelect listSelect = new ListSelect();
+        listSelect.setWidth(100, Unit.PERCENTAGE);
+        gl.addComponent(listSelect);
+        gl.setMargin(true);
+
+        final Button testButton = new Button("Open Window",
+                new Button.ClickListener() {
+                    @Override
+                    public void buttonClick(ClickEvent event) {
+                        UI.getCurrent().addWindow(testWindow);
+                    }
+                });
+        uiLayout.addComponent(testButton);
+
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "When opening the window, it should NOT contain a horizontal"
+                + " scrollbar and the vertical height should be proportional"
+                + " to the list select component inside it.";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 11994;
+    }
+
+}