126494 2014-01-04 16:20:27 -0800 Move a few more functions from RenderBlock to RenderBlockFlow 2014-01-04 16:24:46 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 964431 0 sam 2014-01-04 16:20:27 -0800 Move a few more functions from RenderBlock to RenderBlockFlow 964432 1 220380 sam 2014-01-04 16:21:06 -0800 Created attachment 220380 Patch 964433 2 sam 2014-01-04 16:24:46 -0800 Committed r161316: <http://trac.webkit.org/changeset/161316> 220380 2014-01-04 16:21:06 -0800 2014-01-04 16:24:00 -0800 Patch bug-126494-20140104162105.patch text/plain 5943 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MTMxNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE0LTAxLTA0ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTW92ZSBhIGZldyBtb3JlIGZ1bmN0aW9u cyBmcm9tIFJlbmRlckJsb2NrIHRvIFJlbmRlckJsb2NrRmxvdworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI2NDk0CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suaDoK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93Lmg6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCbG9ja0Zsb3c6OmFkanVzdElubGluZURpcmVjdGlvbkxpbmVCb3VuZHMpOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQmxvY2tGbG93Ojp0ZXh0QWxpZ25tZW50Rm9yTGluZSk6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OnVwZGF0ZUxvZ2ljYWxXaWR0aEZvckFsaWdubWVudCk6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OnN0YXJ0QWxpZ25lZE9mZnNldEZv ckxpbmUpOgorICAgICAgICBUaGVzZSBhcmUgb25seSB1c2VkIGJ5IFJlbmRlckJsb2NrRmxvdywg c28gbW92ZSB0aGVtIHRoZXJlLgorCiAyMDE0LTAxLTA0ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5m cmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFByZXBhcmUgdGhlIFNjcm9sbGluZ1RyZWUgZm9y IHJlbW90ZSB1c2UKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCShy ZXZpc2lvbiAxNjEzMTUpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2su aAkod29ya2luZyBjb3B5KQpAQCAtMTkwLDcgKzE5MCw2IEBAIHB1YmxpYzoKICAgICAgICAgICAg IDogbG9naWNhbFdpZHRoKCkgLSBsb2dpY2FsUmlnaHRPZmZzZXRGb3JMaW5lKHBvc2l0aW9uLCBz aG91bGRJbmRlbnRUZXh0LCBsb2dpY2FsSGVpZ2h0KTsKICAgICB9CiAKLSAgICBMYXlvdXRVbml0 IHN0YXJ0QWxpZ25lZE9mZnNldEZvckxpbmUoTGF5b3V0VW5pdCBwb3NpdGlvbiwgYm9vbCBzaG91 bGRJbmRlbnRUZXh0KTsKICAgICBMYXlvdXRVbml0IHRleHRJbmRlbnRPZmZzZXQoKSBjb25zdDsK IAogICAgIHZpcnR1YWwgVmlzaWJsZVBvc2l0aW9uIHBvc2l0aW9uRm9yUG9pbnQoY29uc3QgTGF5 b3V0UG9pbnQmKSBPVkVSUklERTsKQEAgLTI5OSw4ICsyOTgsNiBAQCBwdWJsaWM6CiAgICAgTGF5 b3V0VW5pdCBjb2xsYXBzZWRNYXJnaW5CZWZvcmVGb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmIGNo aWxkKSBjb25zdDsKICAgICBMYXlvdXRVbml0IGNvbGxhcHNlZE1hcmdpbkFmdGVyRm9yQ2hpbGQo Y29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3Q7CiAKLSAgICB2b2lkIHVwZGF0ZUxvZ2ljYWxX aWR0aEZvckFsaWdubWVudChjb25zdCBFVGV4dEFsaWduJiwgQmlkaVJ1biogdHJhaWxpbmdTcGFj ZVJ1biwgZmxvYXQmIGxvZ2ljYWxMZWZ0LCBmbG9hdCYgdG90YWxMb2dpY2FsV2lkdGgsIGZsb2F0 JiBhdmFpbGFibGVMb2dpY2FsV2lkdGgsIGludCBleHBhbnNpb25PcHBvcnR1bml0eUNvdW50KTsK LQogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVGaXJzdExldHRlcigpOwogCiAgICAgdmlydHVhbCB2 b2lkIHNjcm9sbGJhcnNDaGFuZ2VkKGJvb2wgLypob3Jpem9udGFsU2Nyb2xsYmFyQ2hhbmdlZCov LCBib29sIC8qdmVydGljYWxTY3JvbGxiYXJDaGFuZ2VkKi8pIHsgfQpAQCAtNDA3LDkgKzQwNCw2 IEBAIHByb3RlY3RlZDoKICAgICAgICAgcmV0dXJuIGFkanVzdExvZ2ljYWxMZWZ0T2Zmc2V0Rm9y TGluZShsb2dpY2FsTGVmdEZsb2F0T2Zmc2V0Rm9yTGluZShsb2dpY2FsVG9wLCBmaXhlZE9mZnNl dCwgbG9naWNhbEhlaWdodCksIGFwcGx5VGV4dEluZGVudCk7CiAgICAgfQogCi0gICAgdmlydHVh bCBFVGV4dEFsaWduIHRleHRBbGlnbm1lbnRGb3JMaW5lKGJvb2wgZW5kc1dpdGhTb2Z0QnJlYWsp IGNvbnN0OwotICAgIHZpcnR1YWwgdm9pZCBhZGp1c3RJbmxpbmVEaXJlY3Rpb25MaW5lQm91bmRz KGludCAvKiBleHBhbnNpb25PcHBvcnR1bml0eUNvdW50ICovLCBmbG9hdCYgLyogbG9naWNhbExl ZnQgKi8sIGZsb2F0JiAvKiBsb2dpY2FsV2lkdGggKi8pIGNvbnN0IHsgfQotCiAgICAgdmlydHVh bCBib29sIG5vZGVBdFBvaW50KGNvbnN0IEhpdFRlc3RSZXF1ZXN0JiwgSGl0VGVzdFJlc3VsdCYs IGNvbnN0IEhpdFRlc3RMb2NhdGlvbiYgbG9jYXRpb25JbkNvbnRhaW5lciwgY29uc3QgTGF5b3V0 UG9pbnQmIGFjY3VtdWxhdGVkT2Zmc2V0LCBIaXRUZXN0QWN0aW9uKSBPVkVSUklERTsKIAogICAg IHZpcnR1YWwgdm9pZCBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhMYXlvdXRVbml0JiBt aW5Mb2dpY2FsV2lkdGgsIExheW91dFVuaXQmIG1heExvZ2ljYWxXaWR0aCkgY29uc3QgT1ZFUlJJ REU7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5oCShy ZXZpc2lvbiAxNjEzMTUpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tG bG93LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ3NSw2ICs0NzUsMTAgQEAgcHVibGljOgogICAgIHN0 YXRpYyB2b2lkIGFwcGVuZFJ1bnNGb3JPYmplY3QoQmlkaVJ1bkxpc3Q8QmlkaVJ1bj4mLCBpbnQg c3RhcnQsIGludCBlbmQsIFJlbmRlck9iamVjdCosIElubGluZUJpZGlSZXNvbHZlciYpOwogICAg IFJvb3RJbmxpbmVCb3gqIGNyZWF0ZUFuZEFwcGVuZFJvb3RJbmxpbmVCb3goKTsKIAorICAgIExh eW91dFVuaXQgc3RhcnRBbGlnbmVkT2Zmc2V0Rm9yTGluZShMYXlvdXRVbml0IHBvc2l0aW9uLCBi b29sIHNob3VsZEluZGVudFRleHQpOworICAgIHZpcnR1YWwgRVRleHRBbGlnbiB0ZXh0QWxpZ25t ZW50Rm9yTGluZShib29sIGVuZHNXaXRoU29mdEJyZWFrKSBjb25zdDsKKyAgICB2aXJ0dWFsIHZv aWQgYWRqdXN0SW5saW5lRGlyZWN0aW9uTGluZUJvdW5kcyhpbnQgLyogZXhwYW5zaW9uT3Bwb3J0 dW5pdHlDb3VudCAqLywgZmxvYXQmIC8qIGxvZ2ljYWxMZWZ0ICovLCBmbG9hdCYgLyogbG9naWNh bFdpZHRoICovKSBjb25zdCB7IH0KKwogcHJpdmF0ZToKICAgICB2b2lkIGxheW91dExpbmVCb3hl cyhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIExheW91dFVuaXQmIHJlcGFpbnRMb2dpY2FsVG9wLCBM YXlvdXRVbml0JiByZXBhaW50TG9naWNhbEJvdHRvbSk7CiAgICAgdm9pZCBsYXlvdXRTaW1wbGVM aW5lcyhMYXlvdXRVbml0JiByZXBhaW50TG9naWNhbFRvcCwgTGF5b3V0VW5pdCYgcmVwYWludExv Z2ljYWxCb3R0b20pOwpAQCAtNTE1LDYgKzUxOSw3IEBAIHByaXZhdGU6CiAgICAgLy8gcmVnaW9u L3BhZ2UvY29sdW1uIHRoYXQgaGFzIGEgZGlmZmVyZW50IGF2YWlsYWJsZSBsaW5lIHdpZHRoIHRo YW4gdGhlIG9sZCBvbmUuIFVzZWQgdG8ga25vdyB3aGVuIHlvdSBoYXZlIHRvIGRpcnR5IGEKICAg ICAvLyBsaW5lLCBpLmUuLCB0aGF0IGl0IGNhbid0IGJlIHJlLXVzZWQuCiAgICAgYm9vbCBsaW5l V2lkdGhGb3JQYWdpbmF0ZWRMaW5lQ2hhbmdlZChSb290SW5saW5lQm94KiwgTGF5b3V0VW5pdCBs aW5lRGVsdGEsIFJlbmRlckZsb3dUaHJlYWQqKSBjb25zdDsKKyAgICB2b2lkIHVwZGF0ZUxvZ2lj YWxXaWR0aEZvckFsaWdubWVudChjb25zdCBFVGV4dEFsaWduJiwgQmlkaVJ1biogdHJhaWxpbmdT cGFjZVJ1biwgZmxvYXQmIGxvZ2ljYWxMZWZ0LCBmbG9hdCYgdG90YWxMb2dpY2FsV2lkdGgsIGZs b2F0JiBhdmFpbGFibGVMb2dpY2FsV2lkdGgsIGludCBleHBhbnNpb25PcHBvcnR1bml0eUNvdW50 KTsKIAogLy8gRU5EIE1FVEhPRFMgREVGSU5FRCBJTiBSZW5kZXJCbG9ja0xpbmVMYXlvdXQKIApJ bmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxh eW91dC5jcHAJKHJldmlzaW9uIDE2MTMxNSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNTIsNyArMzUyLDcg QEAgUm9vdElubGluZUJveCogUmVuZGVyQmxvY2tGbG93Ojpjb25zdHJ1YwogICAgIHJldHVybiBs YXN0Um9vdEJveCgpOwogfQogCi1FVGV4dEFsaWduIFJlbmRlckJsb2NrOjp0ZXh0QWxpZ25tZW50 Rm9yTGluZShib29sIGVuZHNXaXRoU29mdEJyZWFrKSBjb25zdAorRVRleHRBbGlnbiBSZW5kZXJC bG9ja0Zsb3c6OnRleHRBbGlnbm1lbnRGb3JMaW5lKGJvb2wgZW5kc1dpdGhTb2Z0QnJlYWspIGNv bnN0CiB7CiAgICAgRVRleHRBbGlnbiBhbGlnbm1lbnQgPSBzdHlsZSgpLnRleHRBbGlnbigpOwog ICAgIGlmICghZW5kc1dpdGhTb2Z0QnJlYWsgJiYgYWxpZ25tZW50ID09IEpVU1RJRlkpCkBAIC01 NDgsNyArNTQ4LDcgQEAgc3RhdGljIGlubGluZSB2b2lkIGNvbXB1dGVFeHBhbnNpb25Gb3JKdQog ICAgIH0KIH0KIAotdm9pZCBSZW5kZXJCbG9jazo6dXBkYXRlTG9naWNhbFdpZHRoRm9yQWxpZ25t ZW50KGNvbnN0IEVUZXh0QWxpZ24mIHRleHRBbGlnbiwgQmlkaVJ1biogdHJhaWxpbmdTcGFjZVJ1 biwgZmxvYXQmIGxvZ2ljYWxMZWZ0LCBmbG9hdCYgdG90YWxMb2dpY2FsV2lkdGgsIGZsb2F0JiBh dmFpbGFibGVMb2dpY2FsV2lkdGgsIGludCBleHBhbnNpb25PcHBvcnR1bml0eUNvdW50KQordm9p ZCBSZW5kZXJCbG9ja0Zsb3c6OnVwZGF0ZUxvZ2ljYWxXaWR0aEZvckFsaWdubWVudChjb25zdCBF VGV4dEFsaWduJiB0ZXh0QWxpZ24sIEJpZGlSdW4qIHRyYWlsaW5nU3BhY2VSdW4sIGZsb2F0JiBs b2dpY2FsTGVmdCwgZmxvYXQmIHRvdGFsTG9naWNhbFdpZHRoLCBmbG9hdCYgYXZhaWxhYmxlTG9n aWNhbFdpZHRoLCBpbnQgZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudCkKIHsKICAgICAvLyBBcm1l ZCB3aXRoIHRoZSB0b3RhbCB3aWR0aCBvZiB0aGUgbGluZSAod2l0aG91dCBqdXN0aWZpY2F0aW9u KSwKICAgICAvLyB3ZSBub3cgZXhhbWluZSBvdXIgdGV4dC1hbGlnbiBwcm9wZXJ0eSBpbiBvcmRl ciB0byBkZXRlcm1pbmUgd2hlcmUgdG8gcG9zaXRpb24gdGhlCkBAIC0yMTI4LDcgKzIxMjgsNyBA QCBib29sIFJlbmRlckJsb2NrRmxvdzo6cG9zaXRpb25OZXdGbG9hdE9uCiAgICAgcmV0dXJuIHRy dWU7CiB9CiAKLUxheW91dFVuaXQgUmVuZGVyQmxvY2s6OnN0YXJ0QWxpZ25lZE9mZnNldEZvckxp bmUoTGF5b3V0VW5pdCBwb3NpdGlvbiwgYm9vbCBmaXJzdExpbmUpCitMYXlvdXRVbml0IFJlbmRl ckJsb2NrRmxvdzo6c3RhcnRBbGlnbmVkT2Zmc2V0Rm9yTGluZShMYXlvdXRVbml0IHBvc2l0aW9u LCBib29sIGZpcnN0TGluZSkKIHsKICAgICBFVGV4dEFsaWduIHRleHRBbGlnbiA9IHN0eWxlKCku dGV4dEFsaWduKCk7CiAK