18411 2008-04-10 12:06:52 -0700 Enable Page caching and create FrameViews on the fly 2008-04-14 13:09:09 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED Gtk P2 Normal --- 18064 1 zecke webkit-unassigned alp oldest_to_newest 77179 0 zecke 2008-04-10 12:06:52 -0700 Enable page caching for the Gtk+ port. This requires changes to the FrameLoaderClient, the way we handle the GtkAdjustments in the webview, and on the fly frameview creation. 77181 1 20461 zecke 2008-04-10 12:09:42 -0700 Created attachment 20461 Enable caching of pages Enable the page caching for the gtk+ port. 77546 2 jmalonzo 2008-04-14 06:05:31 -0700 *** Bug 14794 has been marked as a duplicate of this bug. *** 77550 3 20530 jmalonzo 2008-04-14 06:29:07 -0700 Created attachment 20530 test case This patch passes the attached test case. Also, the test case exposes bug #18064. 77605 4 alp 2008-04-14 13:09:09 -0700 Landed in r31877. Thanks for seeing this one through Holger! 20461 2008-04-10 12:09:42 -0700 2008-04-14 13:06:31 -0700 Enable caching of pages 0001-Create-the-FrameView-on-the-fly.patch text/plain 15376 zecke RnJvbSAwYzgyZTQwMmEzOTUzYjQ0MzFmMGI1M2NlMGM2YjliYzEyMWU3YTY4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBIb2xnZXIgRnJleXRoZXIgPHplY2tlQHNlbGZpc2gub3JnPgpE YXRlOiBTYXQsIDkgRmViIDIwMDggMDA6NTI6MzAgKzAxMDAKU3ViamVjdDogW1BBVENIXSBDcmVh dGUgdGhlIEZyYW1lVmlldyBvbiB0aGUgZmx5IGFuZCBjYWNoZSBwYWdlcwogICAgIC0gS2VlcCBh IGNvcHkgb2YgdGhlIEd0a0FkanVzdG1lbnQgdG8gYmUgYWJsZSB0byByZXVzZSBpdCBmb3IgdGhl CiAgICAgICBGcmFtZVZpZXdzCiAgICAgLSBEbyBub3QgaW5pdGlhbGx5IGNyZWF0ZSBhIEZyYW1l VmlldyBhbmQgdXBkYXRlIHRoZSBXZWJLaXQgY29kZSB0bwogICAgICAgY29wZSB3aXRoIG5vdCBo YXZpbmcgYSB2aWV3LgogICAgIC0gQ2FjaGUgc2V2ZW4gcGFnZXMgYnkgZGVmYXVsdC4KCi0tLQog V2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xsVmlld0d0ay5jcHAgICAgICAgICAgICAgfCAgICA3 IC0tCiBXZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcCB8 ICAgNjMgKysrKysrKysrKysrKy0tLS0tCiBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRl LmNwcCAgICAgICAgICAgICAgICB8ICAgIDQgKwogV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0cHJp dmF0ZS5oICAgICAgICAgICAgICAgICAgfCAgICAzICsKIFdlYktpdC9ndGsvd2Via2l0L3dlYmtp dHdlYmZyYW1lLmNwcCAgICAgICAgICAgICAgIHwgICAxOCArLS0tLS0KIFdlYktpdC9ndGsvd2Vi a2l0L3dlYmtpdHdlYnZpZXcuY3BwICAgICAgICAgICAgICAgIHwgICA2NiArKysrKysrKysrKysr KysrKysrLQogNiBmaWxlcyBjaGFuZ2VkLCAxMjAgaW5zZXJ0aW9ucygrKSwgNDEgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xsVmlld0d0ay5jcHAg Yi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3JvbGxWaWV3R3RrLmNwcAppbmRleCA1NTA5ZDk1Li5h NTQ5NWM2IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3JvbGxWaWV3R3RrLmNw cAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3JvbGxWaWV3R3RrLmNwcApAQCAtMjg3LDE1 ICsyODcsOCBAQCB2b2lkIFNjcm9sbFZpZXc6OnNldEd0a0FkanVzdG1lbnRzKEd0a0FkanVzdG1l bnQqIGhhZGosIEd0a0FkanVzdG1lbnQqIHZhZGopCiAgICAgICAgIG1fZGF0YS0+c2V0SGFzVmVy dGljYWxTY3JvbGxiYXIoZmFsc2UpOwogICAgICAgICBtX2RhdGEtPnNldEhhc0hvcml6b250YWxT Y3JvbGxiYXIoZmFsc2UpOwogCi0jaWYgR0xJQl9DSEVDS19WRVJTSU9OKDIsMTAsMCkKLSAgICAg ICAgZ19vYmplY3RfcmVmX3NpbmsobV9kYXRhLT5ob3Jpem9udGFsQWRqdXN0bWVudCk7Ci0gICAg ICAgIGdfb2JqZWN0X3JlZl9zaW5rKG1fZGF0YS0+dmVydGljYWxBZGp1c3RtZW50KTsKLSNlbHNl CiAgICAgICAgIGdfb2JqZWN0X3JlZihtX2RhdGEtPmhvcml6b250YWxBZGp1c3RtZW50KTsKLSAg ICAgICAgZ3RrX29iamVjdF9zaW5rKEdUS19PQkpFQ1QobV9kYXRhLT5ob3Jpem9udGFsQWRqdXN0 bWVudCkpOwogICAgICAgICBnX29iamVjdF9yZWYobV9kYXRhLT52ZXJ0aWNhbEFkanVzdG1lbnQp OwotICAgICAgICBndGtfb2JqZWN0X3NpbmsoR1RLX09CSkVDVChtX2RhdGEtPnZlcnRpY2FsQWRq dXN0bWVudCkpOwotI2VuZGlmCiAgICAgfQogCiAgICAgdXBkYXRlU2Nyb2xsYmFycyhtX2RhdGEt PnNjcm9sbE9mZnNldCk7CmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50R3RrLmNwcCBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVM b2FkZXJDbGllbnRHdGsuY3BwCmluZGV4IGRkYTM4MTAuLmZjNjU4ZTcgMTAwNjQ0Ci0tLSBhL1dl YktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCisrKyBiL1dl YktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCkBAIC0zNSw2 ICszNSw3IEBACiAjaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKICNpbmNsdWRlICJQbGF0Zm9y bVN0cmluZy5oIgogI2luY2x1ZGUgIlBsdWdpbkRhdGFiYXNlLmgiCisjaW5jbHVkZSAiUmVuZGVy UGFydC5oIgogI2luY2x1ZGUgIlJlc291cmNlUmVxdWVzdC5oIgogI2luY2x1ZGUgIkNTdHJpbmcu aCIKICNpbmNsdWRlICJQcm9ncmVzc1RyYWNrZXIuaCIKQEAgLTI4NCwxOSArMjg1LDYgQEAgUGFz c1JlZlB0cjxGcmFtZT4gRnJhbWVMb2FkZXJDbGllbnQ6OmNyZWF0ZUZyYW1lKGNvbnN0IEtVUkwm IHVybCwgY29uc3QgU3RyaW5nJgogICAgIGlmICghY2hpbGRGcmFtZS0+dHJlZSgpLT5wYXJlbnQo KSkKICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICAvLyBQcm9wYWdhdGUgdGhlIG1hcmdpbndpZHRo L2hlaWdodCBhbmQgc2Nyb2xsaW5nIG1vZGVzIHRvIHRoZSB2aWV3LgotICAgIGlmIChvd25lckVs ZW1lbnQtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjpmcmFtZVRhZykgfHwgb3duZXJFbGVtZW50LT5o YXNUYWdOYW1lKEhUTUxOYW1lczo6aWZyYW1lVGFnKSkgewotICAgICAgICBIVE1MRnJhbWVFbGVt ZW50KiBmcmFtZUVsdCA9IHN0YXRpY19jYXN0PEhUTUxGcmFtZUVsZW1lbnQqPihvd25lckVsZW1l bnQpOwotICAgICAgICBpZiAoZnJhbWVFbHQtPnNjcm9sbGluZ01vZGUoKSA9PSBTY3JvbGxiYXJB bHdheXNPZmYpCi0gICAgICAgICAgICBjaGlsZEZyYW1lLT52aWV3KCktPnNldFNjcm9sbGJhcnNN b2RlKFNjcm9sbGJhckFsd2F5c09mZik7Ci0gICAgICAgIGludCBtYXJnaW5XaWR0aCA9IGZyYW1l RWx0LT5nZXRNYXJnaW5XaWR0aCgpOwotICAgICAgICBpbnQgbWFyZ2luSGVpZ2h0ID0gZnJhbWVF bHQtPmdldE1hcmdpbkhlaWdodCgpOwotICAgICAgICBpZiAobWFyZ2luV2lkdGggIT0gLTEpCi0g ICAgICAgICAgICBjaGlsZEZyYW1lLT52aWV3KCktPnNldE1hcmdpbldpZHRoKG1hcmdpbldpZHRo KTsKLSAgICAgICAgaWYgKG1hcmdpbkhlaWdodCAhPSAtMSkKLSAgICAgICAgICAgIGNoaWxkRnJh bWUtPnZpZXcoKS0+c2V0TWFyZ2luSGVpZ2h0KG1hcmdpbkhlaWdodCk7Ci0gICAgfQotCiAgICAg cmV0dXJuIGNoaWxkRnJhbWUucmVsZWFzZSgpOwogfQogCkBAIC03MDgsOCArNjk2LDcgQEAgYm9v bCBGcmFtZUxvYWRlckNsaWVudDo6c2hvdWxkRmFsbEJhY2soY29uc3QgUmVzb3VyY2VFcnJvciYp CiAKIGJvb2wgRnJhbWVMb2FkZXJDbGllbnQ6OmNhbkNhY2hlUGFnZSgpIGNvbnN0CiB7Ci0gICAg bm90SW1wbGVtZW50ZWQoKTsKLSAgICByZXR1cm4gZmFsc2U7CisgICAgcmV0dXJuIHRydWU7CiB9 CiAKIEZyYW1lKiBGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hDcmVhdGVQYWdlKCkKQEAgLTc0 MCwxNyArNzI3LDU3IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OnVwZGF0ZUdsb2JhbEhpc3Rv cnkoY29uc3QgS1VSTCYpCiAKIHZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OnNhdmVQbGF0Zm9ybURh dGFUb0NhY2hlZFBhZ2UoQ2FjaGVkUGFnZSopCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKIH0K IAogdm9pZCBGcmFtZUxvYWRlckNsaWVudDo6dHJhbnNpdGlvblRvQ29tbWl0dGVkRnJvbUNhY2hl ZFBhZ2UoQ2FjaGVkUGFnZSopCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKIH0KIAogdm9pZCBG cmFtZUxvYWRlckNsaWVudDo6dHJhbnNpdGlvblRvQ29tbWl0dGVkRm9yTmV3UGFnZSgpCiB7Ci0g ICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICBGcmFtZSogZnJhbWUgPSBjb3JlKG1fZnJhbWUpOwor ICAgIEFTU0VSVChmcmFtZSk7CisKKyAgICBQYWdlKiBwYWdlID0gZnJhbWUtPnBhZ2UoKTsKKyAg ICBBU1NFUlQocGFnZSk7CisKKyAgICBXZWJLaXRXZWJWaWV3KiBjb250YWluaW5nV2luZG93ID0g Z2V0Vmlld0Zyb21GcmFtZShtX2ZyYW1lKTsKKyAgICBib29sIGlzTWFpbkZyYW1lID0gZnJhbWUg PT0gcGFnZS0+bWFpbkZyYW1lKCk7CisgICAgZnJhbWUtPnNldFZpZXcoMCk7CisKKyAgICBGcmFt ZVZpZXcqIGZyYW1lVmlldzsKKyAgICBpZiAoaXNNYWluRnJhbWUpIHsKKyAgICAgICAgSW50U2l6 ZSBzaXplID0gSW50U2l6ZShHVEtfV0lER0VUKGNvbnRhaW5pbmdXaW5kb3cpLT5hbGxvY2F0aW9u LndpZHRoLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdUS19XSURHRVQoY29udGFp bmluZ1dpbmRvdyktPmFsbG9jYXRpb24uaGVpZ2h0KTsKKyAgICAgICAgZnJhbWVWaWV3ID0gbmV3 IEZyYW1lVmlldyhmcmFtZSwgc2l6ZSk7CisgICAgICAgIFdlYktpdFdlYlZpZXdQcml2YXRlKiBw cml2ID0gV0VCS0lUX1dFQl9WSUVXX0dFVF9QUklWQVRFKGNvbnRhaW5pbmdXaW5kb3cpOworICAg ICAgICBmcmFtZVZpZXctPnNldEd0a0FkanVzdG1lbnRzKHByaXYtPmhvcml6b250YWxBZGp1c3Rt ZW50LCBwcml2LT52ZXJ0aWNhbEFkanVzdG1lbnQpOworICAgIH0gZWxzZQorICAgICAgICBmcmFt ZVZpZXcgPSBuZXcgRnJhbWVWaWV3KGZyYW1lKTsKKworICAgIGZyYW1lLT5zZXRWaWV3KGZyYW1l Vmlldyk7CisgICAgLy8gRnJhbWVWaWV3cyBhcmUgY3JlYXRlZCB3aXRoIGEgcmVmIGNvdW50IG9m IDEuIFJlbGVhc2UgdGhpcyByZWYgc2luY2Ugd2UndmUgYXNzaWduZWQgaXQgdG8gZnJhbWUuCisg ICAgZnJhbWVWaWV3LT5kZXJlZigpOworICAgIGZyYW1lVmlldy0+c2V0Q29udGFpbmluZ1dpbmRv dyhHVEtfV0lER0VUKGNvbnRhaW5pbmdXaW5kb3cpKTsKKworICAgIGlmIChmcmFtZS0+b3duZXJS ZW5kZXJlcigpKQorICAgICAgICBmcmFtZS0+b3duZXJSZW5kZXJlcigpLT5zZXRXaWRnZXQoZnJh bWVWaWV3KTsKKworICAgIGlmICghZnJhbWUtPm93bmVyRWxlbWVudCgpKQorICAgICAgICByZXR1 cm47CisKKyAgICBIVE1MRnJhbWVPd25lckVsZW1lbnQqIG93bmVyRWxlbWVudCA9IGZyYW1lLT5v d25lckVsZW1lbnQoKTsKKyAgICBpZiAob3duZXJFbGVtZW50LT5oYXNUYWdOYW1lKEhUTUxOYW1l czo6ZnJhbWVUYWcpIHx8IG93bmVyRWxlbWVudC0+aGFzVGFnTmFtZShIVE1MTmFtZXM6OmlmcmFt ZVRhZykpIHsKKyAgICAgICAgSFRNTEZyYW1lRWxlbWVudCogZnJhbWVFbHQgPSBzdGF0aWNfY2Fz dDxIVE1MRnJhbWVFbGVtZW50Kj4ob3duZXJFbGVtZW50KTsKKyAgICAgICAgaWYgKGZyYW1lRWx0 LT5zY3JvbGxpbmdNb2RlKCkgPT0gU2Nyb2xsYmFyQWx3YXlzT2ZmKQorICAgICAgICAgICAgZnJh bWVWaWV3LT5zZXRTY3JvbGxiYXJzTW9kZShTY3JvbGxiYXJBbHdheXNPZmYpOworICAgICAgICBp bnQgbWFyZ2luV2lkdGggPSBmcmFtZUVsdC0+Z2V0TWFyZ2luV2lkdGgoKTsKKyAgICAgICAgaW50 IG1hcmdpbkhlaWdodCA9IGZyYW1lRWx0LT5nZXRNYXJnaW5IZWlnaHQoKTsKKyAgICAgICAgaWYg KG1hcmdpbldpZHRoICE9IC0xKQorICAgICAgICAgICAgZnJhbWVWaWV3LT5zZXRNYXJnaW5XaWR0 aChtYXJnaW5XaWR0aCk7CisgICAgICAgIGlmIChtYXJnaW5IZWlnaHQgIT0gLTEpCisgICAgICAg ICAgICBmcmFtZVZpZXctPnNldE1hcmdpbkhlaWdodChtYXJnaW5IZWlnaHQpOworICAgIH0KIH0K IAogfQpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0cHJpdmF0ZS5jcHAgYi9X ZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmNwcAppbmRleCAyNDVjOTgxLi4xYTg1MjY1 IDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmNwcAorKysgYi9X ZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmNwcApAQCAtMjUsNiArMjUsNyBAQAogI2lu Y2x1ZGUgIkZyYW1lTG9hZGVyQ2xpZW50R3RrLmgiCiAjaW5jbHVkZSAiTG9nZ2luZy5oIgogI2lu Y2x1ZGUgIk5vdEltcGxlbWVudGVkLmgiCisjaW5jbHVkZSAiUGFnZUNhY2hlLmgiCiAjaW5jbHVk ZSAiUGFzdGVib2FyZC5oIgogI2luY2x1ZGUgIlBhc3RlYm9hcmRIZWxwZXJHdGsuaCIKICNpbmNs dWRlIDxranMvSW5pdGlhbGl6ZVRocmVhZGluZy5oPgpAQCAtOTMsNiArOTQsOSBAQCB2b2lkIHdl YmtpdF9pbml0KCkKICAgICBLSlM6OmluaXRpYWxpemVUaHJlYWRpbmcoKTsKICAgICBXZWJDb3Jl OjpJbml0aWFsaXplTG9nZ2luZ0NoYW5uZWxzSWZOZWNlc3NhcnkoKTsKIAorICAgIC8vIEZJWE1F OiBFeHBvc2UgdGhpcyB3aXRoIGFuIEFQSQorICAgIFdlYkNvcmU6OnBhZ2VDYWNoZSgpLT5zZXRD YXBhY2l0eSg3KTsKKwogI2lmIEVOQUJMRShEQVRBQkFTRSkKICAgICAvLyBGSVhNRTogSXQgc2hv dWxkIGJlIHBvc3NpYmxlIGZvciBjbGllbnQgYXBwbGljYXRpb25zIHRvIG92ZXJyaWRlIHRoaXMg ZGVmYXVsdCBsb2NhdGlvbgogICAgIGdjaGFyKiBkYXRhYmFzZURpcmVjdG9yeSA9IGdfYnVpbGRf ZmlsZW5hbWUoZ19nZXRfdXNlcl9kYXRhX2RpcigpLCAid2Via2l0IiwgImRhdGFiYXNlcyIsIE5V TEwpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0cHJpdmF0ZS5oIGIvV2Vi S2l0L2d0ay93ZWJraXQvd2Via2l0cHJpdmF0ZS5oCmluZGV4IGU2OGZmNmMuLjZhNjBhZTkgMTAw NjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHByaXZhdGUuaAorKysgYi9XZWJLaXQv Z3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmgKQEAgLTg1LDYgKzg1LDkgQEAgZXh0ZXJuICJDIiB7 CiAgICAgICAgIEd0a1RhcmdldExpc3QqIHBhc3RlX3RhcmdldF9saXN0OwogCiAgICAgICAgIGdi b29sZWFuIHRyYW5zcGFyZW50OworCisgICAgICAgIEd0a0FkanVzdG1lbnQqIGhvcml6b250YWxB ZGp1c3RtZW50OworICAgICAgICBHdGtBZGp1c3RtZW50KiB2ZXJ0aWNhbEFkanVzdG1lbnQ7CiAg ICAgfTsKIAogICAgICNkZWZpbmUgV0VCS0lUX1dFQl9GUkFNRV9HRVRfUFJJVkFURShvYmopICAg IChHX1RZUEVfSU5TVEFOQ0VfR0VUX1BSSVZBVEUoKG9iaiksIFdFQktJVF9UWVBFX1dFQl9GUkFN RSwgV2ViS2l0V2ViRnJhbWVQcml2YXRlKSkKZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvd2Via2l0 L3dlYmtpdHdlYmZyYW1lLmNwcCBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYmZyYW1lLmNw cAppbmRleCAxMmI5ZjMxLi42MWExNDk3IDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93 ZWJraXR3ZWJmcmFtZS5jcHAKKysrIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViZnJhbWUu Y3BwCkBAIC0yMTcsMTcgKzIxNywxMCBAQCBXZWJLaXRXZWJGcmFtZSogd2Via2l0X3dlYl9mcmFt ZV9uZXcoV2ViS2l0V2ViVmlldyogd2ViVmlldykKICAgICBXZWJLaXRXZWJGcmFtZVByaXZhdGUq IHByaXYgPSBmcmFtZS0+cHJpdjsKICAgICBXZWJLaXRXZWJWaWV3UHJpdmF0ZSogdmlld1ByaXYg PSBXRUJLSVRfV0VCX1ZJRVdfR0VUX1BSSVZBVEUod2ViVmlldyk7CiAKKyAgICBwcml2LT53ZWJW aWV3ID0gd2ViVmlldzsKICAgICBwcml2LT5jbGllbnQgPSBuZXcgV2ViS2l0OjpGcmFtZUxvYWRl ckNsaWVudChmcmFtZSk7CiAgICAgcHJpdi0+Y29yZUZyYW1lID0gbmV3IEZyYW1lKHZpZXdQcml2 LT5jb3JlUGFnZSwgMCwgcHJpdi0+Y2xpZW50KTsKLQotICAgIEZyYW1lVmlldyogZnJhbWVWaWV3 ID0gbmV3IEZyYW1lVmlldyhwcml2LT5jb3JlRnJhbWUuZ2V0KCkpOwotICAgIGZyYW1lVmlldy0+ c2V0Q29udGFpbmluZ1dpbmRvdyhHVEtfV0lER0VUKHdlYlZpZXcpKTsKLSAgICBmcmFtZVZpZXct PnNldEd0a0FkanVzdG1lbnRzKEdUS19BREpVU1RNRU5UKGd0a19hZGp1c3RtZW50X25ldygwLjAs IDAuMCwgMC4wLCAwLjAsIDAuMCwgMC4wKSksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBHVEtfQURKVVNUTUVOVChndGtfYWRqdXN0bWVudF9uZXcoMC4wLCAwLjAsIDAuMCwgMC4w LCAwLjAsIDAuMCkpKTsKLSAgICBwcml2LT5jb3JlRnJhbWUtPnNldFZpZXcoZnJhbWVWaWV3KTsK LSAgICBmcmFtZVZpZXctPmRlcmVmKCk7CiAgICAgcHJpdi0+Y29yZUZyYW1lLT5pbml0KCk7Ci0g ICAgcHJpdi0+d2ViVmlldyA9IHdlYlZpZXc7CiAKICAgICByZXR1cm4gZnJhbWU7CiB9CkBAIC0y MzgsMTUgKzIzMSwxMCBAQCBXZWJLaXRXZWJGcmFtZSogd2Via2l0X3dlYl9mcmFtZV9pbml0X3dp dGhfd2ViX3ZpZXcoV2ViS2l0V2ViVmlldyogd2ViVmlldywgSFRNTAogICAgIFdlYktpdFdlYkZy YW1lUHJpdmF0ZSogcHJpdiA9IGZyYW1lLT5wcml2OwogICAgIFdlYktpdFdlYlZpZXdQcml2YXRl KiB2aWV3UHJpdiA9IFdFQktJVF9XRUJfVklFV19HRVRfUFJJVkFURSh3ZWJWaWV3KTsKIAorICAg IHByaXYtPndlYlZpZXcgPSB3ZWJWaWV3OwogICAgIHByaXYtPmNsaWVudCA9IG5ldyBXZWJLaXQ6 OkZyYW1lTG9hZGVyQ2xpZW50KGZyYW1lKTsKICAgICBwcml2LT5jb3JlRnJhbWUgPSBuZXcgRnJh bWUodmlld1ByaXYtPmNvcmVQYWdlLCBlbGVtZW50LCBwcml2LT5jbGllbnQpOwotCi0gICAgRnJh bWVWaWV3KiBmcmFtZVZpZXcgPSBuZXcgRnJhbWVWaWV3KHByaXYtPmNvcmVGcmFtZS5nZXQoKSk7 Ci0gICAgZnJhbWVWaWV3LT5zZXRDb250YWluaW5nV2luZG93KEdUS19XSURHRVQod2ViVmlldykp OwotICAgIHByaXYtPmNvcmVGcmFtZS0+c2V0VmlldyhmcmFtZVZpZXcpOwotICAgIGZyYW1lVmll dy0+ZGVyZWYoKTsKICAgICBwcml2LT5jb3JlRnJhbWUtPmluaXQoKTsKLSAgICBwcml2LT53ZWJW aWV3ID0gd2ViVmlldzsKIAogICAgIHJldHVybiBmcmFtZTsKIH0KQEAgLTQ4OCw3ICs0NzYsNyBA QCBnY2hhciogd2Via2l0X3dlYl9mcmFtZV9nZXRfaW5uZXJfdGV4dChXZWJLaXRXZWJGcmFtZSog ZnJhbWUpCiAKICAgICBGcmFtZVZpZXcqIHZpZXcgPSBjb3JlRnJhbWUtPnZpZXcoKTsKIAotICAg IGlmICh2aWV3LT5sYXlvdXRQZW5kaW5nKCkpCisgICAgaWYgKHZpZXcgJiYgdmlldy0+bGF5b3V0 UGVuZGluZygpKQogICAgICAgICB2aWV3LT5sYXlvdXQoKTsKIAogICAgIEVsZW1lbnQqIGRvY3Vt ZW50RWxlbWVudCA9IGNvcmVGcmFtZS0+ZG9jdW1lbnQoKS0+ZG9jdW1lbnRFbGVtZW50KCk7CmRp ZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcCBiL1dlYktpdC9n dGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCmluZGV4IGNkOWRkZmMuLmQyNmYxM2EgMTAwNjQ0 Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCisrKyBiL1dlYktpdC9n dGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCkBAIC0xMTQsNiArMTE0LDEwIEBAIHN0YXRpYyBn Ym9vbGVhbiB3ZWJraXRfd2ViX3ZpZXdfZm9yd2FyZF9jb250ZXh0X21lbnVfZXZlbnQoV2ViS2l0 V2ViVmlldyogd2ViVmllCiAgICAgUGFnZSogcGFnZSA9IGNvcmUod2ViVmlldyk7CiAgICAgcGFn ZS0+Y29udGV4dE1lbnVDb250cm9sbGVyKCktPmNsZWFyQ29udGV4dE1lbnUoKTsKICAgICBGcmFt ZSogZm9jdXNlZEZyYW1lID0gcGFnZS0+Zm9jdXNDb250cm9sbGVyKCktPmZvY3VzZWRPck1haW5G cmFtZSgpOworCisgICAgaWYgKCFmb2N1c2VkRnJhbWUtPnZpZXcoKSkKKyAgICAgICAgcmV0dXJu IEZBTFNFOworCiAgICAgZm9jdXNlZEZyYW1lLT52aWV3KCktPnNldEN1cnNvcihwb2ludGVyQ3Vy c29yKCkpOwogICAgIGJvb2wgaGFuZGxlZEV2ZW50ID0gZm9jdXNlZEZyYW1lLT5ldmVudEhhbmRs ZXIoKS0+c2VuZENvbnRleHRNZW51RXZlbnQoZXZlbnQpOwogICAgIGlmICghaGFuZGxlZEV2ZW50 KQpAQCAtMTUxLDYgKzE1NSw5IEBAIHN0YXRpYyBnYm9vbGVhbiB3ZWJraXRfd2ViX3ZpZXdfcG9w dXBfbWVudV9oYW5kbGVyKEd0a1dpZGdldCogd2lkZ2V0KQogICAgIC8vIFRoZSBjb250ZXh0IG1l bnUgZXZlbnQgd2FzIGdlbmVyYXRlZCBmcm9tIHRoZSBrZXlib2FyZCwgc28gc2hvdyB0aGUgY29u dGV4dCBtZW51IGJ5IHRoZSBjdXJyZW50IHNlbGVjdGlvbi4KICAgICBQYWdlKiBwYWdlID0gY29y ZShXRUJLSVRfV0VCX1ZJRVcod2lkZ2V0KSk7CiAgICAgRnJhbWVWaWV3KiB2aWV3ID0gcGFnZS0+ bWFpbkZyYW1lKCktPnZpZXcoKTsKKyAgICBpZiAoIXZpZXcpCisgICAgICAgIHJldHVybiBGQUxT RTsgICAgCisKICAgICBQb3NpdGlvbiBzdGFydCA9IHBhZ2UtPm1haW5GcmFtZSgpLT5zZWxlY3Rp b25Db250cm9sbGVyKCktPnNlbGVjdGlvbigpLnN0YXJ0KCk7CiAgICAgUG9zaXRpb24gZW5kID0g cGFnZS0+bWFpbkZyYW1lKCktPnNlbGVjdGlvbkNvbnRyb2xsZXIoKS0+c2VsZWN0aW9uKCkuZW5k KCk7CiAKQEAgLTI1MSw3ICsyNTgsNyBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0X3dlYl92aWV3 X2V4cG9zZV9ldmVudChHdGtXaWRnZXQqIHdpZGdldCwgR2RrRXZlbnRFeHBvc2UqCiAgICAgY2Fp cm9fdCogY3IgPSBnZGtfY2Fpcm9fY3JlYXRlKGV2ZW50LT53aW5kb3cpOwogICAgIEdyYXBoaWNz Q29udGV4dCBjdHgoY3IpOwogICAgIGN0eC5zZXRHZGtFeHBvc2VFdmVudChldmVudCk7Ci0gICAg aWYgKGZyYW1lLT5yZW5kZXJlcigpKSB7CisgICAgaWYgKGZyYW1lLT5yZW5kZXJlcigpICYmIGZy YW1lLT52aWV3KCkpIHsKICAgICAgICAgZnJhbWUtPnZpZXcoKS0+bGF5b3V0SWZOZWVkZWRSZWN1 cnNpdmUoKTsKIAogICAgICAgICBpZiAocHJpdi0+dHJhbnNwYXJlbnQpIHsKQEAgLTI3NSw2ICsy ODIsOSBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0X3dlYl92aWV3X2tleV9wcmVzc19ldmVudChH dGtXaWRnZXQqIHdpZGdldCwgR2RrRXZlbnRLZXkqCiAgICAgRnJhbWUqIGZyYW1lID0gY29yZSh3 ZWJWaWV3KS0+Zm9jdXNDb250cm9sbGVyKCktPmZvY3VzZWRPck1haW5GcmFtZSgpOwogICAgIFBs YXRmb3JtS2V5Ym9hcmRFdmVudCBrZXlib2FyZEV2ZW50KGV2ZW50KTsKIAorICAgIGlmICghZnJh bWUtPnZpZXcoKSkKKyAgICAgICAgcmV0dXJuIEZBTFNFOworCiAgICAgaWYgKGZyYW1lLT5ldmVu dEhhbmRsZXIoKS0+a2V5RXZlbnQoa2V5Ym9hcmRFdmVudCkpCiAgICAgICAgIHJldHVybiBUUlVF OwogCkBAIC0zMTcsNiArMzI3LDkgQEAgc3RhdGljIGdib29sZWFuIHdlYmtpdF93ZWJfdmlld19r ZXlfcmVsZWFzZV9ldmVudChHdGtXaWRnZXQqIHdpZGdldCwgR2RrRXZlbnRLZXkKICAgICBXZWJL aXRXZWJWaWV3KiB3ZWJWaWV3ID0gV0VCS0lUX1dFQl9WSUVXKHdpZGdldCk7CiAKICAgICBGcmFt ZSogZnJhbWUgPSBjb3JlKHdlYlZpZXcpLT5mb2N1c0NvbnRyb2xsZXIoKS0+Zm9jdXNlZE9yTWFp bkZyYW1lKCk7CisgICAgaWYgKCFmcmFtZS0+dmlldygpKQorICAgICAgICByZXR1cm4gRkFMU0U7 CisKICAgICBQbGF0Zm9ybUtleWJvYXJkRXZlbnQga2V5Ym9hcmRFdmVudChldmVudCk7CiAKICAg ICBpZiAoZnJhbWUtPmV2ZW50SGFuZGxlcigpLT5rZXlFdmVudChrZXlib2FyZEV2ZW50KSkKQEAg LTMzOCw2ICszNTEsOSBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0X3dlYl92aWV3X2J1dHRvbl9w cmVzc19ldmVudChHdGtXaWRnZXQqIHdpZGdldCwgR2RrRXZlbnRCdQogICAgIGlmIChldmVudC0+ YnV0dG9uID09IDMpCiAgICAgICAgIHJldHVybiB3ZWJraXRfd2ViX3ZpZXdfZm9yd2FyZF9jb250 ZXh0X21lbnVfZXZlbnQod2ViVmlldywgUGxhdGZvcm1Nb3VzZUV2ZW50KGV2ZW50KSk7CiAKKyAg ICBpZiAoIWZyYW1lLT52aWV3KCkpCisgICAgICAgIHJldHVybiBGQUxTRTsKKwogICAgIHJldHVy biBmcmFtZS0+ZXZlbnRIYW5kbGVyKCktPmhhbmRsZU1vdXNlUHJlc3NFdmVudChQbGF0Zm9ybU1v dXNlRXZlbnQoZXZlbnQpKTsKIH0KIApAQCAtMzU2LDYgKzM3Miw5IEBAIHN0YXRpYyBnYm9vbGVh biB3ZWJraXRfd2ViX3ZpZXdfYnV0dG9uX3JlbGVhc2VfZXZlbnQoR3RrV2lkZ2V0KiB3aWRnZXQs IEdka0V2ZW50CiAjZW5kaWYKICAgICB9CiAKKyAgICBpZiAoIWZvY3VzZWRGcmFtZS0+dmlldygp KQorICAgICAgICByZXR1cm4gRkFMU0U7CisKICAgICByZXR1cm4gZm9jdXNlZEZyYW1lLT5ldmVu dEhhbmRsZXIoKS0+aGFuZGxlTW91c2VSZWxlYXNlRXZlbnQoUGxhdGZvcm1Nb3VzZUV2ZW50KGV2 ZW50KSk7CiB9CiAKQEAgLTM2NCw2ICszODMsOSBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0X3dl Yl92aWV3X21vdGlvbl9ldmVudChHdGtXaWRnZXQqIHdpZGdldCwgR2RrRXZlbnRNb3Rpb24qCiAg ICAgV2ViS2l0V2ViVmlldyogd2ViVmlldyA9IFdFQktJVF9XRUJfVklFVyh3aWRnZXQpOwogCiAg ICAgRnJhbWUqIGZyYW1lID0gY29yZSh3ZWJWaWV3KS0+bWFpbkZyYW1lKCk7CisgICAgaWYgKCFm cmFtZS0+dmlldygpKQorICAgICAgICByZXR1cm4gRkFMU0U7CisKICAgICByZXR1cm4gZnJhbWUt PmV2ZW50SGFuZGxlcigpLT5tb3VzZU1vdmVkKFBsYXRmb3JtTW91c2VFdmVudChldmVudCkpOwog fQogCkBAIC0zNzIsNiArMzk0LDkgQEAgc3RhdGljIGdib29sZWFuIHdlYmtpdF93ZWJfdmlld19z Y3JvbGxfZXZlbnQoR3RrV2lkZ2V0KiB3aWRnZXQsIEdka0V2ZW50U2Nyb2xsKgogICAgIFdlYktp dFdlYlZpZXcqIHdlYlZpZXcgPSBXRUJLSVRfV0VCX1ZJRVcod2lkZ2V0KTsKIAogICAgIEZyYW1l KiBmcmFtZSA9IGNvcmUod2ViVmlldyktPm1haW5GcmFtZSgpOworICAgIGlmICghZnJhbWUtPnZp ZXcoKSkKKyAgICAgICAgcmV0dXJuIEZBTFNFOworCiAgICAgUGxhdGZvcm1XaGVlbEV2ZW50IHdo ZWVsRXZlbnQoZXZlbnQpOwogICAgIHJldHVybiBmcmFtZS0+ZXZlbnRIYW5kbGVyKCktPmhhbmRs ZVdoZWVsRXZlbnQod2hlZWxFdmVudCk7CiB9CkBAIC0zODMsNiArNDA4LDkgQEAgc3RhdGljIHZv aWQgd2Via2l0X3dlYl92aWV3X3NpemVfYWxsb2NhdGUoR3RrV2lkZ2V0KiB3aWRnZXQsIEd0a0Fs bG9jYXRpb24qIGFsbG8KICAgICBXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3ID0gV0VCS0lUX1dFQl9W SUVXKHdpZGdldCk7CiAKICAgICBGcmFtZSogZnJhbWUgPSBjb3JlKHdlYlZpZXcpLT5tYWluRnJh bWUoKTsKKyAgICBpZiAoIWZyYW1lLT52aWV3KCkpCisgICAgICAgIHJldHVybjsKKwogICAgIGZy YW1lLT52aWV3KCktPnJlc2l6ZShhbGxvY2F0aW9uLT53aWR0aCwgYWxsb2NhdGlvbi0+aGVpZ2h0 KTsKICAgICBmcmFtZS0+Zm9yY2VMYXlvdXQoKTsKICAgICBmcmFtZS0+dmlldygpLT5hZGp1c3RW aWV3U2l6ZSgpOwpAQCAtNDM4LDYgKzQ2NiwyNSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3Zp ZXdfcmVhbGl6ZShHdGtXaWRnZXQqIHdpZGdldCkKIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmll d19zZXRfc2Nyb2xsX2FkanVzdG1lbnRzKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIEd0a0FkanVz dG1lbnQqIGhhZGosIEd0a0FkanVzdG1lbnQqIHZhZGopCiB7CiAgICAgRnJhbWVWaWV3KiB2aWV3 ID0gY29yZSh3ZWJraXRfd2ViX3ZpZXdfZ2V0X21haW5fZnJhbWUod2ViVmlldykpLT52aWV3KCk7 CisKKyAgICBpZiAoaGFkaikKKyAgICAgICAgZ19vYmplY3RfcmVmKGhhZGopOworICAgIGlmICh2 YWRqKQorICAgICAgICBnX29iamVjdF9yZWYodmFkaik7CisKKyAgICBXZWJLaXRXZWJWaWV3UHJp dmF0ZSogcHJpdiA9IHdlYlZpZXctPnByaXY7CisKKyAgICBpZiAocHJpdi0+aG9yaXpvbnRhbEFk anVzdG1lbnQpCisgICAgICAgIGdfb2JqZWN0X3VucmVmKHByaXYtPmhvcml6b250YWxBZGp1c3Rt ZW50KTsKKyAgICBpZiAocHJpdi0+dmVydGljYWxBZGp1c3RtZW50KQorICAgICAgICBnX29iamVj dF91bnJlZihwcml2LT52ZXJ0aWNhbEFkanVzdG1lbnQpOworCisgICAgcHJpdi0+aG9yaXpvbnRh bEFkanVzdG1lbnQgPSBoYWRqOworICAgIHByaXYtPnZlcnRpY2FsQWRqdXN0bWVudCA9IHZhZGo7 CisKKyAgICBpZiAoIXZpZXcpCisgICAgICAgIHJldHVybjsKKwogICAgIHZpZXctPnNldEd0a0Fk anVzdG1lbnRzKGhhZGosIHZhZGopOwogfQogCkBAIC02MzEsNiArNjc4LDEwIEBAIHN0YXRpYyB2 b2lkIHdlYmtpdF93ZWJfdmlld19maW5hbGl6ZShHT2JqZWN0KiBvYmplY3QpCiAgICAgY29yZShw cml2LT5tYWluRnJhbWUpLT5sb2FkZXIoKS0+ZGV0YWNoQ2hpbGRyZW4oKTsKICAgICBkZWxldGUg cHJpdi0+Y29yZVBhZ2U7CiAKKyAgICBpZiAocHJpdi0+aG9yaXpvbnRhbEFkanVzdG1lbnQpCisg ICAgICAgIGdfb2JqZWN0X3VucmVmKHByaXYtPmhvcml6b250YWxBZGp1c3RtZW50KTsKKyAgICBp ZiAocHJpdi0+dmVydGljYWxBZGp1c3RtZW50KQorICAgICAgICBnX29iamVjdF91bnJlZihwcml2 LT52ZXJ0aWNhbEFkanVzdG1lbnQpOwogICAgIGdfb2JqZWN0X3VucmVmKHByaXYtPmJhY2tGb3J3 YXJkTGlzdCk7CiAgICAgZ19vYmplY3RfdW5yZWYocHJpdi0+d2ViU2V0dGluZ3MpOwogICAgIGdf b2JqZWN0X3VucmVmKHByaXYtPm1haW5GcmFtZSk7CkBAIC0xMjQ4LDYgKzEyOTksMTkgQEAgc3Rh dGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2luaXQoV2ViS2l0V2ViVmlldyogd2ViVmlldykKICAg ICBwcml2LT5pbUNvbnRleHQgPSBndGtfaW1fbXVsdGljb250ZXh0X25ldygpOwogICAgIHByaXYt PmNvcmVQYWdlID0gbmV3IFBhZ2UobmV3IFdlYktpdDo6Q2hyb21lQ2xpZW50KHdlYlZpZXcpLCBu ZXcgV2ViS2l0OjpDb250ZXh0TWVudUNsaWVudCwgbmV3IFdlYktpdDo6RWRpdG9yQ2xpZW50KHdl YlZpZXcpLCBuZXcgV2ViS2l0OjpEcmFnQ2xpZW50LCBuZXcgV2ViS2l0OjpJbnNwZWN0b3JDbGll bnQpOwogCisgICAgcHJpdi0+aG9yaXpvbnRhbEFkanVzdG1lbnQgPSBHVEtfQURKVVNUTUVOVChn dGtfYWRqdXN0bWVudF9uZXcoMC4wLCAwLjAsIDAuMCwgMC4wLCAwLjAsIDAuMCkpOworICAgIHBy aXYtPnZlcnRpY2FsQWRqdXN0bWVudCA9IEdUS19BREpVU1RNRU5UKGd0a19hZGp1c3RtZW50X25l dygwLjAsIDAuMCwgMC4wLCAwLjAsIDAuMCwgMC4wKSk7CisKKyNpZiBHTElCX0NIRUNLX1ZFUlNJ T04oMiwxMCwwKQorICAgIGdfb2JqZWN0X3JlZl9zaW5rKHByaXYtPmhvcml6b250YWxBZGp1c3Rt ZW50KTsKKyAgICBnX29iamVjdF9yZWZfc2luayhwcml2LT52ZXJ0aWNhbEFkanVzdG1lbnQpOwor I2Vsc2UKKyAgICBnX29iamVjdF9yZWYocHJpdi0+aG9yaXpvbnRhbEFkanVzdG1lbnQpOworICAg IGd0a19vYmplY3Rfc2luayhHVEtfT0JKRUNUKHByaXYtPmhvcml6b250YWxBZGp1c3RtZW50KSk7 CisgICAgZ19vYmplY3RfcmVmKHByaXYtPnZlcnRpY2FsQWRqdXN0bWVudCk7CisgICAgZ3RrX29i amVjdF9zaW5rKEdUS19PQkpFQ1QocHJpdi0+dmVydGljYWxBZGp1c3RtZW50KSk7CisjZW5kaWYK KwogICAgIEdUS19XSURHRVRfU0VUX0ZMQUdTKHdlYlZpZXcsIEdUS19DQU5fRk9DVVMpOwogICAg IHByaXYtPm1haW5GcmFtZSA9IFdFQktJVF9XRUJfRlJBTUUod2Via2l0X3dlYl9mcmFtZV9uZXco d2ViVmlldykpOwogICAgIHByaXYtPmxhc3RQb3B1cFhQb3NpdGlvbiA9IHByaXYtPmxhc3RQb3B1 cFlQb3NpdGlvbiA9IC0xOwotLSAKMS41LjQucmMzLjI0LmdiNTMxMzkKCg== 20530 2008-04-14 06:29:07 -0700 2008-04-14 06:29:07 -0700 test case frametest.html text/html 177 jmalonzo PGlmcmFtZSBzcmM9Imh0dHA6Ly9tYXBzLmdvb2dsZS5jb20iIHdpZHRoPSI2MDAiIGhlaWdodD0i MjAwIgpmcmFtZWJvcmRlcj0iMCIgc2Nyb2xsaW5nPSJhdXRvIiBuYW1lPSJteUlubGluZUZyYW1l Ij4KdGVzdCBmcmFtZTwvaWZyYW1lPgoKPGEgaHJlZj0iaHR0cDovL3d3dy5nb29nbGUuY29tIj5H bzwvYT4K