123757 2013-11-04 14:56:25 -0800 Subresource loads should not prevent page throttling 2013-11-05 17:25:03 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough barraclough commit-queue eflews.bot gtk-ews gyuyoung.kim japhet rego+ews xan.lopez oldest_to_newest 946836 0 barraclough 2013-11-04 14:56:25 -0800 Some pages leave long running XHRs open, thee should not inhibit processes suspension. 946838 1 215956 barraclough 2013-11-04 15:01:02 -0800 Created attachment 215956 Fix 946855 2 215956 eflews.bot 2013-11-04 15:33:01 -0800 Comment on attachment 215956 Fix Attachment 215956 did not pass efl-ews (efl): Output: http://webkit-queues.appspot.com/results/20328760 946859 3 215956 eflews.bot 2013-11-04 15:51:08 -0800 Comment on attachment 215956 Fix Attachment 215956 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/19598874 946860 4 215956 gtk-ews 2013-11-04 15:52:44 -0800 Comment on attachment 215956 Fix Attachment 215956 did not pass gtk-ews (gtk): Output: http://webkit-queues.appspot.com/results/19648854 946910 5 215956 darin 2013-11-04 17:19:32 -0800 Comment on attachment 215956 Fix View in context: https://bugs.webkit.org/attachment.cgi?id=215956&action=review Patch looks fine, but seems you missed call sites in the GTK and EFL ports. > Source/WebCore/loader/ResourceLoaderOptions.h:82 > + ResourceLoaderOptions(SendCallbackPolicy sendLoadCallbacks, ContentSniffingPolicy sniffContent, DataBufferingPolicy dataBufferingPolicy, StoredCredentials allowCredentials, ClientCredentialPolicy credentialPolicy, SecurityCheckPolicy securityCheck, RequestOriginPolicy requestOriginPolicy, RequestIsXMLHTTP requestIsXMLHTTP) Good that this argument is an enum. > Source/WebCore/loader/ResourceLoaderOptions.h:100 > + RequestIsXMLHTTP requestIsXMLHTTP; But seems to me this should be a bool. 947316 6 barraclough 2013-11-05 13:23:07 -0800 Maciej doesn't like treating XHRs differently from other requests, and has suggested simplifying the page-is-loading check to simply be frame loading + hysteresis. New patch forthcoming. 947322 7 216069 barraclough 2013-11-05 13:30:33 -0800 Created attachment 216069 New fix 947385 8 216069 ap 2013-11-05 15:15:26 -0800 Comment on attachment 216069 New fix Looks like we should question whether we should take an activity assertion during frame loads either. If we don't need them for subresources, maybe we don't need it for any loads? r=me 947425 9 barraclough 2013-11-05 17:25:03 -0800 Fixed in r158702 215956 2013-11-04 15:01:02 -0800 2013-11-05 13:30:33 -0800 Fix 123757.patch text/plain 11136 barraclough SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1ODU5OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM4IEBACisyMDEzLTExLTA0ICBHYXZpbiBC YXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KKworICAgICAgICBPcGVuIFhIUnMg c2hvdWxkIG5vdCBwcmV2ZW50IHBhZ2UgdGhyb3R0bGluZworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIzNzU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU29tZSBwYWdlcyBsZWF2ZSBsb25nIHJ1bm5pbmcg WEhScyBvcGVuLCB0aGVlIHNob3VsZCBub3QgaW5oaWJpdCBwcm9jZXNzZXMgc3VzcGVuc2lvbi4K KworICAgICAgICAqIGxvYWRlci9Eb2N1bWVudExvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpEb2N1bWVudExvYWRlcjo6c3RhcnRMb2FkaW5nTWFpblJlc291cmNlKToKKyAgICAgICAgICAg IC0gcmVxdWVzdCBJc05vdFhNTEhUVFAKKyAgICAgICAgKiBsb2FkZXIvTmV0c2NhcGVQbHVnSW5T dHJlYW1Mb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TmV0c2NhcGVQbHVnSW5TdHJlYW1M b2FkZXI6Ok5ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyKToKKyAgICAgICAgICAgIC0gcmVxdWVz dCBJc05vdFhNTEhUVFAKKyAgICAgICAgKiBsb2FkZXIvUmVzb3VyY2VMb2FkZXJPcHRpb25zLmg6 CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRlck9wdGlvbnM6OlJlc291cmNlTG9hZGVy T3B0aW9ucyk6CisgICAgICAgICAgICAtIEFkZGVkIFJlcXVlc3RJc1hNTEhUVFAgZW51bSAmIG1l bWJlciB0byBvcHRpb25zLgorICAgICAgICAqIGxvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTdWJyZXNvdXJjZUxvYWRlcjo6aW5pdCk6CisgICAgICAgICAg ICAtIE9ubHkgdGFrZSBhbiBhY3Rpdml0eSB0b2tlbiBpZiBJc05vdFhNTEhUVFAuCisgICAgICAg ICogbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjpyZXF1ZXN0VXNlckNTU1N0eWxlU2hlZXQpOgorICAg ICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VMb2FkZXI6OmRlZmF1bHRDYWNoZWRSZXNvdXJj ZU9wdGlvbnMpOgorICAgICAgICAgICAgLSByZXF1ZXN0IElzTm90WE1MSFRUUAorICAgICAgICAq IGxvYWRlci9pY29uL0ljb25Mb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SWNvbkxvYWRl cjo6c3RhcnRMb2FkaW5nKToKKyAgICAgICAgICAgIC0gcmVxdWVzdCBJc05vdFhNTEhUVFAKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9XZWJDb3JlQVZGUmVz b3VyY2VMb2FkZXIubW06CisgICAgICAgIChXZWJDb3JlOjpXZWJDb3JlQVZGUmVzb3VyY2VMb2Fk ZXI6OnN0YXJ0TG9hZGluZyk6CisgICAgICAgICAgICAtIHJlcXVlc3QgSXNOb3RYTUxIVFRQCisg ICAgICAgICogeG1sL1hNTEh0dHBSZXF1ZXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlhNTEh0 dHBSZXF1ZXN0OjpjcmVhdGVSZXF1ZXN0KToKKyAgICAgICAgICAgIC0gU2V0IG9wdGlvbnMucmVx dWVzdElzWE1MSFRUUAorCiAyMDEzLTExLTAxICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUu Y29tPgogCiAgICAgICAgIFtQbHVnaW5Qcm94eV0gQWRkIGEgc2V0dGluZyB0byBkaXNhYmxlIHZp ZGVvIHBsdWdpbiBwcm94eSBzdXBwb3J0IGluIEhUTUxNZWRpYUVsZW1lbnQuCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAJKHJldmlzaW9uIDE1ODQ2MSkKKysr IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTEzODYsNyArMTM4Niw3IEBAIHZvaWQgRG9jdW1lbnRMb2FkZXI6OnN0YXJ0TG9hZGluZ01h aW5SZXMKIAogICAgIFJlc291cmNlUmVxdWVzdCByZXF1ZXN0KG1fcmVxdWVzdCk7CiAgICAgREVG SU5FX1NUQVRJQ19MT0NBTChSZXNvdXJjZUxvYWRlck9wdGlvbnMsIG1haW5SZXNvdXJjZUxvYWRP cHRpb25zLAotICAgICAgICAoU2VuZENhbGxiYWNrcywgU25pZmZDb250ZW50LCBCdWZmZXJEYXRh LCBBbGxvd1N0b3JlZENyZWRlbnRpYWxzLCBBc2tDbGllbnRGb3JBbGxDcmVkZW50aWFscywgU2tp cFNlY3VyaXR5Q2hlY2ssIFVzZURlZmF1bHRPcmlnaW5SZXN0cmljdGlvbnNGb3JUeXBlKSk7Cisg ICAgICAgIChTZW5kQ2FsbGJhY2tzLCBTbmlmZkNvbnRlbnQsIEJ1ZmZlckRhdGEsIEFsbG93U3Rv cmVkQ3JlZGVudGlhbHMsIEFza0NsaWVudEZvckFsbENyZWRlbnRpYWxzLCBTa2lwU2VjdXJpdHlD aGVjaywgVXNlRGVmYXVsdE9yaWdpblJlc3RyaWN0aW9uc0ZvclR5cGUsIElzTm90WE1MSFRUUCkp OwogICAgIENhY2hlZFJlc291cmNlUmVxdWVzdCBjYWNoZWRSZXNvdXJjZVJlcXVlc3QocmVxdWVz dCwgbWFpblJlc291cmNlTG9hZE9wdGlvbnMpOwogICAgIG1fbWFpblJlc291cmNlID0gbV9jYWNo ZWRSZXNvdXJjZUxvYWRlci0+cmVxdWVzdE1haW5SZXNvdXJjZShjYWNoZWRSZXNvdXJjZVJlcXVl c3QpOwogICAgIGlmICghbV9tYWluUmVzb3VyY2UpIHsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xv YWRlci9OZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvbG9hZGVyL05ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVyLmNwcAkocmV2aXNpb24g MTU4NDYxKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL05ldHNjYXBlUGx1Z0luU3RyZWFtTG9h ZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzcsNyArMzcsNyBAQAogbmFtZXNwYWNlIFdlYkNv cmUgewogCiBOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlcjo6TmV0c2NhcGVQbHVnSW5TdHJlYW1M b2FkZXIoRnJhbWUqIGZyYW1lLCBOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlckNsaWVudCogY2xp ZW50KQotICAgIDogUmVzb3VyY2VMb2FkZXIoZnJhbWUsIFJlc291cmNlTG9hZGVyT3B0aW9ucyhT ZW5kQ2FsbGJhY2tzLCBTbmlmZkNvbnRlbnQsIERvTm90QnVmZmVyRGF0YSwgQWxsb3dTdG9yZWRD cmVkZW50aWFscywgQXNrQ2xpZW50Rm9yQWxsQ3JlZGVudGlhbHMsIFNraXBTZWN1cml0eUNoZWNr LCBVc2VEZWZhdWx0T3JpZ2luUmVzdHJpY3Rpb25zRm9yVHlwZSkpCisgICAgOiBSZXNvdXJjZUxv YWRlcihmcmFtZSwgUmVzb3VyY2VMb2FkZXJPcHRpb25zKFNlbmRDYWxsYmFja3MsIFNuaWZmQ29u dGVudCwgRG9Ob3RCdWZmZXJEYXRhLCBBbGxvd1N0b3JlZENyZWRlbnRpYWxzLCBBc2tDbGllbnRG b3JBbGxDcmVkZW50aWFscywgU2tpcFNlY3VyaXR5Q2hlY2ssIFVzZURlZmF1bHRPcmlnaW5SZXN0 cmljdGlvbnNGb3JUeXBlLCBJc05vdFhNTEhUVFApKQogICAgICwgbV9jbGllbnQoY2xpZW50KQog ewogfQpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZGVyT3B0aW9ucy5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlck9wdGlv bnMuaAkocmV2aXNpb24gMTU4NDYxKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNl TG9hZGVyT3B0aW9ucy5oCSh3b3JraW5nIGNvcHkpCkBAIC02MSw2ICs2MSwxMSBAQCBlbnVtIFJl cXVlc3RPcmlnaW5Qb2xpY3kgewogICAgIFBvdGVudGlhbGx5Q3Jvc3NPcmlnaW5FbmFibGVkIC8v IEluZGljYXRlcyAicG90ZW50aWFsbHkgQ09SUy1lbmFibGVkIGZldGNoIiBpbiBIVE1MIHN0YW5k YXJkLgogfTsKIAorZW51bSBSZXF1ZXN0SXNYTUxIVFRQIHsKKyAgICBJc05vdFhNTEhUVFAsCisg ICAgSXNYTUxIVFRQCit9OworCiBzdHJ1Y3QgUmVzb3VyY2VMb2FkZXJPcHRpb25zIHsKICAgICBS ZXNvdXJjZUxvYWRlck9wdGlvbnMoKQogICAgICAgICA6IHNlbmRMb2FkQ2FsbGJhY2tzKERvTm90 U2VuZENhbGxiYWNrcykKQEAgLTcwLDEwICs3NSwxMSBAQCBzdHJ1Y3QgUmVzb3VyY2VMb2FkZXJP cHRpb25zIHsKICAgICAgICAgLCBjbGllbnRDcmVkZW50aWFsUG9saWN5KERvTm90QXNrQ2xpZW50 Rm9yQW55Q3JlZGVudGlhbHMpCiAgICAgICAgICwgc2VjdXJpdHlDaGVjayhEb1NlY3VyaXR5Q2hl Y2spCiAgICAgICAgICwgcmVxdWVzdE9yaWdpblBvbGljeShVc2VEZWZhdWx0T3JpZ2luUmVzdHJp Y3Rpb25zRm9yVHlwZSkKKyAgICAgICAgLCByZXF1ZXN0SXNYTUxIVFRQKElzTm90WE1MSFRUUCkK ICAgICB7CiAgICAgfQogCi0gICAgUmVzb3VyY2VMb2FkZXJPcHRpb25zKFNlbmRDYWxsYmFja1Bv bGljeSBzZW5kTG9hZENhbGxiYWNrcywgQ29udGVudFNuaWZmaW5nUG9saWN5IHNuaWZmQ29udGVu dCwgRGF0YUJ1ZmZlcmluZ1BvbGljeSBkYXRhQnVmZmVyaW5nUG9saWN5LCBTdG9yZWRDcmVkZW50 aWFscyBhbGxvd0NyZWRlbnRpYWxzLCBDbGllbnRDcmVkZW50aWFsUG9saWN5IGNyZWRlbnRpYWxQ b2xpY3ksIFNlY3VyaXR5Q2hlY2tQb2xpY3kgc2VjdXJpdHlDaGVjaywgUmVxdWVzdE9yaWdpblBv bGljeSByZXF1ZXN0T3JpZ2luUG9saWN5KQorICAgIFJlc291cmNlTG9hZGVyT3B0aW9ucyhTZW5k Q2FsbGJhY2tQb2xpY3kgc2VuZExvYWRDYWxsYmFja3MsIENvbnRlbnRTbmlmZmluZ1BvbGljeSBz bmlmZkNvbnRlbnQsIERhdGFCdWZmZXJpbmdQb2xpY3kgZGF0YUJ1ZmZlcmluZ1BvbGljeSwgU3Rv cmVkQ3JlZGVudGlhbHMgYWxsb3dDcmVkZW50aWFscywgQ2xpZW50Q3JlZGVudGlhbFBvbGljeSBj cmVkZW50aWFsUG9saWN5LCBTZWN1cml0eUNoZWNrUG9saWN5IHNlY3VyaXR5Q2hlY2ssIFJlcXVl c3RPcmlnaW5Qb2xpY3kgcmVxdWVzdE9yaWdpblBvbGljeSwgUmVxdWVzdElzWE1MSFRUUCByZXF1 ZXN0SXNYTUxIVFRQKQogICAgICAgICA6IHNlbmRMb2FkQ2FsbGJhY2tzKHNlbmRMb2FkQ2FsbGJh Y2tzKQogICAgICAgICAsIHNuaWZmQ29udGVudChzbmlmZkNvbnRlbnQpCiAgICAgICAgICwgZGF0 YUJ1ZmZlcmluZ1BvbGljeShkYXRhQnVmZmVyaW5nUG9saWN5KQpAQCAtODEsNiArODcsNyBAQCBz dHJ1Y3QgUmVzb3VyY2VMb2FkZXJPcHRpb25zIHsKICAgICAgICAgLCBjbGllbnRDcmVkZW50aWFs UG9saWN5KGNyZWRlbnRpYWxQb2xpY3kpCiAgICAgICAgICwgc2VjdXJpdHlDaGVjayhzZWN1cml0 eUNoZWNrKQogICAgICAgICAsIHJlcXVlc3RPcmlnaW5Qb2xpY3kocmVxdWVzdE9yaWdpblBvbGlj eSkKKyAgICAgICAgLCByZXF1ZXN0SXNYTUxIVFRQKHJlcXVlc3RJc1hNTEhUVFApCiAgICAgewog ICAgIH0KICAgICBTZW5kQ2FsbGJhY2tQb2xpY3kgc2VuZExvYWRDYWxsYmFja3M7CkBAIC05MCw2 ICs5Nyw3IEBAIHN0cnVjdCBSZXNvdXJjZUxvYWRlck9wdGlvbnMgewogICAgIENsaWVudENyZWRl bnRpYWxQb2xpY3kgY2xpZW50Q3JlZGVudGlhbFBvbGljeTsgLy8gV2hlbiB3ZSBzaG91bGQgYXNr IHRoZSBjbGllbnQgZm9yIGNyZWRlbnRpYWxzIChpZiB3ZSBhbGxvdyBjcmVkZW50aWFscyBhdCBh bGwpLgogICAgIFNlY3VyaXR5Q2hlY2tQb2xpY3kgc2VjdXJpdHlDaGVjazsKICAgICBSZXF1ZXN0 T3JpZ2luUG9saWN5IHJlcXVlc3RPcmlnaW5Qb2xpY3k7CisgICAgUmVxdWVzdElzWE1MSFRUUCBy ZXF1ZXN0SXNYTUxIVFRQOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZSAgICAKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNwcAkocmV2aXNpb24g MTU4NDYxKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTA5LDcgKzEwOSw3IEBAIGJvb2wgU3VicmVzb3VyY2VMb2FkZXI6 OmluaXQoY29uc3QgUmVzb3UKIAogICAgIEFTU0VSVCghcmVhY2hlZFRlcm1pbmFsU3RhdGUoKSk7 CiAgICAgbV9zdGF0ZSA9IEluaXRpYWxpemVkOwotICAgIGlmIChtX2ZyYW1lICYmIG1fZnJhbWUt PnBhZ2UoKSAmJiAhbV9hY3Rpdml0eUFzc2VydGlvbikKKyAgICBpZiAobV9mcmFtZSAmJiBtX2Zy YW1lLT5wYWdlKCkgJiYgIW1fYWN0aXZpdHlBc3NlcnRpb24gJiYgb3B0aW9ucygpLnJlcXVlc3RJ c1hNTEhUVFAgPT0gSXNOb3RYTUxIVFRQKQogICAgICAgICBtX2FjdGl2aXR5QXNzZXJ0aW9uID0g bV9mcmFtZS0+cGFnZSgpLT5jcmVhdGVBY3Rpdml0eVRva2VuKCk7CiAgICAgbV9kb2N1bWVudExv YWRlci0+YWRkU3VicmVzb3VyY2VMb2FkZXIodGhpcyk7CiAgICAgcmV0dXJuIHRydWU7CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxv YWRlci5jcHAJKHJldmlzaW9uIDE1ODQ2MSkKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNo ZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxNiw3ICsyMTYs NyBAQCBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRDU1NTdHlsZVNoZWV0CiAgICAgbWVtb3J5 Q2FjaGUoKS0+YWRkKHVzZXJTaGVldC5nZXQoKSk7CiAgICAgLy8gRklYTUU6IGxvYWRSZXNvdXJj ZSBjYWxscyBzZXRPd25pbmdDYWNoZWRSZXNvdXJjZUxvYWRlcigpIGlmIHRoZSByZXNvdXJjZSBj b3VsZG4ndCBiZSBhZGRlZCB0byBjYWNoZS4gRG9lcyB0aGlzIGZ1bmN0aW9uIG5lZWQgdG8gY2Fs bCBpdCwgdG9vPwogCi0gICAgdXNlclNoZWV0LT5sb2FkKHRoaXMsIFJlc291cmNlTG9hZGVyT3B0 aW9ucyhEb05vdFNlbmRDYWxsYmFja3MsIFNuaWZmQ29udGVudCwgQnVmZmVyRGF0YSwgQWxsb3dT dG9yZWRDcmVkZW50aWFscywgQXNrQ2xpZW50Rm9yQWxsQ3JlZGVudGlhbHMsIFNraXBTZWN1cml0 eUNoZWNrLCBVc2VEZWZhdWx0T3JpZ2luUmVzdHJpY3Rpb25zRm9yVHlwZSkpOworICAgIHVzZXJT aGVldC0+bG9hZCh0aGlzLCBSZXNvdXJjZUxvYWRlck9wdGlvbnMoRG9Ob3RTZW5kQ2FsbGJhY2tz LCBTbmlmZkNvbnRlbnQsIEJ1ZmZlckRhdGEsIEFsbG93U3RvcmVkQ3JlZGVudGlhbHMsIEFza0Ns aWVudEZvckFsbENyZWRlbnRpYWxzLCBTa2lwU2VjdXJpdHlDaGVjaywgVXNlRGVmYXVsdE9yaWdp blJlc3RyaWN0aW9uc0ZvclR5cGUsIElzTm90WE1MSFRUUCkpOwogICAgIAogICAgIHJldHVybiB1 c2VyU2hlZXQ7CiB9CkBAIC05NzcsNyArOTc3LDcgQEAgdm9pZCBDYWNoZWRSZXNvdXJjZUxvYWRl cjo6cHJpbnRQcmVsb2FkUwogCiBjb25zdCBSZXNvdXJjZUxvYWRlck9wdGlvbnMmIENhY2hlZFJl c291cmNlTG9hZGVyOjpkZWZhdWx0Q2FjaGVkUmVzb3VyY2VPcHRpb25zKCkKIHsKLSAgICBzdGF0 aWMgUmVzb3VyY2VMb2FkZXJPcHRpb25zIG9wdGlvbnMoU2VuZENhbGxiYWNrcywgU25pZmZDb250 ZW50LCBCdWZmZXJEYXRhLCBBbGxvd1N0b3JlZENyZWRlbnRpYWxzLCBBc2tDbGllbnRGb3JBbGxD cmVkZW50aWFscywgRG9TZWN1cml0eUNoZWNrLCBVc2VEZWZhdWx0T3JpZ2luUmVzdHJpY3Rpb25z Rm9yVHlwZSk7CisgICAgc3RhdGljIFJlc291cmNlTG9hZGVyT3B0aW9ucyBvcHRpb25zKFNlbmRD YWxsYmFja3MsIFNuaWZmQ29udGVudCwgQnVmZmVyRGF0YSwgQWxsb3dTdG9yZWRDcmVkZW50aWFs cywgQXNrQ2xpZW50Rm9yQWxsQ3JlZGVudGlhbHMsIERvU2VjdXJpdHlDaGVjaywgVXNlRGVmYXVs dE9yaWdpblJlc3RyaWN0aW9uc0ZvclR5cGUsIElzTm90WE1MSFRUUCk7CiAgICAgcmV0dXJuIG9w dGlvbnM7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9pY29uL0ljb25Mb2FkZXIu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9pY29uL0ljb25Mb2FkZXIu Y3BwCShyZXZpc2lvbiAxNTg0NjEpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvaWNvbi9JY29u TG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTgsNyArNTgsNyBAQCB2b2lkIEljb25Mb2Fk ZXI6OnN0YXJ0TG9hZGluZygpCiAgICAgaWYgKG1fcmVzb3VyY2UgfHwgIW1fZnJhbWUuZG9jdW1l bnQoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0IHJlcXVl c3QoUmVzb3VyY2VSZXF1ZXN0KG1fZnJhbWUubG9hZGVyKCkuaWNvbigpLnVybCgpKSwgUmVzb3Vy Y2VMb2FkZXJPcHRpb25zKFNlbmRDYWxsYmFja3MsIFNuaWZmQ29udGVudCwgQnVmZmVyRGF0YSwg RG9Ob3RBbGxvd1N0b3JlZENyZWRlbnRpYWxzLCBEb05vdEFza0NsaWVudEZvckFueUNyZWRlbnRp YWxzLCBEb1NlY3VyaXR5Q2hlY2ssIFVzZURlZmF1bHRPcmlnaW5SZXN0cmljdGlvbnNGb3JUeXBl KSk7CisgICAgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0KG1f ZnJhbWUubG9hZGVyKCkuaWNvbigpLnVybCgpKSwgUmVzb3VyY2VMb2FkZXJPcHRpb25zKFNlbmRD YWxsYmFja3MsIFNuaWZmQ29udGVudCwgQnVmZmVyRGF0YSwgRG9Ob3RBbGxvd1N0b3JlZENyZWRl bnRpYWxzLCBEb05vdEFza0NsaWVudEZvckFueUNyZWRlbnRpYWxzLCBEb1NlY3VyaXR5Q2hlY2ss IFVzZURlZmF1bHRPcmlnaW5SZXN0cmljdGlvbnNGb3JUeXBlLCBJc05vdFhNTEhUVFApKTsKIAog I2lmIFBMQVRGT1JNKEJMQUNLQkVSUlkpCiAgICAgcmVxdWVzdC5tdXRhYmxlUmVzb3VyY2VSZXF1 ZXN0KCkuc2V0VGFyZ2V0VHlwZShSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzRmF2aWNvbik7Cklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9X ZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXIubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvV2ViQ29yZUFWRlJlc291cmNlTG9h ZGVyLm1tCShyZXZpc2lvbiAxNTg0NjEpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9hdmZvdW5kYXRpb24vb2JqYy9XZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXIubW0JKHdvcmtp bmcgY29weSkKQEAgLTY4LDcgKzY4LDcgQEAgdm9pZCBXZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXI6 OnN0YXJ0TG9hZAogCiAgICAgVVJMIHJlcXVlc3RVUkwgPSBbW21fYXZSZXF1ZXN0LmdldCgpIHJl cXVlc3RdIFVSTF07CiAKLSAgICBDYWNoZWRSZXNvdXJjZVJlcXVlc3QgcmVxdWVzdChSZXNvdXJj ZVJlcXVlc3QocmVxdWVzdFVSTCksIFJlc291cmNlTG9hZGVyT3B0aW9ucyhTZW5kQ2FsbGJhY2tz LCBEb05vdFNuaWZmQ29udGVudCwgQnVmZmVyRGF0YSwgRG9Ob3RBbGxvd1N0b3JlZENyZWRlbnRp YWxzLCBEb05vdEFza0NsaWVudEZvckNyb3NzT3JpZ2luQ3JlZGVudGlhbHMsIERvU2VjdXJpdHlD aGVjaywgVXNlRGVmYXVsdE9yaWdpblJlc3RyaWN0aW9uc0ZvclR5cGUpKTsKKyAgICBDYWNoZWRS ZXNvdXJjZVJlcXVlc3QgcmVxdWVzdChSZXNvdXJjZVJlcXVlc3QocmVxdWVzdFVSTCksIFJlc291 cmNlTG9hZGVyT3B0aW9ucyhTZW5kQ2FsbGJhY2tzLCBEb05vdFNuaWZmQ29udGVudCwgQnVmZmVy RGF0YSwgRG9Ob3RBbGxvd1N0b3JlZENyZWRlbnRpYWxzLCBEb05vdEFza0NsaWVudEZvckNyb3Nz T3JpZ2luQ3JlZGVudGlhbHMsIERvU2VjdXJpdHlDaGVjaywgVXNlRGVmYXVsdE9yaWdpblJlc3Ry aWN0aW9uc0ZvclR5cGUsIElzTm90WE1MSFRUUCkpOwogCiAgICAgcmVxdWVzdC5tdXRhYmxlUmVz b3VyY2VSZXF1ZXN0KCkuc2V0UHJpb3JpdHkoUmVzb3VyY2VMb2FkUHJpb3JpdHlMb3cpOwogICAg IENhY2hlZFJlc291cmNlTG9hZGVyKiBsb2FkZXIgPSBtX3BhcmVudC0+cGxheWVyKCktPmNhY2hl ZFJlc291cmNlTG9hZGVyKCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVl c3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5j cHAJKHJldmlzaW9uIDE1ODQ2MSkKKysrIFNvdXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVz dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc5Nyw2ICs3OTcsNyBAQCB2b2lkIFhNTEh0dHBSZXF1 ZXN0OjpjcmVhdGVSZXF1ZXN0KEV4Y2VwCiAgICAgb3B0aW9ucy5hbGxvd0NyZWRlbnRpYWxzID0g KG1fc2FtZU9yaWdpblJlcXVlc3QgfHwgbV9pbmNsdWRlQ3JlZGVudGlhbHMpID8gQWxsb3dTdG9y ZWRDcmVkZW50aWFscyA6IERvTm90QWxsb3dTdG9yZWRDcmVkZW50aWFsczsKICAgICBvcHRpb25z LmNyb3NzT3JpZ2luUmVxdWVzdFBvbGljeSA9IFVzZUFjY2Vzc0NvbnRyb2w7CiAgICAgb3B0aW9u cy5zZWN1cml0eU9yaWdpbiA9IHNlY3VyaXR5T3JpZ2luKCk7CisgICAgb3B0aW9ucy5yZXF1ZXN0 SXNYTUxIVFRQID0gSXNYTUxIVFRQOwogI2lmIEVOQUJMRShSRVNPVVJDRV9USU1JTkcpCiAgICAg b3B0aW9ucy5pbml0aWF0b3IgPSBjYWNoZWRSZXNvdXJjZVJlcXVlc3RJbml0aWF0b3JzKCkueG1s aHR0cHJlcXVlc3Q7CiAjZW5kaWYK 216069 2013-11-05 13:30:33 -0800 2013-11-05 15:15:26 -0800 New fix 123757.2.patch text/plain 3541 barraclough SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1ODY5MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDEzLTExLTA1ICBHYXZpbiBC YXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KKworICAgICAgICBTdWJyZXNvdXJj ZSBsb2FkcyBzaG91bGQgbm90IHByZXZlbnQgcGFnZSB0aHJvdHRsaW5nCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjM3NTcKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgcGFnZS1pcy1sb2FkaW5nIHRl c3QgZm9yIGluaGliaXRpbmcgcHJvY2VzcyBzdXByZXNzaW9uIGlzIGN1cnJlbnRseQorICAgICAg ICB0b28gY29uc2VydmF0aXZlLCBwcmV2ZW50aW5nIHN1cHJlc3Npb24gb2YgcGFnZXMgd2l0aCBp bmZpbml0ZWx5IGxvYWRpbmcKKyAgICAgICAgcmVzb3VyY2VzIChjb21tb25seSBYSFJzKS4gSW5z dGVhZCwganVzdCByZWx5IG9uIHRoZSBGcmFtZUxvYWRlciBiZWluZworICAgICAgICBhY3RpdmUg KHdpdGggaHlzdGVyZXNpcykuCisKKyAgICAgICAgKiBsb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6U3VicmVzb3VyY2VMb2FkZXI6OmluaXQpOgorICAgICAg ICAoV2ViQ29yZTo6U3VicmVzb3VyY2VMb2FkZXI6OmNoZWNrRm9ySFRUUFN0YXR1c0NvZGVFcnJv cik6CisgICAgICAgIChXZWJDb3JlOjpTdWJyZXNvdXJjZUxvYWRlcjo6ZGlkRmluaXNoTG9hZGlu Zyk6CisgICAgICAgIChXZWJDb3JlOjpTdWJyZXNvdXJjZUxvYWRlcjo6ZGlkRmFpbCk6CisgICAg ICAgIChXZWJDb3JlOjpTdWJyZXNvdXJjZUxvYWRlcjo6d2lsbENhbmNlbCk6CisgICAgICAgICog bG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmg6CisgICAgICAgICAgICAtIHJlbW92ZSBtX2FjdGl2 aXR5QXNzZXJ0aW9uIGZyb20gU3VicmVzb3VyY2VMb2FkZXIuCisKIDIwMTMtMTEtMDUgIENvbW1p dCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQs IHJvbGxpbmcgb3V0IHIxNTg2NzguCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3VicmVz b3VyY2VMb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJy ZXNvdXJjZUxvYWRlci5jcHAJKHJldmlzaW9uIDE1ODQ2MSkKKysrIFNvdXJjZS9XZWJDb3JlL2xv YWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwOSw4ICsxMDks NiBAQCBib29sIFN1YnJlc291cmNlTG9hZGVyOjppbml0KGNvbnN0IFJlc291CiAKICAgICBBU1NF UlQoIXJlYWNoZWRUZXJtaW5hbFN0YXRlKCkpOwogICAgIG1fc3RhdGUgPSBJbml0aWFsaXplZDsK LSAgICBpZiAobV9mcmFtZSAmJiBtX2ZyYW1lLT5wYWdlKCkgJiYgIW1fYWN0aXZpdHlBc3NlcnRp b24pCi0gICAgICAgIG1fYWN0aXZpdHlBc3NlcnRpb24gPSBtX2ZyYW1lLT5wYWdlKCktPmNyZWF0 ZUFjdGl2aXR5VG9rZW4oKTsKICAgICBtX2RvY3VtZW50TG9hZGVyLT5hZGRTdWJyZXNvdXJjZUxv YWRlcih0aGlzKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KQEAgLTI2MCw3ICsyNTgsNiBAQCBib29s IFN1YnJlc291cmNlTG9hZGVyOjpjaGVja0ZvckhUVFBTdGF0CiAgICAgICAgIHJldHVybiBmYWxz ZTsKIAogICAgIG1fc3RhdGUgPSBGaW5pc2hpbmc7Ci0gICAgbV9hY3Rpdml0eUFzc2VydGlvbiA9 IG51bGxwdHI7CiAgICAgbV9yZXNvdXJjZS0+ZXJyb3IoQ2FjaGVkUmVzb3VyY2U6OkxvYWRFcnJv cik7CiAgICAgY2FuY2VsKCk7CiAgICAgcmV0dXJuIHRydWU7CkBAIC0yNzgsNyArMjc1LDYgQEAg dm9pZCBTdWJyZXNvdXJjZUxvYWRlcjo6ZGlkRmluaXNoTG9hZGluZwogICAgIFJlZjxTdWJyZXNv dXJjZUxvYWRlcj4gcHJvdGVjdCgqdGhpcyk7CiAgICAgQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2Fj aGVkUmVzb3VyY2U+IHByb3RlY3RSZXNvdXJjZShtX3Jlc291cmNlKTsKICAgICBtX3N0YXRlID0g RmluaXNoaW5nOwotICAgIG1fYWN0aXZpdHlBc3NlcnRpb24gPSBudWxscHRyOwogICAgIG1fcmVz b3VyY2UtPnNldExvYWRGaW5pc2hUaW1lKGZpbmlzaFRpbWUpOwogICAgIG1fcmVzb3VyY2UtPmZp bmlzaExvYWRpbmcocmVzb3VyY2VEYXRhKCkpOwogCkBAIC0zMDMsNyArMjk5LDYgQEAgdm9pZCBT dWJyZXNvdXJjZUxvYWRlcjo6ZGlkRmFpbChjb25zdCBSZQogICAgIFJlZjxTdWJyZXNvdXJjZUxv YWRlcj4gcHJvdGVjdCgqdGhpcyk7CiAgICAgQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkUmVz b3VyY2U+IHByb3RlY3RSZXNvdXJjZShtX3Jlc291cmNlKTsKICAgICBtX3N0YXRlID0gRmluaXNo aW5nOwotICAgIG1fYWN0aXZpdHlBc3NlcnRpb24gPSBudWxscHRyOwogICAgIGlmIChtX3Jlc291 cmNlLT5yZXNvdXJjZVRvUmV2YWxpZGF0ZSgpKQogICAgICAgICBtZW1vcnlDYWNoZSgpLT5yZXZh bGlkYXRpb25GYWlsZWQobV9yZXNvdXJjZSk7CiAgICAgbV9yZXNvdXJjZS0+c2V0UmVzb3VyY2VF cnJvcihlcnJvcik7CkBAIC0zMjYsNyArMzIxLDYgQEAgdm9pZCBTdWJyZXNvdXJjZUxvYWRlcjo6 d2lsbENhbmNlbChjb25zdAogCiAgICAgUmVmPFN1YnJlc291cmNlTG9hZGVyPiBwcm90ZWN0KCp0 aGlzKTsKICAgICBtX3N0YXRlID0gRmluaXNoaW5nOwotICAgIG1fYWN0aXZpdHlBc3NlcnRpb24g PSBudWxscHRyOwogICAgIGlmIChtX3Jlc291cmNlLT5yZXNvdXJjZVRvUmV2YWxpZGF0ZSgpKQog ICAgICAgICBtZW1vcnlDYWNoZSgpLT5yZXZhbGlkYXRpb25GYWlsZWQobV9yZXNvdXJjZSk7CiAg ICAgbV9yZXNvdXJjZS0+c2V0UmVzb3VyY2VFcnJvcihlcnJvcik7CkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9sb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9sb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuaAkocmV2aXNpb24gMTU4NDYxKQorKysgU291 cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmgJKHdvcmtpbmcgY29weSkKQEAg LTEwMiw3ICsxMDIsNiBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9sb2FkaW5nTXVsdGlwYXJ0Q29u dGVudDsKICAgICBTdWJyZXNvdXJjZUxvYWRlclN0YXRlIG1fc3RhdGU7CiAgICAgT3duUHRyPFJl cXVlc3RDb3VudFRyYWNrZXI+IG1fcmVxdWVzdENvdW50VHJhY2tlcjsKLSAgICBzdGQ6OnVuaXF1 ZV9wdHI8UGFnZUFjdGl2aXR5QXNzZXJ0aW9uVG9rZW4+IG1fYWN0aXZpdHlBc3NlcnRpb247CiB9 OwogCiB9Cg==