41014 2010-06-22 15:16:34 -0700 [GTK] Add support for the progress tag 2010-08-19 08:47:55 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 mrobinson webkit-unassigned abarth eric gustavo webkit.review.bot oldest_to_newest 241478 0 mrobinson 2010-06-22 15:16:34 -0700 The GTK+ port does not yet support the HTML5 progress tag. The only necessity is to add support to RenderThemeGtk for this control. 241490 1 59424 mrobinson 2010-06-22 15:44:09 -0700 Created attachment 59424 Add support for rendering the progress element 241491 2 webkit.review.bot 2010-06-22 15:46:46 -0700 Attachment 59424 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebCore/platform/gtk/gtkdrawing.h:492: moz_gtk_get_progress_widget is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WARNING: File exempt from style guide. Skipping: "WebCore/platform/gtk/gtk2drawing.c" Total errors found: 1 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 241497 3 mrobinson 2010-06-22 15:50:33 -0700 This above is a bug in the style checker. I've filed it here: https://bugs.webkit.org/show_bug.cgi?id=41017 243823 4 59424 xan.lopez 2010-06-28 12:41:35 -0700 Comment on attachment 59424 Add support for rendering the progress element >diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog >--- a/WebCore/platform/gtk/RenderThemeGtk.cpp >+++ b/WebCore/platform/gtk/RenderThemeGtk.cpp >@@ -34,6 +34,9 @@ > #include "MediaControlElements.h" > #include "NotImplemented.h" > #include "RenderBox.h" >+#if ENABLE(PROGRESS_TAG) >+#include "RenderProgress.h" >+#endif Style guide says this has to go at the end of the includes in its own block. >+bool RenderThemeGtk::paintProgressBar(RenderObject* renderObject, const RenderObject::PaintInfo& paintInfo, const IntRect& rect) >+{ >+ if (!renderObject->isProgress()) >+ return true; >+ >+ GtkWidget* progressBarWidget = moz_gtk_get_progress_widget(); >+ if (!progressBarWidget) >+ return true; >+ >+ if (paintMozillaGtkWidget(this, MOZ_GTK_PROGRESSBAR, renderObject, paintInfo, rect)) >+ return true; >+ >+ IntRect chunkRect(rect); >+ RenderProgress* renderProgress = toRenderProgress(renderObject); >+ >+ chunkRect.setHeight(chunkRect.height() - (2 * progressBarWidget->style->ythickness)); >+ chunkRect.setY(chunkRect.y() + progressBarWidget->style->ythickness); >+ chunkRect.setWidth(chunkRect.width() - (2 * progressBarWidget->style->xthickness)); Don't access style like that, it won't compile with GSEAL enabled. r- for the GSEAL stuff. 243844 5 59926 mrobinson 2010-06-28 13:10:35 -0700 Created attachment 59926 Updated patch with Xan's suggestions 243847 6 webkit.review.bot 2010-06-28 13:12:03 -0700 Attachment 59926 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebCore/platform/gtk/gtkdrawing.h:492: moz_gtk_get_progress_widget is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WARNING: File exempt from style guide. Skipping: "WebCore/platform/gtk/gtk2drawing.c" Total errors found: 1 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 243876 7 59926 mrobinson 2010-06-28 13:44:16 -0700 Comment on attachment 59926 Updated patch with Xan's suggestions Patch has landed (r62034), so I'm clearing the flags. 243900 8 webkit.review.bot 2010-06-28 14:24:15 -0700 http://trac.webkit.org/changeset/62034 might have broken GTK Linux 32-bit Debug The following changes are on the blame list: http://trac.webkit.org/changeset/62032 http://trac.webkit.org/changeset/62033 http://trac.webkit.org/changeset/62034 http://trac.webkit.org/changeset/62031 266753 9 gustavo 2010-08-19 08:23:32 -0700 So this bug is done, then? =) I'll close it, feel free to reopen if I'm mistaken. 266767 10 mrobinson 2010-08-19 08:47:55 -0700 Yep! This should be complete. 59424 2010-06-22 15:44:09 -0700 2010-06-28 13:10:33 -0700 Add support for rendering the progress element bug-41014-20100622154404.patch text/plain 10311 mrobinson ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBiNGY2NWNjNzJkYzlmZDNkOWRhOWMxMTkyZTE1NzQwZDkyOTFhZDhkLi5hMTA5YmUy MmNmYmMxNTNiMmYxNDE5YTQ1NzhmYzkwZDU3MWM3OGUxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAK KzIwMTAtMDYtMjIgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIEFkZCBz dXBwb3J0IGZvciB0aGUgcHJvZ3Jlc3MgYmFyIHRhZworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDEwMTQKKworICAgICAgICBVbnNraXAgdGVzdHMgd2hp Y2ggYXJlIG5vdyBwYXNzaW5nIGFmdGVyIGFkZGluZyBzdXBwb3J0IGZvciByZW5kZXJpbmcgdGhl IHByb2dyZXNzIHRhZy4KKworICAgICAgICAqIHBsYXRmb3JtL2d0ay9Ta2lwcGVkOgorICAgICAg ICAqIHBsYXRmb3JtL2d0ay9mYXN0L2RvbS9IVE1MUHJvZ3Jlc3NFbGVtZW50L3Byb2dyZXNzLWJh ci12YWx1ZS1wc2V1ZG8tZWxlbWVudC1leHBlY3RlZC50eHQ6IENvcGllZCBmcm9tIExheW91dFRl c3RzL3BsYXRmb3JtL21hYy9mYXN0L2RvbS9IVE1MUHJvZ3Jlc3NFbGVtZW50L3Byb2dyZXNzLWJh ci12YWx1ZS1wc2V1ZG8tZWxlbWVudC1leHBlY3RlZC50eHQuCisgICAgICAgICogcGxhdGZvcm0v Z3RrL2Zhc3QvZG9tL0hUTUxQcm9ncmVzc0VsZW1lbnQvcHJvZ3Jlc3MtZWxlbWVudC1leHBlY3Rl ZC50eHQ6IEFkZGVkLgorCiAyMDEwLTA2LTIyICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFBhdmVsIEZlbGRtYW4uCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZCBiL0xheW91dFRlc3RzL3BsYXRm b3JtL2d0ay9Ta2lwcGVkCmluZGV4IGZlOTAyMmI3ZmQ0NTA1OTcyZjA3Y2E5ZjUxNmMwNTQ4MDI3 NDg5YjYuLjVlMTZjZWQyM2UxODgxYzM1MmU3NGVmNmQxNDFlYzAxMzE5YzFjZDkgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3Bs YXRmb3JtL2d0ay9Ta2lwcGVkCkBAIC01NjE5LDExICs1NjE5LDYgQEAgZmFzdC9ldmVudHMvcmVt b3ZlLWNoaWxkLW9uc2Nyb2xsLmh0bWwKIGZhc3QvZXZlbnRzL3BsYXRmb3JtLXdoZWVsZXZlbnQt aW4tc2Nyb2xsaW5nLWRpdi5odG1sCiBmYXN0L2V2ZW50cy9jb250aW51b3VzLXBsYXRmb3JtLXdo ZWVsZXZlbnQtaW4tc2Nyb2xsaW5nLWRpdi5odG1sCiAKLSMgcmVuZGVyVGhlbWUgaXMgbm90IHJl YWR5IHRvIGRyYXcgcHJvZ3Jlc3MgZWxlbWVudAotZmFzdC9kb20vSFRNTFByb2dyZXNzRWxlbWVu dC9wcm9ncmVzcy1lbGVtZW50Lmh0bWwKLWZhc3QvZG9tL0hUTUxQcm9ncmVzc0VsZW1lbnQvc2V0 LXByb2dyZXNzLXByb3BlcnRpZXMuaHRtbAotZmFzdC9kb20vSFRNTFByb2dyZXNzRWxlbWVudC9w cm9ncmVzcy1iYXItdmFsdWUtcHNldWRvLWVsZW1lbnQuaHRtbAotCiAjIG1ldGVyIGVsZW1lbnQg aXMgbm90IHN1cHBvcnRlZAogZmFzdC9kb20vSFRNTE1ldGVyRWxlbWVudC9tZXRlci1lbGVtZW50 Lmh0bWwKIGZhc3QvZG9tL0hUTUxNZXRlckVsZW1lbnQvc2V0LW1ldGVyLXByb3BlcnRpZXMuaHRt bApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2Zhc3QvZG9tL0hUTUxQcm9n cmVzc0VsZW1lbnQvcHJvZ3Jlc3MtYmFyLXZhbHVlLXBzZXVkby1lbGVtZW50LWV4cGVjdGVkLnR4 dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9mYXN0L2RvbS9IVE1MUHJvZ3Jlc3NFbGVtZW50 L3Byb2dyZXNzLWJhci12YWx1ZS1wc2V1ZG8tZWxlbWVudC1leHBlY3RlZC50eHQKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uYjk5MjNmYzNlNjNiMWZkNjBkYjg1MzBjYmIzMTU5YzU3MzA3YWE0ZgotLS0gL2Rldi9udWxs CisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9mYXN0L2RvbS9IVE1MUHJvZ3Jlc3NFbGVt ZW50L3Byb2dyZXNzLWJhci12YWx1ZS1wc2V1ZG8tZWxlbWVudC1leHBlY3RlZC50eHQKQEAgLTAs MCArMSwxMyBAQAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisgIFJlbmRlclZpZXcgYXQg KDAsMCkgc2l6ZSA4MDB4NjAwCitsYXllciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgUmVuZGVy QmxvY2sge0hUTUx9IGF0ICgwLDApIHNpemUgODAweDYwMAorICAgIFJlbmRlckJvZHkge0JPRFl9 IGF0ICg4LDgpIHNpemUgNzg0eDU4NAorICAgICAgUmVuZGVyUHJvZ3Jlc3Mge1BST0dSRVNTfSBh dCAoMCwyOCkgc2l6ZSAxNjZ4MjIgW2JnY29sb3I9IzAwRkZGRl0gW2JvcmRlcjogKDNweCBkb3R0 ZWQgI0ZGMDAwMCldCisgICAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICg1MSwzKSBzaXplIDEx MngxNiBbYmdjb2xvcj0jMDAwMDhCXQorICAgICAgUmVuZGVyUHJvZ3Jlc3Mge1BST0dSRVNTfSBh dCAoMTY2LDApIHNpemUgMzAweDUwIFtiZ2NvbG9yPSMwMDAwRkZdCisgICAgICAgIFJlbmRlckJs b2NrIHtESVZ9IGF0ICgwLDApIHNpemUgMjEweDUwIFtiZ2NvbG9yPSM4MDgwODBdCisgICAgICBS ZW5kZXJQcm9ncmVzcyB7UFJPR1JFU1N9IGF0ICg0NjYsMjgpIHNpemUgMTY2eDIyIFtib3JkZXI6 ICgzcHggc29saWQgI0ZGMDAwMCldCisgICAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgzLDMp IHNpemUgODB4MTYgW2JnY29sb3I9IzgwODA4MF0KKyAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBh dCAoMCwwKSBzaXplIDB4MAorICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUg MHgwCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvZmFzdC9kb20vSFRNTFBy b2dyZXNzRWxlbWVudC9wcm9ncmVzcy1lbGVtZW50LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz L3BsYXRmb3JtL2d0ay9mYXN0L2RvbS9IVE1MUHJvZ3Jlc3NFbGVtZW50L3Byb2dyZXNzLWVsZW1l bnQtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmUzNTMxMDEwZDc0YjBhYTZlYjM1Y2M3MTc4YWFj ODcwZWEzNzMwZDgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsv ZmFzdC9kb20vSFRNTFByb2dyZXNzRWxlbWVudC9wcm9ncmVzcy1lbGVtZW50LWV4cGVjdGVkLnR4 dApAQCAtMCwwICsxLDkgQEAKK2xheWVyIGF0ICgwLDApIHNpemUgODAweDYwMAorICBSZW5kZXJW aWV3IGF0ICgwLDApIHNpemUgODAweDYwMAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisg IFJlbmRlckJsb2NrIHtIVE1MfSBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgICBSZW5kZXJCb2R5 IHtCT0RZfSBhdCAoOCw4KSBzaXplIDc4NHg1ODQKKyAgICAgIFJlbmRlclByb2dyZXNzIHtQUk9H UkVTU30gYXQgKDAsMCkgc2l6ZSAxNjB4MTYKKyAgICAgIFJlbmRlcklubGluZSB7U01BTEx9IGF0 ICgwLDApIHNpemUgMTMzeDE3CisgICAgICAgIFJlbmRlclByb2dyZXNzIHtQUk9HUkVTU30gYXQg KDE2MCwyKSBzaXplIDEzM3gxMworICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNp emUgMHgwCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9n CmluZGV4IDE5MDlkZTc5YzExNWExYTM4MTQyMDhmZDdmYjAwMWJlNDU4N2IzNWIuLjNhMzBhMTBh MTczMjZlMDNmMTRhYjU5YTE4ZTFjYzNlMTg5ZWM1NjIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hh bmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTAtMDYt MjIgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIEFkZCBzdXBwb3J0IGZv ciB0aGUgcHJvZ3Jlc3MgYmFyIHRhZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NDEwMTQKKworICAgICAgICBBZGQgc3VwcG9ydCBmb3IgcmVuZGVyaW5n IHRoZSBwcm9ncmVzcyB0YWcgZm9yIFdlYktpdCBHVEsrLgorCisgICAgICAgICogR05VbWFrZWZp bGUuYW06CisgICAgICAgICogcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lR3RrOjphbmltYXRpb25SZXBlYXRJbnRlcnZhbEZvclBy b2dyZXNzQmFyKToKKyAgICAgICAgQWRkZWQuIEN1cnJlbnRseSBwcm9ncmVzcyBiYXIgYW5pbWF0 aW9ucyBhcmUgZGlzYWJsZWQuIEFzIGl0IGxvb2tzIGxpa2UKKyAgICAgICAgdGhlcmUgbWF5IG5v dCBiZSBhIGdvb2Qgd2F5IHRvIHN1cHBvcnQgdGhpcyB3aXRoIE1vemlsbGEncyB0aGVtZSBkcmF3 aW5nIGNvZGUuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUd0azo6YW5pbWF0aW9uRHVy YXRpb25Gb3JQcm9ncmVzc0Jhcik6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhl bWVHdGs6OmFkanVzdFByb2dyZXNzQmFyU3R5bGUpOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlclRoZW1lR3RrOjpwYWludFByb2dyZXNzQmFyKTogQWRkZWQuCisgICAgICAgICogcGxh dGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmg6IEFkZCBkZWNsYXJhdGlvbnMgZm9yIG5ldyBtZXRo b2RzLgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9ndGsyZHJhd2luZy5jOiAKKyAgICAgICAgKG1v el9ndGtfZ2V0X3Byb2dyZXNzX3dpZGdldCk6IEV4cG9zZSB0aGUgcHJvZ3Jlc3Mgd2lkZ2V0IHNv IHRoYXQgdGhlIGNodW5rIGNhbiBiZSBwb3NpdGlvbmVkIHByb3Blcmx5LgorICAgICAgICAqIHBs YXRmb3JtL2d0ay9ndGtkcmF3aW5nLmg6IEFkZGVkIGRlY2xhcmF0aW9uIGZvciBtb3pfZ3RrX2dl dF9wcm9ncmVzc193aWRnZXQuCisKIDIwMTAtMDYtMDQgIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6 a292QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlm ZiAtLWdpdCBhL1dlYkNvcmUvR05VbWFrZWZpbGUuYW0gYi9XZWJDb3JlL0dOVW1ha2VmaWxlLmFt CmluZGV4IGEyZjYzNmI2ODE1MzYxNmI3ZmZhYmIyOWZhM2RkODhlZjQyNjZiMDUuLjg4NWM3ODY3 NGFiNDM2MmYxYTE0NWFkZTIyOWVmYTY2ZTg5NDc1YTIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvR05V bWFrZWZpbGUuYW0KKysrIGIvV2ViQ29yZS9HTlVtYWtlZmlsZS5hbQpAQCAtMjMyOCwxMiArMjMy OCwxMiBAQCB3ZWJjb3JlX2NwcGZsYWdzICs9IFwKICAgICAtREVOQUJMRV9NRVRFUl9UQUc9MAog CiAjIC0tLS0KLSMgSFRNTCBQcm9ncmVzcyBFbGVtZW50IC0gZGlzYWJsZSBmb3Igbm93LCBzaW5j ZSBwYWludGluZyBjb2RlIGlzIG1pc3NpbmcuCisjIEhUTUwgUHJvZ3Jlc3MgRWxlbWVudAogIyAt LS0tCi1GRUFUVVJFX0RFRklORVMgKz0gRU5BQkxFX1BST0dSRVNTX1RBRz0wCitGRUFUVVJFX0RF RklORVMgKz0gRU5BQkxFX1BST0dSRVNTX1RBRz0xCiAKIHdlYmNvcmVfY3BwZmxhZ3MgKz0gXAot CS1ERU5BQkxFX1BST0dSRVNTX1RBRz0wCisJLURFTkFCTEVfUFJPR1JFU1NfVEFHPTEKIAogIyAt LS0tCiAjIEphdmFTY3JpcHQgRGVidWdnZXIvUHJvZmlsZXIKZGlmZiAtLWdpdCBhL1dlYkNvcmUv cGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1Jl bmRlclRoZW1lR3RrLmNwcAppbmRleCA2MjA1ZGJkZTQ3NzM5ZDkxYzVmOTgxOTExNjJlODUwYjll OTE1ZTdlLi4xMWJiOWM3ZWMyM2UzODNmN2Q4ZDJkY2E3MzdhZTMzMDJlZjY5ODAzIDEwMDY0NAot LS0gYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHAKKysrIGIvV2ViQ29y ZS9wbGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGsuY3BwCkBAIC0zNCw2ICszNCw5IEBACiAjaW5j bHVkZSAiTWVkaWFDb250cm9sRWxlbWVudHMuaCIKICNpbmNsdWRlICJOb3RJbXBsZW1lbnRlZC5o IgogI2luY2x1ZGUgIlJlbmRlckJveC5oIgorI2lmIEVOQUJMRShQUk9HUkVTU19UQUcpCisjaW5j bHVkZSAiUmVuZGVyUHJvZ3Jlc3MuaCIKKyNlbmRpZgogI2luY2x1ZGUgIlJlbmRlck9iamVjdC5o IgogI2luY2x1ZGUgIlVzZXJBZ2VudFN0eWxlU2hlZXRzLmgiCiAjaW5jbHVkZSAiZ3RrZHJhd2lu Zy5oIgpAQCAtODQyLDQgKzg0NSw1MiBAQCBib29sIFJlbmRlclRoZW1lR3RrOjpwYWludE1lZGlh U2xpZGVyVGh1bWIoUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBSZW5kZXJPYmplY3Q6OgogfQogI2Vu ZGlmCiAKKyNpZiBFTkFCTEUoUFJPR1JFU1NfVEFHKQorZG91YmxlIFJlbmRlclRoZW1lR3RrOjph bmltYXRpb25SZXBlYXRJbnRlcnZhbEZvclByb2dyZXNzQmFyKFJlbmRlclByb2dyZXNzKikgY29u c3QKK3sKKyAgICAvLyBGSVhNRTogSXQgZG9lc24ndCBsb29rIGxpa2UgdGhlcmUgaXMgYSBnb29k IHdheSB5ZXQgdG8gc3VwcG9ydCBhbmltYXRlZAorICAgIC8vIHByb2dyZXNzIGJhcnMgd2l0aCB0 aGUgTW96aWxsYSB0aGVtZSBkcmF3aW5nIGNvZGUuCisgICAgcmV0dXJuIDA7Cit9CisKK2RvdWJs ZSBSZW5kZXJUaGVtZUd0azo6YW5pbWF0aW9uRHVyYXRpb25Gb3JQcm9ncmVzc0JhcihSZW5kZXJQ cm9ncmVzcyopIGNvbnN0Cit7CisgICAgLy8gRklYTUU6IEl0IGRvZXNuJ3QgbG9vayBsaWtlIHRo ZXJlIGlzIGEgZ29vZCB3YXkgeWV0IHRvIHN1cHBvcnQgYW5pbWF0ZWQKKyAgICAvLyBwcm9ncmVz cyBiYXJzIHdpdGggdGhlIE1vemlsbGEgdGhlbWUgZHJhd2luZyBjb2RlLgorICAgIHJldHVybiAw OworfQorCit2b2lkIFJlbmRlclRoZW1lR3RrOjphZGp1c3RQcm9ncmVzc0JhclN0eWxlKENTU1N0 eWxlU2VsZWN0b3IqLCBSZW5kZXJTdHlsZSogc3R5bGUsIEVsZW1lbnQqKSBjb25zdAoreworICAg IHN0eWxlLT5zZXRCb3hTaGFkb3coMCk7Cit9CisKK2Jvb2wgUmVuZGVyVGhlbWVHdGs6OnBhaW50 UHJvZ3Jlc3NCYXIoUmVuZGVyT2JqZWN0KiByZW5kZXJPYmplY3QsIGNvbnN0IFJlbmRlck9iamVj dDo6UGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IEludFJlY3QmIHJlY3QpCit7CisgICAgaWYg KCFyZW5kZXJPYmplY3QtPmlzUHJvZ3Jlc3MoKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKKyAg ICBHdGtXaWRnZXQqIHByb2dyZXNzQmFyV2lkZ2V0ID0gbW96X2d0a19nZXRfcHJvZ3Jlc3Nfd2lk Z2V0KCk7CisgICAgaWYgKCFwcm9ncmVzc0JhcldpZGdldCkKKyAgICAgICAgcmV0dXJuIHRydWU7 CisKKyAgICBpZiAocGFpbnRNb3ppbGxhR3RrV2lkZ2V0KHRoaXMsIE1PWl9HVEtfUFJPR1JFU1NC QVIsIHJlbmRlck9iamVjdCwgcGFpbnRJbmZvLCByZWN0KSkKKyAgICAgICAgcmV0dXJuIHRydWU7 CisKKyAgICBJbnRSZWN0IGNodW5rUmVjdChyZWN0KTsKKyAgICBSZW5kZXJQcm9ncmVzcyogcmVu ZGVyUHJvZ3Jlc3MgPSB0b1JlbmRlclByb2dyZXNzKHJlbmRlck9iamVjdCk7CisKKyAgICBjaHVu a1JlY3Quc2V0SGVpZ2h0KGNodW5rUmVjdC5oZWlnaHQoKSAtICgyICogcHJvZ3Jlc3NCYXJXaWRn ZXQtPnN0eWxlLT55dGhpY2tuZXNzKSk7CisgICAgY2h1bmtSZWN0LnNldFkoY2h1bmtSZWN0Lnko KSArIHByb2dyZXNzQmFyV2lkZ2V0LT5zdHlsZS0+eXRoaWNrbmVzcyk7CisgICAgY2h1bmtSZWN0 LnNldFdpZHRoKGNodW5rUmVjdC53aWR0aCgpIC0gKDIgKiBwcm9ncmVzc0JhcldpZGdldC0+c3R5 bGUtPnh0aGlja25lc3MpKTsKKyAgICBjaHVua1JlY3Quc2V0V2lkdGgoKChmbG9hdCkgY2h1bmtS ZWN0LndpZHRoKCkpICogcmVuZGVyUHJvZ3Jlc3MtPnBvc2l0aW9uKCkpOworICAgIGlmIChyZW5k ZXJPYmplY3QtPnN0eWxlKCktPmRpcmVjdGlvbigpID09IFJUTCkKKyAgICAgICAgY2h1bmtSZWN0 LnNldFgocmVjdC54KCkgKyByZWN0LndpZHRoKCkgLSBjaHVua1JlY3Qud2lkdGgoKSAtIHByb2dy ZXNzQmFyV2lkZ2V0LT5zdHlsZS0+eHRoaWNrbmVzcyk7CisgICAgZWxzZQorICAgICAgICBjaHVu a1JlY3Quc2V0WChjaHVua1JlY3QueCgpICsgcHJvZ3Jlc3NCYXJXaWRnZXQtPnN0eWxlLT54dGhp Y2tuZXNzKTsKKworICAgIHJldHVybiBwYWludE1vemlsbGFHdGtXaWRnZXQodGhpcywgTU9aX0dU S19QUk9HUkVTU19DSFVOSywgcmVuZGVyT2JqZWN0LCBwYWludEluZm8sIGNodW5rUmVjdCk7Cit9 CisjZW5kaWYKKwogfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVyVGhl bWVHdGsuaCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmgKaW5kZXggNDFi NTE4ZTZhZmJjMzFlM2YzOGIyMDM3MTk4NTBjMGRmZWY4YTBmZS4uYTIyY2RlNDE2ZTk2MGJmYWFl ZDdkYjMzN2JmYzE1ZjkwODRjODM2MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsv UmVuZGVyVGhlbWVHdGsuaAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0 ay5oCkBAIC0xNDEsNiArMTQxLDEzIEBAIHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIGJvb2wgcGFp bnRNZWRpYVNsaWRlclRodW1iKFJlbmRlck9iamVjdCosIGNvbnN0IFJlbmRlck9iamVjdDo6UGFp bnRJbmZvJiwgY29uc3QgSW50UmVjdCYpOwogI2VuZGlmCiAKKyNpZiBFTkFCTEUoUFJPR1JFU1Nf VEFHKQorICAgIHZpcnR1YWwgZG91YmxlIGFuaW1hdGlvblJlcGVhdEludGVydmFsRm9yUHJvZ3Jl c3NCYXIoUmVuZGVyUHJvZ3Jlc3MqKSBjb25zdDsKKyAgICB2aXJ0dWFsIGRvdWJsZSBhbmltYXRp b25EdXJhdGlvbkZvclByb2dyZXNzQmFyKFJlbmRlclByb2dyZXNzKikgY29uc3Q7CisgICAgdmly dHVhbCB2b2lkIGFkanVzdFByb2dyZXNzQmFyU3R5bGUoQ1NTU3R5bGVTZWxlY3RvciosIFJlbmRl clN0eWxlKiwgRWxlbWVudCopIGNvbnN0OworICAgIHZpcnR1YWwgYm9vbCBwYWludFByb2dyZXNz QmFyKFJlbmRlck9iamVjdCosIGNvbnN0IFJlbmRlck9iamVjdDo6UGFpbnRJbmZvJiwgY29uc3Qg SW50UmVjdCYpOworI2VuZGlmCisKIHByaXZhdGU6CiAgICAgLyoKICAgICAgKiBob2xkIHRoZSBz dGF0ZQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvZ3RrMmRyYXdpbmcuYyBiL1dl YkNvcmUvcGxhdGZvcm0vZ3RrL2d0azJkcmF3aW5nLmMKaW5kZXggNmE4YWY1NzRhMTlmMjJkNDll ZDRkY2UwNzI0MzRjNDUyZmM3MGE1Ny4uNTRjY2U0OTM4NWU2NGQyNTJkYWNiNWY0YzlhMzJiZWYw ZDA1MTEwNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvZ3RrMmRyYXdpbmcuYwor KysgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9ndGsyZHJhd2luZy5jCkBAIC0zMjQ3LDMgKzMyNDcs MTEgQEAgdm9pZCBtb3pfZ3RrX2Rlc3Ryb3lfdGhlbWVfcGFydHNfd2lkZ2V0cyhHdGtUaGVtZVBh cnRzKiBwYXJ0cykKICAgICAgICAgcGFydHMtPnByb3RvV2luZG93ID0gTlVMTDsKICAgICB9CiB9 CisKK0d0a1dpZGdldCogbW96X2d0a19nZXRfcHJvZ3Jlc3Nfd2lkZ2V0KCkKK3sKKyAgICBpZiAo IWlzX2luaXRpYWxpemVkKQorICAgICAgICByZXR1cm4gTlVMTDsKKyAgICBlbnN1cmVfcHJvZ3Jl c3Nfd2lkZ2V0KCk7CisgICAgcmV0dXJuIGdQYXJ0cy0+cHJvZ3Jlc1dpZGdldDsKK30KZGlmZiAt LWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL2d0a2RyYXdpbmcuaCBiL1dlYkNvcmUvcGxhdGZv cm0vZ3RrL2d0a2RyYXdpbmcuaAppbmRleCAxZTkwMjNmOGIwYzNkOWFlMDYyMWZjNjU0ZjIxNTlh ZmFhNjdkMTY0Li5iNWE3ZmViMjRhNjQ2ZjRkNjAxNDhmZDY0NGIwNTBiMDI3ZGU1Y2M4IDEwMDY0 NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9ndGtkcmF3aW5nLmgKKysrIGIvV2ViQ29yZS9w bGF0Zm9ybS9ndGsvZ3RrZHJhd2luZy5oCkBAIC00ODUsNiArNDg1LDEyIEBAIGdpbnQgbW96X2d0 a19nZXRfdGFiX3RoaWNrbmVzcyh2b2lkKTsKICAqLwogZ2Jvb2xlYW4gbW96X2d0a19pbWFnZXNf aW5fbWVudXModm9pZCk7CiAKKy8qKgorICogUmV0cmlldmUgYW4gYWN0dWFsIEdUSyBwcm9ncmVz cyBiYXIgd2lkZ2V0IGZvciBzdHlsZSBhbmFseXNpcy4gSXQgd2lsbCBub3QKKyAqIGJlIG1vZGlm aWVkLgorICovCitHdGtXaWRnZXQqIG1vel9ndGtfZ2V0X3Byb2dyZXNzX3dpZGdldCh2b2lkKTsK KwogI2lmZGVmIF9fY3BsdXNwbHVzCiB9CiAjZW5kaWYgLyogX19jcGx1c3BsdXMgKi8K 59926 2010-06-28 13:10:35 -0700 2010-06-28 13:44:16 -0700 Updated patch with Xan's suggestions bug-41014-20100628131033.patch text/plain 10309 mrobinson ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA5ZWU5NTUxNzljOTQ3YTY0YWFjMjZkOTI1OTYxYTAyOWM3ZGM1N2ZiLi5jZmI0YzE3 ODkzZDhiZTQ0ZTVjMmM5MTFmMTM1ZWQyZmYzZDcwNGFmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAK KzIwMTAtMDYtMjggIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIEFkZCBz dXBwb3J0IGZvciB0aGUgcHJvZ3Jlc3MgYmFyIHRhZworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDEwMTQKKworICAgICAgICBVbnNraXAgdGVzdHMgd2hp Y2ggYXJlIG5vdyBwYXNzaW5nIGFmdGVyIGFkZGluZyBzdXBwb3J0IGZvciByZW5kZXJpbmcgdGhl IHByb2dyZXNzIHRhZy4KKworICAgICAgICAqIHBsYXRmb3JtL2d0ay9Ta2lwcGVkOgorICAgICAg ICAqIHBsYXRmb3JtL2d0ay9mYXN0L2RvbS9IVE1MUHJvZ3Jlc3NFbGVtZW50L3Byb2dyZXNzLWJh ci12YWx1ZS1wc2V1ZG8tZWxlbWVudC1leHBlY3RlZC50eHQ6IENvcGllZCBmcm9tIExheW91dFRl c3RzL3BsYXRmb3JtL21hYy9mYXN0L2RvbS9IVE1MUHJvZ3Jlc3NFbGVtZW50L3Byb2dyZXNzLWJh ci12YWx1ZS1wc2V1ZG8tZWxlbWVudC1leHBlY3RlZC50eHQuCisgICAgICAgICogcGxhdGZvcm0v Z3RrL2Zhc3QvZG9tL0hUTUxQcm9ncmVzc0VsZW1lbnQvcHJvZ3Jlc3MtZWxlbWVudC1leHBlY3Rl ZC50eHQ6IEFkZGVkLgorCiAyMDEwLTA2LTI4ICBSb2JlcnQgSG9nYW4gIDxyb2JlcnRAd2Via2l0 Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByNjIwMjEuCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZCBiL0xheW91dFRlc3RzL3BsYXRm b3JtL2d0ay9Ta2lwcGVkCmluZGV4IGQyZGFiZmNiNTJjMDE5ZjhhZjcwOTNiMDZkZWRjNmQzMWM0 MGE4Y2QuLmE2YWM2ZDNjY2NmM2VjNmMxYjk5NWE2ZjQ2MmU0MTFkODAwM2Q1OTEgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3Bs YXRmb3JtL2d0ay9Ta2lwcGVkCkBAIC01NTEyLDExICs1NTEyLDYgQEAgZmFzdC9ldmVudHMvcmVt b3ZlLWNoaWxkLW9uc2Nyb2xsLmh0bWwKIGZhc3QvZXZlbnRzL3BsYXRmb3JtLXdoZWVsZXZlbnQt aW4tc2Nyb2xsaW5nLWRpdi5odG1sCiBmYXN0L2V2ZW50cy9jb250aW51b3VzLXBsYXRmb3JtLXdo ZWVsZXZlbnQtaW4tc2Nyb2xsaW5nLWRpdi5odG1sCiAKLSMgcmVuZGVyVGhlbWUgaXMgbm90IHJl YWR5IHRvIGRyYXcgcHJvZ3Jlc3MgZWxlbWVudAotZmFzdC9kb20vSFRNTFByb2dyZXNzRWxlbWVu dC9wcm9ncmVzcy1lbGVtZW50Lmh0bWwKLWZhc3QvZG9tL0hUTUxQcm9ncmVzc0VsZW1lbnQvc2V0 LXByb2dyZXNzLXByb3BlcnRpZXMuaHRtbAotZmFzdC9kb20vSFRNTFByb2dyZXNzRWxlbWVudC9w cm9ncmVzcy1iYXItdmFsdWUtcHNldWRvLWVsZW1lbnQuaHRtbAotCiAjIG1ldGVyIGVsZW1lbnQg aXMgbm90IHN1cHBvcnRlZAogZmFzdC9kb20vSFRNTE1ldGVyRWxlbWVudC9tZXRlci1lbGVtZW50 Lmh0bWwKIGZhc3QvZG9tL0hUTUxNZXRlckVsZW1lbnQvc2V0LW1ldGVyLXByb3BlcnRpZXMuaHRt bApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2Zhc3QvZG9tL0hUTUxQcm9n cmVzc0VsZW1lbnQvcHJvZ3Jlc3MtYmFyLXZhbHVlLXBzZXVkby1lbGVtZW50LWV4cGVjdGVkLnR4 dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9mYXN0L2RvbS9IVE1MUHJvZ3Jlc3NFbGVtZW50 L3Byb2dyZXNzLWJhci12YWx1ZS1wc2V1ZG8tZWxlbWVudC1leHBlY3RlZC50eHQKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uYjk5MjNmYzNlNjNiMWZkNjBkYjg1MzBjYmIzMTU5YzU3MzA3YWE0ZgotLS0gL2Rldi9udWxs CisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9mYXN0L2RvbS9IVE1MUHJvZ3Jlc3NFbGVt ZW50L3Byb2dyZXNzLWJhci12YWx1ZS1wc2V1ZG8tZWxlbWVudC1leHBlY3RlZC50eHQKQEAgLTAs MCArMSwxMyBAQAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisgIFJlbmRlclZpZXcgYXQg KDAsMCkgc2l6ZSA4MDB4NjAwCitsYXllciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgUmVuZGVy QmxvY2sge0hUTUx9IGF0ICgwLDApIHNpemUgODAweDYwMAorICAgIFJlbmRlckJvZHkge0JPRFl9 IGF0ICg4LDgpIHNpemUgNzg0eDU4NAorICAgICAgUmVuZGVyUHJvZ3Jlc3Mge1BST0dSRVNTfSBh dCAoMCwyOCkgc2l6ZSAxNjZ4MjIgW2JnY29sb3I9IzAwRkZGRl0gW2JvcmRlcjogKDNweCBkb3R0 ZWQgI0ZGMDAwMCldCisgICAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICg1MSwzKSBzaXplIDEx MngxNiBbYmdjb2xvcj0jMDAwMDhCXQorICAgICAgUmVuZGVyUHJvZ3Jlc3Mge1BST0dSRVNTfSBh dCAoMTY2LDApIHNpemUgMzAweDUwIFtiZ2NvbG9yPSMwMDAwRkZdCisgICAgICAgIFJlbmRlckJs b2NrIHtESVZ9IGF0ICgwLDApIHNpemUgMjEweDUwIFtiZ2NvbG9yPSM4MDgwODBdCisgICAgICBS ZW5kZXJQcm9ncmVzcyB7UFJPR1JFU1N9IGF0ICg0NjYsMjgpIHNpemUgMTY2eDIyIFtib3JkZXI6 ICgzcHggc29saWQgI0ZGMDAwMCldCisgICAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgzLDMp IHNpemUgODB4MTYgW2JnY29sb3I9IzgwODA4MF0KKyAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBh dCAoMCwwKSBzaXplIDB4MAorICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUg MHgwCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvZmFzdC9kb20vSFRNTFBy b2dyZXNzRWxlbWVudC9wcm9ncmVzcy1lbGVtZW50LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz L3BsYXRmb3JtL2d0ay9mYXN0L2RvbS9IVE1MUHJvZ3Jlc3NFbGVtZW50L3Byb2dyZXNzLWVsZW1l bnQtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmUzNTMxMDEwZDc0YjBhYTZlYjM1Y2M3MTc4YWFj ODcwZWEzNzMwZDgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsv ZmFzdC9kb20vSFRNTFByb2dyZXNzRWxlbWVudC9wcm9ncmVzcy1lbGVtZW50LWV4cGVjdGVkLnR4 dApAQCAtMCwwICsxLDkgQEAKK2xheWVyIGF0ICgwLDApIHNpemUgODAweDYwMAorICBSZW5kZXJW aWV3IGF0ICgwLDApIHNpemUgODAweDYwMAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisg IFJlbmRlckJsb2NrIHtIVE1MfSBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgICBSZW5kZXJCb2R5 IHtCT0RZfSBhdCAoOCw4KSBzaXplIDc4NHg1ODQKKyAgICAgIFJlbmRlclByb2dyZXNzIHtQUk9H UkVTU30gYXQgKDAsMCkgc2l6ZSAxNjB4MTYKKyAgICAgIFJlbmRlcklubGluZSB7U01BTEx9IGF0 ICgwLDApIHNpemUgMTMzeDE3CisgICAgICAgIFJlbmRlclByb2dyZXNzIHtQUk9HUkVTU30gYXQg KDE2MCwyKSBzaXplIDEzM3gxMworICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNp emUgMHgwCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9n CmluZGV4IGFhOWU4MTFmOWM0MWZiZDViMzgxYThmN2EyMmJiYjEwOTNhMmFkMDAuLjllNTgxZTc2 MDgwZjk0MzFjZTYyN2MxMzMyNmVmMjUwOTJhZTYyYjAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hh bmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTAtMDYt MjggIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIEFkZCBzdXBwb3J0IGZv ciB0aGUgcHJvZ3Jlc3MgYmFyIHRhZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NDEwMTQKKworICAgICAgICBBZGQgc3VwcG9ydCBmb3IgcmVuZGVyaW5n IHRoZSBwcm9ncmVzcyB0YWcgZm9yIFdlYktpdCBHVEsrLgorCisgICAgICAgICogR05VbWFrZWZp bGUuYW06CisgICAgICAgICogcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lR3RrOjphbmltYXRpb25SZXBlYXRJbnRlcnZhbEZvclBy b2dyZXNzQmFyKToKKyAgICAgICAgQWRkZWQuIEN1cnJlbnRseSBwcm9ncmVzcyBiYXIgYW5pbWF0 aW9ucyBhcmUgZGlzYWJsZWQuIEFzIGl0IGxvb2tzIGxpa2UKKyAgICAgICAgdGhlcmUgbWF5IG5v dCBiZSBhIGdvb2Qgd2F5IHRvIHN1cHBvcnQgdGhpcyB3aXRoIE1vemlsbGEncyB0aGVtZSBkcmF3 aW5nIGNvZGUuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUd0azo6YW5pbWF0aW9uRHVy YXRpb25Gb3JQcm9ncmVzc0Jhcik6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhl bWVHdGs6OmFkanVzdFByb2dyZXNzQmFyU3R5bGUpOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlclRoZW1lR3RrOjpwYWludFByb2dyZXNzQmFyKTogQWRkZWQuCisgICAgICAgICogcGxh dGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmg6IEFkZCBkZWNsYXJhdGlvbnMgZm9yIG5ldyBtZXRo b2RzLgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9ndGsyZHJhd2luZy5jOiAKKyAgICAgICAgKG1v el9ndGtfZ2V0X3Byb2dyZXNzX3dpZGdldCk6IEV4cG9zZSB0aGUgcHJvZ3Jlc3Mgd2lkZ2V0IHNv IHRoYXQgdGhlIGNodW5rIGNhbiBiZSBwb3NpdGlvbmVkIHByb3Blcmx5LgorICAgICAgICAqIHBs YXRmb3JtL2d0ay9ndGtkcmF3aW5nLmg6IEFkZGVkIGRlY2xhcmF0aW9uIGZvciBtb3pfZ3RrX2dl dF9wcm9ncmVzc193aWRnZXQuCisKIDIwMTAtMDYtMjggIFhhbiBMb3BleiAgPHhsb3BlekBpZ2Fs aWEuY29tPgogCiAgICAgICAgIEZpeCBkaXN0Y2hlY2suCmRpZmYgLS1naXQgYS9XZWJDb3JlL0dO VW1ha2VmaWxlLmFtIGIvV2ViQ29yZS9HTlVtYWtlZmlsZS5hbQppbmRleCA2NDc5ZGJiZmVkMTc3 ZjkwMmYwNGQ0MzIyOWU0YzFjYmUyMzIwMGQ1Li5iNWMyNjQ4NTZhODY1YmNjYTVkZDYzMzMwNGRi YzFiOTQxOGU2YmY5IDEwMDY0NAotLS0gYS9XZWJDb3JlL0dOVW1ha2VmaWxlLmFtCisrKyBiL1dl YkNvcmUvR05VbWFrZWZpbGUuYW0KQEAgLTIzNTgsMTIgKzIzNTgsMTIgQEAgd2ViY29yZV9jcHBm bGFncyArPSBcCiAgICAgLURFTkFCTEVfTUVURVJfVEFHPTAKIAogIyAtLS0tCi0jIEhUTUwgUHJv Z3Jlc3MgRWxlbWVudCAtIGRpc2FibGUgZm9yIG5vdywgc2luY2UgcGFpbnRpbmcgY29kZSBpcyBt aXNzaW5nLgorIyBIVE1MIFByb2dyZXNzIEVsZW1lbnQKICMgLS0tLQotRkVBVFVSRV9ERUZJTkVT ICs9IEVOQUJMRV9QUk9HUkVTU19UQUc9MAorRkVBVFVSRV9ERUZJTkVTICs9IEVOQUJMRV9QUk9H UkVTU19UQUc9MQogCiB3ZWJjb3JlX2NwcGZsYWdzICs9IFwKLQktREVOQUJMRV9QUk9HUkVTU19U QUc9MAorCS1ERU5BQkxFX1BST0dSRVNTX1RBRz0xCiAKICMgLS0tLQogIyBKYXZhU2NyaXB0IERl YnVnZ2VyL1Byb2ZpbGVyCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJU aGVtZUd0ay5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHAKaW5k ZXggMGY2MWRmZDkyYzFlMDRmN2QxMGQwNmMwNTY4ZmVlMmVlYTdhODNlNy4uZDI4YzA2NDYzNzE0 ZDQyZGNkNTY2Y2Q4ZTE5ODZhYjIxZTI5MWE4ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9y bS9ndGsvUmVuZGVyVGhlbWVHdGsuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRl clRoZW1lR3RrLmNwcApAQCAtMzgsMTAgKzM4LDEzIEBACiAjaW5jbHVkZSAiUmVuZGVyT2JqZWN0 LmgiCiAjaW5jbHVkZSAiVXNlckFnZW50U3R5bGVTaGVldHMuaCIKICNpbmNsdWRlICJndGtkcmF3 aW5nLmgiCi0jaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgotCiAjaW5jbHVkZSA8Z2RrL2dk ay5oPgogI2luY2x1ZGUgPGd0ay9ndGsuaD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+ CisKKyNpZiBFTkFCTEUoUFJPR1JFU1NfVEFHKQorI2luY2x1ZGUgIlJlbmRlclByb2dyZXNzLmgi CisjZW5kaWYKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC04MjksNCArODMyLDUzIEBAIGJv b2wgUmVuZGVyVGhlbWVHdGs6OnBhaW50TWVkaWFTbGlkZXJUaHVtYihSZW5kZXJPYmplY3QqIG8s IGNvbnN0IFJlbmRlck9iamVjdDo6CiB9CiAjZW5kaWYKIAorI2lmIEVOQUJMRShQUk9HUkVTU19U QUcpCitkb3VibGUgUmVuZGVyVGhlbWVHdGs6OmFuaW1hdGlvblJlcGVhdEludGVydmFsRm9yUHJv Z3Jlc3NCYXIoUmVuZGVyUHJvZ3Jlc3MqKSBjb25zdAoreworICAgIC8vIEZJWE1FOiBJdCBkb2Vz bid0IGxvb2sgbGlrZSB0aGVyZSBpcyBhIGdvb2Qgd2F5IHlldCB0byBzdXBwb3J0IGFuaW1hdGVk CisgICAgLy8gcHJvZ3Jlc3MgYmFycyB3aXRoIHRoZSBNb3ppbGxhIHRoZW1lIGRyYXdpbmcgY29k ZS4KKyAgICByZXR1cm4gMDsKK30KKworZG91YmxlIFJlbmRlclRoZW1lR3RrOjphbmltYXRpb25E dXJhdGlvbkZvclByb2dyZXNzQmFyKFJlbmRlclByb2dyZXNzKikgY29uc3QKK3sKKyAgICAvLyBG SVhNRTogSXQgZG9lc24ndCBsb29rIGxpa2UgdGhlcmUgaXMgYSBnb29kIHdheSB5ZXQgdG8gc3Vw cG9ydCBhbmltYXRlZAorICAgIC8vIHByb2dyZXNzIGJhcnMgd2l0aCB0aGUgTW96aWxsYSB0aGVt ZSBkcmF3aW5nIGNvZGUuCisgICAgcmV0dXJuIDA7Cit9CisKK3ZvaWQgUmVuZGVyVGhlbWVHdGs6 OmFkanVzdFByb2dyZXNzQmFyU3R5bGUoQ1NTU3R5bGVTZWxlY3RvciosIFJlbmRlclN0eWxlKiBz dHlsZSwgRWxlbWVudCopIGNvbnN0Cit7CisgICAgc3R5bGUtPnNldEJveFNoYWRvdygwKTsKK30K KworYm9vbCBSZW5kZXJUaGVtZUd0azo6cGFpbnRQcm9ncmVzc0JhcihSZW5kZXJPYmplY3QqIHJl bmRlck9iamVjdCwgY29uc3QgUmVuZGVyT2JqZWN0OjpQYWludEluZm8mIHBhaW50SW5mbywgY29u c3QgSW50UmVjdCYgcmVjdCkKK3sKKyAgICBpZiAoIXJlbmRlck9iamVjdC0+aXNQcm9ncmVzcygp KQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIEd0a1dpZGdldCogcHJvZ3Jlc3NCYXJXaWRn ZXQgPSBtb3pfZ3RrX2dldF9wcm9ncmVzc193aWRnZXQoKTsKKyAgICBpZiAoIXByb2dyZXNzQmFy V2lkZ2V0KQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIGlmIChwYWludE1vemlsbGFHdGtX aWRnZXQodGhpcywgTU9aX0dUS19QUk9HUkVTU0JBUiwgcmVuZGVyT2JqZWN0LCBwYWludEluZm8s IHJlY3QpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIEludFJlY3QgY2h1bmtSZWN0KHJl Y3QpOworICAgIFJlbmRlclByb2dyZXNzKiByZW5kZXJQcm9ncmVzcyA9IHRvUmVuZGVyUHJvZ3Jl c3MocmVuZGVyT2JqZWN0KTsKKworICAgIEd0a1N0eWxlKiBzdHlsZSA9IGd0a193aWRnZXRfZ2V0 X3N0eWxlKHByb2dyZXNzQmFyV2lkZ2V0KTsKKyAgICBjaHVua1JlY3Quc2V0SGVpZ2h0KGNodW5r UmVjdC5oZWlnaHQoKSAtICgyICogc3R5bGUtPnl0aGlja25lc3MpKTsKKyAgICBjaHVua1JlY3Qu c2V0WShjaHVua1JlY3QueSgpICsgc3R5bGUtPnl0aGlja25lc3MpOworICAgIGNodW5rUmVjdC5z ZXRXaWR0aChjaHVua1JlY3Qud2lkdGgoKSAtICgyICogc3R5bGUtPnh0aGlja25lc3MpKTsKKyAg ICBjaHVua1JlY3Quc2V0V2lkdGgoKChmbG9hdCkgY2h1bmtSZWN0LndpZHRoKCkpICogcmVuZGVy UHJvZ3Jlc3MtPnBvc2l0aW9uKCkpOworICAgIGlmIChyZW5kZXJPYmplY3QtPnN0eWxlKCktPmRp cmVjdGlvbigpID09IFJUTCkKKyAgICAgICAgY2h1bmtSZWN0LnNldFgocmVjdC54KCkgKyByZWN0 LndpZHRoKCkgLSBjaHVua1JlY3Qud2lkdGgoKSAtIHN0eWxlLT54dGhpY2tuZXNzKTsKKyAgICBl bHNlCisgICAgICAgIGNodW5rUmVjdC5zZXRYKGNodW5rUmVjdC54KCkgKyBzdHlsZS0+eHRoaWNr bmVzcyk7CisKKyAgICByZXR1cm4gcGFpbnRNb3ppbGxhR3RrV2lkZ2V0KHRoaXMsIE1PWl9HVEtf UFJPR1JFU1NfQ0hVTkssIHJlbmRlck9iamVjdCwgcGFpbnRJbmZvLCBjaHVua1JlY3QpOworfQor I2VuZGlmCisKIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1l R3RrLmggYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5oCmluZGV4IDQxYjUx OGU2YWZiYzMxZTNmMzhiMjAzNzE5ODUwYzBkZmVmOGEwZmUuLmEyMmNkZTQxNmU5NjBiZmFhZWQ3 ZGIzMzdiZmMxNWY5MDg0YzgzNjMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1Jl bmRlclRoZW1lR3RrLmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGsu aApAQCAtMTQxLDYgKzE0MSwxMyBAQCBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCBib29sIHBhaW50 TWVkaWFTbGlkZXJUaHVtYihSZW5kZXJPYmplY3QqLCBjb25zdCBSZW5kZXJPYmplY3Q6OlBhaW50 SW5mbyYsIGNvbnN0IEludFJlY3QmKTsKICNlbmRpZgogCisjaWYgRU5BQkxFKFBST0dSRVNTX1RB RykKKyAgICB2aXJ0dWFsIGRvdWJsZSBhbmltYXRpb25SZXBlYXRJbnRlcnZhbEZvclByb2dyZXNz QmFyKFJlbmRlclByb2dyZXNzKikgY29uc3Q7CisgICAgdmlydHVhbCBkb3VibGUgYW5pbWF0aW9u RHVyYXRpb25Gb3JQcm9ncmVzc0JhcihSZW5kZXJQcm9ncmVzcyopIGNvbnN0OworICAgIHZpcnR1 YWwgdm9pZCBhZGp1c3RQcm9ncmVzc0JhclN0eWxlKENTU1N0eWxlU2VsZWN0b3IqLCBSZW5kZXJT dHlsZSosIEVsZW1lbnQqKSBjb25zdDsKKyAgICB2aXJ0dWFsIGJvb2wgcGFpbnRQcm9ncmVzc0Jh cihSZW5kZXJPYmplY3QqLCBjb25zdCBSZW5kZXJPYmplY3Q6OlBhaW50SW5mbyYsIGNvbnN0IElu dFJlY3QmKTsKKyNlbmRpZgorCiBwcml2YXRlOgogICAgIC8qCiAgICAgICogaG9sZCB0aGUgc3Rh dGUKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL2d0azJkcmF3aW5nLmMgYi9XZWJD b3JlL3BsYXRmb3JtL2d0ay9ndGsyZHJhd2luZy5jCmluZGV4IGFiYWFkNGEzMDQ2ZGY4ZGMxMDU0 YzlhOGQ5ZDdkYzg2MWVhMjIwMDcuLjgwZTJjMmFlNjVkMWVhMzhjMWY5Y2YzZGMwODIyZTI4ZmRi NTNkMTkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL2d0azJkcmF3aW5nLmMKKysr IGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvZ3RrMmRyYXdpbmcuYwpAQCAtMzMwNiwzICszMzA2LDEx IEBAIHZvaWQgbW96X2d0a19kZXN0cm95X3RoZW1lX3BhcnRzX3dpZGdldHMoR3RrVGhlbWVQYXJ0 cyogcGFydHMpCiAgICAgICAgIHBhcnRzLT5wcm90b1dpbmRvdyA9IE5VTEw7CiAgICAgfQogfQor CitHdGtXaWRnZXQqIG1vel9ndGtfZ2V0X3Byb2dyZXNzX3dpZGdldCgpCit7CisgICAgaWYgKCFp c19pbml0aWFsaXplZCkKKyAgICAgICAgcmV0dXJuIE5VTEw7CisgICAgZW5zdXJlX3Byb2dyZXNz X3dpZGdldCgpOworICAgIHJldHVybiBnUGFydHMtPnByb2dyZXNXaWRnZXQ7Cit9CmRpZmYgLS1n aXQgYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9ndGtkcmF3aW5nLmggYi9XZWJDb3JlL3BsYXRmb3Jt L2d0ay9ndGtkcmF3aW5nLmgKaW5kZXggMWU5MDIzZjhiMGMzZDlhZTA2MjFmYzY1NGYyMTU5YWZh YTY3ZDE2NC4uYjVhN2ZlYjI0YTY0NmY0ZDYwMTQ4ZmQ2NDRiMDUwYjAyN2RlNWNjOCAxMDA2NDQK LS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvZ3RrZHJhd2luZy5oCisrKyBiL1dlYkNvcmUvcGxh dGZvcm0vZ3RrL2d0a2RyYXdpbmcuaApAQCAtNDg1LDYgKzQ4NSwxMiBAQCBnaW50IG1vel9ndGtf Z2V0X3RhYl90aGlja25lc3Modm9pZCk7CiAgKi8KIGdib29sZWFuIG1vel9ndGtfaW1hZ2VzX2lu X21lbnVzKHZvaWQpOwogCisvKioKKyAqIFJldHJpZXZlIGFuIGFjdHVhbCBHVEsgcHJvZ3Jlc3Mg YmFyIHdpZGdldCBmb3Igc3R5bGUgYW5hbHlzaXMuIEl0IHdpbGwgbm90CisgKiBiZSBtb2RpZmll ZC4KKyAqLworR3RrV2lkZ2V0KiBtb3pfZ3RrX2dldF9wcm9ncmVzc193aWRnZXQodm9pZCk7CisK ICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2VuZGlmIC8qIF9fY3BsdXNwbHVzICovCg==