52459 2011-01-14 10:48:26 -0800 Refactor some FrameView::syncCompositingState code 2011-01-14 10:53:41 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser simon.fraser oldest_to_newest 334407 0 simon.fraser 2011-01-14 10:48:26 -0800 Refactor some FrameView::syncCompositingState code 334409 1 78961 simon.fraser 2011-01-14 10:50:03 -0800 Created attachment 78961 Patch 334414 2 simon.fraser 2011-01-14 10:53:41 -0800 http://trac.webkit.org/changeset/75803 78961 2011-01-14 10:50:03 -0800 2011-01-14 10:51:22 -0800 Patch bug-52459-20110114105001.patch text/plain 5019 simon.fraser ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwYTY5YTc0Y2FkNjQ3Yjg1NGUxNzA2MWYzYjM2NGVlMzgzNmY1M2ZiLi5j NjQ3YmQzMTk0YTc5NTU5NjdlZmU2M2UxMjBkNzk4OTY2NmU0NmEyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTkgQEAKKzIwMTEtMDEtMTQgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBs ZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg UmVmYWN0b3Igc29tZSBGcmFtZVZpZXc6OnN5bmNDb21wb3NpdGluZ1N0YXRlIGNvZGUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUyNDU5CisKKyAgICAg ICAgUmVmYWN0b3Igc29tZSBjb2RlIGluIEZyYW1lVmlldyByZWxhdGVkIHRvIHN5bmNocm9uaXpp bmcKKyAgICAgICAgY29tcG9zaXRpbmcgbGF5ZXIgc3RhdGUuCisgICAgICAgIAorICAgICAgICAq IHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6c3luY0Nv bXBvc2l0aW5nU3RhdGVGb3JUaGlzRnJhbWUpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3 OjpzeW5jQ29tcG9zaXRpbmdTdGF0ZVJlY3Vyc2l2ZSk6CisgICAgICAgIChXZWJDb3JlOjpGcmFt ZVZpZXc6OnBhaW50Q29udGVudHMpOgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3Lmg6CisKIDIw MTEtMDEtMTQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IE1hcnRpbiBSb2JpbnNvbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3 LmNwcAppbmRleCA3N2UxOTc2MmYxNGI0MDEzMTc2ZTI1N2Q3ODg2ODFiNzVlNzFmOGViLi4yYzQy YWI0ZTFhZjI3ZDZmN2Q5NzRiNTI4MTUwZWRjZWFiMDM2MzIwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFt ZVZpZXcuY3BwCkBAIC01NTQsNiArNTU0LDI4IEBAIHZvaWQgRnJhbWVWaWV3Ojp1cGRhdGVDb21w b3NpdGluZ0xheWVycygpCiAjZW5kaWYKIH0KIAordm9pZCBGcmFtZVZpZXc6OnN5bmNDb21wb3Np dGluZ1N0YXRlRm9yVGhpc0ZyYW1lKCkKK3sKKyAgICBSZW5kZXJWaWV3KiB2aWV3ID0gbV9mcmFt ZS0+Y29udGVudFJlbmRlcmVyKCk7CisgICAgR3JhcGhpY3NMYXllciogcm9vdExheWVyID0gdmll dyA/IHZpZXctPmNvbXBvc2l0b3IoKS0+cm9vdFBsYXRmb3JtTGF5ZXIoKSA6IDA7CisgICAgaWYg KCFyb290TGF5ZXIpCisgICAgICAgIHJldHVybjsKKworICAgIHJvb3RMYXllci0+c3luY0NvbXBv c2l0aW5nU3RhdGUoKTsKKworI2lmIEVOQUJMRShGVUxMU0NSRUVOX0FQSSkKKyAgICAvLyBUaGUg ZnVsbFNjcmVlblJlbmRlcmVyJ3MgZ3JhcGhpY3NMYXllciAgaGFzIGJlZW4gcmUtcGFyZW50ZWQs IGFuZCB0aGUgYWJvdmUgcmVjdXJzaXZlIHN5bmNDb21wb3NpdGluZ1N0YXRlCisgICAgLy8gY2Fs bCB3aWxsIG5vdCBjYXVzZSB0aGUgc3VidHJlZSB1bmRlciBpdCB0byByZXBhaW50LiAgRXhwbGlj aXRseSBjYWxsIHRoZSBzeW5jQ29tcG9zaXRpbmdTdGF0ZSBvbiAKKyAgICAvLyB0aGUgZnVsbFNj cmVlblJlbmRlcmVyJ3MgZ3JhcGhpY3NMYXllciBoZXJlOgorICAgIERvY3VtZW50KiBkb2N1bWVu dCA9IG1fZnJhbWUtPmRvY3VtZW50KCk7CisgICAgaWYgKGlzRG9jdW1lbnRSdW5uaW5nRnVsbFNj cmVlbkFuaW1hdGlvbihkb2N1bWVudCkpIHsKKyAgICAgICAgUmVuZGVyTGF5ZXJCYWNraW5nKiBi YWNraW5nID0gZG9jdW1lbnQtPmZ1bGxTY3JlZW5SZW5kZXJlcigpLT5sYXllcigpLT5iYWNraW5n KCk7CisgICAgICAgIGlmIChHcmFwaGljc0xheWVyKiBmdWxsU2NyZWVuTGF5ZXIgPSBiYWNraW5n LT5ncmFwaGljc0xheWVyKCkpCisgICAgICAgICAgICBmdWxsU2NyZWVuTGF5ZXItPnN5bmNDb21w b3NpdGluZ1N0YXRlKCk7CisgICAgfQorI2VuZGlmICAgIAorfQorCiB2b2lkIEZyYW1lVmlldzo6 c2V0TmVlZHNPbmVTaG90RHJhd2luZ1N5bmNocm9uaXphdGlvbigpCiB7CiAgICAgUGFnZSogcGFn ZSA9IGZyYW1lKCkgPyBmcmFtZSgpLT5wYWdlKCkgOiAwOwpAQCAtNjQzLDIxICs2NjUsOCBAQCBi b29sIEZyYW1lVmlldzo6c3luY0NvbXBvc2l0aW5nU3RhdGVSZWN1cnNpdmUoKQogICAgIGlmIChu ZWVkc0xheW91dCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgCi0gICAgaWYgKEdyYXBo aWNzTGF5ZXIqIHJvb3RMYXllciA9IGNvbnRlbnRSZW5kZXJlci0+Y29tcG9zaXRvcigpLT5yb290 UGxhdGZvcm1MYXllcigpKQotICAgICAgICByb290TGF5ZXItPnN5bmNDb21wb3NpdGluZ1N0YXRl KCk7CisgICAgc3luY0NvbXBvc2l0aW5nU3RhdGVGb3JUaGlzRnJhbWUoKTsKICAgICAKLSNpZiBF TkFCTEUoRlVMTFNDUkVFTl9BUEkpCi0gICAgLy8gVGhlIGZ1bGxTY3JlZW5SZW5kZXJlcidzIGdy YXBoaWNzTGF5ZXIgIGhhcyBiZWVuIHJlLXBhcmVudGVkLCBhbmQgdGhlIGFib3ZlIHJlY3Vyc2l2 ZSBzeW5jQ29tcG9zaXRpbmdTdGF0ZQotICAgIC8vIGNhbGwgd2lsbCBub3QgY2F1c2UgdGhlIHN1 YnRyZWUgdW5kZXIgaXQgdG8gcmVwYWludC4gIEV4cGxpY2l0bHkgY2FsbCB0aGUgc3luY0NvbXBv c2l0aW5nU3RhdGUgb24gCi0gICAgLy8gdGhlIGZ1bGxTY3JlZW5SZW5kZXJlcidzIGdyYXBoaWNz TGF5ZXIgaGVyZToKLSAgICBEb2N1bWVudCogZG9jdW1lbnQgPSBtX2ZyYW1lLT5kb2N1bWVudCgp OwotICAgIGlmIChpc0RvY3VtZW50UnVubmluZ0Z1bGxTY3JlZW5BbmltYXRpb24oZG9jdW1lbnQp KSB7Ci0gICAgICAgIFJlbmRlckxheWVyQmFja2luZyogYmFja2luZyA9IGRvY3VtZW50LT5mdWxs U2NyZWVuUmVuZGVyZXIoKS0+bGF5ZXIoKS0+YmFja2luZygpOwotICAgICAgICBpZiAoR3JhcGhp Y3NMYXllciogZnVsbFNjcmVlbkxheWVyID0gYmFja2luZy0+Z3JhcGhpY3NMYXllcigpKQotICAg ICAgICAgICAgZnVsbFNjcmVlbkxheWVyLT5zeW5jQ29tcG9zaXRpbmdTdGF0ZSgpOwotICAgIH0K LSNlbmRpZiAgICAKLQogICAgIGJvb2wgYWxsU3ViZnJhbWVzU3luY2VkID0gdHJ1ZTsKICAgICBj b25zdCBIYXNoU2V0PFJlZlB0cjxXaWRnZXQ+ID4qIHZpZXdDaGlsZHJlbiA9IGNoaWxkcmVuKCk7 CiAgICAgSGFzaFNldDxSZWZQdHI8V2lkZ2V0PiA+Ojpjb25zdF9pdGVyYXRvciBlbmQgPSB2aWV3 Q2hpbGRyZW4tPmVuZCgpOwpAQCAtMjE1NCwyMCArMjE2Myw4IEBAIHZvaWQgRnJhbWVWaWV3Ojpw YWludENvbnRlbnRzKEdyYXBoaWNzQ29udGV4dCogcCwgY29uc3QgSW50UmVjdCYgcmVjdCkKICAg ICAgICAgcmV0dXJuOwogCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQotICAgIGlm ICghcC0+cGFpbnRpbmdEaXNhYmxlZCgpKSB7Ci0gICAgICAgIGlmIChHcmFwaGljc0xheWVyKiBy b290TGF5ZXIgPSBjb250ZW50UmVuZGVyZXItPmNvbXBvc2l0b3IoKS0+cm9vdFBsYXRmb3JtTGF5 ZXIoKSkKLSAgICAgICAgICAgIHJvb3RMYXllci0+c3luY0NvbXBvc2l0aW5nU3RhdGUoKTsKLSNp ZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkpCi0gICAgICAgIC8vIFRoZSBmdWxsU2NyZWVuUmVuZGVy ZXIncyBncmFwaGljc0xheWVyICBoYXMgYmVlbiByZS1wYXJlbnRlZCwgYW5kIHRoZSBhYm92ZSBy ZWN1cnNpdmUgc3luY0NvbXBvc2l0aW5nU3RhdGUKLSAgICAgICAgLy8gY2FsbCB3aWxsIG5vdCBj YXVzZSB0aGUgc3VidHJlZSB1bmRlciBpdCB0byByZXBhaW50LiAgRXhwbGljaXRseSBjYWxsIHRo ZSBzeW5jQ29tcG9zaXRpbmdTdGF0ZSBvbiAKLSAgICAgICAgLy8gdGhlIGZ1bGxTY3JlZW5SZW5k ZXJlcidzIGdyYXBoaWNzTGF5ZXIgaGVyZToKLSAgICAgICAgaWYgKGlzRG9jdW1lbnRSdW5uaW5n RnVsbFNjcmVlbkFuaW1hdGlvbihkb2N1bWVudCkpIHsKLSAgICAgICAgICAgIFJlbmRlckxheWVy QmFja2luZyogYmFja2luZyA9IGRvY3VtZW50LT5mdWxsU2NyZWVuUmVuZGVyZXIoKS0+bGF5ZXIo KS0+YmFja2luZygpOwotICAgICAgICAgICAgaWYgKEdyYXBoaWNzTGF5ZXIqIGZ1bGxTY3JlZW5M YXllciA9IGJhY2tpbmctPmdyYXBoaWNzTGF5ZXIoKSkKLSAgICAgICAgICAgICAgICBmdWxsU2Ny ZWVuTGF5ZXItPnN5bmNDb21wb3NpdGluZ1N0YXRlKCk7Ci0gICAgICAgIH0KLSNlbmRpZgotICAg IH0KKyAgICBpZiAoIXAtPnBhaW50aW5nRGlzYWJsZWQoKSkKKyAgICAgICAgc3luY0NvbXBvc2l0 aW5nU3RhdGVGb3JUaGlzRnJhbWUoKTsKICNlbmRpZgogCiAgICAgUGFpbnRCZWhhdmlvciBvbGRQ YWludEJlaGF2aW9yID0gbV9wYWludEJlaGF2aW9yOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9GcmFtZVZpZXcuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKaW5k ZXggYTJmNTgxNWI0ZTU1ZTAwMjdiYThiNDJlYmQwNGRlN2YwNThjODc3YS4uNjVhM2E4NTE5ODQ4 MTE1NzcwNjM1NjhjMmYwZWNlMmI1MDBkMGU4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZVZpZXcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCkBA IC05OSw2ICs5OSw3IEBAIHB1YmxpYzoKIAogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElO RykKICAgICB2b2lkIHVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzKCk7CisgICAgdm9pZCBzeW5jQ29t cG9zaXRpbmdTdGF0ZUZvclRoaXNGcmFtZSgpOwogCiAgICAgLy8gQ2FsbGVkIHdoZW4gY2hhbmdl cyB0byB0aGUgR3JhcGhpY3NMYXllciBoaWVyYXJjaHkgaGF2ZSB0byBiZSBzeW5jaHJvbml6ZWQg d2l0aAogICAgIC8vIGNvbnRlbnQgcmVuZGVyZWQgdmlhIHRoZSBub3JtYWwgcGFpbnRpbmcgcGF0 aC4K