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

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

Issue 1969103002: Move updateDragState() 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 1929 matching lines...) Expand 10 before | Expand all | Expand 10 after
1940 { 1940 {
1941 if (childrenInline()) 1941 if (childrenInline())
1942 return toLayoutBlockFlow(this); 1942 return toLayoutBlockFlow(this);
1943 for (LayoutObject* child = firstChild(); child && !child->isFloatingOrOutOfF lowPositioned() && child->isLayoutBlockFlow(); child = toLayoutBlock(child)->fir stChild()) { 1943 for (LayoutObject* child = firstChild(); child && !child->isFloatingOrOutOfF lowPositioned() && child->isLayoutBlockFlow(); child = toLayoutBlock(child)->fir stChild()) {
1944 if (child->childrenInline()) 1944 if (child->childrenInline())
1945 return toLayoutBlockFlow(child); 1945 return toLayoutBlockFlow(child);
1946 } 1946 }
1947 return nullptr; 1947 return nullptr;
1948 } 1948 }
1949 1949
1950 void LayoutBlock::updateDragState(bool dragOn)
1951 {
1952 LayoutBox::updateDragState(dragOn);
1953 if (LayoutBoxModelObject* continuation = this->continuation())
1954 continuation->updateDragState(dragOn);
1955 }
1956
1957 void LayoutBlock::childBecameNonInline(LayoutObject*) 1950 void LayoutBlock::childBecameNonInline(LayoutObject*)
1958 { 1951 {
1959 makeChildrenNonInline(); 1952 makeChildrenNonInline();
1960 if (isAnonymousBlock() && parent() && parent()->isLayoutBlock()) 1953 if (isAnonymousBlock() && parent() && parent()->isLayoutBlock())
1961 toLayoutBlock(parent())->removeLeftoverAnonymousBlock(this); 1954 toLayoutBlock(parent())->removeLeftoverAnonymousBlock(this);
1962 // |this| may be dead here 1955 // |this| may be dead here
1963 } 1956 }
1964 1957
1965 void LayoutBlock::updateHitTestResult(HitTestResult& result, const LayoutPoint& point) 1958 void LayoutBlock::updateHitTestResult(HitTestResult& result, const LayoutPoint& point)
1966 { 1959 {
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
2251 for (TrackedLayoutBoxListHashSet::const_iterator it = positionedDescenda ntSet->begin(); it != end; ++it) { 2244 for (TrackedLayoutBoxListHashSet::const_iterator it = positionedDescenda ntSet->begin(); it != end; ++it) {
2252 LayoutBox* currBox = *it; 2245 LayoutBox* currBox = *it;
2253 ASSERT(!currBox->needsLayout()); 2246 ASSERT(!currBox->needsLayout());
2254 } 2247 }
2255 } 2248 }
2256 } 2249 }
2257 2250
2258 #endif 2251 #endif
2259 2252
2260 } // namespace blink 2253 } // 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