122843 2013-10-15 10:15:30 -0700 [CSS Shapes] Move RenderBlock::layoutShapeInsideInfo into RenderBlock.cpp 2013-10-15 11:06:41 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 121261 1 zoltan zoltan commit-queue esprehn+autocc glenn kondapallykalyan WebkitBugTracker oldest_to_newest 940021 0 zoltan 2013-10-15 10:15:30 -0700 Historically, layoutShapeInsideInfo was a static function in RenderBlockLineLayout, then it has changed to be a member of RenderBlock, but at that time it hasn't been moved to RenderBlock.cpp. This patch moves it into RenderBlock.cpp, next to the Shapes methods. 940022 1 214279 zoltan 2013-10-15 10:19:50 -0700 Created attachment 214279 Patch 940033 2 214279 commit-queue 2013-10-15 11:06:39 -0700 Comment on attachment 214279 Patch Clearing flags on attachment: 214279 Committed r157454: <http://trac.webkit.org/changeset/157454> 940034 3 commit-queue 2013-10-15 11:06:41 -0700 All reviewed patches have been landed. Closing bug. 214279 2013-10-15 10:19:50 -0700 2013-10-15 11:06:39 -0700 Patch bug-122843-20131015101949.patch text/plain 3906 zoltan U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3NDQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjNlN2RjMmI0Y2IxMTcy ZGU5N2Q5NzFmMzZmNTllNzE4N2ZkMzUzYy4uNjc3ZjRlOTNlMWZjMzQ3NzAzM2JhOTM3YWQ2MWY2 YzBkZmY3Mzg4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTEwLTE1ICBab2x0 YW4gSG9ydmF0aCAgPHpvbHRhbkB3ZWJraXQub3JnPgorCisgICAgICAgIFtDU1MgU2hhcGVzXSBN b3ZlIFJlbmRlckJsb2NrOjpsYXlvdXRTaGFwZUluc2lkZUluZm8gaW50byBSZW5kZXJCbG9jay5j cHAKKyAgICAgICAgaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIyODQz CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSGlzdG9y aWNhbGx5LCBsYXlvdXRTaGFwZUluc2lkZUluZm8gd2FzIGEgc3RhdGljIGZ1bmN0aW9uIGluIFJl bmRlckJsb2NrTGluZUxheW91dCwgdGhlbiBpdCBoYXMgY2hhbmdlZCB0byBiZSBhIG1lbWJlciBv ZiBSZW5kZXJCbG9jaywKKyAgICAgICAgYnV0IGF0IHRoYXQgdGltZSBpdCBoYXNuJ3QgYmVlbiBt b3ZlZCB0byBSZW5kZXJCbG9jay5jcHAuIFRoaXMgcGF0Y2ggbW92ZXMgaXQgaW50byBSZW5kZXJC bG9jay5jcHAgbmV4dCB0byB0aGUgU2hhcGVzIGZ1bmN0aW9ucy4gSSByZW1vdmVkCisgICAgICAg IGFuIHVubmVjZXNzYXJ5IENTU19TSEFQRVMgI2lmZGVmIGFzIHdlbGwgZnJvbSBSZW5kZXJCbG9j ay5jcHAuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyQmxvY2s6Om1hcmtTaGFwZUluc2lkZURlc2NlbmRhbnRzRm9yTGF5b3V0KToKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckJsb2NrOjpsYXlvdXRTaGFwZUluc2lkZUluZm8pOgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwOgorCiAyMDEzLTEwLTE1ICBBbmRy ZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBGaWxlSWNvbkxvYWRlciBz aG91bGQgbm90IGJlIHJlZi1jb3VudGVkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9jay5jcHAKaW5kZXggYmViNmIxYTFjNjczNjBhYzIyYjdmZDk3MGMwMzhkNTA2ZDZlNDQ5MS4u YjRkN2M3YWFjYjJiMzFjNmM3MDQzODg1ZDYxOTBjMWRlNWFjYjMwNyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCkBAIC0xNDE3LDkgKzE0MTcsMjMgQEAgdm9pZCBS ZW5kZXJCbG9jazo6bWFya1NoYXBlSW5zaWRlRGVzY2VuZGFudHNGb3JMYXlvdXQoKQogICAgICAg ICBjaGlsZEJsb2NrLT5tYXJrU2hhcGVJbnNpZGVEZXNjZW5kYW50c0ZvckxheW91dCgpOwogICAg IH0KIH0KLSNlbmRpZgogCi0jaWYgRU5BQkxFKENTU19TSEFQRVMpCitTaGFwZUluc2lkZUluZm8q IFJlbmRlckJsb2NrOjpsYXlvdXRTaGFwZUluc2lkZUluZm8oKSBjb25zdAoreworICAgIFNoYXBl SW5zaWRlSW5mbyogc2hhcGVJbnNpZGVJbmZvID0gdmlldygpLmxheW91dFN0YXRlKCktPnNoYXBl SW5zaWRlSW5mbygpOworCisgICAgaWYgKCFzaGFwZUluc2lkZUluZm8gJiYgZmxvd1RocmVhZENv bnRhaW5pbmdCbG9jaygpICYmIGFsbG93c1NoYXBlSW5zaWRlSW5mb1NoYXJpbmcoKSkgeworICAg ICAgICBMYXlvdXRVbml0IGxpbmVIZWlnaHQgPSB0aGlzLT5saW5lSGVpZ2h0KGZhbHNlLCBpc0hv cml6b250YWxXcml0aW5nTW9kZSgpID8gSG9yaXpvbnRhbExpbmUgOiBWZXJ0aWNhbExpbmUsIFBv c2l0aW9uT2ZJbnRlcmlvckxpbmVCb3hlcyk7CisgICAgICAgIC8vIHJlZ2lvbkF0QmxvY2tPZmZz ZXQgcmV0dXJucyByZWdpb25zIGxpa2UgYW4gYXJyYXkgZmlyc3Q9ezAsTi0xfSwgc2Vjb25kPXtO LE0tMX0sIC4uLgorICAgICAgICBMYXlvdXRVbml0IG9mZnNldCA9IGxvZ2ljYWxIZWlnaHQoKSAr IGxpbmVIZWlnaHQgLSBMYXlvdXRVbml0KDEpOworICAgICAgICBSZW5kZXJSZWdpb24qIHJlZ2lv biA9IHJlZ2lvbkF0QmxvY2tPZmZzZXQob2Zmc2V0KTsKKyAgICAgICAgaWYgKHJlZ2lvbikKKyAg ICAgICAgICAgIHNoYXBlSW5zaWRlSW5mbyA9IHJlZ2lvbi0+c2hhcGVJbnNpZGVJbmZvKCk7Cisg ICAgfQorCisgICAgcmV0dXJuIHNoYXBlSW5zaWRlSW5mbzsKK30KKwogc3RhdGljIGlubGluZSBi b29sIHNoYXBlSW5mb1JlcXVpcmVzUmVsYXlvdXQoY29uc3QgUmVuZGVyQmxvY2sqIGJsb2NrKQog ewogICAgIFNoYXBlSW5zaWRlSW5mbyogaW5mbyA9IGJsb2NrLT5zaGFwZUluc2lkZUluZm8oKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlv dXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5j cHAKaW5kZXggN2JjYzVlNDNkMTQ5YmE2MjIyMzA2Mjg2MWRkMzVkNjYwZjA1NDFjMy4uMjc1ZDQ3 ODNjMTE2M2Q5OWY3NzliMzdkNGMxMmUxMWU0OWQ0MWU3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAKQEAgLTEwNywyNCArMTA3 LDYgQEAgcHJpdmF0ZToKICAgICBWZWN0b3I8UmVuZGVyQm94Kj4gbV9wb3NpdGlvbmVkT2JqZWN0 czsKIH07CiAKLSNpZiBFTkFCTEUoQ1NTX1NIQVBFUykKLVNoYXBlSW5zaWRlSW5mbyogUmVuZGVy QmxvY2s6OmxheW91dFNoYXBlSW5zaWRlSW5mbygpIGNvbnN0Ci17Ci0gICAgU2hhcGVJbnNpZGVJ bmZvKiBzaGFwZUluc2lkZUluZm8gPSB2aWV3KCkubGF5b3V0U3RhdGUoKS0+c2hhcGVJbnNpZGVJ bmZvKCk7Ci0KLSAgICBpZiAoIXNoYXBlSW5zaWRlSW5mbyAmJiBmbG93VGhyZWFkQ29udGFpbmlu Z0Jsb2NrKCkgJiYgYWxsb3dzU2hhcGVJbnNpZGVJbmZvU2hhcmluZygpKSB7Ci0gICAgICAgIExh eW91dFVuaXQgbGluZUhlaWdodCA9IHRoaXMtPmxpbmVIZWlnaHQoZmFsc2UsIGlzSG9yaXpvbnRh bFdyaXRpbmdNb2RlKCkgPyBIb3Jpem9udGFsTGluZSA6IFZlcnRpY2FsTGluZSwgUG9zaXRpb25P ZkludGVyaW9yTGluZUJveGVzKTsKLSAgICAgICAgLy8gcmVnaW9uQXRCbG9ja09mZnNldCByZXR1 cm5zIHJlZ2lvbnMgbGlrZSBhbiBhcnJheSBmaXJzdD17MCxOLTF9LCBzZWNvbmQ9e04sTS0xfSwg Li4uCi0gICAgICAgIExheW91dFVuaXQgb2Zmc2V0ID0gbG9naWNhbEhlaWdodCgpICsgbGluZUhl aWdodCAtIExheW91dFVuaXQoMSk7Ci0gICAgICAgIFJlbmRlclJlZ2lvbiogcmVnaW9uID0gcmVn aW9uQXRCbG9ja09mZnNldChvZmZzZXQpOwotICAgICAgICBpZiAocmVnaW9uKQotICAgICAgICAg ICAgc2hhcGVJbnNpZGVJbmZvID0gcmVnaW9uLT5zaGFwZUluc2lkZUluZm8oKTsKLSAgICB9Ci0K LSAgICByZXR1cm4gc2hhcGVJbnNpZGVJbmZvOwotfQotI2VuZGlmCi0KIHN0YXRpYyBpbmxpbmUg TGF5b3V0VW5pdCBib3JkZXJQYWRkaW5nTWFyZ2luU3RhcnQoY29uc3QgUmVuZGVySW5saW5lJiBj aGlsZCkKIHsKICAgICByZXR1cm4gY2hpbGQubWFyZ2luU3RhcnQoKSArIGNoaWxkLnBhZGRpbmdT dGFydCgpICsgY2hpbGQuYm9yZGVyU3RhcnQoKTsK