131641 2014-04-14 15:31:39 -0700 [CSS Shapes] Remove some leftover shape-inside code 2014-04-14 17:27:43 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 130698 1 bjonesbe bjonesbe commit-queue esprehn+autocc glenn kondapallykalyan zoltan oldest_to_newest 1000625 0 bjonesbe 2014-04-14 15:31:39 -0700 [CSS Shapes] Remove some leftover shape-inside code 1000629 1 229315 bjonesbe 2014-04-14 15:33:05 -0700 Created attachment 229315 Patch 1000637 2 zoltan 2014-04-14 15:40:49 -0700 Good catch, looks good to me. 1000670 3 229315 commit-queue 2014-04-14 17:27:40 -0700 Comment on attachment 229315 Patch Clearing flags on attachment: 229315 Committed r167283: <http://trac.webkit.org/changeset/167283> 1000672 4 commit-queue 2014-04-14 17:27:43 -0700 All reviewed patches have been landed. Closing bug. 229315 2014-04-14 15:33:05 -0700 2014-04-14 17:27:40 -0700 Patch bug-131641-20140414153244.patch text/plain 7540 bjonesbe U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3MjY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTM5MGZkOTE0M2YwOGRj MWJjNGNiNzY3YTY4M2U0MzU3NzU4MGZhNi4uZWNkYzdlYmMzMzAyMmFjMmI0ZGQwZWMwODExNGUw M2RmNzAyM2I3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE0LTA0LTE0ICBCZW0g Sm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29tPgorCisgICAgICAgIFtDU1MgU2hhcGVzXSBS ZW1vdmUgc29tZSBsZWZ0b3ZlciBzaGFwZS1pbnNpZGUgY29kZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMxNjQxCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSSBkaXNjb3ZlcmVkIHRoYXQgc29tZSBjb2Rl IGhhZCBiZWVuIGxlZnRvdmVyIGZyb20gdGhlIHNoYXBlLWluc2lkZQorICAgICAgICByZW1vdmFs LiBUaGlzIHJlbW92ZXMgdGhhdCBsZWZ0b3ZlciBjb2RlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0 cywgbm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICogcGxhdGZvcm0vdGV4dC9CaWRpUmVz b2x2ZXIuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvQmlkaVJ1bi5jcHA6CisgICAgICAgIChXZWJD b3JlOjpCaWRpUnVuOjpCaWRpUnVuKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2tG bG93Lmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OmNyZWF0ZUxpbmVCb3hlcyk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OmNvbnN0cnVjdExpbmUpOgorICAgICAgICAo V2ViQ29yZTo6Y29tcHV0ZUV4cGFuc2lvbkZvckp1c3RpZmllZFRleHQpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQmxvY2tGbG93Ojpjb21wdXRlSW5saW5lRGlyZWN0aW9uUG9zaXRpb25zRm9y U2VnbWVudCk6CisKIDIwMTQtMDQtMTQgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5j b20+CiAKICAgICAgICAgRWxpbWluYXRlIENhY2hlZEZyYW1lOjptX21vdXNlUHJlc3NOb2RlCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L0JpZGlSZXNvbHZlci5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9CaWRpUmVzb2x2ZXIuaAppbmRleCA4YTAzMTdk ZDMwZjI5Y2E4NDI2N2E3ZGYyZjIwYjQ3YTNjY2ExYzc1Li5jOTBjNGRjNDBiMjA0MWM4Mzg0ODU3 OGM3MThlY2JmOGM3YTNmNzJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90 ZXh0L0JpZGlSZXNvbHZlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvQmlk aVJlc29sdmVyLmgKQEAgLTE5MCw5ICsxOTAsNiBAQCBwdWJsaWM6CiAgICAgLy8gRG8gbm90IGFk ZCBhbnl0aGluZyBhcGFydCBmcm9tIGJpdGZpZWxkcyB1bnRpbCBhZnRlciBtX25leHQuIFNlZSBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAwMTczCiAgICAgYm9vbCBt X292ZXJyaWRlIDogMTsKICAgICBib29sIG1faGFzSHlwaGVuIDogMTsgLy8gVXNlZCBieSBCaWRp UnVuIHN1YmNsYXNzIHdoaWNoIGlzIGEgbGF5ZXJpbmcgdmlvbGF0aW9uIGJ1dCBlbmFibGVzIHVz IHRvIHNhdmUgOCBieXRlcyBwZXIgb2JqZWN0IG9uIDY0LWJpdC4KLSNpZiBFTkFCTEUoQ1NTX1NI QVBFUykKLSAgICBib29sIG1fc3RhcnRzU2VnbWVudCA6IDE7IC8vIFNhbWUgY29tbWVudCBhcyBt X2hhc0h5cGhlbi4KLSNlbmRpZgogICAgIHVuc2lnbmVkIGNoYXIgbV9sZXZlbDsKICAgICBCaWRp Q2hhcmFjdGVyUnVuKiBtX25leHQ7CiAgICAgaW50IG1fc3RhcnQ7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvQmlkaVJ1bi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvQmlkaVJ1bi5jcHAKaW5kZXggNzkyZTg5Mzg4YTc5NmY1MWZiMDI5ODM1NmU3M2ViYzc0ZWM1 ZDgyMC4uYTZmMzkxOWI0N2QwZmI2MjhhNmZkYzZiOTIxMzYzYmEwZmU0MzNjZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0JpZGlSdW4uY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9CaWRpUnVuLmNwcApAQCAtNDQsOSArNDQsNiBAQCBCaWRpUnVuOjpCaWRp UnVuKGludCBzdGFydCwgaW50IHN0b3AsIFJlbmRlck9iamVjdCYgcmVuZGVyZXIsIEJpZGlDb250 ZXh0KiBjb250ZQogICAgIEFTU0VSVCghbV9yZW5kZXJlci5pc1RleHQoKSB8fCBzdGF0aWNfY2Fz dDx1bnNpZ25lZD4oc3RvcCkgPD0gdG9SZW5kZXJUZXh0KG1fcmVuZGVyZXIpLnRleHRMZW5ndGgo KSk7CiAgICAgLy8gU3RvcmVkIGluIGJhc2UgY2xhc3MgdG8gc2F2ZSBzcGFjZS4KICAgICBtX2hh c0h5cGhlbiA9IGZhbHNlOwotI2lmIEVOQUJMRShDU1NfU0hBUEVTKQotICAgIG1fc3RhcnRzU2Vn bWVudCA9IGZhbHNlOwotI2VuZGlmCiB9CiAKIEJpZGlSdW46On5CaWRpUnVuKCkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuaCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuaAppbmRleCBlNjYzNDJhODQzOTU2MGZm OWMzNDgxMzRlZGQwZGUxZjc1MmYxYzRlLi44YWJjMjg0ZjY2NTFhNGM3MzUwYzA3NTk3MTRmNjYy NGRmMWQ2OWMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2tGbG93LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5o CkBAIC01MjcsNyArNTI3LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGxheW91dFNpbXBsZUxpbmVz KExheW91dFVuaXQmIHJlcGFpbnRMb2dpY2FsVG9wLCBMYXlvdXRVbml0JiByZXBhaW50TG9naWNh bEJvdHRvbSk7CiAKICAgICB2aXJ0dWFsIHN0ZDo6dW5pcXVlX3B0cjxSb290SW5saW5lQm94PiBj cmVhdGVSb290SW5saW5lQm94KCk7IC8vIFN1YmNsYXNzZWQgYnkgUmVuZGVyU1ZHVGV4dC4KLSAg ICBJbmxpbmVGbG93Qm94KiBjcmVhdGVMaW5lQm94ZXMoUmVuZGVyT2JqZWN0KiwgY29uc3QgTGlu ZUluZm8mLCBJbmxpbmVCb3gqIGNoaWxkQm94LCBib29sIHN0YXJ0c05ld1NlZ21lbnQpOworICAg IElubGluZUZsb3dCb3gqIGNyZWF0ZUxpbmVCb3hlcyhSZW5kZXJPYmplY3QqLCBjb25zdCBMaW5l SW5mbyYsIElubGluZUJveCogY2hpbGRCb3gpOwogICAgIFJvb3RJbmxpbmVCb3gqIGNvbnN0cnVj dExpbmUoQmlkaVJ1bkxpc3Q8QmlkaVJ1bj4mLCBjb25zdCBMaW5lSW5mbyYpOwogICAgIHZvaWQg c2V0TWFyZ2luc0ZvclJ1YnlSdW4oQmlkaVJ1biosIFJlbmRlclJ1YnlSdW4mLCBSZW5kZXJPYmpl Y3QqLCBjb25zdCBMaW5lSW5mbyYpOwogICAgIHZvaWQgY29tcHV0ZUlubGluZURpcmVjdGlvblBv c2l0aW9uc0ZvckxpbmUoUm9vdElubGluZUJveCosIGNvbnN0IExpbmVJbmZvJiwgQmlkaVJ1biog Zmlyc3RSdW4sIEJpZGlSdW4qIHRyYWlsaW5nU3BhY2VSdW4sIGJvb2wgcmVhY2hlZEVuZCwgR2x5 cGhPdmVyZmxvd0FuZEZhbGxiYWNrRm9udHNNYXAmLCBWZXJ0aWNhbFBvc2l0aW9uQ2FjaGUmLCBX b3JkTWVhc3VyZW1lbnRzJik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9ja0xpbmVMYXlvdXQuY3BwCmluZGV4IDg2ZTdlNjJlMWFmMWVmYzdkNTkzNGNhZmQyZTI1 M2E5YTE1ODNiYTEuLjA3ZTljOGE2ODYzZGE2YjBkYWQzZGIxMjJkNzhmZDBhNDA0N2UzZTAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQu Y3BwCkBAIC0xODIsNyArMTgyLDcgQEAgc3RhdGljIGJvb2wgcGFyZW50SXNDb25zdHJ1Y3RlZE9y SGF2ZU5leHQoSW5saW5lRmxvd0JveCogcGFyZW50Qm94KQogICAgIHJldHVybiBmYWxzZTsKIH0K IAotSW5saW5lRmxvd0JveCogUmVuZGVyQmxvY2tGbG93OjpjcmVhdGVMaW5lQm94ZXMoUmVuZGVy T2JqZWN0KiBvYmosIGNvbnN0IExpbmVJbmZvJiBsaW5lSW5mbywgSW5saW5lQm94KiBjaGlsZEJv eCwgYm9vbCBzdGFydE5ld1NlZ21lbnQpCitJbmxpbmVGbG93Qm94KiBSZW5kZXJCbG9ja0Zsb3c6 OmNyZWF0ZUxpbmVCb3hlcyhSZW5kZXJPYmplY3QqIG9iaiwgY29uc3QgTGluZUluZm8mIGxpbmVJ bmZvLCBJbmxpbmVCb3gqIGNoaWxkQm94KQogewogICAgIC8vIFNlZSBpZiB3ZSBoYXZlIGFuIHVu Y29uc3RydWN0ZWQgbGluZSBib3ggZm9yIHRoaXMgb2JqZWN0IHRoYXQgaXMgYWxzbwogICAgIC8v IHRoZSBsYXN0IGl0ZW0gb24gdGhlIGxpbmUuCkBAIC0yMDUsOCArMjA1LDcgQEAgSW5saW5lRmxv d0JveCogUmVuZGVyQmxvY2tGbG93OjpjcmVhdGVMaW5lQm94ZXMoUmVuZGVyT2JqZWN0KiBvYmos IGNvbnN0IExpbmVJbmYKICAgICAgICAgLy8gdGhlIHNhbWUgbGluZSAodGhpcyBjYW4gaGFwcGVu IHdpdGggdmVyeSBmYW5jeSBsYW5ndWFnZSBtaXh0dXJlcykuCiAgICAgICAgIGJvb2wgY29uc3Ry dWN0ZWROZXdCb3ggPSBmYWxzZTsKICAgICAgICAgYm9vbCBhbGxvd2VkVG9Db25zdHJ1Y3ROZXdC b3ggPSAhaGFzRGVmYXVsdExpbmVCb3hDb250YWluIHx8ICFpbmxpbmVGbG93IHx8IGlubGluZUZs b3ctPmFsd2F5c0NyZWF0ZUxpbmVCb3hlcygpOwotICAgICAgICBib29sIG11c3RDcmVhdGVCb3hl c1RvUm9vdCA9IHN0YXJ0TmV3U2VnbWVudCAmJiAhKHBhcmVudEJveCAmJiBwYXJlbnRCb3gtPmlz Um9vdElubGluZUJveCgpKTsKLSAgICAgICAgYm9vbCBjYW5Vc2VFeGlzdGluZ1BhcmVudEJveCA9 IHBhcmVudEJveCAmJiAhcGFyZW50SXNDb25zdHJ1Y3RlZE9ySGF2ZU5leHQocGFyZW50Qm94KSAm JiAhbXVzdENyZWF0ZUJveGVzVG9Sb290OworICAgICAgICBib29sIGNhblVzZUV4aXN0aW5nUGFy ZW50Qm94ID0gcGFyZW50Qm94ICYmICFwYXJlbnRJc0NvbnN0cnVjdGVkT3JIYXZlTmV4dChwYXJl bnRCb3gpOwogICAgICAgICBpZiAoYWxsb3dlZFRvQ29uc3RydWN0TmV3Qm94ICYmICFjYW5Vc2VF eGlzdGluZ1BhcmVudEJveCkgewogICAgICAgICAgICAgLy8gV2UgbmVlZCB0byBtYWtlIGEgbmV3 IGJveCBmb3IgdGhpcyByZW5kZXIgb2JqZWN0LiAgT25jZQogICAgICAgICAgICAgLy8gbWFkZSwg d2UgbmVlZCB0byBwbGFjZSBpdCBhdCB0aGUgZW5kIG9mIHRoZSBjdXJyZW50IGxpbmUuCkBAIC0z MDEsMTUgKzMwMCwxMCBAQCBSb290SW5saW5lQm94KiBSZW5kZXJCbG9ja0Zsb3c6OmNvbnN0cnVj dExpbmUoQmlkaVJ1bkxpc3Q8QmlkaVJ1bj4mIGJpZGlSdW5zLCBjbwogICAgICAgICAvLyB0aGVu IHdlIG5lZWQgdG8gY29uc3RydWN0IGlubGluZSBib3hlcyBhcyBuZWNlc3NhcnkgdG8gcHJvcGVy bHkgZW5jbG9zZSB0aGUKICAgICAgICAgLy8gcnVuJ3MgaW5saW5lIGJveC4gU2VnbWVudHMgY2Fu IG9ubHkgYmUgc2libGluZ3MgYXQgdGhlIHJvb3QgbGV2ZWwsIGFzCiAgICAgICAgIC8vIHRoZXkg YXJlIHBvc2l0aW9uZWQgc2VwYXJhdGVseS4KLSNpZiBFTkFCTEUoQ1NTX1NIQVBFUykKLSAgICAg ICAgYm9vbCBydW5TdGFydHNTZWdtZW50ID0gci0+bV9zdGFydHNTZWdtZW50OwotI2Vsc2UKLSAg ICAgICAgYm9vbCBydW5TdGFydHNTZWdtZW50ID0gZmFsc2U7Ci0jZW5kaWYKLSAgICAgICAgaWYg KCFwYXJlbnRCb3ggfHwgJnBhcmVudEJveC0+cmVuZGVyZXIoKSAhPSByLT5yZW5kZXJlcigpLnBh cmVudCgpIHx8IHJ1blN0YXJ0c1NlZ21lbnQpCisgICAgICAgIGlmICghcGFyZW50Qm94IHx8ICZw YXJlbnRCb3gtPnJlbmRlcmVyKCkgIT0gci0+cmVuZGVyZXIoKS5wYXJlbnQoKSkgewogICAgICAg ICAgICAgLy8gQ3JlYXRlIG5ldyBpbmxpbmUgYm94ZXMgYWxsIHRoZSB3YXkgYmFjayB0byB0aGUg YXBwcm9wcmlhdGUgaW5zZXJ0aW9uIHBvaW50LgotICAgICAgICAgICAgcGFyZW50Qm94ID0gY3Jl YXRlTGluZUJveGVzKHItPnJlbmRlcmVyKCkucGFyZW50KCksIGxpbmVJbmZvLCBib3gsIHJ1blN0 YXJ0c1NlZ21lbnQpOwotICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIHBhcmVudEJveCA9IGNy ZWF0ZUxpbmVCb3hlcyhyLT5yZW5kZXJlcigpLnBhcmVudCgpLCBsaW5lSW5mbywgYm94KTsKKyAg ICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIC8vIEFwcGVuZCB0aGUgaW5saW5lIGJveCB0byB0 aGlzIGxpbmUuCiAgICAgICAgICAgICBwYXJlbnRCb3gtPmFkZFRvTGluZShib3gpOwogICAgICAg ICB9CkBAIC01NDUsMTEgKzUzOSw2IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBjb21wdXRlRXhwYW5z aW9uRm9ySnVzdGlmaWVkVGV4dChCaWRpUnVuKiBmaXJzdFJ1biwgQmlkaVJ1bioKIAogICAgIHNp emVfdCBpID0gMDsKICAgICBmb3IgKEJpZGlSdW4qIHIgPSBmaXJzdFJ1bjsgcjsgciA9IHItPm5l eHQoKSkgewotI2lmIEVOQUJMRShDU1NfU0hBUEVTKQotICAgICAgICAvLyBUaGlzIG1ldGhvZCBp cyBjYWxsZWQgb25jZSBwZXIgc2VnbWVudCwgZG8gbm90IG1vdmUgcGFzdCB0aGUgY3VycmVudCBz ZWdtZW50LgotICAgICAgICBpZiAoci0+bV9zdGFydHNTZWdtZW50KQotICAgICAgICAgICAgYnJl YWs7Ci0jZW5kaWYKICAgICAgICAgaWYgKCFyLT5ib3goKSB8fCByID09IHRyYWlsaW5nU3BhY2VS dW4pCiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgCkBAIC02NzIsMTIgKzY2MSw2IEBA IEJpZGlSdW4qIFJlbmRlckJsb2NrRmxvdzo6Y29tcHV0ZUlubGluZURpcmVjdGlvblBvc2l0aW9u c0ZvclNlZ21lbnQoUm9vdElubGluZUJvCiAKICAgICBCaWRpUnVuKiByID0gZmlyc3RSdW47CiAg ICAgZm9yICg7IHI7IHIgPSByLT5uZXh0KCkpIHsKLSNpZiBFTkFCTEUoQ1NTX1NIQVBFUykKLSAg ICAgICAgLy8gT25jZSB3ZSBoYXZlIHJlYWNoZWQgdGhlIHN0YXJ0IG9mIHRoZSBuZXh0IHNlZ21l bnQsIHdlIGhhdmUgZmluaXNoZWQKLSAgICAgICAgLy8gY29tcHV0aW5nIHRoZSBwb3NpdGlvbnMg Zm9yIHRoaXMgc2VnbWVudCdzIGNvbnRlbnRzLgotICAgICAgICBpZiAoci0+bV9zdGFydHNTZWdt ZW50KQotICAgICAgICAgICAgYnJlYWs7Ci0jZW5kaWYKICAgICAgICAgaWYgKCFyLT5ib3goKSB8 fCByLT5yZW5kZXJlcigpLmlzT3V0T2ZGbG93UG9zaXRpb25lZCgpIHx8IHItPmJveCgpLT5pc0xp bmVCcmVhaygpKQogICAgICAgICAgICAgY29udGludWU7IC8vIFBvc2l0aW9uZWQgb2JqZWN0cyBh cmUgb25seSBwYXJ0aWNpcGF0aW5nIHRvIGZpZ3VyZSBvdXQgdGhlaXIKICAgICAgICAgICAgICAg ICAgICAgICAvLyBjb3JyZWN0IHN0YXRpYyB4IHBvc2l0aW9uLiAgVGhleSBoYXZlIG5vIGVmZmVj dCBvbiB0aGUgd2lkdGguCg==