85232 2012-04-30 14:20:47 -0700 Put all of TiledCoreAnimationDrawingArea in #if ENABLE(THREADED_SCROLLING) 2012-04-30 14:38:07 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 612945 0 andersca 2012-04-30 14:20:47 -0700 Put all of TiledCoreAnimationDrawingArea in #if ENABLE(THREADED_SCROLLING) 612946 1 139515 andersca 2012-04-30 14:21:27 -0700 Created attachment 139515 Patch 612953 2 139515 sam 2012-04-30 14:28:35 -0700 Comment on attachment 139515 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=139515&action=review > Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp:46 > +#if PLATFORM(MAC) && ENABLE(THREADED_SCROLLING) > + Extra newline. 612966 3 andersca 2012-04-30 14:38:07 -0700 Committed r115671: <http://trac.webkit.org/changeset/115671> 139515 2012-04-30 14:21:27 -0700 2012-04-30 14:28:35 -0700 Patch bug-85232-20120430142316.patch text/plain 6775 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1NjY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDAyMDc4MDM4Y2ViOTY2 YzgyMDA0MWEyMjJmZDhkODQyY2U5NmViNi4uOTU1OTIzMGQ2MzYwOGYwZWIyODZiODFhN2FlYWU3 Mjk4MWY0NDc5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA0LTMwICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUHV0IGFsbCBvZiBU aWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYSBpbiAjaWYgRU5BQkxFKFRIUkVBREVEX1NDUk9M TElORykKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg1 MjMyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3Rv cCBwcmV0ZW5kaW5nIHRoYXQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEgd29ya3Mgd2l0 aG91dCB0aHJlYWRlZCBzY3JvbGxpbmcuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2Uv RHJhd2luZ0FyZWEuY3BwOgorICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJlYTo6Y3JlYXRlKToK KyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdp bmdBcmVhLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmlt YXRpb25EcmF3aW5nQXJlYS5tbToKKyAgICAgICAgKFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9u RHJhd2luZ0FyZWE6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhKToKKyAgICAgICAgKFdl YktpdDo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6On5UaWxlZENvcmVBbmltYXRpb25E cmF3aW5nQXJlYSk6CisgICAgICAgIChXZWJLaXQ6OmRpc3BhdGNoQmFja1RvTWFpblRocmVhZCk6 CisgICAgICAgIChXZWJLaXQ6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpmb3JjZVJl cGFpbnRBc3luYyk6CisgICAgICAgIChXZWJLaXQ6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdB cmVhOjpkaWRJbnN0YWxsUGFnZU92ZXJsYXkpOgorICAgICAgICAoV2ViS2l0OjpUaWxlZENvcmVB bmltYXRpb25EcmF3aW5nQXJlYTo6ZGlkVW5pbnN0YWxsUGFnZU92ZXJsYXkpOgorICAgICAgICAo V2ViS2l0OjpUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6dXBkYXRlUHJlZmVyZW5jZXMp OgorCiAyMDEyLTA0LTMwICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAg ICAgICAgIFZhbGlkYXRlIGtleXByZXNzIGNvbW1hbmQgbmFtZXMKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYS5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEuY3BwCmluZGV4IDg0MWUzNWFiODdi ZDE5MDM1NGNkMjIxZjg5OTJmZDdiMWI2ZGVmNjAuLjUyODkwMTdiYmQ1N2QxMGM1ZGFjNDMzOTRi YWQ0MDQxZTI4ODUwYzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9EcmF3aW5nQXJlYS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL0RyYXdpbmdBcmVhLmNwcApAQCAtMjksNyArMjksNyBAQAogLy8gU3ViY2xhc3NlcwogI2lu Y2x1ZGUgIkRyYXdpbmdBcmVhSW1wbC5oIgogCi0jaWYgUExBVEZPUk0oTUFDKQorI2lmIFBMQVRG T1JNKE1BQykgJiYgRU5BQkxFKFRIUkVBREVEX1NDUk9MTElORykKICNpbmNsdWRlICJUaWxlZENv cmVBbmltYXRpb25EcmF3aW5nQXJlYS5oIgogI2VuZGlmCiAKQEAgLTQyLDcgKzQyLDggQEAgUGFz c093blB0cjxEcmF3aW5nQXJlYT4gRHJhd2luZ0FyZWE6OmNyZWF0ZShXZWJQYWdlKiB3ZWJQYWdl LCBjb25zdCBXZWJQYWdlQ3JlYXQKICAgICBzd2l0Y2ggKHBhcmFtZXRlcnMuZHJhd2luZ0FyZWFU eXBlKSB7CiAgICAgY2FzZSBEcmF3aW5nQXJlYVR5cGVJbXBsOgogICAgICAgICByZXR1cm4gRHJh d2luZ0FyZWFJbXBsOjpjcmVhdGUod2ViUGFnZSwgcGFyYW1ldGVycyk7Ci0jaWYgUExBVEZPUk0o TUFDKQorI2lmIFBMQVRGT1JNKE1BQykgJiYgRU5BQkxFKFRIUkVBREVEX1NDUk9MTElORykKKwog ICAgIGNhc2UgRHJhd2luZ0FyZWFUeXBlVGlsZWRDb3JlQW5pbWF0aW9uOgogICAgICAgICByZXR1 cm4gVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OmNyZWF0ZSh3ZWJQYWdlLCBwYXJhbWV0 ZXJzKTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5oIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5oCmlu ZGV4IDhhNzZkZTI5M2JkZGFhMWU2NTI4YmYwNzAyMjAyMTEzYWUzNThiNjkuLjhlYTcxNTgwMjY5 YzdkN2FmNmUwZjdiZWEwMDcxN2Q0NWRjMzllZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEuaAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1h dGlvbkRyYXdpbmdBcmVhLmgKQEAgLTI2LDYgKzI2LDggQEAKICNpZm5kZWYgVGlsZWRDb3JlQW5p bWF0aW9uRHJhd2luZ0FyZWFfaAogI2RlZmluZSBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJl YV9oCiAKKyNpZiBFTkFCTEUoVEhSRUFERURfU0NST0xMSU5HKQorCiAjaW5jbHVkZSAiRHJhd2lu Z0FyZWEuaCIKICNpbmNsdWRlICJMYXllclRyZWVDb250ZXh0LmgiCiAjaW5jbHVkZSA8V2ViQ29y ZS9HcmFwaGljc0xheWVyQ2xpZW50Lmg+CkBAIC0xMDIsNCArMTA0LDYgQEAgcHJpdmF0ZToKIAog fSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKKyNlbmRpZiAvLyBFTkFCTEUoVEhSRUFERURfU0NST0xM SU5HKQorCiAjZW5kaWYgLy8gVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFfaApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmlt YXRpb25EcmF3aW5nQXJlYS5tbSBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9t YWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KaW5kZXggYzkwYjM2NGNjNGUwZmU1 ODU2N2ZjYmQ5MjFlODU0YTNkYWNjNmE2ZS4uYWM5NGRkMTk0NDRhYWNlNzU0MWM5YmVjZTYyNGJj ZDRiMGI1Yzk0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1t CkBAIC0yNiw2ICsyNiw4IEBACiAjaW1wb3J0ICJjb25maWcuaCIKICNpbXBvcnQgIlRpbGVkQ29y ZUFuaW1hdGlvbkRyYXdpbmdBcmVhLmgiCiAKKyNpZiBFTkFCTEUoVEhSRUFERURfU0NST0xMSU5H KQorCiAjaW1wb3J0ICJEcmF3aW5nQXJlYVByb3h5TWVzc2FnZXMuaCIKICNpbXBvcnQgIkV2ZW50 RGlzcGF0Y2hlci5oIgogI2ltcG9ydCAiTGF5ZXJIb3N0aW5nQ29udGV4dC5oIgpAQCAtNjgsMTIg KzcwLDkgQEAgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OlRpbGVkQ29yZUFuaW1hdGlv bkRyYXdpbmdBcmVhKFdlYlBhZ2UqIHdlYlBhZ2UsIGMKIAogICAgIC8vIEZJWE1FOiBJdCdzIHdl aXJkIHRoYXQgd2UncmUgbXVja2luZyBhcm91bmQgd2l0aCB0aGUgc2V0dGluZ3MgaGVyZS4KICAg ICBwYWdlLT5zZXR0aW5ncygpLT5zZXRGb3JjZUNvbXBvc2l0aW5nTW9kZSh0cnVlKTsKLQotI2lm IEVOQUJMRShUSFJFQURFRF9TQ1JPTExJTkcpCiAgICAgcGFnZS0+c2V0dGluZ3MoKS0+c2V0U2Ny b2xsaW5nQ29vcmRpbmF0b3JFbmFibGVkKHRydWUpOwogCiAgICAgV2ViUHJvY2Vzczo6c2hhcmVk KCkuZXZlbnREaXNwYXRjaGVyKCkuYWRkU2Nyb2xsaW5nVHJlZUZvclBhZ2Uod2ViUGFnZSk7Ci0j ZW5kaWYKIAogICAgIG1fcm9vdExheWVyID0gW0NBTGF5ZXIgbGF5ZXJdOwogCkBAIC05NCw5ICs5 Myw3IEBAIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpUaWxlZENvcmVBbmltYXRpb25E cmF3aW5nQXJlYShXZWJQYWdlKiB3ZWJQYWdlLCBjCiAKIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdp bmdBcmVhOjp+VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEoKQogewotI2lmIEVOQUJMRShU SFJFQURFRF9TQ1JPTExJTkcpCiAgICAgV2ViUHJvY2Vzczo6c2hhcmVkKCkuZXZlbnREaXNwYXRj aGVyKCkucmVtb3ZlU2Nyb2xsaW5nVHJlZUZvclBhZ2UobV93ZWJQYWdlKTsKLSNlbmRpZgogCiAg ICAgbV9sYXllckZsdXNoU2NoZWR1bGVyLmludmFsaWRhdGUoKTsKIH0KQEAgLTEzOCw3ICsxMzUs NiBAQCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpmb3JjZVJlcGFpbnQoKQog ICAgIFtDQVRyYW5zYWN0aW9uIHN5bmNocm9uaXplXTsKIH0KIAotI2lmIEVOQUJMRShUSFJFQURF RF9TQ1JPTExJTkcpCiBzdGF0aWMgdm9pZCBmb3JjZVJlcGFpbnRBbmRTZW5kTWVzc2FnZSh1aW50 NjRfdCB3ZWJQYWdlSUQsIHVpbnQ2NF90IGNhbGxiYWNrSUQpCiB7CiAgICAgV2ViUGFnZSogd2Vi UGFnZSA9IFdlYlByb2Nlc3M6OnNoYXJlZCgpLndlYlBhZ2Uod2ViUGFnZUlEKTsKQEAgLTE1Mywx OSArMTQ5LDE0IEBAIHN0YXRpYyB2b2lkIGRpc3BhdGNoQmFja1RvTWFpblRocmVhZCh1aW50NjRf dCB3ZWJQYWdlSUQsIHVpbnQ2NF90IGNhbGxiYWNrSUQpCiB7CiAgICAgY2FsbE9uTWFpblRocmVh ZChiaW5kKGZvcmNlUmVwYWludEFuZFNlbmRNZXNzYWdlLCB3ZWJQYWdlSUQsIGNhbGxiYWNrSUQp KTsKIH0KLSNlbmRpZgogCiBib29sIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpmb3Jj ZVJlcGFpbnRBc3luYyh1aW50NjRfdCBjYWxsYmFja0lEKQogewotI2lmIEVOQUJMRShUSFJFQURF RF9TQ1JPTExJTkcpCiAgICAgaWYgKG1fbGF5ZXJUcmVlU3RhdGVJc0Zyb3plbikKICAgICAgICAg cmV0dXJuIGZhbHNlOwogCiAgICAgU2Nyb2xsaW5nVGhyZWFkOjpkaXNwYXRjaChiaW5kKGRpc3Bh dGNoQmFja1RvTWFpblRocmVhZCwgbV93ZWJQYWdlLT5wYWdlSUQoKSwgY2FsbGJhY2tJRCkpOwog ICAgIHJldHVybiB0cnVlOwotI2Vsc2UKLSAgICByZXR1cm4gZmFsc2U7Ci0jZW5kaWYKIH0KIAog dm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6c2V0TGF5ZXJUcmVlU3RhdGVJc0Zy b3plbihib29sIGxheWVyVHJlZVN0YXRlSXNGcm96ZW4pCkBAIC0xOTIsOSArMTgzLDcgQEAgdm9p ZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6c2NoZWR1bGVDb21wb3NpdGluZ0xheWVy U3luYygpCiAKIHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OmRpZEluc3RhbGxQ YWdlT3ZlcmxheSgpCiB7Ci0jaWYgRU5BQkxFKFRIUkVBREVEX1NDUk9MTElORykKICAgICBtX3dl YlBhZ2UtPmNvcmVQYWdlKCktPnNjcm9sbGluZ0Nvb3JkaW5hdG9yKCktPnNldEZvcmNlTWFpblRo cmVhZFNjcm9sbExheWVyUG9zaXRpb25VcGRhdGVzKHRydWUpOwotI2VuZGlmCiAKICAgICBjcmVh dGVQYWdlT3ZlcmxheUxheWVyKCk7CiAgICAgc2NoZWR1bGVDb21wb3NpdGluZ0xheWVyU3luYygp OwpAQCAtMjAyLDEwICsxOTEsOCBAQCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVh OjpkaWRJbnN0YWxsUGFnZU92ZXJsYXkoKQogCiB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdp bmdBcmVhOjpkaWRVbmluc3RhbGxQYWdlT3ZlcmxheSgpCiB7Ci0jaWYgRU5BQkxFKFRIUkVBREVE X1NDUk9MTElORykKICAgICBpZiAoUGFnZSogcGFnZSA9IG1fd2ViUGFnZS0+Y29yZVBhZ2UoKSkK ICAgICAgICAgcGFnZS0+c2Nyb2xsaW5nQ29vcmRpbmF0b3IoKS0+c2V0Rm9yY2VNYWluVGhyZWFk U2Nyb2xsTGF5ZXJQb3NpdGlvblVwZGF0ZXMoZmFsc2UpOwotI2VuZGlmCiAKICAgICBkZXN0cm95 UGFnZU92ZXJsYXlMYXllcigpOwogICAgIHNjaGVkdWxlQ29tcG9zaXRpbmdMYXllclN5bmMoKTsK QEAgLTIzMyw5ICsyMjAsNyBAQCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjp1 cGRhdGVQcmVmZXJlbmNlcygpCiAgICAgICAgIG1fZGVidWdJbmZvTGF5ZXIgPSBudWxscHRyOwog ICAgIH0KIAotI2lmIEVOQUJMRShUSFJFQURFRF9TQ1JPTExJTkcpCiAgICAgU2Nyb2xsaW5nVGhy ZWFkOjpkaXNwYXRjaChiaW5kKCZTY3JvbGxpbmdUcmVlOjpzZXREZWJ1Z1Jvb3RMYXllciwgbV93 ZWJQYWdlLT5jb3JlUGFnZSgpLT5zY3JvbGxpbmdDb29yZGluYXRvcigpLT5zY3JvbGxpbmdUcmVl KCksIG1fZGVidWdJbmZvTGF5ZXIpKTsKLSNlbmRpZgogfQogCiB2b2lkIFRpbGVkQ29yZUFuaW1h dGlvbkRyYXdpbmdBcmVhOjpub3RpZnlBbmltYXRpb25TdGFydGVkKGNvbnN0IEdyYXBoaWNzTGF5 ZXIqLCBkb3VibGUpCkBAIC00MDQsMyArMzg5LDUgQEAgdm9pZCBUaWxlZENvcmVBbmltYXRpb25E cmF3aW5nQXJlYTo6ZGVzdHJveVBhZ2VPdmVybGF5TGF5ZXIoKQogfQogCiB9IC8vIG5hbWVzcGFj ZSBXZWJLaXQKKworI2VuZGlmIC8vIEVOQUJMRShUSFJFQURFRF9TQ1JPTExJTkcpCg==