178217 2017-10-12 10:13:16 -0700 Mark more InlineBox member functions as const 2017-10-12 15:07:00 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Local Build All All RESOLVED FIXED InRadar P2 Normal --- 1 dbates dbates aestes bfulgham simon.fraser webkit-bug-importer zalan oldest_to_newest 1359621 0 dbates 2017-10-12 10:13:16 -0700 Mark more InlineBox member functions as const 1359623 1 323533 dbates 2017-10-12 10:15:48 -0700 Created attachment 323533 Patch 1359740 2 323533 dbates 2017-10-12 14:36:53 -0700 Comment on attachment 323533 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=323533&action=review > Source/WebCore/rendering/InlineBox.cpp:295 > RenderBlockFlow& block = root().blockFlow(); We should add a const version of RootInlineBox::blockFlow() or have it always return a const RenderBlockFlow&. Will fix in a follow up bug/patch. 1359741 3 323533 dbates 2017-10-12 14:38:08 -0700 Comment on attachment 323533 Patch Clearing flags on attachment: 323533 Committed r223260: <https://trac.webkit.org/changeset/223260> 1359742 4 dbates 2017-10-12 14:38:09 -0700 All reviewed patches have been landed. Closing bug. 1359744 5 webkit-bug-importer 2017-10-12 14:38:46 -0700 <rdar://problem/34964190> 1359763 6 dbates 2017-10-12 15:07:00 -0700 (In reply to Daniel Bates from comment #2) > Comment on attachment 323533 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=323533&action=review > > > Source/WebCore/rendering/InlineBox.cpp:295 > > RenderBlockFlow& block = root().blockFlow(); > > We should add a const version of RootInlineBox::blockFlow() or have it > always return a const RenderBlockFlow&. Will fix in a follow up bug/patch. Actually, we should think about whether this makes sense to do in the context of the render tree. Deferring for now. 323533 2017-10-12 10:15:48 -0700 2017-10-12 14:38:08 -0700 Patch bug-178217-20171012101548.patch text/plain 3979 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzMjM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmZhZTY3NzVlYjUwMzE5 OTQ5MmQ3ZmY5ZjBjNTQ5YWFjZGY0MTgwZi4uNGFmMWNmMWY0Y2UxNTFjYTM1ZTY1Yzg4MmE0ZTUy NDFiOWRmN2VhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE3LTEwLTEyICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBNYXJrIG1vcmUgSW5saW5l Qm94IG1lbWJlciBmdW5jdGlvbnMgYXMgY29uc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE3ODIxNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogcmVuZGVyaW5nL0lubGluZUJveC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpJbmxpbmVCb3g6OmxvY2F0aW9uSW5jbHVkaW5nRmxpcHBpbmcgY29uc3QpOiBN YXJrIGFzIGNvbnN0LiBBbHNvIGZpeCBzb21lIHN0eWxlCisgICAgICAgIG5pdHMgd2hpbGUgSSBh bSBoZXJlLgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lQm94OjpmbGlwRm9yV3JpdGluZ01vZGUg Y29uc3QpOiBNYXJrIGFzIGNvbnN0LgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lQm94Ojpsb2Nh dGlvbkluY2x1ZGluZ0ZsaXBwaW5nKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OklubGlu ZUJveDo6ZmxpcEZvcldyaXRpbmdNb2RlKTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcv SW5saW5lQm94Lmg6CisKIDIwMTctMTAtMDkgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUu Y29tPgogCiAgICAgICAgIFRlYWNoIElubGluZVRleHRCb3g6OmNsYW1wT2Zmc2V0KCkgYWJvdXQg Y29tYmluZWQgdGV4dCBhbmQgaHlwaGVuYXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9JbmxpbmVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGlu ZUJveC5jcHAKaW5kZXggMzEwMjYwYmU5ZTNhOGM3OTgyY2E4NWRlNmY1NGRhMTliNzRjODEwYy4u NzNlYTVlMmEzNWE5Y2U4NGQ0ZWFjZThmMmQ5ZDEzZmE2MjlkMzc2ZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL0lubGluZUJveC5jcHAKQEAgLTI4OCwzOSArMjg4LDM4IEBAIHZvaWQgSW5saW5l Qm94OjpjbGVhcktub3duVG9IYXZlTm9PdmVyZmxvdygpCiAgICAgICAgIHBhcmVudCgpLT5jbGVh cktub3duVG9IYXZlTm9PdmVyZmxvdygpOwogfQogCi1GbG9hdFBvaW50IElubGluZUJveDo6bG9j YXRpb25JbmNsdWRpbmdGbGlwcGluZygpCitGbG9hdFBvaW50IElubGluZUJveDo6bG9jYXRpb25J bmNsdWRpbmdGbGlwcGluZygpIGNvbnN0CiB7CiAgICAgaWYgKCFtX3JlbmRlcmVyLnN0eWxlKCku aXNGbGlwcGVkQmxvY2tzV3JpdGluZ01vZGUoKSkKLSAgICAgICAgcmV0dXJuIEZsb2F0UG9pbnQo eCgpLCB5KCkpOworICAgICAgICByZXR1cm4gdG9wTGVmdCgpOwogICAgIFJlbmRlckJsb2NrRmxv dyYgYmxvY2sgPSByb290KCkuYmxvY2tGbG93KCk7CiAgICAgaWYgKGJsb2NrLnN0eWxlKCkuaXNI b3Jpem9udGFsV3JpdGluZ01vZGUoKSkKLSAgICAgICAgcmV0dXJuIEZsb2F0UG9pbnQoeCgpLCBi bG9jay5oZWlnaHQoKSAtIGhlaWdodCgpIC0geSgpKTsKLSAgICBlbHNlCi0gICAgICAgIHJldHVy biBGbG9hdFBvaW50KGJsb2NrLndpZHRoKCkgLSB3aWR0aCgpIC0geCgpLCB5KCkpOworICAgICAg ICByZXR1cm4geyB4KCksIGJsb2NrLmhlaWdodCgpIC0gaGVpZ2h0KCkgLSB5KCkgfTsKKyAgICBy ZXR1cm4geyBibG9jay53aWR0aCgpIC0gd2lkdGgoKSAtIHgoKSwgeSgpIH07CiB9CiAKLXZvaWQg SW5saW5lQm94OjpmbGlwRm9yV3JpdGluZ01vZGUoRmxvYXRSZWN0JiByZWN0KQordm9pZCBJbmxp bmVCb3g6OmZsaXBGb3JXcml0aW5nTW9kZShGbG9hdFJlY3QmIHJlY3QpIGNvbnN0CiB7CiAgICAg aWYgKCFtX3JlbmRlcmVyLnN0eWxlKCkuaXNGbGlwcGVkQmxvY2tzV3JpdGluZ01vZGUoKSkKICAg ICAgICAgcmV0dXJuOwogICAgIHJvb3QoKS5ibG9ja0Zsb3coKS5mbGlwRm9yV3JpdGluZ01vZGUo cmVjdCk7CiB9CiAKLUZsb2F0UG9pbnQgSW5saW5lQm94OjpmbGlwRm9yV3JpdGluZ01vZGUoY29u c3QgRmxvYXRQb2ludCYgcG9pbnQpCitGbG9hdFBvaW50IElubGluZUJveDo6ZmxpcEZvcldyaXRp bmdNb2RlKGNvbnN0IEZsb2F0UG9pbnQmIHBvaW50KSBjb25zdAogewogICAgIGlmICghbV9yZW5k ZXJlci5zdHlsZSgpLmlzRmxpcHBlZEJsb2Nrc1dyaXRpbmdNb2RlKCkpCiAgICAgICAgIHJldHVy biBwb2ludDsKICAgICByZXR1cm4gcm9vdCgpLmJsb2NrRmxvdygpLmZsaXBGb3JXcml0aW5nTW9k ZShwb2ludCk7CiB9CiAKLXZvaWQgSW5saW5lQm94OjpmbGlwRm9yV3JpdGluZ01vZGUoTGF5b3V0 UmVjdCYgcmVjdCkKK3ZvaWQgSW5saW5lQm94OjpmbGlwRm9yV3JpdGluZ01vZGUoTGF5b3V0UmVj dCYgcmVjdCkgY29uc3QKIHsKICAgICBpZiAoIW1fcmVuZGVyZXIuc3R5bGUoKS5pc0ZsaXBwZWRC bG9ja3NXcml0aW5nTW9kZSgpKQogICAgICAgICByZXR1cm47CiAgICAgcm9vdCgpLmJsb2NrRmxv dygpLmZsaXBGb3JXcml0aW5nTW9kZShyZWN0KTsKIH0KIAotTGF5b3V0UG9pbnQgSW5saW5lQm94 OjpmbGlwRm9yV3JpdGluZ01vZGUoY29uc3QgTGF5b3V0UG9pbnQmIHBvaW50KQorTGF5b3V0UG9p bnQgSW5saW5lQm94OjpmbGlwRm9yV3JpdGluZ01vZGUoY29uc3QgTGF5b3V0UG9pbnQmIHBvaW50 KSBjb25zdAogewogICAgIGlmICghbV9yZW5kZXJlci5zdHlsZSgpLmlzRmxpcHBlZEJsb2Nrc1dy aXRpbmdNb2RlKCkpCiAgICAgICAgIHJldHVybiBwb2ludDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9J bmxpbmVCb3guaAppbmRleCA1YmVlODY5M2EwN2M5ODRhNzJlODEwMzVhZWIwY2JlNWU2ZjIzNzEy Li5hYzBhYzAxOTAwMDUzMDdhODhjNzM4YTg4NGQ3N2E4ZGI0MWMyYjZlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL0lubGluZUJveC5oCkBAIC0yNTQsMTEgKzI1NCwxMSBAQCBwdWJsaWM6CiAgICAg ICAgIHJldHVybiBudWxscHRyOwogICAgIH0KIAotICAgIEZsb2F0UG9pbnQgbG9jYXRpb25JbmNs dWRpbmdGbGlwcGluZygpOwotICAgIHZvaWQgZmxpcEZvcldyaXRpbmdNb2RlKEZsb2F0UmVjdCYp OwotICAgIEZsb2F0UG9pbnQgZmxpcEZvcldyaXRpbmdNb2RlKGNvbnN0IEZsb2F0UG9pbnQmKTsK LSAgICB2b2lkIGZsaXBGb3JXcml0aW5nTW9kZShMYXlvdXRSZWN0Jik7Ci0gICAgTGF5b3V0UG9p bnQgZmxpcEZvcldyaXRpbmdNb2RlKGNvbnN0IExheW91dFBvaW50Jik7CisgICAgRmxvYXRQb2lu dCBsb2NhdGlvbkluY2x1ZGluZ0ZsaXBwaW5nKCkgY29uc3Q7CisgICAgdm9pZCBmbGlwRm9yV3Jp dGluZ01vZGUoRmxvYXRSZWN0JikgY29uc3Q7CisgICAgRmxvYXRQb2ludCBmbGlwRm9yV3JpdGlu Z01vZGUoY29uc3QgRmxvYXRQb2ludCYpIGNvbnN0OworICAgIHZvaWQgZmxpcEZvcldyaXRpbmdN b2RlKExheW91dFJlY3QmKSBjb25zdDsKKyAgICBMYXlvdXRQb2ludCBmbGlwRm9yV3JpdGluZ01v ZGUoY29uc3QgTGF5b3V0UG9pbnQmKSBjb25zdDsKIAogICAgIGJvb2wga25vd25Ub0hhdmVOb092 ZXJmbG93KCkgY29uc3QgeyByZXR1cm4gbV9iaXRmaWVsZHMua25vd25Ub0hhdmVOb092ZXJmbG93 KCk7IH0KICAgICB2b2lkIGNsZWFyS25vd25Ub0hhdmVOb092ZXJmbG93KCk7Cg==