Merge remote branch 'origin/6.8'

Conflicts:
	tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java

diff --cc WebContent/VAADIN/themes/chameleon/components/button/button.css
index 6629cfeb1ef9920f0938226a5afa5757a9417ce2,0a9544b5aeeb2b404b7a3f626284b5afa532b16e..1dffddb4c24302f158cfd413de0603f9afc9258e
--- 1/WebContent/VAADIN/themes/chameleon/components/button/button.css
--- 2/WebContent/VAADIN/themes/chameleon/components/button/button.css
+++ b/WebContent/VAADIN/themes/chameleon/components/button/button.css
@@@ -254,4 -289,4 +254,4 @@@ body.v-ie .v-pressed.v-button-borderles
  
  .v-button-icon-only .v-icon {
        margin-right: -.5em;
--      }
++      }

diff --cc src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
Simple merge

diff --cc src/com/vaadin/terminal/gwt/client/ui/VWindow.java
Simple merge

diff --cc src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
Simple merge

diff --cc src/com/vaadin/terminal/gwt/server/WebBrowser.java
Simple merge

diff --cc src/com/vaadin/ui/Window.java
Simple merge

diff --cc tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java
index bf98c83585baedcbb8308c51d87a8cfdf327c392,cca76ce418313be915344bde7076c4ac46bd04ed..b9a2307aff2d2544ab30eebb4ea3f2d68dbe0e9a
--- 1/tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java
--- 2/tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java
+++ b/tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java
@@@ -3,8 -3,9 +3,9 @@@ package com.vaadin.tests.components.but
  import com.vaadin.tests.components.AbstractTestCase;\r
  import com.vaadin.ui.Button;\r
  import com.vaadin.ui.HorizontalLayout;\r
 +import com.vaadin.ui.Root.LegacyWindow;\r
  import com.vaadin.ui.VerticalLayout;\r
 -import com.vaadin.ui.Window;\r
+ import com.vaadin.ui.themes.BaseTheme;\r
  \r
  public class ButtonsInHorizontalLayout extends AbstractTestCase {\r
  \r
@@@ -12,16 -13,30 +13,30 @@@
      public void init() {\r
          VerticalLayout content = new VerticalLayout();\r
          content.setMargin(true);\r
 -        setMainWindow(new Window("", content));\r
+         content.setSpacing(true);\r
+ \r
+         content.addComponent(createButtonLayout(null));\r
+         content.addComponent(createButtonLayout(BaseTheme.BUTTON_LINK));\r
+ \r
++        setMainWindow(new LegacyWindow("", content));\r
+     }\r
+ \r
+     private HorizontalLayout createButtonLayout(String style) {\r
          HorizontalLayout layout = new HorizontalLayout();\r
          layout.setSpacing(true);\r
-         layout.addComponent(new Button(\r
-                 "Look at me in IE7 or IE8 in compatibility mode"));\r
-         layout.addComponent(new Button(\r
-                 "Look at me in IE7 or IE8 in compatibility mode"));\r
-         layout.addComponent(new Button(\r
-                 "Look at me in IE7 or IE8 in compatibility mode"));\r
-         content.addComponent(layout);\r
-         setMainWindow(new LegacyWindow("", content));\r
+         layout.addComponent(createButton(style));\r
+         layout.addComponent(createButton(style));\r
+         layout.addComponent(createButton(style));\r
+         return layout;\r
+     }\r
+ \r
+     private Button createButton(String style) {\r
+         Button button = new Button(\r
+                 "Look at me in IE7 or IE8 in compatibility mode");\r
+         if (style != null && style.length() != 0) {\r
+             button.setStyleName(style);\r
+         }\r
+         return button;\r
      }\r
  \r
      @Override\r

diff --cc tests/testbench/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java
index 0000000000000000000000000000000000000000,d88b36abb171af2bf36a7da604556227c0409f80..85b5d3b7f7e555ea19d251997f06565220863b9e
mode 000000,100644..100644
--- /dev/null
--- 2/tests/testbench/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java
+++ b/tests/testbench/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java
@@@ -1,0 -1,65 +1,65 @@@
 -import com.vaadin.ui.Window;\r
+ package com.vaadin.tests.components.table;\r
+ \r
+ import java.util.ArrayList;\r
+ import java.util.List;\r
+ \r
+ import com.vaadin.data.util.BeanItemContainer;\r
+ import com.vaadin.tests.components.TestBase;\r
+ import com.vaadin.tests.util.Person;\r
+ import com.vaadin.ui.HorizontalLayout;\r
++import com.vaadin.ui.Root.LegacyWindow;\r
+ import com.vaadin.ui.Table;\r
 -        setMainWindow(new Window("", new TestView()));\r
+ \r
+ public class ScrollCausesRequestLoop extends TestBase {\r
+ \r
+     @Override\r
+     protected void setup() {\r
++        setMainWindow(new LegacyWindow("", new TestView()));\r
+     }\r
+ \r
+     @Override\r
+     protected String getDescription() {\r
+         return "Scrolling a table causes an infinite loop of UIDL requests in some cases";\r
+     }\r
+ \r
+     @Override\r
+     protected Integer getTicketNumber() {\r
+         return 8040;\r
+     }\r
+ \r
+     private static class TestView extends HorizontalLayout {\r
+ \r
+         TestView() {\r
+             Table table = new Table();\r
+             List<Person> data = createData();\r
+             BeanItemContainer<Person> container = new BeanItemContainer<Person>(\r
+                     Person.class, data) {\r
+ \r
+                 @Override\r
+                 public Person getIdByIndex(int index) {\r
+                     try {\r
+                         // Simulate some loading delay with some exaggeration\r
+                         // to make easier to reproduce\r
+                         Thread.sleep(50);\r
+                     } catch (InterruptedException e) {\r
+                         Thread.currentThread().interrupt();\r
+                         throw new RuntimeException(e);\r
+                     }\r
+                     return super.getIdByIndex(index);\r
+                 }\r
+             };\r
+             table.setContainerDataSource(container);\r
+             addComponent(table);\r
+         }\r
+     }\r
+ \r
+     private static List<Person> createData() {\r
+         int count = 500;\r
+         List<Person> data = new ArrayList<Person>(count);\r
+         for (int i = 0; i < count; i++) {\r
+             data.add(new Person("Person", "" + i, "Email", "Phone", "Street",\r
+                     12345, "City"));\r
+         }\r
+         return data;\r
+     }\r
+ }\r

diff --cc tests/testbench/com/vaadin/tests/components/table/TableHeaderZoom.java
index 0000000000000000000000000000000000000000,90a91910365f281bea15d43604760e06ccbd1dde..8540e39c8c198391a73f07d79ef79a3de6dda8fd
mode 000000,100644..100644
--- /dev/null
--- 2/tests/testbench/com/vaadin/tests/components/table/TableHeaderZoom.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableHeaderZoom.java
@@@ -1,0 -1,32 +1,32 @@@
 -import com.vaadin.ui.Window;
+ package com.vaadin.tests.components.table;
+ 
+ import com.vaadin.tests.components.TestBase;
+ import com.vaadin.ui.CssLayout;
++import com.vaadin.ui.Root.LegacyWindow;
+ import com.vaadin.ui.Table;
 -        Window main = getMainWindow();
+ 
+ public class TableHeaderZoom extends TestBase {
+ 
+     @Override
+     protected void setup() {
+         Table table = new Table();
+         table.setHeight("100px");
+         table.setWidth("200px");
+         table.setEnabled(false);
+         table.addContainerProperty("Column 1", String.class, "");
+ 
++        LegacyWindow main = getMainWindow();
+         main.setContent(new CssLayout());
+         main.addComponent(table);
+     }
+ 
+     @Override
+     protected String getDescription() {
+         return "Table header text/icon disappears when zooming out";
+     }
+ 
+     @Override
+     protected Integer getTicketNumber() {
+         return 6870;
+     }
+ }