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

Side by Side Diff: Source/core/rendering/RenderBlock.cpp

Issue 15179002: Remove code that is unused after ContextMenu cleanup (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Remove canHandleRequest code from DRT Created 7 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 | Annotate | Revision Log
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 6490 matching lines...) Expand 10 before | Expand all | Expand 10 after
6501 const FontMetrics& fontMetrics = firstLineStyle()->fontMetrics(); 6501 const FontMetrics& fontMetrics = firstLineStyle()->fontMetrics();
6502 return fontMetrics.ascent() 6502 return fontMetrics.ascent()
6503 + (lineHeight(true, lineDirection, PositionOfInteriorLineBoxes) - fontMetrics.height()) / 2 6503 + (lineHeight(true, lineDirection, PositionOfInteriorLineBoxes) - fontMetrics.height()) / 2
6504 + (lineDirection == HorizontalLine ? borderTop() + paddingTop() : borderRight() + paddingRight()); 6504 + (lineDirection == HorizontalLine ? borderTop() + paddingTop() : borderRight() + paddingRight());
6505 } 6505 }
6506 } 6506 }
6507 6507
6508 return -1; 6508 return -1;
6509 } 6509 }
6510 6510
6511 bool RenderBlock::containsNonZeroBidiLevel() const
6512 {
6513 for (RootInlineBox* root = firstRootBox(); root; root = root->nextRootBox()) {
6514 for (InlineBox* box = root->firstLeafChild(); box; box = box->nextLeafCh ild()) {
6515 if (box->bidiLevel())
6516 return true;
6517 }
6518 }
6519 return false;
6520 }
6521
6522 RenderBlock* RenderBlock::firstLineBlock() const 6511 RenderBlock* RenderBlock::firstLineBlock() const
6523 { 6512 {
6524 RenderBlock* firstLineBlock = const_cast<RenderBlock*>(this); 6513 RenderBlock* firstLineBlock = const_cast<RenderBlock*>(this);
6525 bool hasPseudo = false; 6514 bool hasPseudo = false;
6526 while (true) { 6515 while (true) {
6527 hasPseudo = firstLineBlock->style()->hasPseudoStyle(FIRST_LINE); 6516 hasPseudo = firstLineBlock->style()->hasPseudoStyle(FIRST_LINE);
6528 if (hasPseudo) 6517 if (hasPseudo)
6529 break; 6518 break;
6530 RenderObject* parentBlock = firstLineBlock->parent(); 6519 RenderObject* parentBlock = firstLineBlock->parent();
6531 // We include isRenderButton in this check because buttons are 6520 // We include isRenderButton in this check because buttons are
(...skipping 1615 matching lines...) Expand 10 before | Expand all | Expand 10 after
8147 { 8136 {
8148 memoryInstrumentation->addRootObject(gColumnInfoMap, WebCoreMemoryTypes::Ren deringStructures); 8137 memoryInstrumentation->addRootObject(gColumnInfoMap, WebCoreMemoryTypes::Ren deringStructures);
8149 memoryInstrumentation->addRootObject(gPositionedDescendantsMap, WebCoreMemor yTypes::RenderingStructures); 8138 memoryInstrumentation->addRootObject(gPositionedDescendantsMap, WebCoreMemor yTypes::RenderingStructures);
8150 memoryInstrumentation->addRootObject(gPercentHeightDescendantsMap, WebCoreMe moryTypes::RenderingStructures); 8139 memoryInstrumentation->addRootObject(gPercentHeightDescendantsMap, WebCoreMe moryTypes::RenderingStructures);
8151 memoryInstrumentation->addRootObject(gPositionedContainerMap, WebCoreMemoryT ypes::RenderingStructures); 8140 memoryInstrumentation->addRootObject(gPositionedContainerMap, WebCoreMemoryT ypes::RenderingStructures);
8152 memoryInstrumentation->addRootObject(gPercentHeightContainerMap, WebCoreMemo ryTypes::RenderingStructures); 8141 memoryInstrumentation->addRootObject(gPercentHeightContainerMap, WebCoreMemo ryTypes::RenderingStructures);
8153 memoryInstrumentation->addRootObject(gDelayedUpdateScrollInfoSet, WebCoreMem oryTypes::RenderingStructures); 8142 memoryInstrumentation->addRootObject(gDelayedUpdateScrollInfoSet, WebCoreMem oryTypes::RenderingStructures);
8154 } 8143 }
8155 8144
8156 } // namespace WebCore 8145 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlock.h ('k') | Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698