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

Side by Side Diff: Source/core/testing/Internals.cpp

Issue 14458008: Clean up RenderLayer paintOrderLists code (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 8 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * Copyright (C) 2013 Apple Inc. All rights reserved. 3 * Copyright (C) 2013 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 #include "PseudoElement.h" 61 #include "PseudoElement.h"
62 #include "Range.h" 62 #include "Range.h"
63 #include "SelectRuleFeatureSet.h" 63 #include "SelectRuleFeatureSet.h"
64 #include "SerializedScriptValue.h" 64 #include "SerializedScriptValue.h"
65 #include "ShadowRoot.h" 65 #include "ShadowRoot.h"
66 #include "StyleSheetContents.h" 66 #include "StyleSheetContents.h"
67 #include "TreeScope.h" 67 #include "TreeScope.h"
68 #include "TypeConversions.h" 68 #include "TypeConversions.h"
69 #include "ViewportArguments.h" 69 #include "ViewportArguments.h"
70 #include "WorkerThread.h" 70 #include "WorkerThread.h"
71 #include "core/dom/StaticNodeList.h"
71 #include "core/editing/Editor.h" 72 #include "core/editing/Editor.h"
72 #include "core/editing/SpellChecker.h" 73 #include "core/editing/SpellChecker.h"
73 #include "core/editing/TextIterator.h" 74 #include "core/editing/TextIterator.h"
74 #include "core/history/BackForwardController.h" 75 #include "core/history/BackForwardController.h"
75 #include "core/history/HistoryItem.h" 76 #include "core/history/HistoryItem.h"
76 #include "core/loader/FrameLoader.h" 77 #include "core/loader/FrameLoader.h"
77 #include "core/loader/cache/CachedResourceLoader.h" 78 #include "core/loader/cache/CachedResourceLoader.h"
78 #include "core/loader/cache/MemoryCache.h" 79 #include "core/loader/cache/MemoryCache.h"
79 #include "core/page/Chrome.h" 80 #include "core/page/Chrome.h"
80 #include "core/page/ChromeClient.h" 81 #include "core/page/ChromeClient.h"
(...skipping 1470 matching lines...) Expand 10 before | Expand all | Expand 10 after
1551 ec = INVALID_ACCESS_ERR; 1552 ec = INVALID_ACCESS_ERR;
1552 return 0; 1553 return 0;
1553 } 1554 }
1554 1555
1555 RenderLayer* layer = toRenderBox(renderer)->layer(); 1556 RenderLayer* layer = toRenderBox(renderer)->layer();
1556 if (!layer) { 1557 if (!layer) {
1557 ec = INVALID_ACCESS_ERR; 1558 ec = INVALID_ACCESS_ERR;
1558 return 0; 1559 return 0;
1559 } 1560 }
1560 1561
1561 return layer->paintOrderList(type); 1562 Vector<RefPtr<Node> > nodes;
1563 layer->computePaintOrderList(type, nodes);
1564 return StaticNodeList::adopt(nodes);
1562 } 1565 }
1563 1566
1564 PassRefPtr<NodeList> Internals::paintOrderListBeforePromote(Element* element, Ex ceptionCode& ec) 1567 PassRefPtr<NodeList> Internals::paintOrderListBeforePromote(Element* element, Ex ceptionCode& ec)
1565 { 1568 {
1566 return paintOrderList(element, ec, RenderLayer::BeforePromote); 1569 return paintOrderList(element, ec, RenderLayer::BeforePromote);
1567 } 1570 }
1568 1571
1569 PassRefPtr<NodeList> Internals::paintOrderListAfterPromote(Element* element, Exc eptionCode& ec) 1572 PassRefPtr<NodeList> Internals::paintOrderListAfterPromote(Element* element, Exc eptionCode& ec)
1570 { 1573 {
1571 return paintOrderList(element, ec, RenderLayer::AfterPromote); 1574 return paintOrderList(element, ec, RenderLayer::AfterPromote);
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
1962 1965
1963 RenderObject* renderer = select->renderer(); 1966 RenderObject* renderer = select->renderer();
1964 if (!renderer->isMenuList()) 1967 if (!renderer->isMenuList())
1965 return false; 1968 return false;
1966 1969
1967 RenderMenuList* menuList = toRenderMenuList(renderer); 1970 RenderMenuList* menuList = toRenderMenuList(renderer);
1968 return menuList->popupIsVisible(); 1971 return menuList->popupIsVisible();
1969 } 1972 }
1970 1973
1971 } 1974 }
OLDNEW
« Source/core/rendering/RenderLayer.cpp ('K') | « Source/core/rendering/RenderLayer.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698