Merge branch 'master' into layoutgraph

2 files changed, 14 insertions, 13 deletions

diff --git a/shared/src/com/vaadin/shared/ComponentState.java b/shared/src/com/vaadin/shared/ComponentState.java
index 6c9f055732..41bddd4666 100644
--- a/shared/src/com/vaadin/shared/ComponentState.java
+++ b/shared/src/com/vaadin/shared/ComponentState.java
@@ -42,7 +42,7 @@ public class ComponentState extends SharedState {
     private boolean visible = true;
     private URLReference icon = null;
     private List<String> styles = null;
-    private String debugId = null;
+    private String id = null;
     /**
      * A set of event identifiers with registered listeners.
      */
@@ -313,25 +313,25 @@ public class ComponentState extends SharedState {
     }
 
     /**
-     * Gets the debug id for the component. The debugId is added as DOM id for
-     * the component.
+     * Gets the id for the component. The id is added as DOM id for the
+     * component.
      * 
-     * @return The debug id for the component or null if not set
+     * @return The id for the component or null if not set
      */
-    public String getDebugId() {
-        return debugId;
+    public String getId() {
+        return id;
     }
 
     /**
-     * Sets the debug id for the component. The debugId is added as DOM id for
-     * the component.
+     * Sets the id for the component. The id is added as DOM id for the
+     * component.
      * 
-     * @param debugId
-     *            The new debugId for the component or null for no debug id
+     * @param id
+     *            The new id for the component or null for no id
      * 
      */
-    public void setDebugId(String debugId) {
-        this.debugId = debugId;
+    public void setId(String id) {
+        this.id = id;
     }
 
     /**
diff --git a/shared/src/com/vaadin/shared/VBrowserDetails.java b/shared/src/com/vaadin/shared/VBrowserDetails.java
index 7646d2ba01..2e81fbfe61 100644
--- a/shared/src/com/vaadin/shared/VBrowserDetails.java
+++ b/shared/src/com/vaadin/shared/VBrowserDetails.java
@@ -460,7 +460,8 @@ public class VBrowserDetails implements Serializable {
         if (isIE() && getBrowserMajorVersion() < 8) {
             return true;
         }
-        if (isSafari() && getBrowserMajorVersion() < 5) {
+        // Webkit 533 in Safari 4.1+, Android 2.2+, iOS 4+
+        if (isSafari() && getBrowserEngineVersion() < 533) {
             return true;
         }
         if (isFirefox() && getBrowserMajorVersion() < 4) {