| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 break; | 98 break; |
| 99 } | 99 } |
| 100 | 100 |
| 101 ts << " "; | 101 ts << " "; |
| 102 } | 102 } |
| 103 | 103 |
| 104 static String getTagName(Node* n) | 104 static String getTagName(Node* n) |
| 105 { | 105 { |
| 106 if (n->isDocumentNode()) | 106 if (n->isDocumentNode()) |
| 107 return ""; | 107 return ""; |
| 108 if (n->getNodeType() == Node::COMMENT_NODE) | 108 if (n->getNodeType() == Node::kCommentNode) |
| 109 return "COMMENT"; | 109 return "COMMENT"; |
| 110 return n->nodeName(); | 110 return n->nodeName(); |
| 111 } | 111 } |
| 112 | 112 |
| 113 static bool isEmptyOrUnstyledAppleStyleSpan(const Node* node) | 113 static bool isEmptyOrUnstyledAppleStyleSpan(const Node* node) |
| 114 { | 114 { |
| 115 if (!isHTMLSpanElement(node)) | 115 if (!isHTMLSpanElement(node)) |
| 116 return false; | 116 return false; |
| 117 | 117 |
| 118 const HTMLElement& elem = toHTMLElement(*node); | 118 const HTMLElement& elem = toHTMLElement(*node); |
| (...skipping 726 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 845 element->document().updateStyleAndLayout(); | 845 element->document().updateStyleAndLayout(); |
| 846 | 846 |
| 847 LayoutObject* layoutObject = element->layoutObject(); | 847 LayoutObject* layoutObject = element->layoutObject(); |
| 848 if (!layoutObject || !layoutObject->isListItem()) | 848 if (!layoutObject || !layoutObject->isListItem()) |
| 849 return String(); | 849 return String(); |
| 850 | 850 |
| 851 return toLayoutListItem(layoutObject)->markerText(); | 851 return toLayoutListItem(layoutObject)->markerText(); |
| 852 } | 852 } |
| 853 | 853 |
| 854 } // namespace blink | 854 } // namespace blink |
| OLD | NEW |