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

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

Issue 940373003: Rename RenderText to LayoutText (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Merge w/HEAD again Created 5 years, 10 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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 24 matching lines...) Expand all
35 #include "core/frame/FrameView.h" 35 #include "core/frame/FrameView.h"
36 #include "core/frame/LocalFrame.h" 36 #include "core/frame/LocalFrame.h"
37 #include "core/frame/Settings.h" 37 #include "core/frame/Settings.h"
38 #include "core/html/HTMLDialogElement.h" 38 #include "core/html/HTMLDialogElement.h"
39 #include "core/layout/HitTestLocation.h" 39 #include "core/layout/HitTestLocation.h"
40 #include "core/layout/Layer.h" 40 #include "core/layout/Layer.h"
41 #include "core/layout/LayoutFlowThread.h" 41 #include "core/layout/LayoutFlowThread.h"
42 #include "core/layout/LayoutMultiColumnFlowThread.h" 42 #include "core/layout/LayoutMultiColumnFlowThread.h"
43 #include "core/layout/LayoutMultiColumnSpannerPlaceholder.h" 43 #include "core/layout/LayoutMultiColumnSpannerPlaceholder.h"
44 #include "core/layout/LayoutPagedFlowThread.h" 44 #include "core/layout/LayoutPagedFlowThread.h"
45 #include "core/layout/LayoutText.h"
45 #include "core/layout/LayoutView.h" 46 #include "core/layout/LayoutView.h"
46 #include "core/layout/TextAutosizer.h" 47 #include "core/layout/TextAutosizer.h"
47 #include "core/layout/line/LineBreaker.h" 48 #include "core/layout/line/LineBreaker.h"
48 #include "core/layout/line/LineWidth.h" 49 #include "core/layout/line/LineWidth.h"
49 #include "core/paint/BlockFlowPainter.h" 50 #include "core/paint/BlockFlowPainter.h"
50 #include "core/paint/RenderDrawingRecorder.h" 51 #include "core/paint/RenderDrawingRecorder.h"
51 #include "core/rendering/RenderText.h"
52 #include "platform/geometry/TransformState.h" 52 #include "platform/geometry/TransformState.h"
53 #include "platform/graphics/paint/ClipRecorderStack.h" 53 #include "platform/graphics/paint/ClipRecorderStack.h"
54 #include "platform/text/BidiTextRun.h" 54 #include "platform/text/BidiTextRun.h"
55 55
56 namespace blink { 56 namespace blink {
57 57
58 bool RenderBlockFlow::s_canPropagateFloatIntoSibling = false; 58 bool RenderBlockFlow::s_canPropagateFloatIntoSibling = false;
59 59
60 struct SameSizeAsMarginInfo { 60 struct SameSizeAsMarginInfo {
61 uint16_t bitfields; 61 uint16_t bitfields;
(...skipping 3072 matching lines...) Expand 10 before | Expand all | Expand 10 after
3134 FrameView* frameView = document().view(); 3134 FrameView* frameView = document().view();
3135 LayoutUnit top = (style()->position() == FixedPosition) ? 0 : frameView->scr ollOffset().height(); 3135 LayoutUnit top = (style()->position() == FixedPosition) ? 0 : frameView->scr ollOffset().height();
3136 int visibleHeight = frameView->visibleContentRect(IncludeScrollbars).height( ); 3136 int visibleHeight = frameView->visibleContentRect(IncludeScrollbars).height( );
3137 if (size().height() < visibleHeight) 3137 if (size().height() < visibleHeight)
3138 top += (visibleHeight - size().height()) / 2; 3138 top += (visibleHeight - size().height()) / 2;
3139 setY(top); 3139 setY(top);
3140 dialog->setCentered(top); 3140 dialog->setCentered(top);
3141 } 3141 }
3142 3142
3143 } // namespace blink 3143 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698