Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(324)

Side by Side Diff: Source/core/html/HTMLElement.cpp

Issue 428823002: Use tighter typing in editing: markup (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/editing/markup.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2004-2008, 2013, 2014 Apple Inc. All rights reserved. 4 * Copyright (C) 2004-2008, 2013, 2014 Apple Inc. All rights reserved.
5 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 5 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
6 * Copyright (C) 2011 Motorola Mobility. All rights reserved. 6 * Copyright (C) 2011 Motorola Mobility. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 if (!parentNode()) 440 if (!parentNode())
441 exceptionState.throwDOMException(HierarchyRequestError, "The element has no parent."); 441 exceptionState.throwDOMException(HierarchyRequestError, "The element has no parent.");
442 442
443 if (exceptionState.hadException()) 443 if (exceptionState.hadException())
444 return; 444 return;
445 445
446 parent->replaceChild(newChild.release(), this, exceptionState); 446 parent->replaceChild(newChild.release(), this, exceptionState);
447 447
448 RefPtrWillBeRawPtr<Node> node = next ? next->previousSibling() : nullptr; 448 RefPtrWillBeRawPtr<Node> node = next ? next->previousSibling() : nullptr;
449 if (!exceptionState.hadException() && node && node->isTextNode()) 449 if (!exceptionState.hadException() && node && node->isTextNode())
450 mergeWithNextTextNode(node.release(), exceptionState); 450 mergeWithNextTextNode(toText(node.get()), exceptionState);
451 451
452 if (!exceptionState.hadException() && prev && prev->isTextNode()) 452 if (!exceptionState.hadException() && prev && prev->isTextNode())
453 mergeWithNextTextNode(prev.release(), exceptionState); 453 mergeWithNextTextNode(toText(prev.get()), exceptionState);
454 } 454 }
455 455
456 void HTMLElement::applyAlignmentAttributeToStyle(const AtomicString& alignment, MutableStylePropertySet* style) 456 void HTMLElement::applyAlignmentAttributeToStyle(const AtomicString& alignment, MutableStylePropertySet* style)
457 { 457 {
458 // Vertical alignment with respect to the current baseline of the text 458 // Vertical alignment with respect to the current baseline of the text
459 // right or left means floating images. 459 // right or left means floating images.
460 CSSValueID floatValue = CSSValueInvalid; 460 CSSValueID floatValue = CSSValueInvalid;
461 CSSValueID verticalAlignValue = CSSValueInvalid; 461 CSSValueID verticalAlignValue = CSSValueInvalid;
462 462
463 if (equalIgnoringCase(alignment, "absmiddle")) 463 if (equalIgnoringCase(alignment, "absmiddle"))
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after
958 #ifndef NDEBUG 958 #ifndef NDEBUG
959 959
960 // For use in the debugger 960 // For use in the debugger
961 void dumpInnerHTML(blink::HTMLElement*); 961 void dumpInnerHTML(blink::HTMLElement*);
962 962
963 void dumpInnerHTML(blink::HTMLElement* element) 963 void dumpInnerHTML(blink::HTMLElement* element)
964 { 964 {
965 printf("%s\n", element->innerHTML().ascii().data()); 965 printf("%s\n", element->innerHTML().ascii().data());
966 } 966 }
967 #endif 967 #endif
OLDNEW
« no previous file with comments | « Source/core/editing/markup.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698