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

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

Issue 656913006: Remove SVG fonts (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Update tests for landing Created 6 years, 1 month 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) 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 28 matching lines...) Expand all
39 #include "core/paint/BlockFlowPainter.h" 39 #include "core/paint/BlockFlowPainter.h"
40 #include "core/rendering/HitTestLocation.h" 40 #include "core/rendering/HitTestLocation.h"
41 #include "core/rendering/RenderFlowThread.h" 41 #include "core/rendering/RenderFlowThread.h"
42 #include "core/rendering/RenderLayer.h" 42 #include "core/rendering/RenderLayer.h"
43 #include "core/rendering/RenderMultiColumnFlowThread.h" 43 #include "core/rendering/RenderMultiColumnFlowThread.h"
44 #include "core/rendering/RenderPagedFlowThread.h" 44 #include "core/rendering/RenderPagedFlowThread.h"
45 #include "core/rendering/RenderText.h" 45 #include "core/rendering/RenderText.h"
46 #include "core/rendering/RenderView.h" 46 #include "core/rendering/RenderView.h"
47 #include "core/rendering/TextAutosizer.h" 47 #include "core/rendering/TextAutosizer.h"
48 #include "core/rendering/line/LineWidth.h" 48 #include "core/rendering/line/LineWidth.h"
49 #include "core/rendering/svg/SVGTextRunRenderingContext.h"
50 #include "platform/text/BidiTextRun.h" 49 #include "platform/text/BidiTextRun.h"
51 50
52 namespace blink { 51 namespace blink {
53 52
54 bool RenderBlockFlow::s_canPropagateFloatIntoSibling = false; 53 bool RenderBlockFlow::s_canPropagateFloatIntoSibling = false;
55 54
56 struct SameSizeAsMarginInfo { 55 struct SameSizeAsMarginInfo {
57 uint16_t bitfields; 56 uint16_t bitfields;
58 LayoutUnit margins[2]; 57 LayoutUnit margins[2];
59 }; 58 };
(...skipping 2798 matching lines...) Expand 10 before | Expand all | Expand 10 after
2858 FrameView* frameView = document().view(); 2857 FrameView* frameView = document().view();
2859 LayoutUnit top = (style()->position() == FixedPosition) ? 0 : frameView->scr ollOffset().height(); 2858 LayoutUnit top = (style()->position() == FixedPosition) ? 0 : frameView->scr ollOffset().height();
2860 int visibleHeight = frameView->visibleContentRect(IncludeScrollbars).height( ); 2859 int visibleHeight = frameView->visibleContentRect(IncludeScrollbars).height( );
2861 if (height() < visibleHeight) 2860 if (height() < visibleHeight)
2862 top += (visibleHeight - height()) / 2; 2861 top += (visibleHeight - height()) / 2;
2863 setY(top); 2862 setY(top);
2864 dialog->setCentered(top); 2863 dialog->setCentered(top);
2865 } 2864 }
2866 2865
2867 } // namespace blink 2866 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698