67165 2011-08-29 16:35:33 -0700 refactor and cleanup RenderFlexibleBox 2011-08-30 15:32:54 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tony tony hyatt ojan webkit.review.bot oldest_to_newest 458548 0 tony 2011-08-29 16:35:33 -0700 refactor and cleanup RenderFlexibleBox 458553 1 105541 tony 2011-08-29 16:37:40 -0700 Created attachment 105541 Patch 459266 2 105541 webkit.review.bot 2011-08-30 15:32:50 -0700 Comment on attachment 105541 Patch Clearing flags on attachment: 105541 Committed r94117: <http://trac.webkit.org/changeset/94117> 459267 3 webkit.review.bot 2011-08-30 15:32:54 -0700 All reviewed patches have been landed. Closing bug. 105541 2011-08-29 16:37:40 -0700 2011-08-30 15:32:50 -0700 Patch bug-67165-20110829163638.patch text/plain 6491 tony U3VidmVyc2lvbiBSZXZpc2lvbjogOTQwMjgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0YzhlODMxMDQ0ZWYzYjNk OThjOGRkZmZmZTE5M2I1MTc4OTBmNDc4Li5lMTVjNjcxNDkxNThiN2UyMzU5MmUyNDhmOThlYjAx NDUyYzNkN2JhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDgtMjkgIFRvbnkg Q2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICByZWZhY3RvciBhbmQgY2xlYW51 cCBSZW5kZXJGbGV4aWJsZUJveAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NjcxNjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBObyBuZXcgdGVzdHMsIGp1c3QgcmVmYWN0b3JpbmcgY29kZS4KKworICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJGbGV4aWJsZUJveDo6bGF5b3V0SG9yaXpvbnRhbEJsb2NrKToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckZsZXhpYmxlQm94OjpydW5GcmVlU3BhY2VBbGxvY2F0aW9uQWxnb3JpdGhtSG9y aXpvbnRhbCk6IE1ha2UgY2hpbGRTaXplcyBhIHBhcmFtIHNvIHdlIGNhbiBwYXNzIHRoZSByZXN1 bHRzIHRvIGxheW91dEFuZFBsYWNlQ2hpbGRyZW5Ib3Jpem9udGFsLgorICAgICAgICAoV2ViQ29y ZTo6aGFzUGFja2luZ1NwYWNlKTogTW92ZSBjbG9zZXIgdG8gd2hlcmUgaXQncyB1c2VkLgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmxheW91dEFuZFBsYWNlQ2hpbGRyZW5I b3Jpem9udGFsKToKKyAgICAgICAgICAgIFB1bGwgdGhpcyBjb2RlIG91dCBpbnRvIGl0cyBvd24g ZnVuY3Rpb24gYmVjYXVzZSBpdCdzIG5vdCBwYXJ0IG9mIHJ1bm5pbmcgdGhlIGZyZWUgc3BhY2Ug YWxsb2NhdGlvbiBhbGdvcml0aG0uCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxl Qm94Lmg6CisKIDIwMTEtMDgtMjkgIEpvaG4gQmF1bWFuICA8amJhdW1hbkBjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgU3BlZWQgdXAgdGV4SW1hZ2UgZnJvbSBCR1JBCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAppbmRleCBmOGY3ZWE2ZDAzOThiOWZk M2I4NjZkZDliOGZjYTUyMWY1ZjAzOWM4Li44ZmNhNTFhZTBiODUwZjM4NzhlOTQwM2ViMWE0Mzg3 YjE3M2I5MDkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxl eGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJs ZUJveC5jcHAKQEAgLTEzMywxMSArMTMzLDE0IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6Omxh eW91dEhvcml6b250YWxCbG9jayhib29sIHJlbGF5b3V0Q2hpbGRyZW4pCiAgICAgTGF5b3V0VW5p dCBhdmFpbGFibGVGcmVlU3BhY2UgPSBjb250ZW50V2lkdGgoKSAtIHByZWZlcnJlZFNpemU7CiAK ICAgICBJbmZsZXhpYmxlRmxleEl0ZW1TaXplIGluZmxleGlibGVJdGVtczsKLSAgICB3aGlsZSAo IXJ1bkZyZWVTcGFjZUFsbG9jYXRpb25BbGdvcml0aG1Ib3Jpem9udGFsKGF2YWlsYWJsZUZyZWVT cGFjZSwgdG90YWxQb3NpdGl2ZUZsZXhpYmlsaXR5LCB0b3RhbE5lZ2F0aXZlRmxleGliaWxpdHks IGluZmxleGlibGVJdGVtcykpIHsKKyAgICBXVEY6OlZlY3RvcjxMYXlvdXRVbml0PiBjaGlsZFNp emVzOworICAgIHdoaWxlICghcnVuRnJlZVNwYWNlQWxsb2NhdGlvbkFsZ29yaXRobUhvcml6b250 YWwoYXZhaWxhYmxlRnJlZVNwYWNlLCB0b3RhbFBvc2l0aXZlRmxleGliaWxpdHksIHRvdGFsTmVn YXRpdmVGbGV4aWJpbGl0eSwgaW5mbGV4aWJsZUl0ZW1zLCBjaGlsZFNpemVzKSkgewogICAgICAg ICBBU1NFUlQodG90YWxQb3NpdGl2ZUZsZXhpYmlsaXR5ID49IDAgJiYgdG90YWxOZWdhdGl2ZUZs ZXhpYmlsaXR5ID49IDApOwogICAgICAgICBBU1NFUlQoaW5mbGV4aWJsZUl0ZW1zLnNpemUoKSA+ IDApOwogICAgIH0KIAorICAgIGxheW91dEFuZFBsYWNlQ2hpbGRyZW5Ib3Jpem9udGFsKGNoaWxk U2l6ZXMsIGF2YWlsYWJsZUZyZWVTcGFjZSwgdG90YWxQb3NpdGl2ZUZsZXhpYmlsaXR5KTsKKwog ICAgIC8vIEZJWE1FOiBIYW5kbGUgZGlzdHJpYnV0aW9uIG9mIHZlcnRpY2FsIHNwYWNlICh0aGly ZCBkaXN0cmlidXRpb24gcm91bmQpLgogfQogCkBAIC0xODAsMTkgKzE4MywxNCBAQCB2b2lkIFJl bmRlckZsZXhpYmxlQm94Ojpjb21wdXRlUHJlZmVycmVkU2l6ZUhvcml6b250YWwoYm9vbCByZWxh eW91dENoaWxkcmVuLCBGbAogICAgIH0KIH0KIAotc3RhdGljIGJvb2wgaGFzUGFja2luZ1NwYWNl KExheW91dFVuaXQgYXZhaWxhYmxlRnJlZVNwYWNlLCBmbG9hdCB0b3RhbFBvc2l0aXZlRmxleGli aWxpdHkpCi17Ci0gICAgcmV0dXJuIGF2YWlsYWJsZUZyZWVTcGFjZSA+IDAgJiYgIXRvdGFsUG9z aXRpdmVGbGV4aWJpbGl0eTsKLX0KLQogLy8gUmV0dXJucyB0cnVlIGlmIHdlIHN1Y2Nlc3NmdWxs eSByYW4gdGhlIGFsZ29yaXRobSBhbmQgc2l6ZWQgdGhlIGZsZXggaXRlbXMuCi1ib29sIFJlbmRl ckZsZXhpYmxlQm94OjpydW5GcmVlU3BhY2VBbGxvY2F0aW9uQWxnb3JpdGhtSG9yaXpvbnRhbChM YXlvdXRVbml0JiBhdmFpbGFibGVGcmVlU3BhY2UsIGZsb2F0JiB0b3RhbFBvc2l0aXZlRmxleGli aWxpdHksIGZsb2F0JiB0b3RhbE5lZ2F0aXZlRmxleGliaWxpdHksIEluZmxleGlibGVGbGV4SXRl bVNpemUmIGluZmxleGlibGVJdGVtcykKK2Jvb2wgUmVuZGVyRmxleGlibGVCb3g6OnJ1bkZyZWVT cGFjZUFsbG9jYXRpb25BbGdvcml0aG1Ib3Jpem9udGFsKExheW91dFVuaXQmIGF2YWlsYWJsZUZy ZWVTcGFjZSwgZmxvYXQmIHRvdGFsUG9zaXRpdmVGbGV4aWJpbGl0eSwgZmxvYXQmIHRvdGFsTmVn YXRpdmVGbGV4aWJpbGl0eSwgSW5mbGV4aWJsZUZsZXhJdGVtU2l6ZSYgaW5mbGV4aWJsZUl0ZW1z LCBXVEY6OlZlY3RvcjxMYXlvdXRVbml0PiYgY2hpbGRTaXplcykKIHsKICAgICBGbGV4aWJsZUJv eEl0ZXJhdG9yIGl0ZXJhdG9yKHRoaXMpOworICAgIGNoaWxkU2l6ZXMuY2xlYXIoKTsKIAogICAg IC8vIEZJWE1FOiBIYW5kbGUgdmVydGljYWwgd3JpdGluZyBtb2RlcyB3aXRoIGhvcml6b250YWwg ZmxleGluZy4KICAgICBMYXlvdXRVbml0IGZsZXhib3hBdmFpbGFibGVMb2dpY2FsV2lkdGggPSBh dmFpbGFibGVMb2dpY2FsV2lkdGgoKTsKLSAgICBXVEY6OlZlY3RvcjxMYXlvdXRVbml0PiBjaGls ZFNpemVzOwogICAgIGZvciAoUmVuZGVyQm94KiBjaGlsZCA9IGl0ZXJhdG9yLmZpcnN0KCk7IGNo aWxkOyBjaGlsZCA9IGl0ZXJhdG9yLm5leHQoKSkgewogICAgICAgICBMYXlvdXRVbml0IGNoaWxk UHJlZmVycmVkU2l6ZTsKICAgICAgICAgaWYgKGluZmxleGlibGVJdGVtcy5jb250YWlucyhjaGls ZCkpCkBAIC0yMjcsNyArMjI1LDE3IEBAIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6OnJ1bkZyZWVT cGFjZUFsbG9jYXRpb25BbGdvcml0aG1Ib3Jpem9udGFsKExheW91dFVuaXQmIGF2CiAgICAgICAg IH0KICAgICAgICAgY2hpbGRTaXplcy5hcHBlbmQoY2hpbGRQcmVmZXJyZWRTaXplKTsKICAgICB9 CisgICAgcmV0dXJuIHRydWU7Cit9CiAKK3N0YXRpYyBib29sIGhhc1BhY2tpbmdTcGFjZShMYXlv dXRVbml0IGF2YWlsYWJsZUZyZWVTcGFjZSwgZmxvYXQgdG90YWxQb3NpdGl2ZUZsZXhpYmlsaXR5 KQoreworICAgIHJldHVybiBhdmFpbGFibGVGcmVlU3BhY2UgPiAwICYmICF0b3RhbFBvc2l0aXZl RmxleGliaWxpdHk7Cit9CisKK3ZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEFuZFBsYWNl Q2hpbGRyZW5Ib3Jpem9udGFsKGNvbnN0IFdURjo6VmVjdG9yPExheW91dFVuaXQ+JiBjaGlsZFNp emVzLCBMYXlvdXRVbml0IGF2YWlsYWJsZUZyZWVTcGFjZSwgZmxvYXQgdG90YWxQb3NpdGl2ZUZs ZXhpYmlsaXR5KQoreworICAgIEZsZXhpYmxlQm94SXRlcmF0b3IgaXRlcmF0b3IodGhpcyk7CiAg ICAgLy8gTm93IHRoYXQgd2Uga25vdyB0aGUgc2l6ZXMsIGxheW91dCBhbmQgcG9zaXRpb24gdGhl IGZsZXggaXRlbXMuCiAgICAgTGF5b3V0VW5pdCB4T2Zmc2V0ID0gYm9yZGVyTGVmdCgpICsgcGFk ZGluZ0xlZnQoKTsKIApAQCAtMjQyLDggKzI1MCw3IEBAIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6 OnJ1bkZyZWVTcGFjZUFsbG9jYXRpb25BbGdvcml0aG1Ib3Jpem9udGFsKExheW91dFVuaXQmIGF2 CiAgICAgc2V0SGVpZ2h0KDApOwogICAgIHNpemVfdCBpID0gMDsKICAgICBmb3IgKFJlbmRlckJv eCogY2hpbGQgPSBpdGVyYXRvci5maXJzdCgpOyBjaGlsZDsgY2hpbGQgPSBpdGVyYXRvci5uZXh0 KCksICsraSkgewotICAgICAgICBMYXlvdXRVbml0IGNoaWxkUHJlZmVycmVkU2l6ZSA9IGNoaWxk U2l6ZXNbaV07Ci0gICAgICAgIGNoaWxkUHJlZmVycmVkU2l6ZSArPSBjaGlsZC0+Ym9yZGVyTGVm dCgpICsgY2hpbGQtPmJvcmRlclJpZ2h0KCkgKyBjaGlsZC0+cGFkZGluZ0xlZnQoKSArIGNoaWxk LT5wYWRkaW5nUmlnaHQoKTsKKyAgICAgICAgTGF5b3V0VW5pdCBjaGlsZFByZWZlcnJlZFNpemUg PSBjaGlsZC0+Ym9yZGVyTGVmdCgpICsgY2hpbGQtPnBhZGRpbmdMZWZ0KCkgKyBjaGlsZFNpemVz W2ldICsgY2hpbGQtPnBhZGRpbmdSaWdodCgpICsgY2hpbGQtPmJvcmRlclJpZ2h0KCk7CiAgICAg ICAgIC8vIEZJWE1FOiBIYW5kbGUgdmVydGljYWwgd3JpdGluZyBtb2RlcyB3aXRoIGhvcml6b250 YWwgZmxleGluZy4KICAgICAgICAgY2hpbGQtPnNldE92ZXJyaWRlU2l6ZShMYXlvdXRTaXplKGNo aWxkUHJlZmVycmVkU2l6ZSwgMCkpOwogICAgICAgICBjaGlsZC0+c2V0Q2hpbGROZWVkc0xheW91 dCh0cnVlKTsKQEAgLTI2Myw3ICsyNzAsNiBAQCBib29sIFJlbmRlckZsZXhpYmxlQm94OjpydW5G cmVlU3BhY2VBbGxvY2F0aW9uQWxnb3JpdGhtSG9yaXpvbnRhbChMYXlvdXRVbml0JiBhdgogICAg ICAgICBpZiAoaGFzUGFja2luZ1NwYWNlKGF2YWlsYWJsZUZyZWVTcGFjZSwgdG90YWxQb3NpdGl2 ZUZsZXhpYmlsaXR5KSAmJiBzdHlsZSgpLT5mbGV4UGFjaygpID09IFBhY2tKdXN0aWZ5ICYmIGNo aWxkU2l6ZXMuc2l6ZSgpID4gMSkKICAgICAgICAgICAgIHhPZmZzZXQgKz0gYXZhaWxhYmxlRnJl ZVNwYWNlIC8gKGNoaWxkU2l6ZXMuc2l6ZSgpIC0gMSk7CiAgICAgfQotICAgIHJldHVybiB0cnVl OwogfQogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxl eGlibGVCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5o CmluZGV4IGZjZmI5ZWMzYzI1MTNkOTNjMjEzYTFmMzQwYmYyNmRjZGQ2NjJiZjIuLjM2MTNlMjA2 ZTYxMTMxOTZhNWViMzkyMTA1YTNhZjdjZmE5ZTU2M2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCkBAIC01NSw3ICs1NSw4IEBAIHByaXZhdGU6CiAg ICAgdm9pZCBsYXlvdXRIb3Jpem9udGFsQmxvY2soYm9vbCByZWxheW91dENoaWxkcmVuKTsKIAog ICAgIHZvaWQgY29tcHV0ZVByZWZlcnJlZFNpemVIb3Jpem9udGFsKGJvb2wgcmVsYXlvdXRDaGls ZHJlbiwgRmxleGlibGVCb3hJdGVyYXRvciYsIExheW91dFVuaXQmLCBmbG9hdCYgdG90YWxQb3Np dGl2ZUZsZXhpYmlsaXR5LCBmbG9hdCYgdG90YWxOZWdhdGl2ZUZsZXhpYmlsaXR5KTsKLSAgICBi b29sIHJ1bkZyZWVTcGFjZUFsbG9jYXRpb25BbGdvcml0aG1Ib3Jpem9udGFsKExheW91dFVuaXQm IGF2YWlsYWJsZUZyZWVTcGFjZSwgZmxvYXQmIHRvdGFsUG9zaXRpdmVGbGV4aWJpbGl0eSwgZmxv YXQmIHRvdGFsTmVnYXRpdmVGbGV4aWJpbGl0eSwgSW5mbGV4aWJsZUZsZXhJdGVtU2l6ZSYpOwor ICAgIGJvb2wgcnVuRnJlZVNwYWNlQWxsb2NhdGlvbkFsZ29yaXRobUhvcml6b250YWwoTGF5b3V0 VW5pdCYgYXZhaWxhYmxlRnJlZVNwYWNlLCBmbG9hdCYgdG90YWxQb3NpdGl2ZUZsZXhpYmlsaXR5 LCBmbG9hdCYgdG90YWxOZWdhdGl2ZUZsZXhpYmlsaXR5LCBJbmZsZXhpYmxlRmxleEl0ZW1TaXpl JiwgV1RGOjpWZWN0b3I8TGF5b3V0VW5pdD4mIGNoaWxkU2l6ZXMpOworICAgIHZvaWQgbGF5b3V0 QW5kUGxhY2VDaGlsZHJlbkhvcml6b250YWwoY29uc3QgV1RGOjpWZWN0b3I8TGF5b3V0VW5pdD4m IGNoaWxkU2l6ZXMsIExheW91dFVuaXQgYXZhaWxhYmxlRnJlZVNwYWNlLCBmbG9hdCB0b3RhbFBv c2l0aXZlRmxleGliaWxpdHkpOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo=