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

Side by Side Diff: Source/core/dom/Element.cpp

Issue 373423002: Split Dictionary's get and convert into DictionaryHelper. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 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/css/FontFace.cpp ('k') | Source/core/dom/MutationObserver.cpp » ('j') | 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 * (C) 2001 Peter Kelly (pmk@post.com) 4 * (C) 2001 Peter Kelly (pmk@post.com)
5 * (C) 2001 Dirk Mueller (mueller@kde.org) 5 * (C) 2001 Dirk Mueller (mueller@kde.org)
6 * (C) 2007 David Smith (catfish.man@gmail.com) 6 * (C) 2007 David Smith (catfish.man@gmail.com)
7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved. 7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
8 * (C) 2007 Eric Seidel (eric@webkit.org) 8 * (C) 2007 Eric Seidel (eric@webkit.org)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 693 matching lines...) Expand 10 before | Expand all | Expand 10 after
704 return; 704 return;
705 705
706 view->setScrollPosition(IntPoint(roundf(newLeft * frame->pageZoomFactor( )), view->scrollY())); 706 view->setScrollPosition(IntPoint(roundf(newLeft * frame->pageZoomFactor( )), view->scrollY()));
707 } 707 }
708 } 708 }
709 709
710 void Element::setScrollLeft(const Dictionary& scrollOptionsHorizontal, Exception State& exceptionState) 710 void Element::setScrollLeft(const Dictionary& scrollOptionsHorizontal, Exception State& exceptionState)
711 { 711 {
712 String scrollBehaviorString; 712 String scrollBehaviorString;
713 ScrollBehavior scrollBehavior = ScrollBehaviorAuto; 713 ScrollBehavior scrollBehavior = ScrollBehaviorAuto;
714 if (scrollOptionsHorizontal.get("behavior", scrollBehaviorString)) { 714 if (DictionaryHelper::get(scrollOptionsHorizontal, "behavior", scrollBehavio rString)) {
715 if (!ScrollableArea::scrollBehaviorFromString(scrollBehaviorString, scro llBehavior)) { 715 if (!ScrollableArea::scrollBehaviorFromString(scrollBehaviorString, scro llBehavior)) {
716 exceptionState.throwTypeError("The ScrollBehavior provided is invali d."); 716 exceptionState.throwTypeError("The ScrollBehavior provided is invali d.");
717 return; 717 return;
718 } 718 }
719 } 719 }
720 720
721 int position; 721 int position;
722 if (!scrollOptionsHorizontal.get("x", position)) { 722 if (!DictionaryHelper::get(scrollOptionsHorizontal, "x", position)) {
723 exceptionState.throwTypeError("ScrollOptionsHorizontal must include an ' x' member."); 723 exceptionState.throwTypeError("ScrollOptionsHorizontal must include an ' x' member.");
724 return; 724 return;
725 } 725 }
726 726
727 // FIXME: Use scrollBehavior to decide whether to scroll smoothly or instant ly. 727 // FIXME: Use scrollBehavior to decide whether to scroll smoothly or instant ly.
728 setScrollLeft(position); 728 setScrollLeft(position);
729 } 729 }
730 730
731 void Element::setScrollTop(int newTop) 731 void Element::setScrollTop(int newTop)
732 { 732 {
(...skipping 17 matching lines...) Expand all
750 return; 750 return;
751 751
752 view->setScrollPosition(IntPoint(view->scrollX(), roundf(newTop * frame- >pageZoomFactor()))); 752 view->setScrollPosition(IntPoint(view->scrollX(), roundf(newTop * frame- >pageZoomFactor())));
753 } 753 }
754 } 754 }
755 755
756 void Element::setScrollTop(const Dictionary& scrollOptionsVertical, ExceptionSta te& exceptionState) 756 void Element::setScrollTop(const Dictionary& scrollOptionsVertical, ExceptionSta te& exceptionState)
757 { 757 {
758 String scrollBehaviorString; 758 String scrollBehaviorString;
759 ScrollBehavior scrollBehavior = ScrollBehaviorAuto; 759 ScrollBehavior scrollBehavior = ScrollBehaviorAuto;
760 if (scrollOptionsVertical.get("behavior", scrollBehaviorString)) { 760 if (DictionaryHelper::get(scrollOptionsVertical, "behavior", scrollBehaviorS tring)) {
761 if (!ScrollableArea::scrollBehaviorFromString(scrollBehaviorString, scro llBehavior)) { 761 if (!ScrollableArea::scrollBehaviorFromString(scrollBehaviorString, scro llBehavior)) {
762 exceptionState.throwTypeError("The ScrollBehavior provided is invali d."); 762 exceptionState.throwTypeError("The ScrollBehavior provided is invali d.");
763 return; 763 return;
764 } 764 }
765 } 765 }
766 766
767 int position; 767 int position;
768 if (!scrollOptionsVertical.get("y", position)) { 768 if (!DictionaryHelper::get(scrollOptionsVertical, "y", position)) {
769 exceptionState.throwTypeError("ScrollOptionsVertical must include a 'y' member."); 769 exceptionState.throwTypeError("ScrollOptionsVertical must include a 'y' member.");
770 return; 770 return;
771 } 771 }
772 772
773 // FIXME: Use scrollBehavior to decide whether to scroll smoothly or instant ly. 773 // FIXME: Use scrollBehavior to decide whether to scroll smoothly or instant ly.
774 setScrollTop(position); 774 setScrollTop(position);
775 } 775 }
776 776
777 int Element::scrollWidth() 777 int Element::scrollWidth()
778 { 778 {
(...skipping 2566 matching lines...) Expand 10 before | Expand all | Expand 10 after
3345 3345
3346 void Element::trace(Visitor* visitor) 3346 void Element::trace(Visitor* visitor)
3347 { 3347 {
3348 if (hasRareData()) 3348 if (hasRareData())
3349 visitor->trace(elementRareData()); 3349 visitor->trace(elementRareData());
3350 visitor->trace(m_elementData); 3350 visitor->trace(m_elementData);
3351 ContainerNode::trace(visitor); 3351 ContainerNode::trace(visitor);
3352 } 3352 }
3353 3353
3354 } // namespace WebCore 3354 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/FontFace.cpp ('k') | Source/core/dom/MutationObserver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698