104819 2012-12-12 09:01:38 -0800 [GTK][AC][Clutter] The non-composited content is not painted 2013-01-14 10:46:28 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 105699 1 joone joone alex gustavo mrobinson webkit.review.bot oldest_to_newest 789610 0 joone 2012-12-12 09:01:38 -0800 When Accelerated Compositing is enabled, GraphicsLayers are only painted. 789644 1 179071 joone 2012-12-12 09:51:27 -0800 Created attachment 179071 Patch 789663 2 179071 gustavo 2012-12-12 10:14:49 -0800 Comment on attachment 179071 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=179071&action=review > Source/WebKit/gtk/ChangeLog:8 > + When Accelerated Compositing is enabled, GraphicsLayers are only painted. "only GraphicsLayers are painted" > Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContext.h:80 > - WebCore::GraphicsLayer* m_rootGraphicsLayer; > GtkWidget* m_rootLayerEmbedder; > + OwnPtr<WebCore::GraphicsLayer> m_rootLayer; > + OwnPtr<WebCore::GraphicsLayer> m_nonCompositedContentLayer; I'd like to take this m_rootLayer declaration out of the if/elifs if possible, since all implementations use this. But this can be done in another patch and we can grab feedback from mrobinson for that, too. 789675 3 179077 joone 2012-12-12 10:27:24 -0800 Created attachment 179077 Patch 789695 4 179077 webkit.review.bot 2012-12-12 10:45:29 -0800 Comment on attachment 179077 Patch Clearing flags on attachment: 179077 Committed r137483: <http://trac.webkit.org/changeset/137483> 179071 2012-12-12 09:51:27 -0800 2013-01-14 10:46:28 -0800 Patch bug-104819-20121212184830.patch text/plain 11015 joone U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3MDk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggNTJkNTI5YThh YjgyMGNhNjQ0NjU3MmM0ODRlMzUyNzNmZjExN2RkNS4uODM2OGQ0NGU5MDEwNTZkOWFiZGRkYjE5 N2JhNDM1YTliOTZmN2FhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEy LTEyLTEyICBKb29uZSBIdXIgIDxqb29uZS5odXJAaW50ZWwuY29tPgorCisgICAgICAgIFtHVEtd W0FDXSBUaGUgbm9uLWNvbXBvc2l0ZWQgY29udGVudCBpcyBub3QgcGFpbnRlZAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA0ODE5CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBBY2NlbGVyYXRlZCBD b21wb3NpdGluZyBpcyBlbmFibGVkLCBHcmFwaGljc0xheWVycyBhcmUgb25seSBwYWludGVkLgor ICAgICAgICBUaGlzIHBhdGNoIGFsbG93cyB0byBwYWludCB0aGUgbm9uLWNvbXBvc2l0ZWQgY29u dGVudCBvbiB0aGUgdmlld3BvcnQgd2l0aCAKKyAgICAgICAgR3JhcGhpY3NMYXllcnMuIE1vc3Qg b2YgdGhlIGNvZGVzIGFyZSB0aGUgc2FtZSBhcyBBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4 dEdMLmNwcAorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvQWNjZWxlcmF0ZWRDb21wb3NpdGlu Z0NvbnRleHQuaDogQWRkIG1fbm9uQ29tcG9zaXRlZENvbnRlbnRMYXllci4KKyAgICAgICAgKiBX ZWJDb3JlU3VwcG9ydC9BY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dENsdXR0ZXIuY3BwOgor ICAgICAgICAoV2ViS2l0OjpBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6QWNjZWxlcmF0 ZWRDb21wb3NpdGluZ0NvbnRleHQpOgorICAgICAgICAoV2ViS2l0OjpBY2NlbGVyYXRlZENvbXBv c2l0aW5nQ29udGV4dDo6aW5pdGlhbGl6ZSk6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAo V2ViS2l0OjpBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6fkFjY2VsZXJhdGVkQ29tcG9z aXRpbmdDb250ZXh0KToKKyAgICAgICAgKFdlYktpdDo6QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0Nv bnRleHQ6OnJlbmRlckxheWVyc1RvV2luZG93KToKKyAgICAgICAgKFdlYktpdDo6QWNjZWxlcmF0 ZWRDb21wb3NpdGluZ0NvbnRleHQ6OnNldFJvb3RDb21wb3NpdGluZ0xheWVyKToKKyAgICAgICAg KFdlYktpdDo6QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OnNldE5vbkNvbXBvc2l0ZWRD b250ZW50c05lZWREaXNwbGF5KToKKyAgICAgICAgKFdlYktpdDo6QWNjZWxlcmF0ZWRDb21wb3Np dGluZ0NvbnRleHQ6OnJlc2l6ZVJvb3RMYXllcik6CisgICAgICAgIChXZWJLaXQ6OkFjY2VsZXJh dGVkQ29tcG9zaXRpbmdDb250ZXh0OjpzY3JvbGxOb25Db21wb3NpdGVkQ29udGVudHMpOiBNYWtl IHRoZSBub24tY29tcG9zaXRlZCAKKyAgICAgICAgY29udGVudCBzY3JvbGwuCisgICAgICAgIChX ZWJLaXQ6OkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0OjpsYXllckZsdXNoVGltZXJGaXJl ZENhbGxiYWNrKToKKyAgICAgICAgKFdlYktpdDo6QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRl eHQ6OmZsdXNoUGVuZGluZ0xheWVyQ2hhbmdlcyk6CisgICAgICAgIChXZWJLaXQ6OkFjY2VsZXJh dGVkQ29tcG9zaXRpbmdDb250ZXh0OjpmbHVzaEFuZFJlbmRlckxheWVycyk6CisgICAgICAgIChX ZWJLaXQ6OkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0Ojpub3RpZnlBbmltYXRpb25TdGFy dGVkKToKKyAgICAgICAgKFdlYktpdDo6QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OnBh aW50Q29udGVudHMpOiBQYWludCB0aGUgbm9uLWNvbXBvc2l0ZWQgY29udGVudC4KKwogMjAxMi0x Mi0xMSAgSm9vbmUgSHVyICA8am9vbmUuaHVyQGludGVsLmNvbT4KIAogICAgICAgICBbR1RLXVtB Q10gR3JhcGhpY3NMYXllcnMgYXJlIG5vdCBzaG93biBvbiB0aGUgdmlld3BvcnQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0FjY2VsZXJhdGVkQ29tcG9zaXRp bmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9BY2NlbGVyYXRl ZENvbXBvc2l0aW5nQ29udGV4dC5oCmluZGV4IGFkMzU2ODUwNzc4N2VjZTgwZDE2MGE5MmFlNGY4 NjdjOWVlOGRkMjcuLmIwZjk3NDM0ZGI4ODQ2MTY4ZWI0Njc0MzAwOTAxZmMyMjU0MDIyYWEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0FjY2VsZXJhdGVkQ29t cG9zaXRpbmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQv QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQuaApAQCAtNzUsOCArNzUsMTAgQEAgcHJpdmF0 ZToKICAgICB1bnNpZ25lZCBpbnQgbV9sYXllckZsdXNoVGltZXJDYWxsYmFja0lkOwogCiAjaWYg VVNFKENMVVRURVIpCi0gICAgV2ViQ29yZTo6R3JhcGhpY3NMYXllciogbV9yb290R3JhcGhpY3NM YXllcjsKICAgICBHdGtXaWRnZXQqIG1fcm9vdExheWVyRW1iZWRkZXI7CisgICAgT3duUHRyPFdl YkNvcmU6OkdyYXBoaWNzTGF5ZXI+IG1fcm9vdExheWVyOworICAgIE93blB0cjxXZWJDb3JlOjpH cmFwaGljc0xheWVyPiBtX25vbkNvbXBvc2l0ZWRDb250ZW50TGF5ZXI7CisKICAgICBzdGF0aWMg Z2Jvb2xlYW4gbGF5ZXJGbHVzaFRpbWVyRmlyZWRDYWxsYmFjayhBY2NlbGVyYXRlZENvbXBvc2l0 aW5nQ29udGV4dCopOwogI2VsaWYgVVNFKFRFWFRVUkVfTUFQUEVSX0dMKQogICAgIE93blB0cjxX ZWJDb3JlOjpSZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdz4gbV9yZWRpcmVjdGVkV2luZG93Owpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQWNjZWxlcmF0ZWRD b21wb3NpdGluZ0NvbnRleHRDbHV0dGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVT dXBwb3J0L0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0Q2x1dHRlci5jcHAKaW5kZXggM2U0 YzkxOWZiNjdiZWEwMDUwOGFiNGY2Yjg5M2RiYjliODQ5YzgxYy4uNzI5ZDkzMjA5YTQ5YzlhYTcy YTA3NDk0N2JmODU1YThmODNhYTYzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvV2Vi Q29yZVN1cHBvcnQvQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHRDbHV0dGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9BY2NlbGVyYXRlZENvbXBvc2l0aW5n Q29udGV4dENsdXR0ZXIuY3BwCkBAIC0yNSw3ICsyNSw5IEBACiAjaW5jbHVkZSAiRnJhbWUuaCIK ICNpbmNsdWRlICJGcmFtZVZpZXcuaCIKICNpbmNsdWRlICJHcmFwaGljc0xheWVyLmgiCisjaW5j bHVkZSAiR3JhcGhpY3NMYXllckFjdG9yLmgiCiAjaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIK KyNpbmNsdWRlICJTZXR0aW5ncy5oIgogI2luY2x1ZGUgIndlYmtpdHdlYnZpZXdwcml2YXRlLmgi CiAjaW5jbHVkZSA8Y2x1dHRlci1ndGsvY2x1dHRlci1ndGsuaD4KICNpbmNsdWRlIDxjbHV0dGVy L2NsdXR0ZXIuaD4KQEAgLTM3LDExICszOSw0MiBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIEFjY2Vs ZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0OjpBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dChX ZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQogICAgIDogbV93ZWJWaWV3KHdlYlZpZXcpCiAgICAgLCBt X2xheWVyRmx1c2hUaW1lckNhbGxiYWNrSWQoMCkKLSAgICAsIG1fcm9vdEdyYXBoaWNzTGF5ZXIo MCkKICAgICAsIG1fcm9vdExheWVyRW1iZWRkZXIoMCkKIHsKIH0KIAordm9pZCBBY2NlbGVyYXRl ZENvbXBvc2l0aW5nQ29udGV4dDo6aW5pdGlhbGl6ZSgpCit7CisgICAgaWYgKG1fcm9vdExheWVy KQorICAgICAgICByZXR1cm47CisKKyAgICBHdGtBbGxvY2F0aW9uIGFsbG9jYXRpb247CisgICAg Z3RrX3dpZGdldF9nZXRfYWxsb2NhdGlvbihHVEtfV0lER0VUKG1fd2ViVmlldyksICZhbGxvY2F0 aW9uKTsKKyAgICBJbnRTaXplIHBhZ2VTaXplKGFsbG9jYXRpb24ud2lkdGgsIGFsbG9jYXRpb24u aGVpZ2h0KTsKKworICAgIG1fcm9vdExheWVyID0gR3JhcGhpY3NMYXllcjo6Y3JlYXRlKDAsIHRo aXMpOworICAgIG1fcm9vdExheWVyLT5zZXREcmF3c0NvbnRlbnQoZmFsc2UpOworICAgIG1fcm9v dExheWVyLT5zZXRTaXplKHBhZ2VTaXplKTsKKworICAgIC8vIFRoZSBub24tY29tcG9zaXRlZCBj b250ZW50cyBhcmUgYSBjaGlsZCBvZiB0aGUgcm9vdCBsYXllci4KKyAgICBtX25vbkNvbXBvc2l0 ZWRDb250ZW50TGF5ZXIgPSBHcmFwaGljc0xheWVyOjpjcmVhdGUoMCwgdGhpcyk7CisgICAgbV9u b25Db21wb3NpdGVkQ29udGVudExheWVyLT5zZXREcmF3c0NvbnRlbnQodHJ1ZSk7CisgICAgbV9u b25Db21wb3NpdGVkQ29udGVudExheWVyLT5zZXRDb250ZW50c09wYXF1ZSghbV93ZWJWaWV3LT5w cml2LT50cmFuc3BhcmVudCk7CisgICAgbV9ub25Db21wb3NpdGVkQ29udGVudExheWVyLT5zZXRT aXplKHBhZ2VTaXplKTsKKyAgICBpZiAoY29yZShtX3dlYlZpZXcpLT5zZXR0aW5ncygpLT5hY2Nl bGVyYXRlZERyYXdpbmdFbmFibGVkKCkpCisgICAgICAgIG1fbm9uQ29tcG9zaXRlZENvbnRlbnRM YXllci0+c2V0QWNjZWxlcmF0ZXNEcmF3aW5nKHRydWUpOworCisjaWZuZGVmIE5ERUJVRworICAg IG1fcm9vdExheWVyLT5zZXROYW1lKCJSb290IGxheWVyIik7CisgICAgbV9ub25Db21wb3NpdGVk Q29udGVudExheWVyLT5zZXROYW1lKCJOb24tY29tcG9zaXRlZCBjb250ZW50Iik7CisjZW5kaWYK KworICAgIG1fcm9vdExheWVyLT5hZGRDaGlsZChtX25vbkNvbXBvc2l0ZWRDb250ZW50TGF5ZXIu Z2V0KCkpOworICAgIG1fbm9uQ29tcG9zaXRlZENvbnRlbnRMYXllci0+c2V0TmVlZHNEaXNwbGF5 KCk7CisKKyAgICBzY2hlZHVsZUxheWVyRmx1c2goKTsKK30KKwogQWNjZWxlcmF0ZWRDb21wb3Np dGluZ0NvbnRleHQ6On5BY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dCgpCiB7CiAgICAgaWYg KG1fbGF5ZXJGbHVzaFRpbWVyQ2FsbGJhY2tJZCkKQEAgLTUwLDcgKzgzLDcgQEAgQWNjZWxlcmF0 ZWRDb21wb3NpdGluZ0NvbnRleHQ6On5BY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dCgpCiAK IGJvb2wgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OmVuYWJsZWQoKQogewotICAgIHJl dHVybiBtX3Jvb3RHcmFwaGljc0xheWVyOworICAgIHJldHVybiBtX3Jvb3RMYXllcjsKIH0KIAog Ym9vbCBBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6cmVuZGVyTGF5ZXJzVG9XaW5kb3co Y2Fpcm9fdCosIGNvbnN0IEludFJlY3QmIGNsaXBSZWN0KQpAQCAtNjQsNyArOTcsOCBAQCB2b2lk IEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0OjpzZXRSb290Q29tcG9zaXRpbmdMYXllcihH cmFwaGljc0xheWVyKiBncmFwaAogICAgIGlmICghZ3JhcGhpY3NMYXllcikgewogICAgICAgICBn dGtfY29udGFpbmVyX3JlbW92ZShHVEtfQ09OVEFJTkVSKG1fd2ViVmlldyksIG1fcm9vdExheWVy RW1iZWRkZXIpOwogICAgICAgICBtX3Jvb3RMYXllckVtYmVkZGVyID0gMDsKLSAgICAgICAgbV9y b290R3JhcGhpY3NMYXllciA9IDA7CisgICAgICAgIG1fcm9vdExheWVyID0gbnVsbHB0cjsKKyAg ICAgICAgbV9ub25Db21wb3NpdGVkQ29udGVudExheWVyID0gbnVsbHB0cjsKICAgICAgICAgcmV0 dXJuOwogICAgIH0KIApAQCAtNzksMTMgKzExMywxOCBAQCB2b2lkIEFjY2VsZXJhdGVkQ29tcG9z aXRpbmdDb250ZXh0OjpzZXRSb290Q29tcG9zaXRpbmdMYXllcihHcmFwaGljc0xheWVyKiBncmFw aAogICAgICAgICBndGtfd2lkZ2V0X3Nob3cobV9yb290TGF5ZXJFbWJlZGRlcik7CiAgICAgfQog CisgICAgLy8gQWRkIHRoZSBhY2NlbGVyYXRlZCBsYXllciB0cmVlIGhpZXJhcmNoeS4KKyAgICBp bml0aWFsaXplKCk7CisKKyAgICBtX25vbkNvbXBvc2l0ZWRDb250ZW50TGF5ZXItPnJlbW92ZUFs bENoaWxkcmVuKCk7CisgICAgbV9ub25Db21wb3NpdGVkQ29udGVudExheWVyLT5hZGRDaGlsZChn cmFwaGljc0xheWVyKTsKKwogICAgIC8vIEFkZCBhIHJvb3QgR3JhcGhpY3NMYXllciB0byB0aGUg c3RhZ2UuCiAgICAgaWYgKGdyYXBoaWNzTGF5ZXIpIHsKLSAgICAgICAgbV9yb290R3JhcGhpY3NM YXllciA9IGdyYXBoaWNzTGF5ZXI7CiAgICAgICAgIENsdXR0ZXJDb2xvciBzdGFnZUNvbG9yID0g eyAweEZGLCAweEZGLCAweEZGLCAweEZGIH07CiAgICAgICAgIENsdXR0ZXJBY3Rvciogc3RhZ2Ug PSBndGtfY2x1dHRlcl9lbWJlZF9nZXRfc3RhZ2UoR1RLX0NMVVRURVJfRU1CRUQobV9yb290TGF5 ZXJFbWJlZGRlcikpOwogICAgICAgICBjbHV0dGVyX3N0YWdlX3NldF9jb2xvcihDTFVUVEVSX1NU QUdFKHN0YWdlKSwgJnN0YWdlQ29sb3IpOwotICAgICAgICBjbHV0dGVyX2NvbnRhaW5lcl9hZGRf YWN0b3IoQ0xVVFRFUl9DT05UQUlORVIoc3RhZ2UpLCBtX3Jvb3RHcmFwaGljc0xheWVyLT5wbGF0 Zm9ybUxheWVyKCkpOworICAgICAgICBjbHV0dGVyX2NvbnRhaW5lcl9hZGRfYWN0b3IoQ0xVVFRF Ul9DT05UQUlORVIoc3RhZ2UpLCBtX3Jvb3RMYXllci0+cGxhdGZvcm1MYXllcigpKTsKICAgICAg ICAgY2x1dHRlcl9hY3Rvcl9zaG93X2FsbChzdGFnZSk7CiAgICAgfQogCkBAIC05NCwzNSArMTMz LDU2IEBAIHZvaWQgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OnNldFJvb3RDb21wb3Np dGluZ0xheWVyKEdyYXBoaWNzTGF5ZXIqIGdyYXBoCiAKIHZvaWQgQWNjZWxlcmF0ZWRDb21wb3Np dGluZ0NvbnRleHQ6OnNldE5vbkNvbXBvc2l0ZWRDb250ZW50c05lZWREaXNwbGF5KGNvbnN0IElu dFJlY3QmIHJlY3QpCiB7Ci0gICAgaWYgKCFtX3Jvb3RHcmFwaGljc0xheWVyKQorICAgIGlmICgh bV9yb290TGF5ZXIpCiAgICAgICAgIHJldHVybjsKIAogICAgIGlmIChyZWN0LmlzRW1wdHkoKSkg ewotICAgICAgICBtX3Jvb3RHcmFwaGljc0xheWVyLT5zZXROZWVkc0Rpc3BsYXkoKTsKKyAgICAg ICAgbV9yb290TGF5ZXItPnNldE5lZWRzRGlzcGxheSgpOwogICAgICAgICByZXR1cm47CiAgICAg fQogCi0gICAgbV9yb290R3JhcGhpY3NMYXllci0+c2V0TmVlZHNEaXNwbGF5SW5SZWN0KHJlY3Qp OworICAgIG1fbm9uQ29tcG9zaXRlZENvbnRlbnRMYXllci0+c2V0TmVlZHNEaXNwbGF5SW5SZWN0 KHJlY3QpOworICAgIHNjaGVkdWxlTGF5ZXJGbHVzaCgpOwogfQogCi12b2lkIEFjY2VsZXJhdGVk Q29tcG9zaXRpbmdDb250ZXh0OjpyZXNpemVSb290TGF5ZXIoY29uc3QgSW50U2l6ZSYgc2l6ZSkK K3ZvaWQgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OnJlc2l6ZVJvb3RMYXllcihjb25z dCBJbnRTaXplJiBuZXdTaXplKQogewogICAgIGlmICghbV9yb290TGF5ZXJFbWJlZGRlcikKICAg ICAgICAgcmV0dXJuOwogCisgICAgaWYgKG1fcm9vdExheWVyLT5zaXplKCkgPT0gbmV3U2l6ZSkK KyAgICAgICAgcmV0dXJuOworCiAgICAgR3RrQWxsb2NhdGlvbiBhbGxvY2F0aW9uOwogICAgIGFs bG9jYXRpb24ueCA9IDA7CiAgICAgYWxsb2NhdGlvbi55ID0gMDsKLSAgICBhbGxvY2F0aW9uLndp ZHRoID0gc2l6ZS53aWR0aCgpOwotICAgIGFsbG9jYXRpb24uaGVpZ2h0ID0gc2l6ZS5oZWlnaHQo KTsKKyAgICBhbGxvY2F0aW9uLndpZHRoID0gbmV3U2l6ZS53aWR0aCgpOworICAgIGFsbG9jYXRp b24uaGVpZ2h0ID0gbmV3U2l6ZS5oZWlnaHQoKTsKICAgICBndGtfd2lkZ2V0X3NpemVfYWxsb2Nh dGUoR1RLX1dJREdFVChtX3Jvb3RMYXllckVtYmVkZGVyKSwgJmFsbG9jYXRpb24pOwogCisgICAg bV9yb290TGF5ZXItPnNldFNpemUobmV3U2l6ZSk7CisKKyAgICAvLyBJZiB0aGUgbmV3U2l6ZSBl eHBvc2VzIG5ldyBhcmVhcyBvZiB0aGUgbm9uLWNvbXBvc2l0ZWQgY29udGVudCBhIHNldE5lZWRz RGlzcGxheSBpcyBuZWVkZWQKKyAgICAvLyBmb3IgdGhvc2UgbmV3bHkgZXhwb3NlZCBhcmVhcy4K KyAgICBGbG9hdFNpemUgb2xkU2l6ZSA9IG1fbm9uQ29tcG9zaXRlZENvbnRlbnRMYXllci0+c2l6 ZSgpOworICAgIG1fbm9uQ29tcG9zaXRlZENvbnRlbnRMYXllci0+c2V0U2l6ZShuZXdTaXplKTsK KworICAgIGlmIChuZXdTaXplLndpZHRoKCkgPiBvbGRTaXplLndpZHRoKCkpIHsKKyAgICAgICAg ZmxvYXQgaGVpZ2h0ID0gc3RkOjptaW4oc3RhdGljX2Nhc3Q8ZmxvYXQ+KG5ld1NpemUuaGVpZ2h0 KCkpLCBvbGRTaXplLmhlaWdodCgpKTsKKyAgICAgICAgbV9ub25Db21wb3NpdGVkQ29udGVudExh eWVyLT5zZXROZWVkc0Rpc3BsYXlJblJlY3QoRmxvYXRSZWN0KG9sZFNpemUud2lkdGgoKSwgMCwg bmV3U2l6ZS53aWR0aCgpIC0gb2xkU2l6ZS53aWR0aCgpLCBoZWlnaHQpKTsKKyAgICB9CisKKyAg ICBpZiAobmV3U2l6ZS5oZWlnaHQoKSA+IG9sZFNpemUuaGVpZ2h0KCkpCisgICAgICAgIG1fbm9u Q29tcG9zaXRlZENvbnRlbnRMYXllci0+c2V0TmVlZHNEaXNwbGF5SW5SZWN0KEZsb2F0UmVjdCgw LCBvbGRTaXplLmhlaWdodCgpLCBuZXdTaXplLndpZHRoKCksIG5ld1NpemUuaGVpZ2h0KCkgLSBv bGRTaXplLmhlaWdodCgpKSk7CisKKyAgICBtX25vbkNvbXBvc2l0ZWRDb250ZW50TGF5ZXItPnNl dE5lZWRzRGlzcGxheUluUmVjdChJbnRSZWN0KEludFBvaW50KCksIG5ld1NpemUpKTsKICAgICBz Y2hlZHVsZUxheWVyRmx1c2goKTsKIH0KIAogdm9pZCBBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29u dGV4dDo6c2Nyb2xsTm9uQ29tcG9zaXRlZENvbnRlbnRzKGNvbnN0IEludFJlY3QmIHNjcm9sbFJl Y3QsIGNvbnN0IEludFNpemUmIHNjcm9sbE9mZnNldCkKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgp OworICAgIG1fbm9uQ29tcG9zaXRlZENvbnRlbnRMYXllci0+c2V0TmVlZHNEaXNwbGF5SW5SZWN0 KHNjcm9sbFJlY3QpOworICAgIHNjaGVkdWxlTGF5ZXJGbHVzaCgpOwogfQogCiBnYm9vbGVhbiBB Y2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6bGF5ZXJGbHVzaFRpbWVyRmlyZWRDYWxsYmFj ayhBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dCogY29udGV4dCkKQEAgLTE0Myw4ICsyMDMs MTAgQEAgdm9pZCBBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6c2NoZWR1bGVMYXllckZs dXNoKCkKIAogYm9vbCBBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6Zmx1c2hQZW5kaW5n TGF5ZXJDaGFuZ2VzKCkKIHsKLSAgICBpZiAobV9yb290R3JhcGhpY3NMYXllcikKLSAgICAgICAg bV9yb290R3JhcGhpY3NMYXllci0+Zmx1c2hDb21wb3NpdGluZ1N0YXRlRm9yVGhpc0xheWVyT25s eSgpOworICAgIGlmIChtX3Jvb3RMYXllcikgeworICAgICAgICBtX3Jvb3RMYXllci0+Zmx1c2hD b21wb3NpdGluZ1N0YXRlRm9yVGhpc0xheWVyT25seSgpOworICAgICAgICBtX25vbkNvbXBvc2l0 ZWRDb250ZW50TGF5ZXItPmZsdXNoQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNMYXllck9ubHkoKTsK KyAgICB9CiAKICAgICByZXR1cm4gY29yZShtX3dlYlZpZXcpLT5tYWluRnJhbWUoKS0+dmlldygp LT5mbHVzaENvbXBvc2l0aW5nU3RhdGVJbmNsdWRpbmdTdWJmcmFtZXMoKTsKIH0KQEAgLTE1Miwx MSArMjE0LDE2IEBAIGJvb2wgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OmZsdXNoUGVu ZGluZ0xheWVyQ2hhbmdlcygpCiB2b2lkIEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0Ojpm bHVzaEFuZFJlbmRlckxheWVycygpCiB7CiAgICAgbV9sYXllckZsdXNoVGltZXJDYWxsYmFja0lk ID0gMDsKLSAgICBmbHVzaFBlbmRpbmdMYXllckNoYW5nZXMoKTsKLSAgICBpZiAoIW1fcm9vdEdy YXBoaWNzTGF5ZXIpCisKKyAgICBpZiAoIWVuYWJsZWQoKSkKICAgICAgICAgcmV0dXJuOwogCi0g ICAgcmVuZGVyTGF5ZXJzVG9XaW5kb3coMCwgSW50UmVjdCgpKTsKKyAgICBGcmFtZSogZnJhbWUg PSBjb3JlKG1fd2ViVmlldyktPm1haW5GcmFtZSgpOworICAgIGlmICghZnJhbWUgfHwgIWZyYW1l LT5jb250ZW50UmVuZGVyZXIoKSB8fCAhZnJhbWUtPnZpZXcoKSkKKyAgICAgICAgcmV0dXJuOwor CisgICAgaWYgKCFmbHVzaFBlbmRpbmdMYXllckNoYW5nZXMoKSkKKyAgICAgICAgcmV0dXJuOwog fQogCiB2b2lkIEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0Ojpub3RpZnlBbmltYXRpb25T dGFydGVkKGNvbnN0IFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXIqLCBkb3VibGUgdGltZSkKQEAgLTE2 OCw5ICsyMzUsMTIgQEAgdm9pZCBBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6bm90aWZ5 Rmx1c2hSZXF1aXJlZChjb25zdCBXZWJDb3JlOjpHcmFwaGljc0wKICAgICBBU1NFUlRfTk9UX1JF QUNIRUQoKTsKIH0KIAotdm9pZCBBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6cGFpbnRD b250ZW50cyhjb25zdCBXZWJDb3JlOjpHcmFwaGljc0xheWVyKiwgV2ViQ29yZTo6R3JhcGhpY3ND b250ZXh0JiwgV2ViQ29yZTo6R3JhcGhpY3NMYXllclBhaW50aW5nUGhhc2UsIGNvbnN0IFdlYkNv cmU6OkludFJlY3QmKQordm9pZCBBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6cGFpbnRD b250ZW50cyhjb25zdCBXZWJDb3JlOjpHcmFwaGljc0xheWVyKiwgV2ViQ29yZTo6R3JhcGhpY3ND b250ZXh0JiBjb250ZXh0LCBXZWJDb3JlOjpHcmFwaGljc0xheWVyUGFpbnRpbmdQaGFzZSwgY29u c3QgV2ViQ29yZTo6SW50UmVjdCYgcmVjdFRvUGFpbnQpCiB7Ci0gICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7CisgICAgY29udGV4dC5zYXZlKCk7CisgICAgY29udGV4dC5jbGlwKHJlY3RUb1BhaW50 KTsKKyAgICBjb3JlKG1fd2ViVmlldyktPm1haW5GcmFtZSgpLT52aWV3KCktPnBhaW50KCZjb250 ZXh0LCByZWN0VG9QYWludCk7CisgICAgY29udGV4dC5yZXN0b3JlKCk7CiB9CiAKIH0gLy8gbmFt ZXNwYWNlIFdlYktpdAo= 179077 2012-12-12 10:27:24 -0800 2012-12-12 10:45:29 -0800 Patch bug-104819-20121212192427.patch text/plain 11022 joone U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3MDk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggNTJkNTI5YThh YjgyMGNhNjQ0NjU3MmM0ODRlMzUyNzNmZjExN2RkNS4uMjdmZTc5ZWU3MjVhMTY1ZTY2ODgyZjYy MDRmNWE4NjU5OTdmNDgxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEy LTEyLTEyICBKb29uZSBIdXIgIDxqb29uZS5odXJAaW50ZWwuY29tPgorCisgICAgICAgIFtHVEtd W0FDXSBUaGUgbm9uLWNvbXBvc2l0ZWQgY29udGVudCBpcyBub3QgcGFpbnRlZAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA0ODE5CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgR3VzdGF2byBOb3JvbmhhIFNpbHZhLgorCisgICAgICAgIFdoZW4gQWNjZWxl cmF0ZWQgQ29tcG9zaXRpbmcgaXMgZW5hYmxlZCwgb25seSBHcmFwaGljc0xheWVycyBhcmUgcGFp bnRlZC4KKyAgICAgICAgVGhpcyBwYXRjaCBhbGxvd3MgdG8gcGFpbnQgdGhlIG5vbi1jb21wb3Np dGVkIGNvbnRlbnQgb24gdGhlIHZpZXdwb3J0IHdpdGggCisgICAgICAgIEdyYXBoaWNzTGF5ZXJz LiBNb3N0IG9mIHRoZSBjb2RlcyBhcmUgdGhlIHNhbWUgYXMgQWNjZWxlcmF0ZWRDb21wb3NpdGlu Z0NvbnRleHRHTC5jcHAKKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0FjY2VsZXJhdGVkQ29t cG9zaXRpbmdDb250ZXh0Lmg6IEFkZCBtX25vbkNvbXBvc2l0ZWRDb250ZW50TGF5ZXIuCisgICAg ICAgICogV2ViQ29yZVN1cHBvcnQvQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHRDbHV0dGVy LmNwcDoKKyAgICAgICAgKFdlYktpdDo6QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OkFj Y2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0KToKKyAgICAgICAgKFdlYktpdDo6QWNjZWxlcmF0 ZWRDb21wb3NpdGluZ0NvbnRleHQ6OmluaXRpYWxpemUpOgorICAgICAgICAoV2ViS2l0KToKKyAg ICAgICAgKFdlYktpdDo6QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6On5BY2NlbGVyYXRl ZENvbXBvc2l0aW5nQ29udGV4dCk6CisgICAgICAgIChXZWJLaXQ6OkFjY2VsZXJhdGVkQ29tcG9z aXRpbmdDb250ZXh0OjpyZW5kZXJMYXllcnNUb1dpbmRvdyk6CisgICAgICAgIChXZWJLaXQ6OkFj Y2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0OjpzZXRSb290Q29tcG9zaXRpbmdMYXllcik6Cisg ICAgICAgIChXZWJLaXQ6OkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0OjpzZXROb25Db21w b3NpdGVkQ29udGVudHNOZWVkRGlzcGxheSk6CisgICAgICAgIChXZWJLaXQ6OkFjY2VsZXJhdGVk Q29tcG9zaXRpbmdDb250ZXh0OjpyZXNpemVSb290TGF5ZXIpOgorICAgICAgICAoV2ViS2l0OjpB Y2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6c2Nyb2xsTm9uQ29tcG9zaXRlZENvbnRlbnRz KTogTWFrZSB0aGUgbm9uLWNvbXBvc2l0ZWQgCisgICAgICAgIGNvbnRlbnQgc2Nyb2xsLgorICAg ICAgICAoV2ViS2l0OjpBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6bGF5ZXJGbHVzaFRp bWVyRmlyZWRDYWxsYmFjayk6CisgICAgICAgIChXZWJLaXQ6OkFjY2VsZXJhdGVkQ29tcG9zaXRp bmdDb250ZXh0OjpmbHVzaFBlbmRpbmdMYXllckNoYW5nZXMpOgorICAgICAgICAoV2ViS2l0OjpB Y2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6Zmx1c2hBbmRSZW5kZXJMYXllcnMpOgorICAg ICAgICAoV2ViS2l0OjpBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6bm90aWZ5QW5pbWF0 aW9uU3RhcnRlZCk6CisgICAgICAgIChXZWJLaXQ6OkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250 ZXh0OjpwYWludENvbnRlbnRzKTogUGFpbnQgdGhlIG5vbi1jb21wb3NpdGVkIGNvbnRlbnQuCisK IDIwMTItMTItMTEgIEpvb25lIEh1ciAgPGpvb25lLmh1ckBpbnRlbC5jb20+CiAKICAgICAgICAg W0dUS11bQUNdIEdyYXBoaWNzTGF5ZXJzIGFyZSBub3Qgc2hvd24gb24gdGhlIHZpZXdwb3J0CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9BY2NlbGVyYXRlZENv bXBvc2l0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQWNj ZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQuaAppbmRleCBhZDM1Njg1MDc3ODdlY2U4MGQxNjBh OTJhZTRmODY3YzllZThkZDI3Li5iMGY5NzQzNGRiODg0NjE2OGViNDY3NDMwMDkwMWZjMjI1NDAy MmFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9BY2NlbGVy YXRlZENvbXBvc2l0aW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVT dXBwb3J0L0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0LmgKQEAgLTc1LDggKzc1LDEwIEBA IHByaXZhdGU6CiAgICAgdW5zaWduZWQgaW50IG1fbGF5ZXJGbHVzaFRpbWVyQ2FsbGJhY2tJZDsK IAogI2lmIFVTRShDTFVUVEVSKQotICAgIFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXIqIG1fcm9vdEdy YXBoaWNzTGF5ZXI7CiAgICAgR3RrV2lkZ2V0KiBtX3Jvb3RMYXllckVtYmVkZGVyOworICAgIE93 blB0cjxXZWJDb3JlOjpHcmFwaGljc0xheWVyPiBtX3Jvb3RMYXllcjsKKyAgICBPd25QdHI8V2Vi Q29yZTo6R3JhcGhpY3NMYXllcj4gbV9ub25Db21wb3NpdGVkQ29udGVudExheWVyOworCiAgICAg c3RhdGljIGdib29sZWFuIGxheWVyRmx1c2hUaW1lckZpcmVkQ2FsbGJhY2soQWNjZWxlcmF0ZWRD b21wb3NpdGluZ0NvbnRleHQqKTsKICNlbGlmIFVTRShURVhUVVJFX01BUFBFUl9HTCkKICAgICBP d25QdHI8V2ViQ29yZTo6UmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3c+IG1fcmVkaXJlY3RlZFdp bmRvdzsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0FjY2Vs ZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0Q2x1dHRlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L2d0ay9X ZWJDb3JlU3VwcG9ydC9BY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dENsdXR0ZXIuY3BwCmlu ZGV4IDNlNGM5MTlmYjY3YmVhMDA1MDhhYjRmNmI4OTNkYmI5Yjg0OWM4MWMuLjcyOWQ5MzIwOWE0 OWM5YWE3MmEwNzQ5NDdiZjg1NWE4ZjgzYWE2M2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Z3RrL1dlYkNvcmVTdXBwb3J0L0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0Q2x1dHRlci5j cHAKKysrIGIvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQWNjZWxlcmF0ZWRDb21w b3NpdGluZ0NvbnRleHRDbHV0dGVyLmNwcApAQCAtMjUsNyArMjUsOSBAQAogI2luY2x1ZGUgIkZy YW1lLmgiCiAjaW5jbHVkZSAiRnJhbWVWaWV3LmgiCiAjaW5jbHVkZSAiR3JhcGhpY3NMYXllci5o IgorI2luY2x1ZGUgIkdyYXBoaWNzTGF5ZXJBY3Rvci5oIgogI2luY2x1ZGUgIk5vdEltcGxlbWVu dGVkLmgiCisjaW5jbHVkZSAiU2V0dGluZ3MuaCIKICNpbmNsdWRlICJ3ZWJraXR3ZWJ2aWV3cHJp dmF0ZS5oIgogI2luY2x1ZGUgPGNsdXR0ZXItZ3RrL2NsdXR0ZXItZ3RrLmg+CiAjaW5jbHVkZSA8 Y2x1dHRlci9jbHV0dGVyLmg+CkBAIC0zNywxMSArMzksNDIgQEAgbmFtZXNwYWNlIFdlYktpdCB7 CiBBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0Nv bnRleHQoV2ViS2l0V2ViVmlldyogd2ViVmlldykKICAgICA6IG1fd2ViVmlldyh3ZWJWaWV3KQog ICAgICwgbV9sYXllckZsdXNoVGltZXJDYWxsYmFja0lkKDApCi0gICAgLCBtX3Jvb3RHcmFwaGlj c0xheWVyKDApCiAgICAgLCBtX3Jvb3RMYXllckVtYmVkZGVyKDApCiB7CiB9CiAKK3ZvaWQgQWNj ZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OmluaXRpYWxpemUoKQoreworICAgIGlmIChtX3Jv b3RMYXllcikKKyAgICAgICAgcmV0dXJuOworCisgICAgR3RrQWxsb2NhdGlvbiBhbGxvY2F0aW9u OworICAgIGd0a193aWRnZXRfZ2V0X2FsbG9jYXRpb24oR1RLX1dJREdFVChtX3dlYlZpZXcpLCAm YWxsb2NhdGlvbik7CisgICAgSW50U2l6ZSBwYWdlU2l6ZShhbGxvY2F0aW9uLndpZHRoLCBhbGxv Y2F0aW9uLmhlaWdodCk7CisKKyAgICBtX3Jvb3RMYXllciA9IEdyYXBoaWNzTGF5ZXI6OmNyZWF0 ZSgwLCB0aGlzKTsKKyAgICBtX3Jvb3RMYXllci0+c2V0RHJhd3NDb250ZW50KGZhbHNlKTsKKyAg ICBtX3Jvb3RMYXllci0+c2V0U2l6ZShwYWdlU2l6ZSk7CisKKyAgICAvLyBUaGUgbm9uLWNvbXBv c2l0ZWQgY29udGVudHMgYXJlIGEgY2hpbGQgb2YgdGhlIHJvb3QgbGF5ZXIuCisgICAgbV9ub25D b21wb3NpdGVkQ29udGVudExheWVyID0gR3JhcGhpY3NMYXllcjo6Y3JlYXRlKDAsIHRoaXMpOwor ICAgIG1fbm9uQ29tcG9zaXRlZENvbnRlbnRMYXllci0+c2V0RHJhd3NDb250ZW50KHRydWUpOwor ICAgIG1fbm9uQ29tcG9zaXRlZENvbnRlbnRMYXllci0+c2V0Q29udGVudHNPcGFxdWUoIW1fd2Vi Vmlldy0+cHJpdi0+dHJhbnNwYXJlbnQpOworICAgIG1fbm9uQ29tcG9zaXRlZENvbnRlbnRMYXll ci0+c2V0U2l6ZShwYWdlU2l6ZSk7CisgICAgaWYgKGNvcmUobV93ZWJWaWV3KS0+c2V0dGluZ3Mo KS0+YWNjZWxlcmF0ZWREcmF3aW5nRW5hYmxlZCgpKQorICAgICAgICBtX25vbkNvbXBvc2l0ZWRD b250ZW50TGF5ZXItPnNldEFjY2VsZXJhdGVzRHJhd2luZyh0cnVlKTsKKworI2lmbmRlZiBOREVC VUcKKyAgICBtX3Jvb3RMYXllci0+c2V0TmFtZSgiUm9vdCBsYXllciIpOworICAgIG1fbm9uQ29t cG9zaXRlZENvbnRlbnRMYXllci0+c2V0TmFtZSgiTm9uLWNvbXBvc2l0ZWQgY29udGVudCIpOwor I2VuZGlmCisKKyAgICBtX3Jvb3RMYXllci0+YWRkQ2hpbGQobV9ub25Db21wb3NpdGVkQ29udGVu dExheWVyLmdldCgpKTsKKyAgICBtX25vbkNvbXBvc2l0ZWRDb250ZW50TGF5ZXItPnNldE5lZWRz RGlzcGxheSgpOworCisgICAgc2NoZWR1bGVMYXllckZsdXNoKCk7Cit9CisKIEFjY2VsZXJhdGVk Q29tcG9zaXRpbmdDb250ZXh0Ojp+QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQoKQogewog ICAgIGlmIChtX2xheWVyRmx1c2hUaW1lckNhbGxiYWNrSWQpCkBAIC01MCw3ICs4Myw3IEBAIEFj Y2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0Ojp+QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRl eHQoKQogCiBib29sIEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0OjplbmFibGVkKCkKIHsK LSAgICByZXR1cm4gbV9yb290R3JhcGhpY3NMYXllcjsKKyAgICByZXR1cm4gbV9yb290TGF5ZXI7 CiB9CiAKIGJvb2wgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OnJlbmRlckxheWVyc1Rv V2luZG93KGNhaXJvX3QqLCBjb25zdCBJbnRSZWN0JiBjbGlwUmVjdCkKQEAgLTY0LDcgKzk3LDgg QEAgdm9pZCBBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6c2V0Um9vdENvbXBvc2l0aW5n TGF5ZXIoR3JhcGhpY3NMYXllciogZ3JhcGgKICAgICBpZiAoIWdyYXBoaWNzTGF5ZXIpIHsKICAg ICAgICAgZ3RrX2NvbnRhaW5lcl9yZW1vdmUoR1RLX0NPTlRBSU5FUihtX3dlYlZpZXcpLCBtX3Jv b3RMYXllckVtYmVkZGVyKTsKICAgICAgICAgbV9yb290TGF5ZXJFbWJlZGRlciA9IDA7Ci0gICAg ICAgIG1fcm9vdEdyYXBoaWNzTGF5ZXIgPSAwOworICAgICAgICBtX3Jvb3RMYXllciA9IG51bGxw dHI7CisgICAgICAgIG1fbm9uQ29tcG9zaXRlZENvbnRlbnRMYXllciA9IG51bGxwdHI7CiAgICAg ICAgIHJldHVybjsKICAgICB9CiAKQEAgLTc5LDEzICsxMTMsMTggQEAgdm9pZCBBY2NlbGVyYXRl ZENvbXBvc2l0aW5nQ29udGV4dDo6c2V0Um9vdENvbXBvc2l0aW5nTGF5ZXIoR3JhcGhpY3NMYXll ciogZ3JhcGgKICAgICAgICAgZ3RrX3dpZGdldF9zaG93KG1fcm9vdExheWVyRW1iZWRkZXIpOwog ICAgIH0KIAorICAgIC8vIEFkZCB0aGUgYWNjZWxlcmF0ZWQgbGF5ZXIgdHJlZSBoaWVyYXJjaHku CisgICAgaW5pdGlhbGl6ZSgpOworCisgICAgbV9ub25Db21wb3NpdGVkQ29udGVudExheWVyLT5y ZW1vdmVBbGxDaGlsZHJlbigpOworICAgIG1fbm9uQ29tcG9zaXRlZENvbnRlbnRMYXllci0+YWRk Q2hpbGQoZ3JhcGhpY3NMYXllcik7CisKICAgICAvLyBBZGQgYSByb290IEdyYXBoaWNzTGF5ZXIg dG8gdGhlIHN0YWdlLgogICAgIGlmIChncmFwaGljc0xheWVyKSB7Ci0gICAgICAgIG1fcm9vdEdy YXBoaWNzTGF5ZXIgPSBncmFwaGljc0xheWVyOwogICAgICAgICBDbHV0dGVyQ29sb3Igc3RhZ2VD b2xvciA9IHsgMHhGRiwgMHhGRiwgMHhGRiwgMHhGRiB9OwogICAgICAgICBDbHV0dGVyQWN0b3Iq IHN0YWdlID0gZ3RrX2NsdXR0ZXJfZW1iZWRfZ2V0X3N0YWdlKEdUS19DTFVUVEVSX0VNQkVEKG1f cm9vdExheWVyRW1iZWRkZXIpKTsKICAgICAgICAgY2x1dHRlcl9zdGFnZV9zZXRfY29sb3IoQ0xV VFRFUl9TVEFHRShzdGFnZSksICZzdGFnZUNvbG9yKTsKLSAgICAgICAgY2x1dHRlcl9jb250YWlu ZXJfYWRkX2FjdG9yKENMVVRURVJfQ09OVEFJTkVSKHN0YWdlKSwgbV9yb290R3JhcGhpY3NMYXll ci0+cGxhdGZvcm1MYXllcigpKTsKKyAgICAgICAgY2x1dHRlcl9jb250YWluZXJfYWRkX2FjdG9y KENMVVRURVJfQ09OVEFJTkVSKHN0YWdlKSwgbV9yb290TGF5ZXItPnBsYXRmb3JtTGF5ZXIoKSk7 CiAgICAgICAgIGNsdXR0ZXJfYWN0b3Jfc2hvd19hbGwoc3RhZ2UpOwogICAgIH0KIApAQCAtOTQs MzUgKzEzMyw1NiBAQCB2b2lkIEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0OjpzZXRSb290 Q29tcG9zaXRpbmdMYXllcihHcmFwaGljc0xheWVyKiBncmFwaAogCiB2b2lkIEFjY2VsZXJhdGVk Q29tcG9zaXRpbmdDb250ZXh0OjpzZXROb25Db21wb3NpdGVkQ29udGVudHNOZWVkRGlzcGxheShj b25zdCBJbnRSZWN0JiByZWN0KQogewotICAgIGlmICghbV9yb290R3JhcGhpY3NMYXllcikKKyAg ICBpZiAoIW1fcm9vdExheWVyKQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAocmVjdC5pc0Vt cHR5KCkpIHsKLSAgICAgICAgbV9yb290R3JhcGhpY3NMYXllci0+c2V0TmVlZHNEaXNwbGF5KCk7 CisgICAgICAgIG1fcm9vdExheWVyLT5zZXROZWVkc0Rpc3BsYXkoKTsKICAgICAgICAgcmV0dXJu OwogICAgIH0KIAotICAgIG1fcm9vdEdyYXBoaWNzTGF5ZXItPnNldE5lZWRzRGlzcGxheUluUmVj dChyZWN0KTsKKyAgICBtX25vbkNvbXBvc2l0ZWRDb250ZW50TGF5ZXItPnNldE5lZWRzRGlzcGxh eUluUmVjdChyZWN0KTsKKyAgICBzY2hlZHVsZUxheWVyRmx1c2goKTsKIH0KIAotdm9pZCBBY2Nl bGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6cmVzaXplUm9vdExheWVyKGNvbnN0IEludFNpemUm IHNpemUpCit2b2lkIEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0OjpyZXNpemVSb290TGF5 ZXIoY29uc3QgSW50U2l6ZSYgbmV3U2l6ZSkKIHsKICAgICBpZiAoIW1fcm9vdExheWVyRW1iZWRk ZXIpCiAgICAgICAgIHJldHVybjsKIAorICAgIGlmIChtX3Jvb3RMYXllci0+c2l6ZSgpID09IG5l d1NpemUpCisgICAgICAgIHJldHVybjsKKwogICAgIEd0a0FsbG9jYXRpb24gYWxsb2NhdGlvbjsK ICAgICBhbGxvY2F0aW9uLnggPSAwOwogICAgIGFsbG9jYXRpb24ueSA9IDA7Ci0gICAgYWxsb2Nh dGlvbi53aWR0aCA9IHNpemUud2lkdGgoKTsKLSAgICBhbGxvY2F0aW9uLmhlaWdodCA9IHNpemUu aGVpZ2h0KCk7CisgICAgYWxsb2NhdGlvbi53aWR0aCA9IG5ld1NpemUud2lkdGgoKTsKKyAgICBh bGxvY2F0aW9uLmhlaWdodCA9IG5ld1NpemUuaGVpZ2h0KCk7CiAgICAgZ3RrX3dpZGdldF9zaXpl X2FsbG9jYXRlKEdUS19XSURHRVQobV9yb290TGF5ZXJFbWJlZGRlciksICZhbGxvY2F0aW9uKTsK IAorICAgIG1fcm9vdExheWVyLT5zZXRTaXplKG5ld1NpemUpOworCisgICAgLy8gSWYgdGhlIG5l d1NpemUgZXhwb3NlcyBuZXcgYXJlYXMgb2YgdGhlIG5vbi1jb21wb3NpdGVkIGNvbnRlbnQgYSBz ZXROZWVkc0Rpc3BsYXkgaXMgbmVlZGVkCisgICAgLy8gZm9yIHRob3NlIG5ld2x5IGV4cG9zZWQg YXJlYXMuCisgICAgRmxvYXRTaXplIG9sZFNpemUgPSBtX25vbkNvbXBvc2l0ZWRDb250ZW50TGF5 ZXItPnNpemUoKTsKKyAgICBtX25vbkNvbXBvc2l0ZWRDb250ZW50TGF5ZXItPnNldFNpemUobmV3 U2l6ZSk7CisKKyAgICBpZiAobmV3U2l6ZS53aWR0aCgpID4gb2xkU2l6ZS53aWR0aCgpKSB7Cisg ICAgICAgIGZsb2F0IGhlaWdodCA9IHN0ZDo6bWluKHN0YXRpY19jYXN0PGZsb2F0PihuZXdTaXpl LmhlaWdodCgpKSwgb2xkU2l6ZS5oZWlnaHQoKSk7CisgICAgICAgIG1fbm9uQ29tcG9zaXRlZENv bnRlbnRMYXllci0+c2V0TmVlZHNEaXNwbGF5SW5SZWN0KEZsb2F0UmVjdChvbGRTaXplLndpZHRo KCksIDAsIG5ld1NpemUud2lkdGgoKSAtIG9sZFNpemUud2lkdGgoKSwgaGVpZ2h0KSk7CisgICAg fQorCisgICAgaWYgKG5ld1NpemUuaGVpZ2h0KCkgPiBvbGRTaXplLmhlaWdodCgpKQorICAgICAg ICBtX25vbkNvbXBvc2l0ZWRDb250ZW50TGF5ZXItPnNldE5lZWRzRGlzcGxheUluUmVjdChGbG9h dFJlY3QoMCwgb2xkU2l6ZS5oZWlnaHQoKSwgbmV3U2l6ZS53aWR0aCgpLCBuZXdTaXplLmhlaWdo dCgpIC0gb2xkU2l6ZS5oZWlnaHQoKSkpOworCisgICAgbV9ub25Db21wb3NpdGVkQ29udGVudExh eWVyLT5zZXROZWVkc0Rpc3BsYXlJblJlY3QoSW50UmVjdChJbnRQb2ludCgpLCBuZXdTaXplKSk7 CiAgICAgc2NoZWR1bGVMYXllckZsdXNoKCk7CiB9CiAKIHZvaWQgQWNjZWxlcmF0ZWRDb21wb3Np dGluZ0NvbnRleHQ6OnNjcm9sbE5vbkNvbXBvc2l0ZWRDb250ZW50cyhjb25zdCBJbnRSZWN0JiBz Y3JvbGxSZWN0LCBjb25zdCBJbnRTaXplJiBzY3JvbGxPZmZzZXQpCiB7Ci0gICAgbm90SW1wbGVt ZW50ZWQoKTsKKyAgICBtX25vbkNvbXBvc2l0ZWRDb250ZW50TGF5ZXItPnNldE5lZWRzRGlzcGxh eUluUmVjdChzY3JvbGxSZWN0KTsKKyAgICBzY2hlZHVsZUxheWVyRmx1c2goKTsKIH0KIAogZ2Jv b2xlYW4gQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OmxheWVyRmx1c2hUaW1lckZpcmVk Q2FsbGJhY2soQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQqIGNvbnRleHQpCkBAIC0xNDMs OCArMjAzLDEwIEBAIHZvaWQgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OnNjaGVkdWxl TGF5ZXJGbHVzaCgpCiAKIGJvb2wgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OmZsdXNo UGVuZGluZ0xheWVyQ2hhbmdlcygpCiB7Ci0gICAgaWYgKG1fcm9vdEdyYXBoaWNzTGF5ZXIpCi0g ICAgICAgIG1fcm9vdEdyYXBoaWNzTGF5ZXItPmZsdXNoQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNM YXllck9ubHkoKTsKKyAgICBpZiAobV9yb290TGF5ZXIpIHsKKyAgICAgICAgbV9yb290TGF5ZXIt PmZsdXNoQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNMYXllck9ubHkoKTsKKyAgICAgICAgbV9ub25D b21wb3NpdGVkQ29udGVudExheWVyLT5mbHVzaENvbXBvc2l0aW5nU3RhdGVGb3JUaGlzTGF5ZXJP bmx5KCk7CisgICAgfQogCiAgICAgcmV0dXJuIGNvcmUobV93ZWJWaWV3KS0+bWFpbkZyYW1lKCkt PnZpZXcoKS0+Zmx1c2hDb21wb3NpdGluZ1N0YXRlSW5jbHVkaW5nU3ViZnJhbWVzKCk7CiB9CkBA IC0xNTIsMTEgKzIxNCwxNiBAQCBib29sIEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0Ojpm bHVzaFBlbmRpbmdMYXllckNoYW5nZXMoKQogdm9pZCBBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29u dGV4dDo6Zmx1c2hBbmRSZW5kZXJMYXllcnMoKQogewogICAgIG1fbGF5ZXJGbHVzaFRpbWVyQ2Fs bGJhY2tJZCA9IDA7Ci0gICAgZmx1c2hQZW5kaW5nTGF5ZXJDaGFuZ2VzKCk7Ci0gICAgaWYgKCFt X3Jvb3RHcmFwaGljc0xheWVyKQorCisgICAgaWYgKCFlbmFibGVkKCkpCiAgICAgICAgIHJldHVy bjsKIAotICAgIHJlbmRlckxheWVyc1RvV2luZG93KDAsIEludFJlY3QoKSk7CisgICAgRnJhbWUq IGZyYW1lID0gY29yZShtX3dlYlZpZXcpLT5tYWluRnJhbWUoKTsKKyAgICBpZiAoIWZyYW1lIHx8 ICFmcmFtZS0+Y29udGVudFJlbmRlcmVyKCkgfHwgIWZyYW1lLT52aWV3KCkpCisgICAgICAgIHJl dHVybjsKKworICAgIGlmICghZmx1c2hQZW5kaW5nTGF5ZXJDaGFuZ2VzKCkpCisgICAgICAgIHJl dHVybjsKIH0KIAogdm9pZCBBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6bm90aWZ5QW5p bWF0aW9uU3RhcnRlZChjb25zdCBXZWJDb3JlOjpHcmFwaGljc0xheWVyKiwgZG91YmxlIHRpbWUp CkBAIC0xNjgsOSArMjM1LDEyIEBAIHZvaWQgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6 Om5vdGlmeUZsdXNoUmVxdWlyZWQoY29uc3QgV2ViQ29yZTo6R3JhcGhpY3NMCiAgICAgQVNTRVJU X05PVF9SRUFDSEVEKCk7CiB9CiAKLXZvaWQgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6 OnBhaW50Q29udGVudHMoY29uc3QgV2ViQ29yZTo6R3JhcGhpY3NMYXllciosIFdlYkNvcmU6Okdy YXBoaWNzQ29udGV4dCYsIFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJQYWludGluZ1BoYXNlLCBjb25z dCBXZWJDb3JlOjpJbnRSZWN0JikKK3ZvaWQgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6 OnBhaW50Q29udGVudHMoY29uc3QgV2ViQ29yZTo6R3JhcGhpY3NMYXllciosIFdlYkNvcmU6Okdy YXBoaWNzQ29udGV4dCYgY29udGV4dCwgV2ViQ29yZTo6R3JhcGhpY3NMYXllclBhaW50aW5nUGhh c2UsIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHJlY3RUb1BhaW50KQogewotICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOworICAgIGNvbnRleHQuc2F2ZSgpOworICAgIGNvbnRleHQuY2xpcChyZWN0 VG9QYWludCk7CisgICAgY29yZShtX3dlYlZpZXcpLT5tYWluRnJhbWUoKS0+dmlldygpLT5wYWlu dCgmY29udGV4dCwgcmVjdFRvUGFpbnQpOworICAgIGNvbnRleHQucmVzdG9yZSgpOwogfQogCiB9 IC8vIG5hbWVzcGFjZSBXZWJLaXQK