59017 2011-04-20 12:37:02 -0700 [GTK] Implement History API FrameLoaderClient methods 2011-12-03 12:06:31 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 xan.lopez xan.lopez eric gustavo mrobinson webkit.review.bot xan.lopez oldest_to_newest 389438 0 xan.lopez 2011-04-20 12:37:02 -0700 We need to fake a load when they are used for our UA to have a chance of updating its state in the UI. This makes pages like http://diveintohtml5.org/examples/history/casey.html work in Epiphany. 389439 1 90386 xan.lopez 2011-04-20 12:38:25 -0700 Created attachment 90386 history.diff 389445 2 webkit.review.bot 2011-04-20 12:47:10 -0700 Attachment 90386 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/gtk/ChangeLog', u'Source/Web..." exit_code: 1 Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp:908: Declaration has space between type name and * in WebKitWebFrame *mainFrame [whitespace/declaration] [3] Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp:909: Declaration has space between type name and * in WebKitWebDataSource *dataSource [whitespace/declaration] [3] Total errors found: 2 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 389456 3 90392 xan.lopez 2011-04-20 13:05:38 -0700 Created attachment 90392 history.diff Nothing to see here, move along. 389458 4 mrobinson 2011-04-20 13:09:29 -0700 View in context: https://bugs.webkit.org/attachment.cgi?id=90386&action=review Seems okay, but please consider my comments below when landing. > Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp:913 > + WebKitWebView* webView = getViewFromFrame(m_frame); > + WebKitWebFrame *mainFrame = webView->priv->mainFrame; > + WebKitWebDataSource *dataSource = webkit_web_frame_get_data_source(mainFrame); > + bool loaderCompleted = !webkit_web_data_source_is_loading(dataSource); > + > + if (!loaderCompleted) > + return; This can all be reduced to two lines with something like: if (core(getViewFromFrame(m_frame))->mainFrame()->loader()->activeDocumentLoader()->isLoadingInAPISense()) return; I would also leave a comment explaining why you don't want to send these signals during loading. 389460 5 90392 mrobinson 2011-04-20 13:09:49 -0700 Comment on attachment 90392 history.diff r+ with changes above. 389811 6 xan.lopez 2011-04-20 21:07:09 -0700 Dumping here some comments Martin and I had about this on jabber: - If we commit the patch as-is we break at least one invariant our code had before: we'll emit a provisional load signal without having a provisional data source/request. In theory this cannot happen. - If we skip the provisional stage this to avoid the former, we break another invariant: we go through committed and finished before having started at provisional. I believe this, also, cannot happen in theory. So I'm having second thoughts about this. If I had to choose I'd probably decide to go for option a). CCing Gustavo in case he wants to comment. 400968 7 gustavo 2011-05-09 18:28:39 -0700 (In reply to comment #6) > Dumping here some comments Martin and I had about this on jabber: > > - If we commit the patch as-is we break at least one invariant our code had before: we'll emit a provisional load signal without having a provisional data source/request. In theory this cannot happen. > > - If we skip the provisional stage this to avoid the former, we break another invariant: we go through committed and finished before having started at provisional. I believe this, also, cannot happen in theory. > > So I'm having second thoughts about this. If I had to choose I'd probably decide to go for option a). CCing Gustavo in case he wants to comment. We can create a fake provisional data source/request, perhaps? Even if we don't, I think the first option is the one with less chance of causing breakage, so I'd go with it. 423249 8 eric 2011-06-18 13:43:14 -0700 Attachment 90392 was posted by a committer and has review+, assigning to Xan Lopez for commit. 514495 9 117756 xan.lopez 2011-12-03 06:31:45 -0800 Created attachment 117756 Patch 514561 10 117756 webkit.review.bot 2011-12-03 12:06:26 -0800 Comment on attachment 117756 Patch Clearing flags on attachment: 117756 Committed r101933: <http://trac.webkit.org/changeset/101933> 514562 11 webkit.review.bot 2011-12-03 12:06:31 -0800 All reviewed patches have been landed. Closing bug. 90386 2011-04-20 12:38:25 -0700 2011-04-20 13:05:38 -0700 history.diff history.diff text/plain 4828 xan.lopez RnJvbSBiNGU4YmIzODVkZDBmZGFkZDg0ZjEyMDg1MzA5MDUyYzEwZGZlY2FmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYYW4gTG9wZXogPHhsb3BlekBpZ2FsaWEuY29tPgpEYXRlOiBX ZWQsIDIwIEFwciAyMDExIDEyOjM3OjM0IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gMjAxMS0wNC0y MCAgWGFuIExvcGV6ICA8eGxvcGV6QGlnYWxpYS5jb20+CgogICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgoKICAgICAgICBbR1RLXSBJbXBsZW1lbnQgSGlzdG9yeSBBUEkgRnJhbWVM b2FkZXJDbGllbnQgbWV0aG9kcwogICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD01OTAxNwoKICAgICAgICBGYWtlIHRoZSBsb2FkIHByb2Nlc3Mgd2hlbiB0aGUg bmV3IEhUTUw1IEhpc3RvcnkgQVBJcyBhcmUKICAgICAgICB1c2VkLiBPdGhlcndpc2UgdGhlIFVB IGRvZXMgbm90IGhhdmUgYSBjaGFuY2Ugb2YgdXBkYXRpbmcgdGhlIFVSTAogICAgICAgIGVudHJ5 LCBiYWNrL2ZvcndhcmQgYnV0dG9ucywgZXRjLgoKICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50R3RrLmNwcDoKICAgICAgICAoV2ViS2l0OjpGcmFtZUxvYWRlckNsaWVu dDo6ZGlzcGF0Y2hEaWROYXZpZ2F0ZVdpdGhpblBhZ2UpOiBmYWtlIGEKICAgICAgICBsb2FkIHBy b2Nlc3MgYnkgZ29pbmcgdGhyb3VnaCB0aGUgcHJvdmlzaW9uYWwsIGNvbW1pdHRlZCwgZmluaXNo ZWQKICAgICAgICBsb2FkIHN0YXRlcy4KICAgICAgICAoV2ViS2l0OjpGcmFtZUxvYWRlckNsaWVu dDo6ZGlzcGF0Y2hEaWRQdXNoU3RhdGVXaXRoaW5QYWdlKTogY2FsbAogICAgICAgIGRpc3BhdGNo RGlkTmF2aWdhdGVXaXRoaW5QYWdlLgogICAgICAgIChXZWJLaXQ6OkZyYW1lTG9hZGVyQ2xpZW50 OjpkaXNwYXRjaERpZFJlcGxhY2VTdGF0ZVdpdGhpblBhZ2UpOiBkaXR0by4KICAgICAgICAoV2Vi S2l0OjpGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRQb3BTdGF0ZVdpdGhpblBhZ2UpOiBk aXR0by4KICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmg6IGFk ZAogICAgICAgIGRpc3BhdGNoRGlkTmF2aWdhdGVXaXRoaW5QYWdlIHNpbmNlIHdlIG5vdyBpbXBs ZW1lbnQgaXQuCi0tLQogU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nICAgICAgICAgICAgICAg ICAgICAgICAgfCAgIDIyICsrKysrKysrKysrKysrKysrKysrCiAuLi4vZ3RrL1dlYkNvcmVTdXBw b3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcCAgICB8ICAgMjEgKysrKysrKysrKysrKysrKy0t CiAuLi4vZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmggICAgICB8ICAg IDEgKwogMyBmaWxlcyBjaGFuZ2VkLCA0MSBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv Z3RrL0NoYW5nZUxvZwppbmRleCA2NWRmY2M4Li5iOWY0ZDYxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjUgQEAKKzIwMTEtMDQtMjAgIFhhbiBMb3BleiAgPHhsb3BlekBpZ2FsaWEuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtd IEltcGxlbWVudCBIaXN0b3J5IEFQSSBGcmFtZUxvYWRlckNsaWVudCBtZXRob2RzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTAxNworCisgICAgICAg IEZha2UgdGhlIGxvYWQgcHJvY2VzcyB3aGVuIHRoZSBuZXcgSFRNTDUgSGlzdG9yeSBBUElzIGFy ZQorICAgICAgICB1c2VkLiBPdGhlcndpc2UgdGhlIFVBIGRvZXMgbm90IGhhdmUgYSBjaGFuY2Ug b2YgdXBkYXRpbmcgdGhlIFVSTAorICAgICAgICBlbnRyeSwgYmFjay9mb3J3YXJkIGJ1dHRvbnMs IGV0Yy4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNw cDoKKyAgICAgICAgKFdlYktpdDo6RnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkTmF2aWdh dGVXaXRoaW5QYWdlKTogZmFrZSBhCisgICAgICAgIGxvYWQgcHJvY2VzcyBieSBnb2luZyB0aHJv dWdoIHRoZSBwcm92aXNpb25hbCwgY29tbWl0dGVkLCBmaW5pc2hlZAorICAgICAgICBsb2FkIHN0 YXRlcy4KKyAgICAgICAgKFdlYktpdDo6RnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkUHVz aFN0YXRlV2l0aGluUGFnZSk6IGNhbGwKKyAgICAgICAgZGlzcGF0Y2hEaWROYXZpZ2F0ZVdpdGhp blBhZ2UuCisgICAgICAgIChXZWJLaXQ6OkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFJl cGxhY2VTdGF0ZVdpdGhpblBhZ2UpOiBkaXR0by4KKyAgICAgICAgKFdlYktpdDo6RnJhbWVMb2Fk ZXJDbGllbnQ6OmRpc3BhdGNoRGlkUG9wU3RhdGVXaXRoaW5QYWdlKTogZGl0dG8uCisgICAgICAg ICogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuaDogYWRkCisgICAgICAgIGRp c3BhdGNoRGlkTmF2aWdhdGVXaXRoaW5QYWdlIHNpbmNlIHdlIG5vdyBpbXBsZW1lbnQgaXQuCisK IDIwMTEtMDQtMTkgIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcCBiL1NvdXJjZS9X ZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcAppbmRleCA1 Mzk2NzVhLi43YzliYThhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3Vw cG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ndGsvV2Vi Q29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCkBAIC05MDIsMTkgKzkwMiwzNCBA QCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZENoYW5nZUxvY2F0aW9uV2l0aGlu UGFnZSgpCiAgICAgICAgIGdfb2JqZWN0X25vdGlmeShHX09CSkVDVCh3ZWJWaWV3KSwgInVyaSIp OwogfQogCit2b2lkIEZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZE5hdmlnYXRlV2l0aGlu UGFnZSgpCit7CisgICAgV2ViS2l0V2ViVmlldyogd2ViVmlldyA9IGdldFZpZXdGcm9tRnJhbWUo bV9mcmFtZSk7CisgICAgV2ViS2l0V2ViRnJhbWUgKm1haW5GcmFtZSA9IHdlYlZpZXctPnByaXYt Pm1haW5GcmFtZTsKKyAgICBXZWJLaXRXZWJEYXRhU291cmNlICpkYXRhU291cmNlID0gd2Via2l0 X3dlYl9mcmFtZV9nZXRfZGF0YV9zb3VyY2UobWFpbkZyYW1lKTsKKyAgICBib29sIGxvYWRlckNv bXBsZXRlZCA9ICF3ZWJraXRfd2ViX2RhdGFfc291cmNlX2lzX2xvYWRpbmcoZGF0YVNvdXJjZSk7 CisKKyAgICBpZiAoIWxvYWRlckNvbXBsZXRlZCkKKyAgICAgICAgcmV0dXJuOworCisgICAgZGlz cGF0Y2hEaWRTdGFydFByb3Zpc2lvbmFsTG9hZCgpOworICAgIGRpc3BhdGNoRGlkQ29tbWl0TG9h ZCgpOworICAgIGRpc3BhdGNoRGlkRmluaXNoTG9hZCgpOworfQorCiB2b2lkIEZyYW1lTG9hZGVy Q2xpZW50OjpkaXNwYXRjaERpZFB1c2hTdGF0ZVdpdGhpblBhZ2UoKQogewotICAgIG5vdEltcGxl bWVudGVkKCk7CisgICAgZGlzcGF0Y2hEaWROYXZpZ2F0ZVdpdGhpblBhZ2UoKTsKIH0KIAogdm9p ZCBGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRSZXBsYWNlU3RhdGVXaXRoaW5QYWdlKCkK IHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIGRpc3BhdGNoRGlkTmF2aWdhdGVXaXRoaW5Q YWdlKCk7CiB9CiAKIHZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkUG9wU3RhdGVX aXRoaW5QYWdlKCkKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIGRpc3BhdGNoRGlkTmF2 aWdhdGVXaXRoaW5QYWdlKCk7CiB9CiAKIHZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNo V2lsbENsb3NlKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0 L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmggYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9y dC9GcmFtZUxvYWRlckNsaWVudEd0ay5oCmluZGV4IGVkOWFjMzcuLjZlMGMxNjkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3Rr LmgKKysrIGIvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGll bnRHdGsuaApAQCAtNzUsNiArNzUsNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKICAgICAgICAgdmly dHVhbCB2b2lkIGRpc3BhdGNoRGlkQ2FuY2VsQ2xpZW50UmVkaXJlY3QoKTsKICAgICAgICAgdmly dHVhbCB2b2lkIGRpc3BhdGNoV2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdChjb25zdCBXZWJDb3Jl OjpLVVJMJiwgZG91YmxlLCBkb3VibGUpOwogICAgICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hE aWRDaGFuZ2VMb2NhdGlvbldpdGhpblBhZ2UoKTsKKyAgICAgICAgdmlydHVhbCB2b2lkIGRpc3Bh dGNoRGlkTmF2aWdhdGVXaXRoaW5QYWdlKCk7CiAgICAgICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRj aERpZFB1c2hTdGF0ZVdpdGhpblBhZ2UoKTsKICAgICAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNo RGlkUmVwbGFjZVN0YXRlV2l0aGluUGFnZSgpOwogICAgICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0 Y2hEaWRQb3BTdGF0ZVdpdGhpblBhZ2UoKTsKLS0gCjEuNy40LjQKCg== 90392 2011-04-20 13:05:38 -0700 2011-12-03 06:31:38 -0800 history.diff history.diff text/plain 4828 xan.lopez RnJvbSA0Y2QwNTg3YjVmMzViNWI3OWMxMmFmZmYxNDgwOTgzMThlYzI0Y2YxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYYW4gTG9wZXogPHhsb3BlekBpZ2FsaWEuY29tPgpEYXRlOiBX ZWQsIDIwIEFwciAyMDExIDEyOjM3OjM0IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gMjAxMS0wNC0y MCAgWGFuIExvcGV6ICA8eGxvcGV6QGlnYWxpYS5jb20+CgogICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgoKICAgICAgICBbR1RLXSBJbXBsZW1lbnQgSGlzdG9yeSBBUEkgRnJhbWVM b2FkZXJDbGllbnQgbWV0aG9kcwogICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD01OTAxNwoKICAgICAgICBGYWtlIHRoZSBsb2FkIHByb2Nlc3Mgd2hlbiB0aGUg bmV3IEhUTUw1IEhpc3RvcnkgQVBJcyBhcmUKICAgICAgICB1c2VkLiBPdGhlcndpc2UgdGhlIFVB IGRvZXMgbm90IGhhdmUgYSBjaGFuY2Ugb2YgdXBkYXRpbmcgdGhlIFVSTAogICAgICAgIGVudHJ5 LCBiYWNrL2ZvcndhcmQgYnV0dG9ucywgZXRjLgoKICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50R3RrLmNwcDoKICAgICAgICAoV2ViS2l0OjpGcmFtZUxvYWRlckNsaWVu dDo6ZGlzcGF0Y2hEaWROYXZpZ2F0ZVdpdGhpblBhZ2UpOiBmYWtlIGEKICAgICAgICBsb2FkIHBy b2Nlc3MgYnkgZ29pbmcgdGhyb3VnaCB0aGUgcHJvdmlzaW9uYWwsIGNvbW1pdHRlZCwgZmluaXNo ZWQKICAgICAgICBsb2FkIHN0YXRlcy4KICAgICAgICAoV2ViS2l0OjpGcmFtZUxvYWRlckNsaWVu dDo6ZGlzcGF0Y2hEaWRQdXNoU3RhdGVXaXRoaW5QYWdlKTogY2FsbAogICAgICAgIGRpc3BhdGNo RGlkTmF2aWdhdGVXaXRoaW5QYWdlLgogICAgICAgIChXZWJLaXQ6OkZyYW1lTG9hZGVyQ2xpZW50 OjpkaXNwYXRjaERpZFJlcGxhY2VTdGF0ZVdpdGhpblBhZ2UpOiBkaXR0by4KICAgICAgICAoV2Vi S2l0OjpGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRQb3BTdGF0ZVdpdGhpblBhZ2UpOiBk aXR0by4KICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmg6IGFk ZAogICAgICAgIGRpc3BhdGNoRGlkTmF2aWdhdGVXaXRoaW5QYWdlIHNpbmNlIHdlIG5vdyBpbXBs ZW1lbnQgaXQuCi0tLQogU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nICAgICAgICAgICAgICAg ICAgICAgICAgfCAgIDIyICsrKysrKysrKysrKysrKysrKysrCiAuLi4vZ3RrL1dlYkNvcmVTdXBw b3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcCAgICB8ICAgMjEgKysrKysrKysrKysrKysrKy0t CiAuLi4vZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmggICAgICB8ICAg IDEgKwogMyBmaWxlcyBjaGFuZ2VkLCA0MSBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv Z3RrL0NoYW5nZUxvZwppbmRleCA2NWRmY2M4Li5iOWY0ZDYxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjUgQEAKKzIwMTEtMDQtMjAgIFhhbiBMb3BleiAgPHhsb3BlekBpZ2FsaWEuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtd IEltcGxlbWVudCBIaXN0b3J5IEFQSSBGcmFtZUxvYWRlckNsaWVudCBtZXRob2RzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTAxNworCisgICAgICAg IEZha2UgdGhlIGxvYWQgcHJvY2VzcyB3aGVuIHRoZSBuZXcgSFRNTDUgSGlzdG9yeSBBUElzIGFy ZQorICAgICAgICB1c2VkLiBPdGhlcndpc2UgdGhlIFVBIGRvZXMgbm90IGhhdmUgYSBjaGFuY2Ug b2YgdXBkYXRpbmcgdGhlIFVSTAorICAgICAgICBlbnRyeSwgYmFjay9mb3J3YXJkIGJ1dHRvbnMs IGV0Yy4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNw cDoKKyAgICAgICAgKFdlYktpdDo6RnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkTmF2aWdh dGVXaXRoaW5QYWdlKTogZmFrZSBhCisgICAgICAgIGxvYWQgcHJvY2VzcyBieSBnb2luZyB0aHJv dWdoIHRoZSBwcm92aXNpb25hbCwgY29tbWl0dGVkLCBmaW5pc2hlZAorICAgICAgICBsb2FkIHN0 YXRlcy4KKyAgICAgICAgKFdlYktpdDo6RnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkUHVz aFN0YXRlV2l0aGluUGFnZSk6IGNhbGwKKyAgICAgICAgZGlzcGF0Y2hEaWROYXZpZ2F0ZVdpdGhp blBhZ2UuCisgICAgICAgIChXZWJLaXQ6OkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFJl cGxhY2VTdGF0ZVdpdGhpblBhZ2UpOiBkaXR0by4KKyAgICAgICAgKFdlYktpdDo6RnJhbWVMb2Fk ZXJDbGllbnQ6OmRpc3BhdGNoRGlkUG9wU3RhdGVXaXRoaW5QYWdlKTogZGl0dG8uCisgICAgICAg ICogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuaDogYWRkCisgICAgICAgIGRp c3BhdGNoRGlkTmF2aWdhdGVXaXRoaW5QYWdlIHNpbmNlIHdlIG5vdyBpbXBsZW1lbnQgaXQuCisK IDIwMTEtMDQtMTkgIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcCBiL1NvdXJjZS9X ZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcAppbmRleCA1 Mzk2NzVhLi5lOGM1YjgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3Vw cG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ndGsvV2Vi Q29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCkBAIC05MDIsMTkgKzkwMiwzNCBA QCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZENoYW5nZUxvY2F0aW9uV2l0aGlu UGFnZSgpCiAgICAgICAgIGdfb2JqZWN0X25vdGlmeShHX09CSkVDVCh3ZWJWaWV3KSwgInVyaSIp OwogfQogCit2b2lkIEZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZE5hdmlnYXRlV2l0aGlu UGFnZSgpCit7CisgICAgV2ViS2l0V2ViVmlldyogd2ViVmlldyA9IGdldFZpZXdGcm9tRnJhbWUo bV9mcmFtZSk7CisgICAgV2ViS2l0V2ViRnJhbWUqIG1haW5GcmFtZSA9IHdlYlZpZXctPnByaXYt Pm1haW5GcmFtZTsKKyAgICBXZWJLaXRXZWJEYXRhU291cmNlKiBkYXRhU291cmNlID0gd2Via2l0 X3dlYl9mcmFtZV9nZXRfZGF0YV9zb3VyY2UobWFpbkZyYW1lKTsKKyAgICBib29sIGxvYWRlckNv bXBsZXRlZCA9ICF3ZWJraXRfd2ViX2RhdGFfc291cmNlX2lzX2xvYWRpbmcoZGF0YVNvdXJjZSk7 CisKKyAgICBpZiAoIWxvYWRlckNvbXBsZXRlZCkKKyAgICAgICAgcmV0dXJuOworCisgICAgZGlz cGF0Y2hEaWRTdGFydFByb3Zpc2lvbmFsTG9hZCgpOworICAgIGRpc3BhdGNoRGlkQ29tbWl0TG9h ZCgpOworICAgIGRpc3BhdGNoRGlkRmluaXNoTG9hZCgpOworfQorCiB2b2lkIEZyYW1lTG9hZGVy Q2xpZW50OjpkaXNwYXRjaERpZFB1c2hTdGF0ZVdpdGhpblBhZ2UoKQogewotICAgIG5vdEltcGxl bWVudGVkKCk7CisgICAgZGlzcGF0Y2hEaWROYXZpZ2F0ZVdpdGhpblBhZ2UoKTsKIH0KIAogdm9p ZCBGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRSZXBsYWNlU3RhdGVXaXRoaW5QYWdlKCkK IHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIGRpc3BhdGNoRGlkTmF2aWdhdGVXaXRoaW5Q YWdlKCk7CiB9CiAKIHZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkUG9wU3RhdGVX aXRoaW5QYWdlKCkKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIGRpc3BhdGNoRGlkTmF2 aWdhdGVXaXRoaW5QYWdlKCk7CiB9CiAKIHZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNo V2lsbENsb3NlKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0 L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmggYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9y dC9GcmFtZUxvYWRlckNsaWVudEd0ay5oCmluZGV4IGVkOWFjMzcuLjZlMGMxNjkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3Rr LmgKKysrIGIvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGll bnRHdGsuaApAQCAtNzUsNiArNzUsNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKICAgICAgICAgdmly dHVhbCB2b2lkIGRpc3BhdGNoRGlkQ2FuY2VsQ2xpZW50UmVkaXJlY3QoKTsKICAgICAgICAgdmly dHVhbCB2b2lkIGRpc3BhdGNoV2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdChjb25zdCBXZWJDb3Jl OjpLVVJMJiwgZG91YmxlLCBkb3VibGUpOwogICAgICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hE aWRDaGFuZ2VMb2NhdGlvbldpdGhpblBhZ2UoKTsKKyAgICAgICAgdmlydHVhbCB2b2lkIGRpc3Bh dGNoRGlkTmF2aWdhdGVXaXRoaW5QYWdlKCk7CiAgICAgICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRj aERpZFB1c2hTdGF0ZVdpdGhpblBhZ2UoKTsKICAgICAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNo RGlkUmVwbGFjZVN0YXRlV2l0aGluUGFnZSgpOwogICAgICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0 Y2hEaWRQb3BTdGF0ZVdpdGhpblBhZ2UoKTsKLS0gCjEuNy40LjQKCg== 117756 2011-12-03 06:31:45 -0800 2011-12-03 12:06:26 -0800 Patch bug-59017-20111203153138.patch text/plain 4094 xan.lopez U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxOTIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggYWMyMTBmYmI2 ZmJlNmJmMGRjNTM1MWFiOTkxODBkN2RjMWQ5N2M5Yy4uMDFiN2NlMDlhNzBiNmI1ZTUyZTQxZGEw ZjYyZTgwODE4NGZmZWYyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEx LTEyLTAzICBYYW4gTG9wZXogIDx4bG9wZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBJ bXBsZW1lbnQgSGlzdG9yeSBBUEkgRnJhbWVMb2FkZXJDbGllbnQgbWV0aG9kcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTkwMTcKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGYWtlIHRoZSBsb2FkIHByb2Nl c3Mgd2hlbiB0aGUgbmV3IEhUTUw1IEhpc3RvcnkgQVBJcyBhcmUKKyAgICAgICAgdXNlZC4gT3Ro ZXJ3aXNlIHRoZSBVQSBkb2VzIG5vdCBoYXZlIGEgY2hhbmNlIG9mIHVwZGF0aW5nIHRoZSBVUkwK KyAgICAgICAgZW50cnksIGJhY2svZm9yd2FyZCBidXR0b25zLCBldGMuCisKKyAgICAgICAgKiBX ZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6 OkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZE5hdmlnYXRlV2l0aGluUGFnZSk6IGZha2Ug YQorICAgICAgICBsb2FkIHByb2Nlc3MuCisgICAgICAgIChXZWJLaXQ6OkZyYW1lTG9hZGVyQ2xp ZW50OjpkaXNwYXRjaERpZFB1c2hTdGF0ZVdpdGhpblBhZ2UpOiBjYWxsCisgICAgICAgIGRpc3Bh dGNoRGlkTmF2aWdhdGVXaXRoaW5QYWdlLgorICAgICAgICAoV2ViS2l0OjpGcmFtZUxvYWRlckNs aWVudDo6ZGlzcGF0Y2hEaWRSZXBsYWNlU3RhdGVXaXRoaW5QYWdlKToKKyAgICAgICAgZGl0dG8u CisgICAgICAgIChXZWJLaXQ6OkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFBvcFN0YXRl V2l0aGluUGFnZSk6IGRvCisgICAgICAgIG5vdGhpbmcsIGJlY2F1c2UgcHVzaCB3YXMgYWxyZWFk eSBjYWxsZWQsIGJ1dCBub3RlIHRoaXMgaW4gYQorICAgICAgICBjb21tZW50LgorICAgICAgICAq IFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmg6IGFkZCB0aGUgbmV3IG1ldGhv ZC4KKwogMjAxMS0xMi0wMiAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+ CiAKICAgICAgICAgW0dTdHJlYW1lcl0gRnVsbHNjcmVlbiBjb250cm9sbGVyIHN1cHBvcnQgZm9y IHRoZSBuZXcgV2ViS2l0IEZ1bGxzY3JlZW4gQVBJCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2d0ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHAgYi9Tb3VyY2UvV2Vi S2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHAKaW5kZXggNDI5 ZmMxYzg2OWY0YjNmOWI0NjM5Y2MyZTYwYjRlNmE0YmE1ZGNmMi4uZTdiOTZmZjVjMTJiMzhmODA5 Mjc2N2NhZDExYmYzNGIyNzAzYTRkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvV2Vi Q29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv Z3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcApAQCAtNzkyLDE5ICs3 OTIsNDEgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRDaGFuZ2VMb2NhdGlv bldpdGhpblBhZ2UoKQogICAgICAgICBnX29iamVjdF9ub3RpZnkoR19PQkpFQ1Qod2ViVmlldyks ICJ1cmkiKTsKIH0KIAordm9pZCBGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWROYXZpZ2F0 ZVdpdGhpblBhZ2UoKQoreworICAgIFdlYktpdFdlYlZpZXcqIHdlYlZpZXcgPSBnZXRWaWV3RnJv bUZyYW1lKG1fZnJhbWUpOworICAgIFdlYktpdFdlYkZyYW1lKiBtYWluRnJhbWUgPSB3ZWJWaWV3 LT5wcml2LT5tYWluRnJhbWU7CisgICAgV2ViS2l0V2ViRGF0YVNvdXJjZSogZGF0YVNvdXJjZSA9 IHdlYmtpdF93ZWJfZnJhbWVfZ2V0X2RhdGFfc291cmNlKG1haW5GcmFtZSk7CisgICAgYm9vbCBs b2FkZXJDb21wbGV0ZWQgPSAhd2Via2l0X3dlYl9kYXRhX3NvdXJjZV9pc19sb2FkaW5nKGRhdGFT b3VyY2UpOworCisgICAgaWYgKCFsb2FkZXJDb21wbGV0ZWQpCisgICAgICAgIHJldHVybjsKKwor ICAgIC8vIE5vIHByb3Zpc2lvbmFsIGxvYWQgc3RhcnRlZCwgYmVjYXVzZToKKyAgICAvLyAtIEl0 IHdpbGwgYnJlYWsgKG5vIHByb3Zpc2lvbmFsIGRhdGEgc291cmNlIGF0IHRoaXMgcG9pbnQpLgor ICAgIC8vIC0gVGhlcmUncyBubyBwcm92aXNpb25hbCBsb2FkIGdvaW5nIG9uIGFueXdheSwgdGhl IFVSSSBpcyBiZWluZworICAgIC8vICAgcHJvZ3JhbWF0aWNhbGx5IGNoYW5nZWQuCisgICAgLy8g RklYTUU6IHRoaXMgaXMgbm90IGlkZWFsLCBidXQgaXQgc2VlbXMgc2FmZXIgdGhhbiBjaGFuZ2lu ZyBvdXIKKyAgICAvLyBjdXJyZW50IGNvbnRyYWN0IHdpdGggdGhlIGNsaWVudHMgYWJvdXQgcHJv dmlzaW9uYWwgZGF0YQorICAgIC8vIHNvdXJjZXMgbm90IGJlaW5nICcwJyBkdXJpbmcgdGhlIHBy b3Zpc2lvbmFsIGxvYWQgc3RhZ2UuCisgICAgZGlzcGF0Y2hEaWRDb21taXRMb2FkKCk7CisgICAg ZGlzcGF0Y2hEaWRGaW5pc2hMb2FkKCk7Cit9CisKIHZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OmRp c3BhdGNoRGlkUHVzaFN0YXRlV2l0aGluUGFnZSgpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsK KyAgICBkaXNwYXRjaERpZE5hdmlnYXRlV2l0aGluUGFnZSgpOwogfQogCiB2b2lkIEZyYW1lTG9h ZGVyQ2xpZW50OjpkaXNwYXRjaERpZFJlcGxhY2VTdGF0ZVdpdGhpblBhZ2UoKQogewotICAgIG5v dEltcGxlbWVudGVkKCk7CisgICAgZGlzcGF0Y2hEaWROYXZpZ2F0ZVdpdGhpblBhZ2UoKTsKIH0K IAogdm9pZCBGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRQb3BTdGF0ZVdpdGhpblBhZ2Uo KQogewotICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgLy8gTm8gbmVlZCB0byBkbyBhbnl0aGlu Zywgd2UgYWxyZWFkeSBjYWxsZWQKKyAgICAvLyBkaXNwYXRjaERpZE5hdmlnYXRlV2l0aGluUGFn ZSgpIGluIFB1c2hTdGF0ZVdpdGhpblBhZ2UoKS4KIH0KIAogdm9pZCBGcmFtZUxvYWRlckNsaWVu dDo6ZGlzcGF0Y2hXaWxsQ2xvc2UoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvV2Vi Q29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuaCBiL1NvdXJjZS9XZWJLaXQvZ3RrL1dl YkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmgKaW5kZXggNTE2YzRjZjgyOThhMmYw NmVlN2MyN2I3OGM4MTUxOTdlZGNhYzkzZS4uYTJjOTA3NjM1M2VkOWMyYTU3ZThjZGJlNDFkNDEy MjM2MGIxZjI3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQv RnJhbWVMb2FkZXJDbGllbnRHdGsuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3Vw cG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5oCkBAIC03NSw2ICs3NSw3IEBAIG5hbWVzcGFjZSBX ZWJLaXQgewogICAgICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRDYW5jZWxDbGllbnRSZWRp cmVjdCgpOwogICAgICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hXaWxsUGVyZm9ybUNsaWVudFJl ZGlyZWN0KGNvbnN0IFdlYkNvcmU6OktVUkwmLCBkb3VibGUsIGRvdWJsZSk7CiAgICAgICAgIHZp cnR1YWwgdm9pZCBkaXNwYXRjaERpZENoYW5nZUxvY2F0aW9uV2l0aGluUGFnZSgpOworICAgICAg ICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWROYXZpZ2F0ZVdpdGhpblBhZ2UoKTsKICAgICAgICAg dmlydHVhbCB2b2lkIGRpc3BhdGNoRGlkUHVzaFN0YXRlV2l0aGluUGFnZSgpOwogICAgICAgICB2 aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRSZXBsYWNlU3RhdGVXaXRoaW5QYWdlKCk7CiAgICAgICAg IHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZFBvcFN0YXRlV2l0aGluUGFnZSgpOwo=