[macosx] Incorrect merge in the lwawt code.

Some fixes were incorrectly merged into the jdk8-dev and jdk7u-dev.

jdk8:
http://hg.openjdk.java.net/jdk8/awt/jdk/rev/aa4610fe8a73
- peer.notifyReshape(x, y, width, height);
+
final GraphicsConfiguration newGC = peer.getGraphicsConfiguration();
// System-dependent appearance optimization.
+ if (peer != null) {
+ peer.notifyReshape(x, y, width, height);
+ }
+

jdk7:
http://hg.openjdk.java.net/jdk7u/jdk7u-dev/jdk/rev/9062acbc098c

- final GraphicsConfiguration oldGC = peer.getGraphicsConfiguration();
- peer.notifyReshape(x, y, width, height);
- final GraphicsConfiguration newGC = peer.getGraphicsConfiguration();
+ final GraphicsConfiguration oldGC = contentView.getGraphicsConfiguration();
+
+ if (peer!= null) {
+ peer.notifyReshape(x, y, width, height);
+ }
+
+ final GraphicsConfiguration newGC = contentView.getGraphicsConfiguration();