src/share/classes/javax/swing/text/html/StyleSheet.java

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 2077,2087 ****
              if (childtype == null) {
                  if (type == null) {
                      // Parent view.
                      View v = childView.getParent();
                      HTMLDocument doc = (HTMLDocument)v.getDocument();
!                     if (doc.matchNameAttribute(v.getElement().getAttributes(),
                                                 HTML.Tag.OL)) {
                          childtype = CSS.Value.DECIMAL;
                      } else {
                          childtype = CSS.Value.DISC;
                      }
--- 2077,2087 ----
              if (childtype == null) {
                  if (type == null) {
                      // Parent view.
                      View v = childView.getParent();
                      HTMLDocument doc = (HTMLDocument)v.getDocument();
!                     if (HTMLDocument.matchNameAttribute(v.getElement().getAttributes(),
                                                          HTML.Tag.OL)) {
                          childtype = CSS.Value.DECIMAL;
                      } else {
                          childtype = CSS.Value.DISC;
                      }
*** 2471,2487 ****
                  vPosition = pos.getVerticalPosition();
                  if (pos.isHorizontalPositionRelativeToSize()) {
                      flags |= 4;
                  }
                  else if (pos.isHorizontalPositionRelativeToSize()) {
!                     hPosition *= css.getFontSize(a, 12, ss);
                  }
                  if (pos.isVerticalPositionRelativeToSize()) {
                      flags |= 8;
                  }
                  else if (pos.isVerticalPositionRelativeToFontSize()) {
!                     vPosition *= css.getFontSize(a, 12, ss);
                  }
              }
              // Determine any repeating values.
              CSS.Value repeats = (CSS.Value)a.getAttribute(CSS.Attribute.
                                                            BACKGROUND_REPEAT);
--- 2471,2487 ----
                  vPosition = pos.getVerticalPosition();
                  if (pos.isHorizontalPositionRelativeToSize()) {
                      flags |= 4;
                  }
                  else if (pos.isHorizontalPositionRelativeToSize()) {
!                     hPosition *= CSS.getFontSize(a, 12, ss);
                  }
                  if (pos.isVerticalPositionRelativeToSize()) {
                      flags |= 8;
                  }
                  else if (pos.isVerticalPositionRelativeToFontSize()) {
!                     vPosition *= CSS.getFontSize(a, 12, ss);
                  }
              }
              // Determine any repeating values.
              CSS.Value repeats = (CSS.Value)a.getAttribute(CSS.Attribute.
                                                            BACKGROUND_REPEAT);