33186 2010-01-04 15:58:24 -0800 Track state for whether a ResourceRequest is fetched via SPDY 2010-05-13 13:13:07 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Minor --- 1 mbelshe mbelshe abarth commit-queue darin dglazkov eric fishd levin webkit.review.bot oldest_to_newest 176932 0 mbelshe 2010-01-04 15:58:24 -0800 Track whether a ResourceRequest is fetched via the SPDY protocol. Initially this will be chromium specific. SPDY is part of an experiment to see if we can't build a faster web protocol: http://dev.chromium.org/spdy. 177260 1 45913 mbelshe 2010-01-05 11:28:03 -0800 Created attachment 45913 patch 177264 2 webkit.review.bot 2010-01-05 11:30:45 -0800 Attachment 45913 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebKit/chromium/src/WebURLResponse.cpp:258: Place brace on its own line for function definitions. [whitespace/braces] [4] WebKit/chromium/src/WebURLResponse.cpp:262: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 2 177315 3 45921 mbelshe 2010-01-05 12:40:52 -0800 Created attachment 45921 patch fixing style nits 177318 4 webkit.review.bot 2010-01-05 12:44:02 -0800 style-queue ran check-webkit-style on attachment 45921 without any errors. 177607 5 eric 2010-01-06 09:22:30 -0800 I don't really understand the "isSPDY" naming scheme here. Then again, I don't really know much about SPDY. Does the protocol name change for SPDY? like "spdy://"? I'm just wondering if this is the right way to track this, and if "isSPDY" is the right name to do so. 177608 6 mbelshe 2010-01-06 09:24:05 -0800 Eric - the protocol scheme doesn't change, so there are no visible effects to see whether or not SPDY was used. With this, I plan to enable some JS so that the page author can determine whether SPDY was used to deliver the page or not. 177659 7 levin 2010-01-06 11:22:27 -0800 Two comments: 1. It seems redundant that there is #if PLATFORM(CHROMIUM) inside of the chromium only file WebCore/platform/network/chromium/ResourceResponse.h 2. Note that this flag will not be copied for workers because that is done in WebCore/platform/network/ResourceResponseBase.h I don't know if that is important to this change (or will be in the future). If it is, then I can tell you how to fix this. 177696 8 45977 mbelshe 2010-01-06 12:16:25 -0800 Created attachment 45977 Remove ifdef CHROMIUM flag as per David's suggestion 177698 9 mbelshe 2010-01-06 12:18:03 -0800 Thanks David - I removed the ifdef. This isn't needed in the Workers - I am only going to expose this for the main frame URLs anyway. If I need changes in the future, we can add that. 177700 10 webkit.review.bot 2010-01-06 12:20:42 -0800 style-queue ran check-webkit-style on attachment 45977 without any errors. 177728 11 45977 fishd 2010-01-06 13:23:59 -0800 Comment on attachment 45977 Remove ifdef CHROMIUM flag as per David's suggestion > Index: WebCore/platform/network/chromium/ResourceResponse.h ... > + // If this request was fetched via SPDY. > + bool m_isSpdy; How about naming this m_fetchedViaSPDY? Then, the comment can be deleted. You should similarly rename the getter and setter. Same goes for the corresponding WebURLResponse methods. With those changes, LGTM. 177729 12 45977 darin 2010-01-06 13:25:57 -0800 Comment on attachment 45977 Remove ifdef CHROMIUM flag as per David's suggestion For boolean data and function members we try to make them work as if they were in this sentence: "response <xxx>". So something like wasFetchedViaSPDY would be an example of a good name. 177808 13 46001 mbelshe 2010-01-06 15:31:32 -0800 Created attachment 46001 Update with Darin's renaming suggestions. 177812 14 webkit.review.bot 2010-01-06 15:34:18 -0800 style-queue ran check-webkit-style on attachment 46001 without any errors. 177827 15 darin 2010-01-06 15:59:46 -0800 (In reply to comment #13) > Update with Darin's renaming suggestions. You mean Darins’ renaming suggestions ;-) 177832 16 mbelshe 2010-01-06 16:03:54 -0800 yes! :-) 177839 17 46001 darin 2010-01-06 16:08:00 -0800 Comment on attachment 46001 Update with Darin's renaming suggestions. If the name is SPDY, the we would prefer to have that in the identifiers, not Spdy. > + Enabled only in Chromium. No longer true. > + * platform/network/chromium/ResourceResponse.h: > + (WebCore::ResourceResponse::isSpdy): > + (WebCore::ResourceResponse::setIsSpdy): Names here out of date. Where is m_fetchedViaSpdy initialized to false? Normally constructors should initialize all members. > + void setWasFetchedViaSpdy(const bool value) The const here isn't needed or helpful. > + bool m_fetchedViaSpdy; Even data boolean members work well with the "class-name <xxx>" naming scheme, so I would call this m_wasFetchedViaSpdy. > + Enabled only in Chromium. Not true any more. And not really important to add in a Chromium directory ChangeLog. > + * src/WebURLResponse.cpp: > + (WebKit::WebURLResponse::isSpdy): > + (WebKit::WebURLResponse::setIsSpdy): Names here out of date. review- because of this round of nitpicks -- seems generally good 177854 18 46007 mbelshe 2010-01-06 16:31:14 -0800 Created attachment 46007 Update with Darin A's comments. Thanks Darin A. - comments addressed; sorry for my lameness. 177856 19 webkit.review.bot 2010-01-06 16:37:09 -0800 style-queue ran check-webkit-style on attachment 46007 without any errors. 177869 20 46007 commit-queue 2010-01-06 16:54:58 -0800 Comment on attachment 46007 Update with Darin A's comments. Rejecting patch 46007 from commit-queue. mbelshe@chromium.org does not have committer permissions according to http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/committers.py. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in WebKitTools/Scripts/webkitpy/committers.py by adding yourself to the file (no review needed). Due to bug 30084 the commit-queue will require a restart after your change. Please contact eseidel@chromium.org to request a commit-queue restart. After restart the commit-queue will correctly respect your committer rights. 177937 21 46007 commit-queue 2010-01-06 20:06:33 -0800 Comment on attachment 46007 Update with Darin A's comments. Clearing flags on attachment: 46007 Committed r52898: <http://trac.webkit.org/changeset/52898> 177938 22 commit-queue 2010-01-06 20:06:40 -0800 All reviewed patches have been landed. Closing bug. 178002 23 fishd 2010-01-06 22:24:50 -0800 > If the name is SPDY, the we would prefer to have that in the identifiers, not > Spdy. It seems like this change wasn't applied in the final patch. Oversight? 178011 24 mbelshe 2010-01-06 22:45:53 -0800 (In reply to comment #23) > > If the name is SPDY, the we would prefer to have that in the identifiers, not > > Spdy. > > It seems like this change wasn't applied in the final patch. Oversight? Sorry- forgot to comment on that. In the rest of chromium, we're going with Spdy, not SPDY, to match our use of Http, not HTTP. So I was making this match. 178078 25 mrowe 2010-01-07 01:51:45 -0800 (In reply to comment #24) > Sorry- forgot to comment on that. In the rest of chromium, we're going with > Spdy, not SPDY, to match our use of Http, not HTTP. So I was making this > match. Surely code in WebCore should be following WebKit coding conventions. 178079 26 mrowe 2010-01-07 01:52:53 -0800 I also see no mention of a reviewer in <http://trac.webkit.org/changeset/52898>. What’s up with that? 178213 27 mbelshe 2010-01-07 09:21:20 -0800 (In reply to comment #25) > (In reply to comment #24) > > Sorry- forgot to comment on that. In the rest of chromium, we're going with > > Spdy, not SPDY, to match our use of Http, not HTTP. So I was making this > > match. > > Surely code in WebCore should be following WebKit coding conventions. WebCore is inconsistent with this today; let me know if a "correct" casing is documented somewhere. Hopefully this is not a significant issue. Some examples from other code pre-existing in WebCore: WebCore/platform/KURL.h: procotolInHTTPFamily() WebCore/dom/Document.h: processHttpEquiv() Qt port: isHttpOnly() and ignoreHttpError() etc. 178215 28 mbelshe 2010-01-07 09:23:46 -0800 (In reply to comment #26) > I also see no mention of a reviewer in > <http://trac.webkit.org/changeset/52898>. What’s up with that? Sorry, my mistake. So when people do code reviews, you first submit the review, then mark it review:?. At this point, you don't know who the reviewer is going to be, so you leave it blank. Later, after someone reviews it, you create a whole new patch changing the ChangeLog entry and upload that? Sorry for the mistake. 178219 29 darin 2010-01-07 09:25:30 -0800 (In reply to comment #27) > WebCore/platform/KURL.h: procotolInHTTPFamily() New code, represents our project style. This *is* the WebKit style. > WebCore/dom/Document.h: processHttpEquiv() Very old code, dates back to the KHTML days.' > Qt port: isHttpOnly() and ignoreHttpError() Non-cross-port code often receives less-close scrutiny. The WebKit style is to keep acronyms capitalized. This is explicit in <http://webkit.org/coding/coding-style.html>. 178222 30 darin 2010-01-07 09:28:11 -0800 (In reply to comment #28) > Sorry, my mistake. So when people do code reviews, you first submit the > review, then mark it review:?. At this point, you don't know who the reviewer > is going to be, so you leave it blank. You leave it in exactly this format. Reviewed by NOBODY (OOPS!). This helps if you forget, because if you try to commit without changing that line the pre-commit hook will prevent you from checking in. > Later, after someone reviews it, you > create a whole new patch changing the ChangeLog entry and upload that? No. The committer is responsible for putting in the reviewer name. When the committer is a real live person there is some flexibility about what format the Reviewed by line is in. When the committer is the commit-queue script then it has to be exactly the correct format. 178228 31 mbelshe 2010-01-07 09:36:56 -0800 (In reply to comment #29) > (In reply to comment #27) > > WebCore/platform/KURL.h: procotolInHTTPFamily() > > New code, represents our project style. This *is* the WebKit style. > > > WebCore/dom/Document.h: processHttpEquiv() > > Very old code, dates back to the KHTML days.' > > > Qt port: isHttpOnly() and ignoreHttpError() > > Non-cross-port code often receives less-close scrutiny. > > The WebKit style is to keep acronyms capitalized. This is explicit in > <http://webkit.org/coding/coding-style.html>. I'll update. 178234 32 mbelshe 2010-01-07 09:46:36 -0800 Reopening to fix style issues. 178236 33 mbelshe 2010-01-07 09:58:45 -0800 On second thought, I better file a new bug. I'm pretty sure someone will yell at me if I try to attach a style patch onto this bug. 225462 34 abarth 2010-05-13 13:13:07 -0700 (In reply to comment #33) > On second thought, I better file a new bug. I'm pretty sure someone will yell at me if I try to attach a style patch onto this bug. Thanks! :) 45913 2010-01-05 11:28:03 -0800 2010-01-05 12:40:52 -0800 patch 33186.patch text/plain 3948 mbelshe SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MjgxMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDEtMDUgIE1pa2UgQmVsc2hlICA8bWlrZUBiZWxzaGUuY29t PgorCisgICAgICAgIEFkZCBhIGZsYWcgdG8gdGhlIFJlc291cmNlUmVzcG9uc2UgZm9yIHRyYWNr aW5nIGlmIGEgcmVxdWVzdCB3YXMKKyAgICAgICAgZmV0Y2hlZCB2aWEgU1BEWS4gIFRoaXMgaXMg cGx1bWJlZCB0aHJvdWdoIHNvIHRoYXQgd2UgY2FuIGluZm9ybQorICAgICAgICBhIHdlYnBhZ2Ug dmlhIEphdmFTY3JpcHQgaWYgaXQgd2FzIGZlY3RoZWQgdmlhIHRoZSBleHBlcmltZW50YWwKKyAg ICAgICAgU1BEWSBwcm90b2NvbC4KKworICAgICAgICBFbmFibGVkIG9ubHkgaW4gQ2hyb21pdW0u CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMzMTg2 CisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVzcG9uc2Uu aDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2U6OmlzU3BkeSk6CisgICAgICAg IChXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlOjpzZXRJc1NwZHkpOgorCiAyMDEwLTAxLTA1ICBH dXN0YXZvIE5vcm9uaGEgU2lsdmEgPGduc0Bnbm9tZS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgWGFuIExvcGV6LgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jl c291cmNlUmVzcG9uc2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv Y2hyb21pdW0vUmVzb3VyY2VSZXNwb25zZS5oCShyZXZpc2lvbiA1Mjc2OCkKKysrIFdlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlc3BvbnNlLmgJKHdvcmtpbmcgY29w eSkKQEAgLTcyLDYgKzcyLDE0IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgIG1f YXBwQ2FjaGVNYW5pZmVzdFVSTCA9IHVybDsKICAgICAgICAgfQogCisjaWYgUExBVEZPUk0oQ0hS T01JVU0pCisgICAgICAgIGJvb2wgaXNTcGR5KCkgY29uc3QgeyByZXR1cm4gbV9pc1NwZHk7IH0K KyAgICAgICAgdm9pZCBzZXRJc1NwZHkoY29uc3QgYm9vbCB2YWx1ZSkKKyAgICAgICAgeworICAg ICAgICAgICAgbV9pc1NwZHkgPSB2YWx1ZTsKKyAgICAgICAgfQorI2VuZGlmCisKICAgICBwcml2 YXRlOgogICAgICAgICBmcmllbmQgY2xhc3MgUmVzb3VyY2VSZXNwb25zZUJhc2U7CiAKQEAgLTk2 LDYgKzEwNCwxMSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIC8vIFRoZSBtYW5pZmVz dCB1cmwgb2YgdGhlIGFwcGNhY2hlIHRoaXMgcmVzcG9uc2Ugd2FzIHJldHJpZXZlZCBmcm9tLCBp ZiBhbnkuCiAgICAgICAgIC8vIE5vdGU6IG9ubHkgdmFsaWQgZm9yIG1haW4gcmVzb3VyY2UgcmVz cG9uc2VzLgogICAgICAgICBLVVJMIG1fYXBwQ2FjaGVNYW5pZmVzdFVSTDsKKworI2lmIFBMQVRG T1JNKENIUk9NSVVNKQorICAgICAgICAvLyBJZiB0aGlzIHJlcXVlc3Qgd2FzIGZldGNoZWQgdmlh IFNQRFkuCisgICAgICAgIGJvb2wgbV9pc1NwZHk7CisjZW5kaWYKICAgICB9OwogCiB9IC8vIG5h bWVzcGFjZSBXZWJDb3JlCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDUyODEzKQorKysgV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisy MDEwLTAxLTA1ICBNaWtlIEJlbHNoZSAgPG1pa2VAYmVsc2hlLmNvbT4KKworICAgICAgICBBZGQg YSBmbGFnIHRvIHRoZSBSZXNvdXJjZVJlc3BvbnNlIGZvciB0cmFja2luZyBpZiBhIHJlcXVlc3Qg d2FzCisgICAgICAgIGZldGNoZWQgdmlhIFNQRFkuICBUaGlzIGlzIHBsdW1iZWQgdGhyb3VnaCBz byB0aGF0IHdlIGNhbiBpbmZvcm0KKyAgICAgICAgYSB3ZWJwYWdlIHZpYSBKYXZhU2NyaXB0IGlm IGl0IHdhcyBmZWN0aGVkIHZpYSB0aGUgZXhwZXJpbWVudGFsCisgICAgICAgIFNQRFkgcHJvdG9j b2wuCisKKyAgICAgICAgRW5hYmxlZCBvbmx5IGluIENocm9taXVtLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMzE4NgorCisgICAgICAgICogcHVi bGljL1dlYlVSTFJlc3BvbnNlLmg6CisgICAgICAgICogc3JjL1dlYlVSTFJlc3BvbnNlLmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViVVJMUmVzcG9uc2U6OmlzU3BkeSk6CisgICAgICAgIChXZWJL aXQ6OldlYlVSTFJlc3BvbnNlOjpzZXRJc1NwZHkpOgorCiAyMDEwLTAxLTA0ICBNYWNpZWogU3Rh Y2hvd2lhayAgPG1qc0BhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gRmlz aGVyLgpJbmRleDogV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVUkxSZXNwb25zZS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVVJMUmVzcG9uc2UuaAkocmV2aXNp b24gNTI3NjgpCisrKyBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlVSTFJlc3BvbnNlLmgJKHdv cmtpbmcgY29weSkKQEAgLTExOCw2ICsxMTgsMTEgQEAgcHVibGljOgogICAgIGNvbnN0IFdlYkNv cmU6OlJlc291cmNlUmVzcG9uc2UmIHRvUmVzb3VyY2VSZXNwb25zZSgpIGNvbnN0OwogI2VuZGlm CiAKKyAgICAvLyBGbGFnIHdoZXRoZXIgdGhpcyByZXF1ZXN0IHdhcyBsb2FkZWQgdmlhIHRoZSBT UERZIHByb3RvY29sIG9yIG5vdC4KKyAgICAvLyBTUERZIGlzIGFuIGV4cGVyaW1lbnRhbCB3ZWIg cHJvdG9jb2wsIHNlZSBodHRwOi8vZGV2LmNocm9taXVtLm9yZy9zcGR5CisgICAgV0VCS0lUX0FQ SSBib29sIGlzU3BkeSgpIGNvbnN0OworICAgIFdFQktJVF9BUEkgdm9pZCBzZXRJc1NwZHkoY29u c3QgYm9vbCk7CisKIHByb3RlY3RlZDoKICAgICB2b2lkIGFzc2lnbihXZWJVUkxSZXNwb25zZVBy aXZhdGUqKTsKIApJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVUkxSZXNwb25zZS5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVUkxSZXNwb25zZS5jcHAJKHJl dmlzaW9uIDUyNzY4KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVUkxSZXNwb25zZS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTI1NSw2ICsyNTUsMTQgQEAgY29uc3QgUmVzb3VyY2VSZXNwb25z ZSYgV2ViVVJMUmVzcG9uc2U6OgogICAgIHJldHVybiAqbV9wcml2YXRlLT5tX3Jlc291cmNlUmVz cG9uc2U7CiB9CiAKK2Jvb2wgV2ViVVJMUmVzcG9uc2U6OmlzU3BkeSgpIGNvbnN0IHsKKyAgICBy ZXR1cm4gbV9wcml2YXRlLT5tX3Jlc291cmNlUmVzcG9uc2UtPmlzU3BkeSgpOworfQorCit2b2lk IFdlYlVSTFJlc3BvbnNlOjpzZXRJc1NwZHkoY29uc3QgYm9vbCB2YWx1ZSkgeworICAgIG1fcHJp dmF0ZS0+bV9yZXNvdXJjZVJlc3BvbnNlLT5zZXRJc1NwZHkodmFsdWUpOworfQorCiB2b2lkIFdl YlVSTFJlc3BvbnNlOjphc3NpZ24oV2ViVVJMUmVzcG9uc2VQcml2YXRlKiBwKQogewogICAgIC8v IFN1YmNsYXNzZXMgbWF5IGNhbGwgdGhpcyBkaXJlY3RseSBzbyBhIHNlbGYtYXNzaWdubWVudCBj aGVjayBpcyBuZWVkZWQK 45921 2010-01-05 12:40:52 -0800 2010-01-06 12:16:25 -0800 patch fixing style nits 33186.patch text/plain 3950 mbelshe SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MjgxMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDEtMDUgIE1pa2UgQmVsc2hlICA8bWlrZUBiZWxzaGUuY29t PgorCisgICAgICAgIEFkZCBhIGZsYWcgdG8gdGhlIFJlc291cmNlUmVzcG9uc2UgZm9yIHRyYWNr aW5nIGlmIGEgcmVxdWVzdCB3YXMKKyAgICAgICAgZmV0Y2hlZCB2aWEgU1BEWS4gIFRoaXMgaXMg cGx1bWJlZCB0aHJvdWdoIHNvIHRoYXQgd2UgY2FuIGluZm9ybQorICAgICAgICBhIHdlYnBhZ2Ug dmlhIEphdmFTY3JpcHQgaWYgaXQgd2FzIGZlY3RoZWQgdmlhIHRoZSBleHBlcmltZW50YWwKKyAg ICAgICAgU1BEWSBwcm90b2NvbC4KKworICAgICAgICBFbmFibGVkIG9ubHkgaW4gQ2hyb21pdW0u CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMzMTg2 CisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVzcG9uc2Uu aDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2U6OmlzU3BkeSk6CisgICAgICAg IChXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlOjpzZXRJc1NwZHkpOgorCiAyMDEwLTAxLTA1ICBH dXN0YXZvIE5vcm9uaGEgU2lsdmEgPGduc0Bnbm9tZS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgWGFuIExvcGV6LgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jl c291cmNlUmVzcG9uc2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv Y2hyb21pdW0vUmVzb3VyY2VSZXNwb25zZS5oCShyZXZpc2lvbiA1Mjc2OCkKKysrIFdlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlc3BvbnNlLmgJKHdvcmtpbmcgY29w eSkKQEAgLTcyLDYgKzcyLDE0IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgIG1f YXBwQ2FjaGVNYW5pZmVzdFVSTCA9IHVybDsKICAgICAgICAgfQogCisjaWYgUExBVEZPUk0oQ0hS T01JVU0pCisgICAgICAgIGJvb2wgaXNTcGR5KCkgY29uc3QgeyByZXR1cm4gbV9pc1NwZHk7IH0K KyAgICAgICAgdm9pZCBzZXRJc1NwZHkoY29uc3QgYm9vbCB2YWx1ZSkKKyAgICAgICAgeworICAg ICAgICAgICAgbV9pc1NwZHkgPSB2YWx1ZTsKKyAgICAgICAgfQorI2VuZGlmCisKICAgICBwcml2 YXRlOgogICAgICAgICBmcmllbmQgY2xhc3MgUmVzb3VyY2VSZXNwb25zZUJhc2U7CiAKQEAgLTk2 LDYgKzEwNCwxMSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIC8vIFRoZSBtYW5pZmVz dCB1cmwgb2YgdGhlIGFwcGNhY2hlIHRoaXMgcmVzcG9uc2Ugd2FzIHJldHJpZXZlZCBmcm9tLCBp ZiBhbnkuCiAgICAgICAgIC8vIE5vdGU6IG9ubHkgdmFsaWQgZm9yIG1haW4gcmVzb3VyY2UgcmVz cG9uc2VzLgogICAgICAgICBLVVJMIG1fYXBwQ2FjaGVNYW5pZmVzdFVSTDsKKworI2lmIFBMQVRG T1JNKENIUk9NSVVNKQorICAgICAgICAvLyBJZiB0aGlzIHJlcXVlc3Qgd2FzIGZldGNoZWQgdmlh IFNQRFkuCisgICAgICAgIGJvb2wgbV9pc1NwZHk7CisjZW5kaWYKICAgICB9OwogCiB9IC8vIG5h bWVzcGFjZSBXZWJDb3JlCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDUyODEzKQorKysgV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisy MDEwLTAxLTA1ICBNaWtlIEJlbHNoZSAgPG1pa2VAYmVsc2hlLmNvbT4KKworICAgICAgICBBZGQg YSBmbGFnIHRvIHRoZSBSZXNvdXJjZVJlc3BvbnNlIGZvciB0cmFja2luZyBpZiBhIHJlcXVlc3Qg d2FzCisgICAgICAgIGZldGNoZWQgdmlhIFNQRFkuICBUaGlzIGlzIHBsdW1iZWQgdGhyb3VnaCBz byB0aGF0IHdlIGNhbiBpbmZvcm0KKyAgICAgICAgYSB3ZWJwYWdlIHZpYSBKYXZhU2NyaXB0IGlm IGl0IHdhcyBmZWN0aGVkIHZpYSB0aGUgZXhwZXJpbWVudGFsCisgICAgICAgIFNQRFkgcHJvdG9j b2wuCisKKyAgICAgICAgRW5hYmxlZCBvbmx5IGluIENocm9taXVtLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMzE4NgorCisgICAgICAgICogcHVi bGljL1dlYlVSTFJlc3BvbnNlLmg6CisgICAgICAgICogc3JjL1dlYlVSTFJlc3BvbnNlLmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViVVJMUmVzcG9uc2U6OmlzU3BkeSk6CisgICAgICAgIChXZWJL aXQ6OldlYlVSTFJlc3BvbnNlOjpzZXRJc1NwZHkpOgorCiAyMDEwLTAxLTA0ICBNYWNpZWogU3Rh Y2hvd2lhayAgPG1qc0BhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gRmlz aGVyLgpJbmRleDogV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVUkxSZXNwb25zZS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVVJMUmVzcG9uc2UuaAkocmV2aXNp b24gNTI3NjgpCisrKyBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlVSTFJlc3BvbnNlLmgJKHdv cmtpbmcgY29weSkKQEAgLTExOCw2ICsxMTgsMTEgQEAgcHVibGljOgogICAgIGNvbnN0IFdlYkNv cmU6OlJlc291cmNlUmVzcG9uc2UmIHRvUmVzb3VyY2VSZXNwb25zZSgpIGNvbnN0OwogI2VuZGlm CiAKKyAgICAvLyBGbGFnIHdoZXRoZXIgdGhpcyByZXF1ZXN0IHdhcyBsb2FkZWQgdmlhIHRoZSBT UERZIHByb3RvY29sIG9yIG5vdC4KKyAgICAvLyBTUERZIGlzIGFuIGV4cGVyaW1lbnRhbCB3ZWIg cHJvdG9jb2wsIHNlZSBodHRwOi8vZGV2LmNocm9taXVtLm9yZy9zcGR5CisgICAgV0VCS0lUX0FQ SSBib29sIGlzU3BkeSgpIGNvbnN0OworICAgIFdFQktJVF9BUEkgdm9pZCBzZXRJc1NwZHkoY29u c3QgYm9vbCk7CisKIHByb3RlY3RlZDoKICAgICB2b2lkIGFzc2lnbihXZWJVUkxSZXNwb25zZVBy aXZhdGUqKTsKIApJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVUkxSZXNwb25zZS5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVUkxSZXNwb25zZS5jcHAJKHJl dmlzaW9uIDUyNzY4KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVUkxSZXNwb25zZS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTI1NSw2ICsyNTUsMTYgQEAgY29uc3QgUmVzb3VyY2VSZXNwb25z ZSYgV2ViVVJMUmVzcG9uc2U6OgogICAgIHJldHVybiAqbV9wcml2YXRlLT5tX3Jlc291cmNlUmVz cG9uc2U7CiB9CiAKK2Jvb2wgV2ViVVJMUmVzcG9uc2U6OmlzU3BkeSgpIGNvbnN0Cit7CisgICAg cmV0dXJuIG1fcHJpdmF0ZS0+bV9yZXNvdXJjZVJlc3BvbnNlLT5pc1NwZHkoKTsKK30KKwordm9p ZCBXZWJVUkxSZXNwb25zZTo6c2V0SXNTcGR5KGNvbnN0IGJvb2wgdmFsdWUpCit7CisgICAgbV9w cml2YXRlLT5tX3Jlc291cmNlUmVzcG9uc2UtPnNldElzU3BkeSh2YWx1ZSk7Cit9CisKIHZvaWQg V2ViVVJMUmVzcG9uc2U6OmFzc2lnbihXZWJVUkxSZXNwb25zZVByaXZhdGUqIHApCiB7CiAgICAg Ly8gU3ViY2xhc3NlcyBtYXkgY2FsbCB0aGlzIGRpcmVjdGx5IHNvIGEgc2VsZi1hc3NpZ25tZW50 IGNoZWNrIGlzIG5lZWRlZAo= 45977 2010-01-06 12:16:25 -0800 2010-01-06 15:31:32 -0800 Remove ifdef CHROMIUM flag as per David's suggestion 33186.patch text/plain 3885 mbelshe SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MjgxMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDEtMDUgIE1pa2UgQmVsc2hlICA8bWlrZUBiZWxzaGUuY29t PgorCisgICAgICAgIEFkZCBhIGZsYWcgdG8gdGhlIFJlc291cmNlUmVzcG9uc2UgZm9yIHRyYWNr aW5nIGlmIGEgcmVxdWVzdCB3YXMKKyAgICAgICAgZmV0Y2hlZCB2aWEgU1BEWS4gIFRoaXMgaXMg cGx1bWJlZCB0aHJvdWdoIHNvIHRoYXQgd2UgY2FuIGluZm9ybQorICAgICAgICBhIHdlYnBhZ2Ug dmlhIEphdmFTY3JpcHQgaWYgaXQgd2FzIGZlY3RoZWQgdmlhIHRoZSBleHBlcmltZW50YWwKKyAg ICAgICAgU1BEWSBwcm90b2NvbC4KKworICAgICAgICBFbmFibGVkIG9ubHkgaW4gQ2hyb21pdW0u CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMzMTg2 CisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVzcG9uc2Uu aDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2U6OmlzU3BkeSk6CisgICAgICAg IChXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlOjpzZXRJc1NwZHkpOgorCiAyMDEwLTAxLTA1ICBH dXN0YXZvIE5vcm9uaGEgU2lsdmEgPGduc0Bnbm9tZS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgWGFuIExvcGV6LgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jl c291cmNlUmVzcG9uc2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv Y2hyb21pdW0vUmVzb3VyY2VSZXNwb25zZS5oCShyZXZpc2lvbiA1Mjc2OCkKKysrIFdlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlc3BvbnNlLmgJKHdvcmtpbmcgY29w eSkKQEAgLTcyLDYgKzcyLDEyIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgIG1f YXBwQ2FjaGVNYW5pZmVzdFVSTCA9IHVybDsKICAgICAgICAgfQogCisgICAgICAgIGJvb2wgaXNT cGR5KCkgY29uc3QgeyByZXR1cm4gbV9pc1NwZHk7IH0KKyAgICAgICAgdm9pZCBzZXRJc1NwZHko Y29uc3QgYm9vbCB2YWx1ZSkKKyAgICAgICAgeworICAgICAgICAgICAgbV9pc1NwZHkgPSB2YWx1 ZTsKKyAgICAgICAgfQorCiAgICAgcHJpdmF0ZToKICAgICAgICAgZnJpZW5kIGNsYXNzIFJlc291 cmNlUmVzcG9uc2VCYXNlOwogCkBAIC05Niw2ICsxMDIsOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAgICAgICAgIC8vIFRoZSBtYW5pZmVzdCB1cmwgb2YgdGhlIGFwcGNhY2hlIHRoaXMgcmVzcG9u c2Ugd2FzIHJldHJpZXZlZCBmcm9tLCBpZiBhbnkuCiAgICAgICAgIC8vIE5vdGU6IG9ubHkgdmFs aWQgZm9yIG1haW4gcmVzb3VyY2UgcmVzcG9uc2VzLgogICAgICAgICBLVVJMIG1fYXBwQ2FjaGVN YW5pZmVzdFVSTDsKKworICAgICAgICAvLyBJZiB0aGlzIHJlcXVlc3Qgd2FzIGZldGNoZWQgdmlh IFNQRFkuCisgICAgICAgIGJvb2wgbV9pc1NwZHk7CiAgICAgfTsKIAogfSAvLyBuYW1lc3BhY2Ug V2ViQ29yZQpJbmRleDogV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA1MjgxMykKKysrIFdlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0wMS0w NSAgTWlrZSBCZWxzaGUgIDxtaWtlQGJlbHNoZS5jb20+CisKKyAgICAgICAgQWRkIGEgZmxhZyB0 byB0aGUgUmVzb3VyY2VSZXNwb25zZSBmb3IgdHJhY2tpbmcgaWYgYSByZXF1ZXN0IHdhcworICAg ICAgICBmZXRjaGVkIHZpYSBTUERZLiAgVGhpcyBpcyBwbHVtYmVkIHRocm91Z2ggc28gdGhhdCB3 ZSBjYW4gaW5mb3JtCisgICAgICAgIGEgd2VicGFnZSB2aWEgSmF2YVNjcmlwdCBpZiBpdCB3YXMg ZmVjdGhlZCB2aWEgdGhlIGV4cGVyaW1lbnRhbAorICAgICAgICBTUERZIHByb3RvY29sLgorCisg ICAgICAgIEVuYWJsZWQgb25seSBpbiBDaHJvbWl1bS4KKworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzMxODYKKworICAgICAgICAqIHB1YmxpYy9XZWJV UkxSZXNwb25zZS5oOgorICAgICAgICAqIHNyYy9XZWJVUkxSZXNwb25zZS5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYlVSTFJlc3BvbnNlOjppc1NwZHkpOgorICAgICAgICAoV2ViS2l0OjpXZWJV UkxSZXNwb25zZTo6c2V0SXNTcGR5KToKKwogMjAxMC0wMS0wNCAgTWFjaWVqIFN0YWNob3dpYWsg IDxtanNAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEZpc2hlci4KSW5k ZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVVJMUmVzcG9uc2UuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlVSTFJlc3BvbnNlLmgJKHJldmlzaW9uIDUyNzY4 KQorKysgV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVUkxSZXNwb25zZS5oCSh3b3JraW5nIGNv cHkpCkBAIC0xMTgsNiArMTE4LDExIEBAIHB1YmxpYzoKICAgICBjb25zdCBXZWJDb3JlOjpSZXNv dXJjZVJlc3BvbnNlJiB0b1Jlc291cmNlUmVzcG9uc2UoKSBjb25zdDsKICNlbmRpZgogCisgICAg Ly8gRmxhZyB3aGV0aGVyIHRoaXMgcmVxdWVzdCB3YXMgbG9hZGVkIHZpYSB0aGUgU1BEWSBwcm90 b2NvbCBvciBub3QuCisgICAgLy8gU1BEWSBpcyBhbiBleHBlcmltZW50YWwgd2ViIHByb3RvY29s LCBzZWUgaHR0cDovL2Rldi5jaHJvbWl1bS5vcmcvc3BkeQorICAgIFdFQktJVF9BUEkgYm9vbCBp c1NwZHkoKSBjb25zdDsKKyAgICBXRUJLSVRfQVBJIHZvaWQgc2V0SXNTcGR5KGNvbnN0IGJvb2wp OworCiBwcm90ZWN0ZWQ6CiAgICAgdm9pZCBhc3NpZ24oV2ViVVJMUmVzcG9uc2VQcml2YXRlKik7 CiAKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVVJMUmVzcG9uc2UuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVVJMUmVzcG9uc2UuY3BwCShyZXZpc2lvbiA1 Mjc2OCkKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVVJMUmVzcG9uc2UuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0yNTUsNiArMjU1LDE2IEBAIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIFdlYlVS TFJlc3BvbnNlOjoKICAgICByZXR1cm4gKm1fcHJpdmF0ZS0+bV9yZXNvdXJjZVJlc3BvbnNlOwog fQogCitib29sIFdlYlVSTFJlc3BvbnNlOjppc1NwZHkoKSBjb25zdAoreworICAgIHJldHVybiBt X3ByaXZhdGUtPm1fcmVzb3VyY2VSZXNwb25zZS0+aXNTcGR5KCk7Cit9CisKK3ZvaWQgV2ViVVJM UmVzcG9uc2U6OnNldElzU3BkeShjb25zdCBib29sIHZhbHVlKQoreworICAgIG1fcHJpdmF0ZS0+ bV9yZXNvdXJjZVJlc3BvbnNlLT5zZXRJc1NwZHkodmFsdWUpOworfQorCiB2b2lkIFdlYlVSTFJl c3BvbnNlOjphc3NpZ24oV2ViVVJMUmVzcG9uc2VQcml2YXRlKiBwKQogewogICAgIC8vIFN1YmNs YXNzZXMgbWF5IGNhbGwgdGhpcyBkaXJlY3RseSBzbyBhIHNlbGYtYXNzaWdubWVudCBjaGVjayBp cyBuZWVkZWQK 46001 2010-01-06 15:31:32 -0800 2010-01-06 16:31:14 -0800 Update with Darin's renaming suggestions. 33186b.patch text/plain 3947 mbelshe SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MjgxMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDEtMDUgIE1pa2UgQmVsc2hlICA8bWlrZUBiZWxzaGUuY29t PgorCisgICAgICAgIEFkZCBhIGZsYWcgdG8gdGhlIFJlc291cmNlUmVzcG9uc2UgZm9yIHRyYWNr aW5nIGlmIGEgcmVxdWVzdCB3YXMKKyAgICAgICAgZmV0Y2hlZCB2aWEgU1BEWS4gIFRoaXMgaXMg cGx1bWJlZCB0aHJvdWdoIHNvIHRoYXQgd2UgY2FuIGluZm9ybQorICAgICAgICBhIHdlYnBhZ2Ug dmlhIEphdmFTY3JpcHQgaWYgaXQgd2FzIGZlY3RoZWQgdmlhIHRoZSBleHBlcmltZW50YWwKKyAg ICAgICAgU1BEWSBwcm90b2NvbC4KKworICAgICAgICBFbmFibGVkIG9ubHkgaW4gQ2hyb21pdW0u CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMzMTg2 CisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVzcG9uc2Uu aDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2U6OmlzU3BkeSk6CisgICAgICAg IChXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlOjpzZXRJc1NwZHkpOgorCiAyMDEwLTAxLTA1ICBH dXN0YXZvIE5vcm9uaGEgU2lsdmEgPGduc0Bnbm9tZS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgWGFuIExvcGV6LgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jl c291cmNlUmVzcG9uc2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv Y2hyb21pdW0vUmVzb3VyY2VSZXNwb25zZS5oCShyZXZpc2lvbiA1Mjc2OCkKKysrIFdlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlc3BvbnNlLmgJKHdvcmtpbmcgY29w eSkKQEAgLTcyLDYgKzcyLDEyIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgIG1f YXBwQ2FjaGVNYW5pZmVzdFVSTCA9IHVybDsKICAgICAgICAgfQogCisgICAgICAgIGJvb2wgd2Fz RmV0Y2hlZFZpYVNwZHkoKSBjb25zdCB7IHJldHVybiBtX2ZldGNoZWRWaWFTcGR5OyB9CisgICAg ICAgIHZvaWQgc2V0V2FzRmV0Y2hlZFZpYVNwZHkoY29uc3QgYm9vbCB2YWx1ZSkKKyAgICAgICAg eworICAgICAgICAgICAgbV9mZXRjaGVkVmlhU3BkeSA9IHZhbHVlOworICAgICAgICB9CisKICAg ICBwcml2YXRlOgogICAgICAgICBmcmllbmQgY2xhc3MgUmVzb3VyY2VSZXNwb25zZUJhc2U7CiAK QEAgLTk2LDYgKzEwMiw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgLy8gVGhlIG1h bmlmZXN0IHVybCBvZiB0aGUgYXBwY2FjaGUgdGhpcyByZXNwb25zZSB3YXMgcmV0cmlldmVkIGZy b20sIGlmIGFueS4KICAgICAgICAgLy8gTm90ZTogb25seSB2YWxpZCBmb3IgbWFpbiByZXNvdXJj ZSByZXNwb25zZXMuCiAgICAgICAgIEtVUkwgbV9hcHBDYWNoZU1hbmlmZXN0VVJMOworCisgICAg ICAgIGJvb2wgbV9mZXRjaGVkVmlhU3BkeTsKICAgICB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDUyODEzKQorKysgV2ViS2l0L2Nocm9taXVt L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEwLTAxLTA1ICBN aWtlIEJlbHNoZSAgPG1pa2VAYmVsc2hlLmNvbT4KKworICAgICAgICBBZGQgYSBmbGFnIHRvIHRo ZSBSZXNvdXJjZVJlc3BvbnNlIGZvciB0cmFja2luZyBpZiBhIHJlcXVlc3Qgd2FzCisgICAgICAg IGZldGNoZWQgdmlhIFNQRFkuICBUaGlzIGlzIHBsdW1iZWQgdGhyb3VnaCBzbyB0aGF0IHdlIGNh biBpbmZvcm0KKyAgICAgICAgYSB3ZWJwYWdlIHZpYSBKYXZhU2NyaXB0IGlmIGl0IHdhcyBmZWN0 aGVkIHZpYSB0aGUgZXhwZXJpbWVudGFsCisgICAgICAgIFNQRFkgcHJvdG9jb2wuCisKKyAgICAg ICAgRW5hYmxlZCBvbmx5IGluIENocm9taXVtLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMzE4NgorCisgICAgICAgICogcHVibGljL1dlYlVSTFJl c3BvbnNlLmg6CisgICAgICAgICogc3JjL1dlYlVSTFJlc3BvbnNlLmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViVVJMUmVzcG9uc2U6OmlzU3BkeSk6CisgICAgICAgIChXZWJLaXQ6OldlYlVSTFJl c3BvbnNlOjpzZXRJc1NwZHkpOgorCiAyMDEwLTAxLTA0ICBNYWNpZWogU3RhY2hvd2lhayAgPG1q c0BhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gRmlzaGVyLgpJbmRleDog V2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVUkxSZXNwb25zZS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVVJMUmVzcG9uc2UuaAkocmV2aXNpb24gNTI3NjgpCisr KyBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlVSTFJlc3BvbnNlLmgJKHdvcmtpbmcgY29weSkK QEAgLTExOCw2ICsxMTgsMTEgQEAgcHVibGljOgogICAgIGNvbnN0IFdlYkNvcmU6OlJlc291cmNl UmVzcG9uc2UmIHRvUmVzb3VyY2VSZXNwb25zZSgpIGNvbnN0OwogI2VuZGlmCiAKKyAgICAvLyBG bGFnIHdoZXRoZXIgdGhpcyByZXF1ZXN0IHdhcyBsb2FkZWQgdmlhIHRoZSBTUERZIHByb3RvY29s IG9yIG5vdC4KKyAgICAvLyBTUERZIGlzIGFuIGV4cGVyaW1lbnRhbCB3ZWIgcHJvdG9jb2wsIHNl ZSBodHRwOi8vZGV2LmNocm9taXVtLm9yZy9zcGR5CisgICAgV0VCS0lUX0FQSSBib29sIHdhc0Zl dGNoZWRWaWFTcGR5KCkgY29uc3Q7CisgICAgV0VCS0lUX0FQSSB2b2lkIHNldFdhc0ZldGNoZWRW aWFTcGR5KGNvbnN0IGJvb2wpOworCiBwcm90ZWN0ZWQ6CiAgICAgdm9pZCBhc3NpZ24oV2ViVVJM UmVzcG9uc2VQcml2YXRlKik7CiAKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVVJMUmVz cG9uc2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVVJMUmVzcG9u c2UuY3BwCShyZXZpc2lvbiA1Mjc2OCkKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVVJMUmVz cG9uc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNTUsNiArMjU1LDE2IEBAIGNvbnN0IFJlc291 cmNlUmVzcG9uc2UmIFdlYlVSTFJlc3BvbnNlOjoKICAgICByZXR1cm4gKm1fcHJpdmF0ZS0+bV9y ZXNvdXJjZVJlc3BvbnNlOwogfQogCitib29sIFdlYlVSTFJlc3BvbnNlOjp3YXNGZXRjaGVkVmlh U3BkeSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fcHJpdmF0ZS0+bV9yZXNvdXJjZVJlc3BvbnNl LT53YXNGZXRjaGVkVmlhU3BkeSgpOworfQorCit2b2lkIFdlYlVSTFJlc3BvbnNlOjpzZXRXYXNG ZXRjaGVkVmlhU3BkeShjb25zdCBib29sIHZhbHVlKQoreworICAgIG1fcHJpdmF0ZS0+bV9yZXNv dXJjZVJlc3BvbnNlLT5zZXRXYXNGZXRjaGVkVmlhU3BkeSh2YWx1ZSk7Cit9CisKIHZvaWQgV2Vi VVJMUmVzcG9uc2U6OmFzc2lnbihXZWJVUkxSZXNwb25zZVByaXZhdGUqIHApCiB7CiAgICAgLy8g U3ViY2xhc3NlcyBtYXkgY2FsbCB0aGlzIGRpcmVjdGx5IHNvIGEgc2VsZi1hc3NpZ25tZW50IGNo ZWNrIGlzIG5lZWRlZAo= 46007 2010-01-06 16:31:14 -0800 2010-05-13 11:32:27 -0700 Update with Darin A's comments. 33186c.patch text/plain 4385 mbelshe SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MjgxMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMDEtMDUgIE1pa2UgQmVsc2hlICA8bWlrZUBiZWxzaGUuY29t PgorCisgICAgICAgIEFkZCBhIGZsYWcgdG8gdGhlIFJlc291cmNlUmVzcG9uc2UgZm9yIHRyYWNr aW5nIGlmIGEgcmVxdWVzdCB3YXMKKyAgICAgICAgZmV0Y2hlZCB2aWEgU1BEWS4gIFRoaXMgaXMg cGx1bWJlZCB0aHJvdWdoIHNvIHRoYXQgd2UgY2FuIGluZm9ybQorICAgICAgICBhIHdlYnBhZ2Ug dmlhIEphdmFTY3JpcHQgaWYgaXQgd2FzIGZlY3RoZWQgdmlhIHRoZSBleHBlcmltZW50YWwKKyAg ICAgICAgU1BEWSBwcm90b2NvbC4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MzMxODYKKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY2hyb21p dW0vUmVzb3VyY2VSZXNwb25zZS5oOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25z ZTo6d2FzRmV0Y2hlZFZpYVNwZHkpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25z ZTo6c2V0V2FzRmV0Y2hlZFZpYVNwZHkpOgorCiAyMDEwLTAxLTA1ICBHdXN0YXZvIE5vcm9uaGEg U2lsdmEgPGduc0Bnbm9tZS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgWGFuIExvcGV6LgpJ bmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVzcG9uc2Uu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3Vy Y2VSZXNwb25zZS5oCShyZXZpc2lvbiA1Mjc2OCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9jaHJvbWl1bS9SZXNvdXJjZVJlc3BvbnNlLmgJKHdvcmtpbmcgY29weSkKQEAgLTM4LDYgKzM4 LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBSZXNvdXJjZVJlc3BvbnNlKCkKICAg ICAgICAgICAgIDogbV9pc0NvbnRlbnRGaWx0ZXJlZChmYWxzZSkKICAgICAgICAgICAgICwgbV9h cHBDYWNoZUlEKDApCisgICAgICAgICAgICAsIG1fd2FzRmV0Y2hlZFZpYVNwZHkoZmFsc2UpCiAg ICAgICAgIHsKICAgICAgICAgfQogCkBAIC00NSw2ICs0Niw3IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKICAgICAgICAgICAgIDogUmVzb3VyY2VSZXNwb25zZUJhc2UodXJsLCBtaW1lVHlwZSwgZXhw ZWN0ZWRMZW5ndGgsIHRleHRFbmNvZGluZ05hbWUsIGZpbGVuYW1lKQogICAgICAgICAgICAgLCBt X2lzQ29udGVudEZpbHRlcmVkKGZhbHNlKQogICAgICAgICAgICAgLCBtX2FwcENhY2hlSUQoMCkK KyAgICAgICAgICAgICwgbV93YXNGZXRjaGVkVmlhU3BkeShmYWxzZSkKICAgICAgICAgewogICAg ICAgICB9CiAKQEAgLTcyLDYgKzc0LDEyIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAg ICAgIG1fYXBwQ2FjaGVNYW5pZmVzdFVSTCA9IHVybDsKICAgICAgICAgfQogCisgICAgICAgIGJv b2wgd2FzRmV0Y2hlZFZpYVNwZHkoKSBjb25zdCB7IHJldHVybiBtX3dhc0ZldGNoZWRWaWFTcGR5 OyB9CisgICAgICAgIHZvaWQgc2V0V2FzRmV0Y2hlZFZpYVNwZHkoYm9vbCB2YWx1ZSkKKyAgICAg ICAgeworICAgICAgICAgICAgbV93YXNGZXRjaGVkVmlhU3BkeSA9IHZhbHVlOworICAgICAgICB9 CisKICAgICBwcml2YXRlOgogICAgICAgICBmcmllbmQgY2xhc3MgUmVzb3VyY2VSZXNwb25zZUJh c2U7CiAKQEAgLTk2LDYgKzEwNCw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgLy8g VGhlIG1hbmlmZXN0IHVybCBvZiB0aGUgYXBwY2FjaGUgdGhpcyByZXNwb25zZSB3YXMgcmV0cmll dmVkIGZyb20sIGlmIGFueS4KICAgICAgICAgLy8gTm90ZTogb25seSB2YWxpZCBmb3IgbWFpbiBy ZXNvdXJjZSByZXNwb25zZXMuCiAgICAgICAgIEtVUkwgbV9hcHBDYWNoZU1hbmlmZXN0VVJMOwor CisgICAgICAgIGJvb2wgbV93YXNGZXRjaGVkVmlhU3BkeTsKICAgICB9OwogCiB9IC8vIG5hbWVz cGFjZSBXZWJDb3JlCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDUyODEzKQorKysgV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEw LTAxLTA1ICBNaWtlIEJlbHNoZSAgPG1pa2VAYmVsc2hlLmNvbT4KKworICAgICAgICBBZGQgYSBm bGFnIHRvIHRoZSBSZXNvdXJjZVJlc3BvbnNlIGZvciB0cmFja2luZyBpZiBhIHJlcXVlc3Qgd2Fz CisgICAgICAgIGZldGNoZWQgdmlhIFNQRFkuICBUaGlzIGlzIHBsdW1iZWQgdGhyb3VnaCBzbyB0 aGF0IHdlIGNhbiBpbmZvcm0KKyAgICAgICAgYSB3ZWJwYWdlIHZpYSBKYXZhU2NyaXB0IGlmIGl0 IHdhcyBmZWN0aGVkIHZpYSB0aGUgZXhwZXJpbWVudGFsCisgICAgICAgIFNQRFkgcHJvdG9jb2wu CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMzMTg2 CisKKyAgICAgICAgKiBwdWJsaWMvV2ViVVJMUmVzcG9uc2UuaDoKKyAgICAgICAgKiBzcmMvV2Vi VVJMUmVzcG9uc2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJVUkxSZXNwb25zZTo6d2FzRmV0 Y2hlZFZpYVNwZHkpOgorICAgICAgICAoV2ViS2l0OjpXZWJVUkxSZXNwb25zZTo6c2V0V2FzRmV0 Y2hlZFZpYVNwZHkpOgorCiAyMDEwLTAxLTA0ICBNYWNpZWogU3RhY2hvd2lhayAgPG1qc0BhcHBs ZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gRmlzaGVyLgpJbmRleDogV2ViS2l0 L2Nocm9taXVtL3B1YmxpYy9XZWJVUkxSZXNwb25zZS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViVVJMUmVzcG9uc2UuaAkocmV2aXNpb24gNTI3NjgpCisrKyBXZWJL aXQvY2hyb21pdW0vcHVibGljL1dlYlVSTFJlc3BvbnNlLmgJKHdvcmtpbmcgY29weSkKQEAgLTEx OCw2ICsxMTgsMTEgQEAgcHVibGljOgogICAgIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVzcG9u c2UmIHRvUmVzb3VyY2VSZXNwb25zZSgpIGNvbnN0OwogI2VuZGlmCiAKKyAgICAvLyBGbGFnIHdo ZXRoZXIgdGhpcyByZXF1ZXN0IHdhcyBsb2FkZWQgdmlhIHRoZSBTUERZIHByb3RvY29sIG9yIG5v dC4KKyAgICAvLyBTUERZIGlzIGFuIGV4cGVyaW1lbnRhbCB3ZWIgcHJvdG9jb2wsIHNlZSBodHRw Oi8vZGV2LmNocm9taXVtLm9yZy9zcGR5CisgICAgV0VCS0lUX0FQSSBib29sIHdhc0ZldGNoZWRW aWFTcGR5KCkgY29uc3Q7CisgICAgV0VCS0lUX0FQSSB2b2lkIHNldFdhc0ZldGNoZWRWaWFTcGR5 KGJvb2wpOworCiBwcm90ZWN0ZWQ6CiAgICAgdm9pZCBhc3NpZ24oV2ViVVJMUmVzcG9uc2VQcml2 YXRlKik7CiAKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVVJMUmVzcG9uc2UuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVVJMUmVzcG9uc2UuY3BwCShyZXZp c2lvbiA1Mjc2OCkKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVVJMUmVzcG9uc2UuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0yNTUsNiArMjU1LDE2IEBAIGNvbnN0IFJlc291cmNlUmVzcG9uc2Um IFdlYlVSTFJlc3BvbnNlOjoKICAgICByZXR1cm4gKm1fcHJpdmF0ZS0+bV9yZXNvdXJjZVJlc3Bv bnNlOwogfQogCitib29sIFdlYlVSTFJlc3BvbnNlOjp3YXNGZXRjaGVkVmlhU3BkeSgpIGNvbnN0 Cit7CisgICAgcmV0dXJuIG1fcHJpdmF0ZS0+bV9yZXNvdXJjZVJlc3BvbnNlLT53YXNGZXRjaGVk VmlhU3BkeSgpOworfQorCit2b2lkIFdlYlVSTFJlc3BvbnNlOjpzZXRXYXNGZXRjaGVkVmlhU3Bk eShib29sIHZhbHVlKQoreworICAgIG1fcHJpdmF0ZS0+bV9yZXNvdXJjZVJlc3BvbnNlLT5zZXRX YXNGZXRjaGVkVmlhU3BkeSh2YWx1ZSk7Cit9CisKIHZvaWQgV2ViVVJMUmVzcG9uc2U6OmFzc2ln bihXZWJVUkxSZXNwb25zZVByaXZhdGUqIHApCiB7CiAgICAgLy8gU3ViY2xhc3NlcyBtYXkgY2Fs bCB0aGlzIGRpcmVjdGx5IHNvIGEgc2VsZi1hc3NpZ25tZW50IGNoZWNrIGlzIG5lZWRlZAo=