Bug 121263 - Move LineLayoutState class to LineLayoutState.h
Summary: Move LineLayoutState class to LineLayoutState.h
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebCore Misc. (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Zoltan Horvath
URL:
Keywords:
Depends on:
Blocks: 121261
  Show dependency treegraph
 
Reported: 2013-09-12 14:49 PDT by Zoltan Horvath
Modified: 2013-09-13 10:58 PDT (History)
5 users (show)

See Also:


Attachments
proposed patch (15.33 KB, patch)
2013-09-12 14:57 PDT, Zoltan Horvath
rniwa: review+
Details | Formatted Diff | Diff
proposed patch (15.44 KB, patch)
2013-09-13 09:40 PDT, Zoltan Horvath
commit-queue: commit-queue-
Details | Formatted Diff | Diff
proposed patch (15.44 KB, patch)
2013-09-13 10:25 PDT, Zoltan Horvath
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Zoltan Horvath 2013-09-12 14:49:22 PDT
Move LineLayoutState class to LineLayoutState.h
Comment 1 Zoltan Horvath 2013-09-12 14:57:19 PDT
Created attachment 211481 [details]
proposed patch
Comment 2 Ryosuke Niwa 2013-09-12 16:05:54 PDT
Comment on attachment 211481 [details]
proposed patch

View in context: https://bugs.webkit.org/attachment.cgi?id=211481&action=review

> Source/WebCore/rendering/LineLayoutState.h:125
> +    Vector<RenderBlock::FloatWithRect> m_floats;
> +    FloatingObject* m_lastFloat;
> +    RootInlineBox* m_endLine;
> +    LineInfo m_lineInfo;
> +    unsigned m_floatIndex;
> +    LayoutUnit m_endLineLogicalTop;
> +    bool m_endLineMatched;
> +    bool m_checkForFloatsFromLastLine;
> +
> +    bool m_isFullLayout;
> +
> +    // FIXME: Should this be a range object instead of two ints?
> +    LayoutUnit& m_repaintLogicalTop;
> +    LayoutUnit& m_repaintLogicalBottom;
> +
> +    LayoutUnit m_adjustedLogicalLineTop;
> +
> +    bool m_usesRepaintBounds;
> +
> +    RenderFlowThread* m_flowThread;

While we're at it, can we reorder these member variables to match the ordering of member functions?
Also, can we make bools packed with bit fields?
Comment 3 Zoltan Horvath 2013-09-13 09:40:15 PDT
Created attachment 211559 [details]
proposed patch
Comment 4 WebKit Commit Bot 2013-09-13 10:17:54 PDT
Comment on attachment 211559 [details]
proposed patch

Rejecting attachment 211559 [details] from commit-queue.

Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-03', 'validate-changelog', '--check-oops', '--non-interactive', 211559, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

ChangeLog entry in Source/WebCore/ChangeLog contains OOPS!.

Full output: http://webkit-queues.appspot.com/results/1906042
Comment 5 Zoltan Horvath 2013-09-13 10:25:04 PDT
Created attachment 211561 [details]
proposed patch
Comment 6 WebKit Commit Bot 2013-09-13 10:58:14 PDT
Comment on attachment 211561 [details]
proposed patch

Clearing flags on attachment: 211561

Committed r155710: <http://trac.webkit.org/changeset/155710>
Comment 7 WebKit Commit Bot 2013-09-13 10:58:16 PDT
All reviewed patches have been landed.  Closing bug.