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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBlock.cpp

Issue 1970653004: Move hoverAncestor() override to LayoutBlockFlow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
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) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. 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 1926 matching lines...) Expand 10 before | Expand all | Expand 10 after
1937 { 1937 {
1938 if (childrenInline()) 1938 if (childrenInline())
1939 return toLayoutBlockFlow(this); 1939 return toLayoutBlockFlow(this);
1940 for (LayoutObject* child = firstChild(); child && !child->isFloatingOrOutOfF lowPositioned() && child->isLayoutBlockFlow(); child = toLayoutBlock(child)->fir stChild()) { 1940 for (LayoutObject* child = firstChild(); child && !child->isFloatingOrOutOfF lowPositioned() && child->isLayoutBlockFlow(); child = toLayoutBlock(child)->fir stChild()) {
1941 if (child->childrenInline()) 1941 if (child->childrenInline())
1942 return toLayoutBlockFlow(child); 1942 return toLayoutBlockFlow(child);
1943 } 1943 }
1944 return nullptr; 1944 return nullptr;
1945 } 1945 }
1946 1946
1947 LayoutObject* LayoutBlock::hoverAncestor() const
1948 {
1949 return isAnonymousBlockContinuation() ? continuation() : LayoutBox::hoverAnc estor();
1950 }
1951
1952 void LayoutBlock::updateDragState(bool dragOn) 1947 void LayoutBlock::updateDragState(bool dragOn)
1953 { 1948 {
1954 LayoutBox::updateDragState(dragOn); 1949 LayoutBox::updateDragState(dragOn);
1955 if (LayoutBoxModelObject* continuation = this->continuation()) 1950 if (LayoutBoxModelObject* continuation = this->continuation())
1956 continuation->updateDragState(dragOn); 1951 continuation->updateDragState(dragOn);
1957 } 1952 }
1958 1953
1959 void LayoutBlock::childBecameNonInline(LayoutObject*) 1954 void LayoutBlock::childBecameNonInline(LayoutObject*)
1960 { 1955 {
1961 makeChildrenNonInline(); 1956 makeChildrenNonInline();
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
2253 for (TrackedLayoutBoxListHashSet::const_iterator it = positionedDescenda ntSet->begin(); it != end; ++it) { 2248 for (TrackedLayoutBoxListHashSet::const_iterator it = positionedDescenda ntSet->begin(); it != end; ++it) {
2254 LayoutBox* currBox = *it; 2249 LayoutBox* currBox = *it;
2255 ASSERT(!currBox->needsLayout()); 2250 ASSERT(!currBox->needsLayout());
2256 } 2251 }
2257 } 2252 }
2258 } 2253 }
2259 2254
2260 #endif 2255 #endif
2261 2256
2262 } // namespace blink 2257 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlock.h ('k') | third_party/WebKit/Source/core/layout/LayoutBlockFlow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698