|
|
Created:
3 years, 9 months ago by Gleb Lanbin Modified:
3 years, 9 months ago CC:
chromium-reviews, cbiesinger, ojan+watch_chromium.org, szager+layoutwatch_chromium.org, glebl+reviews_chromium.org, dgrogan+ng_chromium.org, atotic+reviews_chromium.org, blink-reviews-layout_chromium.org, pdr+renderingwatchlist_chromium.org, eae+blinkwatch, leviw+renderwatch, zoltan1, jchaffraix+rendering, blink-reviews Target Ref:
refs/pending/heads/master Project:
chromium Visibility:
Public. |
DescriptionAdd ShowLayoutOpportunityTree to NGLayoutOpportunityIterator
ShowLayoutOpportunityTree is used for debug purposes.
BUG=635619
Review-Url: https://codereview.chromium.org/2731893003
Cr-Commit-Position: refs/heads/master@{#455400}
Committed: https://chromium.googlesource.com/chromium/src/+/71cf4c57d32ff6e31adf1d5cfd0182b8132a727a
Patch Set 1 #
Total comments: 2
Patch Set 2 : fix comments #Patch Set 3 : git rebase-update #Patch Set 4 : git rebase v2 #
Messages
Total messages: 71 (38 generated)
glebl@chromium.org changed reviewers: + ikilpatrick@chromium.org
The CQ bit was checked by glebl@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
lgtm
cbiesinger@chromium.org changed reviewers: + cbiesinger@chromium.org
https://codereview.chromium.org/2731893003/diff/1/third_party/WebKit/Source/c... File third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.h (right): https://codereview.chromium.org/2731893003/diff/1/third_party/WebKit/Source/c... third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.h:44: void ShowLayoutOpportunityTree() const; Consider putting this in #ifndef NDEBUG like showLayoutTreeForThis()?
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: This issue passed the CQ dry run.
thanks for the review https://codereview.chromium.org/2731893003/diff/1/third_party/WebKit/Source/c... File third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.h (right): https://codereview.chromium.org/2731893003/diff/1/third_party/WebKit/Source/c... third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.h:44: void ShowLayoutOpportunityTree() const; On 2017/03/06 19:56:02, cbiesinger wrote: > Consider putting this in #ifndef NDEBUG like showLayoutTreeForThis()? Done.
The CQ bit was checked by glebl@chromium.org
The patchset sent to the CQ was uploaded after l-g-t-m from ikilpatrick@chromium.org Link to the patchset: https://codereview.chromium.org/2731893003/#ps20001 (title: "fix comments")
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: win_chromium_rel_ng on master.tryserver.chromium.win (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_...)
The CQ bit was checked by glebl@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: win_chromium_rel_ng on master.tryserver.chromium.win (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_...)
The CQ bit was checked by glebl@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: win_chromium_rel_ng on master.tryserver.chromium.win (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_...)
The CQ bit was checked by glebl@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
lgtm
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: win_chromium_rel_ng on master.tryserver.chromium.win (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_...)
The CQ bit was checked by glebl@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Failed to apply patch for third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc: While running git apply --index -p1; error: patch failed: third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc:6 error: third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc: patch does not apply Patch: third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc Index: third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc diff --git a/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc b/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc index b04dc468c1a84e2540659cd76719c3487e23a2ff..fc9720fe63a90ea86631def28b28eb7430dc7c32 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc +++ b/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc @@ -6,10 +6,41 @@ #include "core/layout/ng/ng_exclusion.h" #include "wtf/NonCopyingSort.h" +#include "wtf/text/StringBuilder.h" namespace blink { namespace { +void AppendNodeToString(const NGLayoutOpportunityTreeNode* node, + StringBuilder* string_builder, + unsigned indent = 0) { + DCHECK(string_builder); + if (!node) { + string_builder->append("'null'\n"); + return; + } + + string_builder->append(node->ToString()); + string_builder->append("\n"); + + StringBuilder indent_builder; + for (unsigned i = 0; i < indent; i++) + indent_builder.append("\t"); + + if (!node->exclusion) + return; + + string_builder->append(indent_builder.toString()); + string_builder->append("Left:\t"); + AppendNodeToString(node->left, string_builder, indent + 2); + string_builder->append(indent_builder.toString()); + string_builder->append("Right:\t"); + AppendNodeToString(node->right, string_builder, indent + 2); + string_builder->append(indent_builder.toString()); + string_builder->append("Bottom:\t"); + AppendNodeToString(node->bottom, string_builder, indent + 2); +} + // Collects all opportunities from leaves of Layout Opportunity spatial tree. void CollectAllOpportunities(const NGLayoutOpportunityTreeNode* node, NGLayoutOpportunities& opportunities) { @@ -275,4 +306,13 @@ const NGLayoutOpportunity NGLayoutOpportunityIterator::Next() { return NGLayoutOpportunity(*opportunity); } +#ifndef NDEBUG +void NGLayoutOpportunityIterator::ShowLayoutOpportunityTree() const { + StringBuilder string_builder; + string_builder.append("\n.:: LayoutOpportunity Tree ::.\n\nRoot Node: "); + AppendNodeToString(opportunity_tree_root_.get(), &string_builder); + fprintf(stderr, "%s\n", string_builder.toString().utf8().data()); +} +#endif + } // namespace blink
The CQ bit was checked by glebl@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Failed to apply patch for third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc: While running git apply --index -p1; error: patch failed: third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc:6 error: third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc: patch does not apply Patch: third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc Index: third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc diff --git a/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc b/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc index b04dc468c1a84e2540659cd76719c3487e23a2ff..fc9720fe63a90ea86631def28b28eb7430dc7c32 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc +++ b/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc @@ -6,10 +6,41 @@ #include "core/layout/ng/ng_exclusion.h" #include "wtf/NonCopyingSort.h" +#include "wtf/text/StringBuilder.h" namespace blink { namespace { +void AppendNodeToString(const NGLayoutOpportunityTreeNode* node, + StringBuilder* string_builder, + unsigned indent = 0) { + DCHECK(string_builder); + if (!node) { + string_builder->append("'null'\n"); + return; + } + + string_builder->append(node->ToString()); + string_builder->append("\n"); + + StringBuilder indent_builder; + for (unsigned i = 0; i < indent; i++) + indent_builder.append("\t"); + + if (!node->exclusion) + return; + + string_builder->append(indent_builder.toString()); + string_builder->append("Left:\t"); + AppendNodeToString(node->left, string_builder, indent + 2); + string_builder->append(indent_builder.toString()); + string_builder->append("Right:\t"); + AppendNodeToString(node->right, string_builder, indent + 2); + string_builder->append(indent_builder.toString()); + string_builder->append("Bottom:\t"); + AppendNodeToString(node->bottom, string_builder, indent + 2); +} + // Collects all opportunities from leaves of Layout Opportunity spatial tree. void CollectAllOpportunities(const NGLayoutOpportunityTreeNode* node, NGLayoutOpportunities& opportunities) { @@ -275,4 +306,13 @@ const NGLayoutOpportunity NGLayoutOpportunityIterator::Next() { return NGLayoutOpportunity(*opportunity); } +#ifndef NDEBUG +void NGLayoutOpportunityIterator::ShowLayoutOpportunityTree() const { + StringBuilder string_builder; + string_builder.append("\n.:: LayoutOpportunity Tree ::.\n\nRoot Node: "); + AppendNodeToString(opportunity_tree_root_.get(), &string_builder); + fprintf(stderr, "%s\n", string_builder.toString().utf8().data()); +} +#endif + } // namespace blink
The CQ bit was checked by glebl@chromium.org
The patchset sent to the CQ was uploaded after l-g-t-m from cbiesinger@chromium.org, ikilpatrick@chromium.org Link to the patchset: https://codereview.chromium.org/2731893003/#ps40001 (title: "git rebase-update")
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: linux_chromium_chromeos_ozone_rel_ng on master.tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
The CQ bit was checked by glebl@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: linux_chromium_chromeos_ozone_rel_ng on master.tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
The CQ bit was checked by glebl@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Failed to apply patch for third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc: While running git apply --index -p1; error: patch failed: third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc:6 error: third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc: patch does not apply Patch: third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc Index: third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc diff --git a/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc b/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc index b04dc468c1a84e2540659cd76719c3487e23a2ff..fc9720fe63a90ea86631def28b28eb7430dc7c32 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc +++ b/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc @@ -6,10 +6,41 @@ #include "core/layout/ng/ng_exclusion.h" #include "wtf/NonCopyingSort.h" +#include "wtf/text/StringBuilder.h" namespace blink { namespace { +void AppendNodeToString(const NGLayoutOpportunityTreeNode* node, + StringBuilder* string_builder, + unsigned indent = 0) { + DCHECK(string_builder); + if (!node) { + string_builder->append("'null'\n"); + return; + } + + string_builder->append(node->ToString()); + string_builder->append("\n"); + + StringBuilder indent_builder; + for (unsigned i = 0; i < indent; i++) + indent_builder.append("\t"); + + if (!node->exclusion) + return; + + string_builder->append(indent_builder.toString()); + string_builder->append("Left:\t"); + AppendNodeToString(node->left, string_builder, indent + 2); + string_builder->append(indent_builder.toString()); + string_builder->append("Right:\t"); + AppendNodeToString(node->right, string_builder, indent + 2); + string_builder->append(indent_builder.toString()); + string_builder->append("Bottom:\t"); + AppendNodeToString(node->bottom, string_builder, indent + 2); +} + // Collects all opportunities from leaves of Layout Opportunity spatial tree. void CollectAllOpportunities(const NGLayoutOpportunityTreeNode* node, NGLayoutOpportunities& opportunities) { @@ -275,4 +306,13 @@ const NGLayoutOpportunity NGLayoutOpportunityIterator::Next() { return NGLayoutOpportunity(*opportunity); } +#ifndef NDEBUG +void NGLayoutOpportunityIterator::ShowLayoutOpportunityTree() const { + StringBuilder string_builder; + string_builder.append("\n.:: LayoutOpportunity Tree ::.\n\nRoot Node: "); + AppendNodeToString(opportunity_tree_root_.get(), &string_builder); + fprintf(stderr, "%s\n", string_builder.toString().utf8().data()); +} +#endif + } // namespace blink
The CQ bit was checked by glebl@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Failed to apply patch for third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc: While running git apply --index -p1; error: patch failed: third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc:6 error: third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc: patch does not apply Patch: third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc Index: third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc diff --git a/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc b/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc index b04dc468c1a84e2540659cd76719c3487e23a2ff..fc9720fe63a90ea86631def28b28eb7430dc7c32 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc +++ b/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_iterator.cc @@ -6,10 +6,41 @@ #include "core/layout/ng/ng_exclusion.h" #include "wtf/NonCopyingSort.h" +#include "wtf/text/StringBuilder.h" namespace blink { namespace { +void AppendNodeToString(const NGLayoutOpportunityTreeNode* node, + StringBuilder* string_builder, + unsigned indent = 0) { + DCHECK(string_builder); + if (!node) { + string_builder->append("'null'\n"); + return; + } + + string_builder->append(node->ToString()); + string_builder->append("\n"); + + StringBuilder indent_builder; + for (unsigned i = 0; i < indent; i++) + indent_builder.append("\t"); + + if (!node->exclusion) + return; + + string_builder->append(indent_builder.toString()); + string_builder->append("Left:\t"); + AppendNodeToString(node->left, string_builder, indent + 2); + string_builder->append(indent_builder.toString()); + string_builder->append("Right:\t"); + AppendNodeToString(node->right, string_builder, indent + 2); + string_builder->append(indent_builder.toString()); + string_builder->append("Bottom:\t"); + AppendNodeToString(node->bottom, string_builder, indent + 2); +} + // Collects all opportunities from leaves of Layout Opportunity spatial tree. void CollectAllOpportunities(const NGLayoutOpportunityTreeNode* node, NGLayoutOpportunities& opportunities) { @@ -275,4 +306,13 @@ const NGLayoutOpportunity NGLayoutOpportunityIterator::Next() { return NGLayoutOpportunity(*opportunity); } +#ifndef NDEBUG +void NGLayoutOpportunityIterator::ShowLayoutOpportunityTree() const { + StringBuilder string_builder; + string_builder.append("\n.:: LayoutOpportunity Tree ::.\n\nRoot Node: "); + AppendNodeToString(opportunity_tree_root_.get(), &string_builder); + fprintf(stderr, "%s\n", string_builder.toString().utf8().data()); +} +#endif + } // namespace blink
The CQ bit was checked by glebl@chromium.org
The patchset sent to the CQ was uploaded after l-g-t-m from cbiesinger@chromium.org, ikilpatrick@chromium.org Link to the patchset: https://codereview.chromium.org/2731893003/#ps60001 (title: "git rebase v2")
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: android_arm64_dbg_recipe on master.tryserver.chromium.android (JOB_FAILED, https://build.chromium.org/p/tryserver.chromium.android/builders/android_arm6...) android_clang_dbg_recipe on master.tryserver.chromium.android (JOB_FAILED, https://build.chromium.org/p/tryserver.chromium.android/builders/android_clan...) android_compile_dbg on master.tryserver.chromium.android (JOB_FAILED, https://build.chromium.org/p/tryserver.chromium.android/builders/android_comp...) android_cronet on master.tryserver.chromium.android (JOB_FAILED, https://build.chromium.org/p/tryserver.chromium.android/builders/android_cron...) android_n5x_swarming_rel on master.tryserver.chromium.android (JOB_FAILED, https://build.chromium.org/p/tryserver.chromium.android/builders/android_n5x_...) cast_shell_android on master.tryserver.chromium.android (JOB_FAILED, https://build.chromium.org/p/tryserver.chromium.android/builders/cast_shell_a...) linux_android_rel_ng on master.tryserver.chromium.android (JOB_FAILED, https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...) mac_chromium_compile_dbg_ng on master.tryserver.chromium.mac (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_comp...) mac_chromium_rel_ng on master.tryserver.chromium.mac (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...) win_chromium_rel_ng on master.tryserver.chromium.win (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_...)
The CQ bit was checked by glebl@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: linux_chromium_rel_ng on master.tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
The CQ bit was checked by glebl@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: linux_chromium_rel_ng on master.tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
The CQ bit was checked by glebl@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
CQ is committing da patch. Bot data: {"patchset_id": 60001, "attempt_start_ts": 1488955771096350, "parent_rev": "97b851195835fc2e6dfc60e1e05e770425e4df6e", "commit_rev": "71cf4c57d32ff6e31adf1d5cfd0182b8132a727a"}
Message was sent while issue was closed.
Description was changed from ========== Add ShowLayoutOpportunityTree to NGLayoutOpportunityIterator ShowLayoutOpportunityTree is used for debug purposes. BUG=635619 ========== to ========== Add ShowLayoutOpportunityTree to NGLayoutOpportunityIterator ShowLayoutOpportunityTree is used for debug purposes. BUG=635619 Review-Url: https://codereview.chromium.org/2731893003 Cr-Commit-Position: refs/heads/master@{#455400} Committed: https://chromium.googlesource.com/chromium/src/+/71cf4c57d32ff6e31adf1d5cfd01... ==========
Message was sent while issue was closed.
Committed patchset #4 (id:60001) as https://chromium.googlesource.com/chromium/src/+/71cf4c57d32ff6e31adf1d5cfd01... |