hg: openjfx/2.2/controls/rt: 2 new changesets

[hang.vo at oracle.com]

Changeset: 121a87ea1d97
Author:    David Grieve<david.grieve at oracle.com>
Date:      2012-07-02 14:15 -0400
URL:       http://hg.openjdk.java.net/openjfx/2.2/controls/rt/rev/121a87ea1d97

RT-22076: backout patch for RT-22076 until after integration

! javafx-ui-common/src/com/sun/javafx/css/CompoundSelector.java
! javafx-ui-common/src/com/sun/javafx/css/Rule.java
! javafx-ui-common/src/com/sun/javafx/css/Selector.java
! javafx-ui-common/src/com/sun/javafx/css/SimpleSelector.java
! javafx-ui-common/src/com/sun/javafx/css/StyleManager.java
! javafx-ui-common/src/javafx/scene/Node.java
! javafx-ui-common/test/unit/com/sun/javafx/css/RuleTest.java

Changeset: 80668368c867
Author:    David Grieve<david.grieve at oracle.com>
Date:      2012-07-02 14:16 -0400
URL:       http://hg.openjdk.java.net/openjfx/2.2/controls/rt/rev/80668368c867

RT-23140: NPE in getStyleHelper if stylesheet fails to load. Check if stylesheet is null and also check if stylesheet List<Rule> is null or empty. If so, move on to next stylesheet.

! javafx-ui-common/src/com/sun/javafx/css/StyleManager.java
! javafx-ui-common/test/unit/com/sun/javafx/css/StylesheetTest.java