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

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

Issue 394773003: Implement HTMLMarqueeElement's animation in private scripts (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 2 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 #include "core/rendering/InlineIterator.h" 46 #include "core/rendering/InlineIterator.h"
47 #include "core/rendering/InlineTextBox.h" 47 #include "core/rendering/InlineTextBox.h"
48 #include "core/rendering/PaintInfo.h" 48 #include "core/rendering/PaintInfo.h"
49 #include "core/rendering/RenderCombineText.h" 49 #include "core/rendering/RenderCombineText.h"
50 #include "core/rendering/RenderDeprecatedFlexibleBox.h" 50 #include "core/rendering/RenderDeprecatedFlexibleBox.h"
51 #include "core/rendering/RenderFlexibleBox.h" 51 #include "core/rendering/RenderFlexibleBox.h"
52 #include "core/rendering/RenderFlowThread.h" 52 #include "core/rendering/RenderFlowThread.h"
53 #include "core/rendering/RenderGrid.h" 53 #include "core/rendering/RenderGrid.h"
54 #include "core/rendering/RenderInline.h" 54 #include "core/rendering/RenderInline.h"
55 #include "core/rendering/RenderLayer.h" 55 #include "core/rendering/RenderLayer.h"
56 #include "core/rendering/RenderMarquee.h"
57 #include "core/rendering/RenderObjectInlines.h" 56 #include "core/rendering/RenderObjectInlines.h"
58 #include "core/rendering/RenderRegion.h" 57 #include "core/rendering/RenderRegion.h"
59 #include "core/rendering/RenderTableCell.h" 58 #include "core/rendering/RenderTableCell.h"
60 #include "core/rendering/RenderTextControl.h" 59 #include "core/rendering/RenderTextControl.h"
61 #include "core/rendering/RenderTextFragment.h" 60 #include "core/rendering/RenderTextFragment.h"
62 #include "core/rendering/RenderTheme.h" 61 #include "core/rendering/RenderTheme.h"
63 #include "core/rendering/RenderView.h" 62 #include "core/rendering/RenderView.h"
64 #include "core/rendering/TextAutosizer.h" 63 #include "core/rendering/TextAutosizer.h"
65 #include "core/rendering/shapes/ShapeOutsideInfo.h" 64 #include "core/rendering/shapes/ShapeOutsideInfo.h"
66 #include "core/rendering/style/ContentData.h" 65 #include "core/rendering/style/ContentData.h"
(...skipping 3089 matching lines...) Expand 10 before | Expand all | Expand 10 after
3156 toRenderBlockFlow(const_cast<RenderBlock*>(this))->computeInlinePreferre dLogicalWidths(minLogicalWidth, maxLogicalWidth); 3155 toRenderBlockFlow(const_cast<RenderBlock*>(this))->computeInlinePreferre dLogicalWidths(minLogicalWidth, maxLogicalWidth);
3157 } else { 3156 } else {
3158 computeBlockPreferredLogicalWidths(minLogicalWidth, maxLogicalWidth); 3157 computeBlockPreferredLogicalWidths(minLogicalWidth, maxLogicalWidth);
3159 } 3158 }
3160 3159
3161 maxLogicalWidth = std::max(minLogicalWidth, maxLogicalWidth); 3160 maxLogicalWidth = std::max(minLogicalWidth, maxLogicalWidth);
3162 3161
3163 adjustIntrinsicLogicalWidthsForColumns(minLogicalWidth, maxLogicalWidth); 3162 adjustIntrinsicLogicalWidthsForColumns(minLogicalWidth, maxLogicalWidth);
3164 3163
3165 // A horizontal marquee with inline children has no minimum width. 3164 // A horizontal marquee with inline children has no minimum width.
3166 if (childrenInline() && isMarquee() && toRenderMarquee(this)->isHorizontal() ) 3165 if (childrenInline())
3167 minLogicalWidth = 0; 3166 minLogicalWidth = 0;
3168 3167
3169 if (isTableCell()) { 3168 if (isTableCell()) {
3170 Length tableCellWidth = toRenderTableCell(this)->styleOrColLogicalWidth( ); 3169 Length tableCellWidth = toRenderTableCell(this)->styleOrColLogicalWidth( );
3171 if (tableCellWidth.isFixed() && tableCellWidth.value() > 0) 3170 if (tableCellWidth.isFixed() && tableCellWidth.value() > 0)
3172 maxLogicalWidth = std::max(minLogicalWidth, adjustContentBoxLogicalW idthForBoxSizing(tableCellWidth.value())); 3171 maxLogicalWidth = std::max(minLogicalWidth, adjustContentBoxLogicalW idthForBoxSizing(tableCellWidth.value()));
3173 } 3172 }
3174 3173
3175 int scrollbarWidth = instrinsicScrollbarLogicalWidth(); 3174 int scrollbarWidth = instrinsicScrollbarLogicalWidth();
3176 maxLogicalWidth += scrollbarWidth; 3175 maxLogicalWidth += scrollbarWidth;
(...skipping 1220 matching lines...) Expand 10 before | Expand all | Expand 10 after
4397 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 4396 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
4398 { 4397 {
4399 showRenderObject(); 4398 showRenderObject();
4400 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 4399 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
4401 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 4400 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
4402 } 4401 }
4403 4402
4404 #endif 4403 #endif
4405 4404
4406 } // namespace blink 4405 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698