69115 2011-09-29 17:57:27 -0700 [GTK] Custom fonts on surlybikes.com and boingboing.net do not load 2011-11-29 07:50:15 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mrobinson mrobinson gustavo svillar xan.lopez oldest_to_newest 475783 0 mrobinson 2011-09-29 17:57:27 -0700 It seems that typekit is doing user-agent sniffing. Since we claim to be Safari, but not OS X by default, we must be detected as iOS. This means that we often get the lighter version of the sites and, in this case, no custom fonts. 475787 1 109230 mrobinson 2011-09-29 18:07:00 -0700 Created attachment 109230 We won't do this anymore. 475987 2 109230 xan.lopez 2011-09-30 02:21:30 -0700 Comment on attachment 109230 We won't do this anymore. Jesus. To be honest I don't know what to do here anymore. Feels to me we are just trying things randomly? :/ 475989 3 xan.lopez 2011-09-30 02:24:51 -0700 I think we need a document somewhere explaining what each string does, because it seems each thing we do fixes something and breaks something else. For instance, is it a good idea at this point to have "Safari" in our UA? 476063 4 mrobinson 2011-09-30 06:42:47 -0700 It's not random really. Sites are dividing Safari into a two buckets: iOS Safari and Desktop Safari. If you do not claim to be Desktop Safari, sites assume you are iOS Safari. This wasn't an issue when we first started because iOS Safari wasn't prevalent. I believe that if we remove Safari from the string we will see lots of broken sites. Even Chrome claims to be Safari and they are much more different from Safari than we are. I tried to add documentation via code comments to part I changed, but if necessary I can expand it to try to explain everything. 476094 5 mrobinson 2011-09-30 08:12:12 -0700 Xan requested a deeper analysis, so I'm going to post a more detailed overview of the situation as I understand it. Safari: Claims to be Mozilla (very old sites used to differeniate between IE and Netscape/Firefox). Claims to be Safari. Safari may either be iOS or OS X (Desktop). The platform information is placed after the Mozilla string. Chromium: Claims to be Mozilla (see above). Claims to be Safari, because when Chromium was created, sites didn't test for it -- instead testing only for Safari. The platform string is correct for Chromium. For instance on Linux it claims to be Linux. WebKitGTK+: Traditionally we claimed to be Safari and Mozilla, for very similar reason to Chrome. We also appended our own identifier (WebKitGTK+). We have claimed to be Safari even *before* Gustavo's controversial patch at: https://bugs.webkit.org/show_bug.cgi?id=39617. That patch didn't really modify the default user agent much, but did make it so that the default user-agent overrides any custom one set on WebKitWebSettings when site-specific-quirk is set. This solution worked pretty well, because we were claiming to be Safari, like Chromium. Things have changed today though, because now that iOS is becoming prevalent sites are starting to trim down their content for mobile user-agents. They do this by sniffing the user-agent to differentiate between OS X Safari and iOS Safari. This is not an issue for Chromium, because these same sites also detect Chromium now. We have no hope (at this point) of getting sites to detect WebKitGTK+ in their scripts so, we need to intensify our Safari claim by also claiming that we are the OS X version of Safari. There is an alternative here which I considered originally. We can also claim to be Chromium. This avoids the need to claim to be OS X. The issue with this (which Oliver Hunt, I think, brought up on Gustavo's patch) is that sites may send different JavaScript to Chromium since it runs a different JavaScript engine. So in my patch, I took the more conservative approach. 477013 6 109230 gustavo 2011-10-03 09:11:54 -0700 Comment on attachment 109230 We won't do this anymore. View in context: https://bugs.webkit.org/attachment.cgi?id=109230&action=review I like this approach; it's a pitty we'll be lying even more to Google, but they had it coming =P. Xan, I don't really remember changes we did in U-A breaking stuff, it's just we found new stuff that was already broken, really. I don't think we have many options other than fine tuning as we find stuff that is broken, given the web's current state. > Source/WebKit/gtk/ChangeLog:14 > + prefix of the user agent hsa changed. hsa->has 491664 7 mrobinson 2011-10-27 10:08:49 -0700 It seems that even yahoo.com is broken now. I'll write another patch which pretends to be Chromium. 503696 8 svillar 2011-11-16 00:57:26 -0800 (In reply to comment #7) > It seems that even yahoo.com is broken now. I'll write another patch which pretends to be Chromium. Looks like they fixed it. 505478 9 115736 mrobinson 2011-11-17 21:39:43 -0800 Created attachment 115736 Pretend to be Chromium 509693 10 115736 xan.lopez 2011-11-28 02:58:18 -0800 Comment on attachment 115736 Pretend to be Chromium So sad, but I'm OK with this. Guess we need 2 r+ since this is a bit like an API break. 510107 11 115736 gustavo 2011-11-28 13:17:50 -0800 Comment on attachment 115736 Pretend to be Chromium I aprove of this message, unfortunately. (from the airport in São Paulo) 510764 12 mrobinson 2011-11-29 07:50:15 -0800 Committed r101379: <http://trac.webkit.org/changeset/101379> 109230 2011-09-29 18:07:00 -0700 2011-11-09 09:36:14 -0800 We won't do this anymore. bug-69115-20110929180659.patch text/plain 6593 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogOTYzNzgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3Rr L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwppbmRleCAyYWQ0ZTJkZWJm ZWQ5ZDA4YzAyNGQ1ZjgxYjNiYzQ5ZmRiM2VjNzFmLi5mOTQzZDQ2NTk4NDkyOTI3MjAwOTRjMDdk YzVmMzUyZGZlMDY4YmI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEt MDktMjkgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisgICAgICAg IFtHVEtdIEN1c3RvbSBmb250cyBvbiBzdXJseWJpa2VzLmNvbSBhbmQgYm9pbmdib2luZy5uZXQg ZG8gbm90IGxvYWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTY5MTE1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgSW5zdGVhZCBvZiBwcmV0ZW5kaW5nIHRvIGJlIFNhZmFyaS9MaW51eCwgcHJldGVuZCB0byBi ZSBhIFNhZmFyaS9PUyBYICsgTGludXguCisgICAgICAgIFRoaXMgZml4ZXMgcGFnZXMgdGhhdCBh c3N1bWUgdGhhdCBpZiBhIGJyb3dzZXIgaXMgU2FmYXJpLCBidXQgbm90IE9TIFgsIGl0IGlzCisg ICAgICAgIHRoZSBpT1MgdmVyc2lvbiBvZiBTYWZhcmkuCisKKyAgICAgICAgKiB0ZXN0cy90ZXN0 d2Vic2V0dGluZ3MuYzoKKyAgICAgICAgKHRlc3Rfd2Via2l0X3dlYl9zZXR0aW5nc191c2VyX2Fn ZW50KTogVXBkYXRlIHRoZSB0ZXN0IHRvIHJlZmxlY3QgdGhhdCB0aGUKKyAgICAgICAgcHJlZml4 IG9mIHRoZSB1c2VyIGFnZW50IGhzYSBjaGFuZ2VkLgorICAgICAgICAqIHdlYmtpdC93ZWJraXR3 ZWJzZXR0aW5ncy5jcHA6CisgICAgICAgIChvc3hTYWZhcmlVc2VyQWdlbnQpOiBSZW5hbWVkIHRo aXMgZnJvbSB3ZWJraXRVc2VyQWdlbnQgdG8gbW9yZSBhY2N1cmF0ZWx5CisgICAgICAgIGRlc2Ny aWJlIHdoYXQgaXQgaXMuCisgICAgICAgICh3ZWJraXRfd2ViX3NldHRpbmdzX2NsYXNzX2luaXQp OiBKdXN0IHVzZSBhbiBlbXB0eSBzdHJpbmcgd2hlbiBpbml0aWFsaXppbmcKKyAgICAgICAgdGhl IHVzZXIgYWdlbnQgdG8gcmVkdWNlIGNvZGUgZHVwbGljYXRpb24uCisgICAgICAgICh3ZWJraXRf d2ViX3NldHRpbmdzX3NldF9wcm9wZXJ0eSk6IFVwZGF0ZWQgdG8gcmVmbGVjdCBuZXcgbWV0aG9k IG5hbWUuCisgICAgICAgICh1c2VyQWdlbnRGb3JVUkwpOiBXZSBkb24ndCBuZWVkIHRvIHNwZWNp YWwgY2FzZSBHb29nbGUgQ2FsZW5kYXIgYW55IGxvbmdlci4KKwogMjAxMS0wOS0yOCAgTWFydGlu IFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gTW92ZSBk cmFnLWFuZC1kcm9wIGNvZGUgd2hpY2ggY2FuIGJlIHNoYXJlZCB3aXRoIFdlYktpdDIgdG8gV2Vi Q29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvdGVzdHMvdGVzdHdlYnNldHRpbmdz LmMgYi9Tb3VyY2UvV2ViS2l0L2d0ay90ZXN0cy90ZXN0d2Vic2V0dGluZ3MuYwppbmRleCBhNDI1 NzU1ZTc5MGUyMDFjMDcwYTFkYTE0MzNhMTllMmQ0Zjc2MDI3Li42OWY3ZDYyZDJhNTdkMDQyMmVm OTgyOTk0ZTNiMTZlM2IxMzRjOWQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay90ZXN0 cy90ZXN0d2Vic2V0dGluZ3MuYworKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay90ZXN0cy90ZXN0d2Vi c2V0dGluZ3MuYwpAQCAtMTQwLDcgKzE0MCw3IEBAIHN0YXRpYyB2b2lkIHRlc3Rfd2Via2l0X3dl Yl9zZXR0aW5nc191c2VyX2FnZW50KHZvaWQpCiAgICAgZ19mcmVlKHVzZXJBZ2VudCk7CiAKICAg ICB1c2VyQWdlbnQgPSB3ZWJraXRXZWJTZXR0aW5nc1VzZXJBZ2VudEZvclVSSShzZXR0aW5ncywg Imh0dHA6Ly9jYWxlbmRhci5nb29nbGUuY29tLyIpOwotICAgIGdfYXNzZXJ0KGdfc3RyX2hhc19w cmVmaXgodXNlckFnZW50LCAiTW96aWxsYS81LjAgKE1hY2ludG9zaDsgVTsgSW50ZWwgTWFjIE9T IFggMTBfNl83OyBlbl9VUykgQXBwbGVXZWJLaXQvIikpOworICAgIGdfYXNzZXJ0KGdfc3RyX2hh c19wcmVmaXgodXNlckFnZW50LCAiTW96aWxsYS81LjAgKE1hY2ludG9zaDsgVTsgSW50ZWwgTWFj IE9TIFggMTBfNl83OyBlbl9VUykiKSk7CiAgICAgZ19mcmVlKHVzZXJBZ2VudCk7CiAKICAgICBn X2ZyZWUoZGVmYXVsdFVzZXJBZ2VudCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay93 ZWJraXQvd2Via2l0d2Vic2V0dGluZ3MuY3BwIGIvU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dl YmtpdHdlYnNldHRpbmdzLmNwcAppbmRleCAzNGU0MzIxN2NkNzVkZjAwZGE3OTUwY2Q1NzQ1ZDMw MWYwZjY2YjFiLi43NzU2YzVmMjU3N2FmYjc1ZmVlNWYxYzk5ZTJiMWNhYTg4ZmU4MzI0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vic2V0dGluZ3MuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJzZXR0aW5ncy5jcHAKQEAgLTE3 MiwzMCArMTcyLDIyIEBAIHN0YXRpYyBTdHJpbmcgd2Via2l0T1NWZXJzaW9uKCkKICAgICByZXR1 cm4gdWFPU1ZlcnNpb247CiB9CiAKLXN0YXRpYyBTdHJpbmcgd2Via2l0VXNlckFnZW50KCkKK3N0 YXRpYyBTdHJpbmcgb3N4U2FmYXJpVXNlckFnZW50KCkKIHsKICAgICAvLyBXZSBtZW50aW9uIFNh ZmFyaSBzaW5jZSBtYW55IGJyb2tlbiBzaXRlcyBjaGVjayBmb3IgaXQgKE9tbmlXZWIgZG9lcyB0 aGlzIHRvbykKICAgICAvLyBXZSByZS11c2UgdGhlIFdlYktpdCB2ZXJzaW9uLCB0aG91Z2ggaXQg ZG9lc24ndCBzZWVtIHRvIG1hdHRlciBtdWNoIGluIHByYWN0aWNlCisgICAgLy8gV2UgYWxzbyBj bGFpbSB0byBiZSBPUyBYIGhlcmUgYmVjYXVzZSBzb21lIHNpdGVzIGFzc3VtZSB0aGF0IHlvdSBh cmUgdGhlIGlPUworICAgIC8vIGJyb3dzZXIgaWYgeW91IGRvbid0IHNheSBzbyBleHBsaWNpdGx5 LiBUeXBpY2FsbHkgc2l0ZXMgc2VydmUgdGhlIGlPUyBicm93c2VyCisgICAgLy8gbGVzcyBmZWF0 dXJlcy4KIAogICAgIERFRklORV9TVEFUSUNfTE9DQUwoY29uc3QgU3RyaW5nLCB1YVZlcnNpb24s IChtYWtlU3RyaW5nKFN0cmluZzo6bnVtYmVyKFdFQktJVF9VU0VSX0FHRU5UX01BSk9SX1ZFUlNJ T04pLCAnLicsIFN0cmluZzo6bnVtYmVyKFdFQktJVF9VU0VSX0FHRU5UX01JTk9SX1ZFUlNJT04p LCAnKycpKSk7Ci0gICAgREVGSU5FX1NUQVRJQ19MT0NBTChjb25zdCBTdHJpbmcsIHN0YXRpY1VB LCAobWFrZVN0cmluZygiTW96aWxsYS81LjAgKCIsIHdlYmtpdFBsYXRmb3JtKCksIHdlYmtpdE9T VmVyc2lvbigpLCAiKSBBcHBsZVdlYktpdC8iLCB1YVZlcnNpb24pICsKKyAgICBERUZJTkVfU1RB VElDX0xPQ0FMKGNvbnN0IFN0cmluZywgc3RhdGljVUEsIChtYWtlU3RyaW5nKCJNb3ppbGxhLzUu MCAoTWFjaW50b3NoOyBVOyBJbnRlbCBNYWMgT1MgWCAxMF82Xzc7IGVuX1VTKSAiCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiKCIs IHdlYmtpdFBsYXRmb3JtKCksIHdlYmtpdE9TVmVyc2lvbigpLCAiKSBBcHBsZVdlYktpdC8iLCB1 YVZlcnNpb24pICsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBtYWtlU3RyaW5nKCIgKEtIVE1MLCBsaWtlIEdlY2tvKSBWZXJzaW9uLzUuMCBTYWZhcmkv IiwgdWFWZXJzaW9uKSkpOwogCiAgICAgcmV0dXJuIHN0YXRpY1VBOwogfQogCi1zdGF0aWMgU3Ry aW5nIHNhZmFyaVVzZXJBZ2VudCgpCi17Ci0gICAgLy8gV2UgbWVudGlvbiBTYWZhcmkgc2luY2Ug bWFueSBicm9rZW4gc2l0ZXMgY2hlY2sgZm9yIGl0IChPbW5pV2ViIGRvZXMgdGhpcyB0b28pCi0g ICAgLy8gV2UgcmUtdXNlIHRoZSBXZWJLaXQgdmVyc2lvbiwgdGhvdWdoIGl0IGRvZXNuJ3Qgc2Vl bSB0byBtYXR0ZXIgbXVjaCBpbiBwcmFjdGljZQotCi0gICAgREVGSU5FX1NUQVRJQ19MT0NBTChj b25zdCBTdHJpbmcsIHVhVmVyc2lvbiwgKG1ha2VTdHJpbmcoU3RyaW5nOjpudW1iZXIoV0VCS0lU X1VTRVJfQUdFTlRfTUFKT1JfVkVSU0lPTiksICcuJywgU3RyaW5nOjpudW1iZXIoV0VCS0lUX1VT RVJfQUdFTlRfTUlOT1JfVkVSU0lPTiksICcrJykpKTsKLSAgICBERUZJTkVfU1RBVElDX0xPQ0FM KGNvbnN0IFN0cmluZywgc3RhdGljVUEsIChtYWtlU3RyaW5nKCJNb3ppbGxhLzUuMCAoTWFjaW50 b3NoOyBVOyBJbnRlbCBNYWMgT1MgWCAxMF82Xzc7IGVuX1VTKSBBcHBsZVdlYktpdC8iLCB1YVZl cnNpb24pICsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBtYWtlU3RyaW5nKCIgKEtIVE1MLCBsaWtlIEdlY2tvKSBWZXJzaW9uLzUuMC41IFNhZmFyaS8i LCB1YVZlcnNpb24pKSk7Ci0KLSAgICByZXR1cm4gc3RhdGljVUE7Ci19Ci0KIHN0YXRpYyB2b2lk IHdlYmtpdF93ZWJfc2V0dGluZ3NfZmluYWxpemUoR09iamVjdCogb2JqZWN0KTsKIAogc3RhdGlj IHZvaWQgd2Via2l0X3dlYl9zZXR0aW5nc19zZXRfcHJvcGVydHkoR09iamVjdCogb2JqZWN0LCBn dWludCBwcm9wX2lkLCBjb25zdCBHVmFsdWUqIHZhbHVlLCBHUGFyYW1TcGVjKiBwc3BlYyk7CkBA IC02MjEsNyArNjEzLDcgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl9zZXR0aW5nc19jbGFzc19p bml0KFdlYktpdFdlYlNldHRpbmdzQ2xhc3MqIGtsYXNzKQogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgZ19wYXJhbV9zcGVjX3N0cmluZygidXNlci1hZ2VudCIsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF8oIlVzZXIg QWdlbnQiKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgXygiVGhlIFVzZXItQWdlbnQgc3RyaW5nIHVzZWQgYnkgV2ViS2l0R3RrIiksCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHdl YmtpdFVzZXJBZ2VudCgpLnV0ZjgoKS5kYXRhKCksCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIiLCAvLyBBbiBlbXB0eSBzdHJpbmcgbWVh bnMgdGhlIGRlZmF1bHQgdXNlci1hZ2VudC4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZmxhZ3MpKTsKIAogICAgIC8qKgpAQCAtMTAzOCw3 ICsxMDMwLDcgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl9zZXR0aW5nc19zZXRfcHJvcGVydHko R09iamVjdCogb2JqZWN0LCBndWludCBwcm9wX2lkLCBjb24KICAgICAgICAgYnJlYWs7CiAgICAg Y2FzZSBQUk9QX1VTRVJfQUdFTlQ6CiAgICAgICAgIGlmICghZ192YWx1ZV9nZXRfc3RyaW5nKHZh bHVlKSB8fCAhc3RybGVuKGdfdmFsdWVfZ2V0X3N0cmluZyh2YWx1ZSkpKQotICAgICAgICAgICAg cHJpdi0+dXNlckFnZW50ID0gd2Via2l0VXNlckFnZW50KCkudXRmOCgpOworICAgICAgICAgICAg cHJpdi0+dXNlckFnZW50ID0gb3N4U2FmYXJpVXNlckFnZW50KCkudXRmOCgpOwogICAgICAgICBl bHNlCiAgICAgICAgICAgICBwcml2LT51c2VyQWdlbnQgPSBnX3ZhbHVlX2dldF9zdHJpbmcodmFs dWUpOwogICAgICAgICBicmVhazsKQEAgLTE0MzcsMjUgKzE0MjksMTIgQEAgc3RhdGljIGJvb2wg aXNHb29nbGVEb21haW4oU3RyaW5nIGhvc3QpCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1zdGF0 aWMgYm9vbCBpc0dvb2dsZUNhbGVuZGFyKGNvbnN0IEtVUkwmIHVybCkKLXsKLSAgICBpZiAodXJs Lmhvc3QoKS5maW5kKCJjYWxlbmRhci5nb29nbGUuIikgPT0gMAotICAgICAgICB8fCAodXJsLmhv c3QoKS5maW5kKCJnb29nbGUuY29tIikgJiYgdXJsLnBhdGgoKS5zdGFydHNXaXRoKCIvY2FsZW5k YXIiKSkpCi0gICAgICAgIHJldHVybiB0cnVlOwotCi0gICAgcmV0dXJuIGZhbHNlOwotfQotCiBz dGF0aWMgU3RyaW5nIHVzZXJBZ2VudEZvclVSTChjb25zdCBLVVJMJiB1cmwpCiB7CiAgICAgLy8g Rm9yIEdvb2dsZSBkb21haW5zLCBkcm9wIHRoZSBicm93c2VyJ3MgY3VzdG9tIFVzZXIgQWdlbnQg c3RyaW5nLCBhbmQgdXNlIHRoZQotICAgIC8vIHN0YW5kYXJkIFdlYktpdC9TYWZhcmkgb25lLCBz byB0aGV5IGRvbid0IGdpdmUgdXMgYSBicm9rZW4gZXhwZXJpZW5jZS4gQ2FsZW5kYXIKLSAgICAv LyB0aGlua3MgIkxpbnV4IFdlYktpdCIgbWVhbnMgbW9iaWxlLgotICAgIGlmIChpc0dvb2dsZUNh bGVuZGFyKHVybCkpCi0gICAgICAgIHJldHVybiBzYWZhcmlVc2VyQWdlbnQoKTsKLQorICAgIC8v IHN0YW5kYXJkIFdlYktpdC9TYWZhcmkgb25lLCBzbyB0aGV5IGRvbid0IGdpdmUgdXMgYSBicm9r ZW4gZXhwZXJpZW5jZS4KICAgICBpZiAoaXNHb29nbGVEb21haW4odXJsLmhvc3QoKSkpCi0gICAg ICAgIHJldHVybiB3ZWJraXRVc2VyQWdlbnQoKTsKKyAgICAgICAgcmV0dXJuIG9zeFNhZmFyaVVz ZXJBZ2VudCgpOwogCiAgICAgcmV0dXJuIFN0cmluZygpOwogfQo= 115736 2011-11-17 21:39:43 -0800 2011-11-28 13:17:50 -0800 Pretend to be Chromium bug-69115-20111117213942.patch text/plain 6298 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwNzEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggY2YzNzkxNjUy MTEwZmNhNTMwMDZjZTc1ZTZlYjU0ZmI5NDljZTEwMC4uNjk1OGMyOTI2MTY3MjM3NjhhZTU3NzJm ZDVkYWFiNzZjODc2ZmVlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDEx LTExLTE3ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAorICAgICAg ICBbR1RLXSBDdXN0b20gZm9udHMgb24gc3VybHliaWtlcy5jb20gYW5kIGJvaW5nYm9pbmcubmV0 IGRvIG5vdCBsb2FkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD02OTExNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEluc3RlYWQgb2YgcHJldGVuZGluZyB0byBiZSBTYWZhcmkvTGludXgsIHByZXRlbmQgdG8g YmUgYSBMaW51eCBDaHJvbWUuCisgICAgICAgIFRoaXMgZml4ZXMgcGFnZXMgdGhhdCBhc3N1bWUg dGhhdCBpZiBhIGJyb3dzZXIgaXMgU2FmYXJpLCBidXQgbm90IE9TIFgsIGl0IGlzCisgICAgICAg IHRoZSBpT1MgdmVyc2lvbiBvZiBTYWZhcmkuCisKKyAgICAgICAgKiB0ZXN0cy90ZXN0d2Vic2V0 dGluZ3MuYzoKKyAgICAgICAgKHRlc3Rfd2Via2l0X3dlYl9zZXR0aW5nc191c2VyX2FnZW50KTog VXBkYXRlIHRoZSB0ZXN0IHRvIHJlZmxlY3QgdGhhdCB0aGUKKyAgICAgICAgdXNlciBhZ2VudCBk b2VzIG5vdCBjaGFuZ2UuCisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYnNldHRpbmdzLmNwcDoK KyAgICAgICAgKGNocm9tZVVzZXJBZ2VudCk6IFJlbmFtZWQgdGhpcyBmcm9tIHdlYmtpdFVzZXJB Z2VudCB0byBtb3JlIGFjY3VyYXRlbHkKKyAgICAgICAgZGVzY3JpYmUgd2hhdCBpdCBpcy4KKyAg ICAgICAgKHdlYmtpdF93ZWJfc2V0dGluZ3NfY2xhc3NfaW5pdCk6IEp1c3QgdXNlIGFuIGVtcHR5 IHN0cmluZyB3aGVuIGluaXRpYWxpemluZworICAgICAgICB0aGUgdXNlciBhZ2VudCB0byByZWR1 Y2UgY29kZSBkdXBsaWNhdGlvbi4KKyAgICAgICAgKHdlYmtpdF93ZWJfc2V0dGluZ3Nfc2V0X3By b3BlcnR5KTogVXBkYXRlZCB0byByZWZsZWN0IG5ldyBtZXRob2QgbmFtZS4KKyAgICAgICAgKHVz ZXJBZ2VudEZvclVSTCk6IFdlIGRvbid0IG5lZWQgdG8gc3BlY2lhbCBjYXNlIEdvb2dsZSBDYWxl bmRhciBhbnkgbG9uZ2VyLgorCisyMDExLTExLTE3ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5z b25AaWdhbGlhLmNvbT4KKwogICAgICAgICBbR1RLXSBSZW1vdmUgdGhlIGxhc3QgcmVtYWluaW5n IFdlYktpdDEgZ3RrZG9jIHdhcm5pbmdzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD03MjYyNwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay90 ZXN0cy90ZXN0d2Vic2V0dGluZ3MuYyBiL1NvdXJjZS9XZWJLaXQvZ3RrL3Rlc3RzL3Rlc3R3ZWJz ZXR0aW5ncy5jCmluZGV4IDg3MDJkNDM1NjEzMTU0ZDc3OTY4Y2I0MTI0OGQ1NTMyMTk4YjlhMzcu LmFiODBmYTJhMGZlYmExYWM2YzNiNTBlZGI3NThiYzJjY2Q0OTIyZmIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvZ3RrL3Rlc3RzL3Rlc3R3ZWJzZXR0aW5ncy5jCisrKyBiL1NvdXJjZS9XZWJL aXQvZ3RrL3Rlc3RzL3Rlc3R3ZWJzZXR0aW5ncy5jCkBAIC0xMzksMTAgKzEzOSw2IEBAIHN0YXRp YyB2b2lkIHRlc3Rfd2Via2l0X3dlYl9zZXR0aW5nc191c2VyX2FnZW50KHZvaWQpCiAgICAgZ19h c3NlcnRfY21wc3RyKHVzZXJBZ2VudCwgPT0sICJ0ZXN0d2Vic2V0dGluZ3MvMC4xIik7CiAgICAg Z19mcmVlKHVzZXJBZ2VudCk7CiAKLSAgICB1c2VyQWdlbnQgPSB3ZWJraXRXZWJTZXR0aW5nc1Vz ZXJBZ2VudEZvclVSSShzZXR0aW5ncywgImh0dHA6Ly9jYWxlbmRhci5nb29nbGUuY29tLyIpOwot ICAgIGdfYXNzZXJ0KGdfc3RyX2hhc19wcmVmaXgodXNlckFnZW50LCAiTW96aWxsYS81LjAgKE1h Y2ludG9zaDsgVTsgSW50ZWwgTWFjIE9TIFggMTBfNl83OyBlbl9VUykgQXBwbGVXZWJLaXQvIikp OwotICAgIGdfZnJlZSh1c2VyQWdlbnQpOwotCiAgICAgZ19mcmVlKGRlZmF1bHRVc2VyQWdlbnQp OwogICAgIGdfb2JqZWN0X3VucmVmKHdlYlZpZXcpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnNldHRpbmdzLmNwcCBiL1NvdXJjZS9XZWJLaXQvZ3Rr L3dlYmtpdC93ZWJraXR3ZWJzZXR0aW5ncy5jcHAKaW5kZXggMzRlNDMyMTdjZDc1ZGYwMGRhNzk1 MGNkNTc0NWQzMDFmMGY2NmIxYi4uNGJlMDk4ZmJhMmQyZTYwYTliMDkyZTBlY2UxOWJkNzViM2M2 M2M4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnNldHRp bmdzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vic2V0dGluZ3Mu Y3BwCkBAIC0xNzIsMjYgKzE3MiwxNyBAQCBzdGF0aWMgU3RyaW5nIHdlYmtpdE9TVmVyc2lvbigp CiAgICAgcmV0dXJuIHVhT1NWZXJzaW9uOwogfQogCi1zdGF0aWMgU3RyaW5nIHdlYmtpdFVzZXJB Z2VudCgpCitzdGF0aWMgU3RyaW5nIGNocm9tZVVzZXJBZ2VudCgpCiB7CiAgICAgLy8gV2UgbWVu dGlvbiBTYWZhcmkgc2luY2UgbWFueSBicm9rZW4gc2l0ZXMgY2hlY2sgZm9yIGl0IChPbW5pV2Vi IGRvZXMgdGhpcyB0b28pCiAgICAgLy8gV2UgcmUtdXNlIHRoZSBXZWJLaXQgdmVyc2lvbiwgdGhv dWdoIGl0IGRvZXNuJ3Qgc2VlbSB0byBtYXR0ZXIgbXVjaCBpbiBwcmFjdGljZQorICAgIC8vIFdl IGFsc28gY2xhaW0gdG8gYmUgT1MgWCBoZXJlIGJlY2F1c2Ugc29tZSBzaXRlcyBhc3N1bWUgdGhh dCB5b3UgYXJlIHRoZSBpT1MKKyAgICAvLyBicm93c2VyIGlmIHlvdSBkb24ndCBzYXkgc28gZXhw bGljaXRseS4gVHlwaWNhbGx5IHNpdGVzIHNlcnZlIHRoZSBpT1MgYnJvd3NlcgorICAgIC8vIGxl c3MgZmVhdHVyZXMuCiAKICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKGNvbnN0IFN0cmluZywgdWFW ZXJzaW9uLCAobWFrZVN0cmluZyhTdHJpbmc6Om51bWJlcihXRUJLSVRfVVNFUl9BR0VOVF9NQUpP Ul9WRVJTSU9OKSwgJy4nLCBTdHJpbmc6Om51bWJlcihXRUJLSVRfVVNFUl9BR0VOVF9NSU5PUl9W RVJTSU9OKSwgJysnKSkpOwogICAgIERFRklORV9TVEFUSUNfTE9DQUwoY29uc3QgU3RyaW5nLCBz dGF0aWNVQSwgKG1ha2VTdHJpbmcoIk1vemlsbGEvNS4wICgiLCB3ZWJraXRQbGF0Zm9ybSgpLCB3 ZWJraXRPU1ZlcnNpb24oKSwgIikgQXBwbGVXZWJLaXQvIiwgdWFWZXJzaW9uKSArCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbWFrZVN0cmluZygiIChL SFRNTCwgbGlrZSBHZWNrbykgVmVyc2lvbi81LjAgU2FmYXJpLyIsIHVhVmVyc2lvbikpKTsKLQot ICAgIHJldHVybiBzdGF0aWNVQTsKLX0KLQotc3RhdGljIFN0cmluZyBzYWZhcmlVc2VyQWdlbnQo KQotewotICAgIC8vIFdlIG1lbnRpb24gU2FmYXJpIHNpbmNlIG1hbnkgYnJva2VuIHNpdGVzIGNo ZWNrIGZvciBpdCAoT21uaVdlYiBkb2VzIHRoaXMgdG9vKQotICAgIC8vIFdlIHJlLXVzZSB0aGUg V2ViS2l0IHZlcnNpb24sIHRob3VnaCBpdCBkb2Vzbid0IHNlZW0gdG8gbWF0dGVyIG11Y2ggaW4g cHJhY3RpY2UKLQotICAgIERFRklORV9TVEFUSUNfTE9DQUwoY29uc3QgU3RyaW5nLCB1YVZlcnNp b24sIChtYWtlU3RyaW5nKFN0cmluZzo6bnVtYmVyKFdFQktJVF9VU0VSX0FHRU5UX01BSk9SX1ZF UlNJT04pLCAnLicsIFN0cmluZzo6bnVtYmVyKFdFQktJVF9VU0VSX0FHRU5UX01JTk9SX1ZFUlNJ T04pLCAnKycpKSk7Ci0gICAgREVGSU5FX1NUQVRJQ19MT0NBTChjb25zdCBTdHJpbmcsIHN0YXRp Y1VBLCAobWFrZVN0cmluZygiTW96aWxsYS81LjAgKE1hY2ludG9zaDsgVTsgSW50ZWwgTWFjIE9T IFggMTBfNl83OyBlbl9VUykgQXBwbGVXZWJLaXQvIiwgdWFWZXJzaW9uKSArCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbWFrZVN0cmluZygiIChLSFRN TCwgbGlrZSBHZWNrbykgVmVyc2lvbi81LjAuNSBTYWZhcmkvIiwgdWFWZXJzaW9uKSkpOworICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1ha2VTdHJpbmco IiAoS0hUTUwsIGxpa2UgR2Vja28pIENocm9taXVtLzE1LjAuODc0LjEyMCBDaHJvbWUvMTUuMC44 NzQuMTIwIFNhZmFyaS8iLCB1YVZlcnNpb24pKSk7CiAKICAgICByZXR1cm4gc3RhdGljVUE7CiB9 CkBAIC02MjEsNyArNjEyLDcgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl9zZXR0aW5nc19jbGFz c19pbml0KFdlYktpdFdlYlNldHRpbmdzQ2xhc3MqIGtsYXNzKQogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgZ19wYXJhbV9zcGVjX3N0cmluZygidXNlci1hZ2VudCIsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF8oIlVz ZXIgQWdlbnQiKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgXygiVGhlIFVzZXItQWdlbnQgc3RyaW5nIHVzZWQgYnkgV2ViS2l0R3RrIiks Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHdlYmtpdFVzZXJBZ2VudCgpLnV0ZjgoKS5kYXRhKCksCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIiLCAvLyBBbiBlbXB0eSBzdHJpbmcg bWVhbnMgdGhlIGRlZmF1bHQgdXNlci1hZ2VudC4KICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZmxhZ3MpKTsKIAogICAgIC8qKgpAQCAtMTAz OCw3ICsxMDI5LDcgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl9zZXR0aW5nc19zZXRfcHJvcGVy dHkoR09iamVjdCogb2JqZWN0LCBndWludCBwcm9wX2lkLCBjb24KICAgICAgICAgYnJlYWs7CiAg ICAgY2FzZSBQUk9QX1VTRVJfQUdFTlQ6CiAgICAgICAgIGlmICghZ192YWx1ZV9nZXRfc3RyaW5n KHZhbHVlKSB8fCAhc3RybGVuKGdfdmFsdWVfZ2V0X3N0cmluZyh2YWx1ZSkpKQotICAgICAgICAg ICAgcHJpdi0+dXNlckFnZW50ID0gd2Via2l0VXNlckFnZW50KCkudXRmOCgpOworICAgICAgICAg ICAgcHJpdi0+dXNlckFnZW50ID0gY2hyb21lVXNlckFnZW50KCkudXRmOCgpOwogICAgICAgICBl bHNlCiAgICAgICAgICAgICBwcml2LT51c2VyQWdlbnQgPSBnX3ZhbHVlX2dldF9zdHJpbmcodmFs dWUpOwogICAgICAgICBicmVhazsKQEAgLTE0MzcsMjUgKzE0MjgsMTIgQEAgc3RhdGljIGJvb2wg aXNHb29nbGVEb21haW4oU3RyaW5nIGhvc3QpCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1zdGF0 aWMgYm9vbCBpc0dvb2dsZUNhbGVuZGFyKGNvbnN0IEtVUkwmIHVybCkKLXsKLSAgICBpZiAodXJs Lmhvc3QoKS5maW5kKCJjYWxlbmRhci5nb29nbGUuIikgPT0gMAotICAgICAgICB8fCAodXJsLmhv c3QoKS5maW5kKCJnb29nbGUuY29tIikgJiYgdXJsLnBhdGgoKS5zdGFydHNXaXRoKCIvY2FsZW5k YXIiKSkpCi0gICAgICAgIHJldHVybiB0cnVlOwotCi0gICAgcmV0dXJuIGZhbHNlOwotfQotCiBz dGF0aWMgU3RyaW5nIHVzZXJBZ2VudEZvclVSTChjb25zdCBLVVJMJiB1cmwpCiB7CiAgICAgLy8g Rm9yIEdvb2dsZSBkb21haW5zLCBkcm9wIHRoZSBicm93c2VyJ3MgY3VzdG9tIFVzZXIgQWdlbnQg c3RyaW5nLCBhbmQgdXNlIHRoZQotICAgIC8vIHN0YW5kYXJkIFdlYktpdC9TYWZhcmkgb25lLCBz byB0aGV5IGRvbid0IGdpdmUgdXMgYSBicm9rZW4gZXhwZXJpZW5jZS4gQ2FsZW5kYXIKLSAgICAv LyB0aGlua3MgIkxpbnV4IFdlYktpdCIgbWVhbnMgbW9iaWxlLgotICAgIGlmIChpc0dvb2dsZUNh bGVuZGFyKHVybCkpCi0gICAgICAgIHJldHVybiBzYWZhcmlVc2VyQWdlbnQoKTsKLQorICAgIC8v IHN0YW5kYXJkIENocm9tZSBvbmUsIHNvIHRoZXkgZG9uJ3QgZ2l2ZSB1cyBhIGJyb2tlbiBleHBl cmllbmNlLgogICAgIGlmIChpc0dvb2dsZURvbWFpbih1cmwuaG9zdCgpKSkKLSAgICAgICAgcmV0 dXJuIHdlYmtpdFVzZXJBZ2VudCgpOworICAgICAgICByZXR1cm4gY2hyb21lVXNlckFnZW50KCk7 CiAKICAgICByZXR1cm4gU3RyaW5nKCk7CiB9Cg==