64897 2011-07-20 15:16:30 -0700 Minimum Row Height For PopupListBoxes should platform-dependent 2011-07-27 20:56:24 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 fsamuel webkit-unassigned dglazkov fishd jamesr rjkroege webkit.review.bot oldest_to_newest 440056 0 fsamuel 2011-07-20 15:16:30 -0700 This defaults to zero for all but certain Chromium Linux platforms. 440059 1 101519 fsamuel 2011-07-20 15:18:04 -0700 Created attachment 101519 This changes behavior only on certain Chromium Linux platforms. 440061 2 webkit.review.bot 2011-07-20 15:21:19 -0700 Attachment 101519 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/platform/chromium/PlatformB..." exit_code: 1 Source/WebCore/rendering/RenderThemeChromiumLinux.cpp:160: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 440063 3 101521 fsamuel 2011-07-20 15:32:11 -0700 Created attachment 101521 Fixed a small style issue 440081 4 101521 jamesr 2011-07-20 15:57:06 -0700 Comment on attachment 101521 Fixed a small style issue View in context: https://bugs.webkit.org/attachment.cgi?id=101521&action=review > Source/WebCore/platform/chromium/PlatformBridge.h:401 > + static int getPopupListBoxMinimumRowHeight(); we don't prefix getters with "get" in WebKit > Source/WebCore/platform/chromium/PopupMenuChromium.cpp:1179 > + int minimumHeight = RenderTheme::defaultTheme()->popupListBoxMinimumRowHeight(); > + why don't you just ask PlatformBridge for the minimum row height here? > Source/WebCore/rendering/RenderTheme.h:170 > + virtual int popupListBoxMinimumRowHeight() const { return 0; } this doesn't seem necessary 440581 5 101521 fsamuel 2011-07-21 12:40:50 -0700 Comment on attachment 101521 Fixed a small style issue View in context: https://bugs.webkit.org/attachment.cgi?id=101521&action=review >> Source/WebCore/platform/chromium/PlatformBridge.h:401 >> + static int getPopupListBoxMinimumRowHeight(); > > we don't prefix getters with "get" in WebKit But using 'get' is consistent with getThemePartSize in the same file. Is this also incorrect? >> Source/WebCore/platform/chromium/PopupMenuChromium.cpp:1179 >> + > > why don't you just ask PlatformBridge for the minimum row height here? Done. >> Source/WebCore/rendering/RenderTheme.h:170 >> + virtual int popupListBoxMinimumRowHeight() const { return 0; } > > this doesn't seem necessary Removed. 440584 6 101630 fsamuel 2011-07-21 12:43:17 -0700 Created attachment 101630 Fixed a couple of style issues as suggested by jamesr 440588 7 101632 fsamuel 2011-07-21 12:47:07 -0700 Created attachment 101632 Uploaded previous file in incorrect format 440612 8 101632 jamesr 2011-07-21 13:17:03 -0700 Comment on attachment 101632 Uploaded previous file in incorrect format View in context: https://bugs.webkit.org/attachment.cgi?id=101632&action=review > Source/WebCore/platform/chromium/PlatformBridge.h:401 > + static int getPopupListBoxMinimumRowHeight(); style nit: we don't use "get" for getters in WebKit. 440619 9 101640 fsamuel 2011-07-21 13:33:13 -0700 Created attachment 101640 Got rid of use of 'get' 440621 10 101640 jamesr 2011-07-21 13:36:40 -0700 Comment on attachment 101640 Got rid of use of 'get' OK 440641 11 101640 webkit.review.bot 2011-07-21 14:41:14 -0700 Comment on attachment 101640 Got rid of use of 'get' Attachment 101640 did not pass cr-mac-ews (chromium): Output: http://queues.webkit.org/results/9200814 440644 12 101640 jamesr 2011-07-21 14:44:12 -0700 Comment on attachment 101640 Got rid of use of 'get' Thanks, EWS bot! You need a definition+declaration of WebThemeEngine::popupListBoxMinimumRowHeight() to exist for each platform. 440969 13 101640 fishd 2011-07-22 08:50:15 -0700 Comment on attachment 101640 Got rid of use of 'get' View in context: https://bugs.webkit.org/attachment.cgi?id=101640&action=review > Source/WebKit/chromium/public/linux/WebThemeEngine.h:150 > + virtual int popupListBoxMinimumRowHeight() const { return 0; } is this really a property of a theme engine? often rendering style is pushed down to webkit. maybe you should just have a static setter on WebPopupMenu for this? put another way, does it really need to be dynamically determined? does it depend on a native theme engine like uxtheme.dll or the gtk theme engine? 440973 14 fishd 2011-07-22 08:52:03 -0700 Examples: WebView::setScrollbarColors WebView::setSelectionColors Other examples: WebSettings 440974 15 fsamuel 2011-07-22 09:01:26 -0700 (In reply to comment #13) > (From update of attachment 101640 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=101640&action=review > > > Source/WebKit/chromium/public/linux/WebThemeEngine.h:150 > > + virtual int popupListBoxMinimumRowHeight() const { return 0; } > > is this really a property of a theme engine? often rendering style is pushed down to webkit. > maybe you should just have a static setter on WebPopupMenu for this? put another way, does > it really need to be dynamically determined? does it depend on a native theme engine like > uxtheme.dll or the gtk theme engine? The size of hit targets for popup items can vary on certain Chromium platforms. 441062 16 fsamuel 2011-07-22 11:51:23 -0700 (In reply to comment #15) > (In reply to comment #13) > > (From update of attachment 101640 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=101640&action=review > > > > > Source/WebKit/chromium/public/linux/WebThemeEngine.h:150 > > > + virtual int popupListBoxMinimumRowHeight() const { return 0; } > > > > is this really a property of a theme engine? often rendering style is pushed down to webkit. > > maybe you should just have a static setter on WebPopupMenu for this? put another way, does > > it really need to be dynamically determined? does it depend on a native theme engine like > > uxtheme.dll or the gtk theme engine? > > The size of hit targets for popup items can vary on certain Chromium platforms. I will give this another approach. Since this is chromium-specific functionality 441231 17 101782 fsamuel 2011-07-22 15:43:50 -0700 Created attachment 101782 Another approach as suggested by fishd 441232 18 webkit.review.bot 2011-07-22 15:47:50 -0700 Attachment 101782 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/platform/chromium/PopupMenu..." exit_code: 1 Source/WebKit/chromium/public/WebWidget.h:129: Missing space inside { }. [whitespace/braces] [5] Source/WebKit/chromium/src/WebViewImpl.h:107: The parameter name "minimumRowHeight" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebCore/platform/chromium/PopupMenuChromium.h:178: The parameter name "popupType" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit/chromium/src/WebPopupMenuImpl.h:76: The parameter name "minimumRowHeight" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 4 in 10 files If any of these errors are false positives, please file a bug against check-webkit-style. 441656 19 101870 fsamuel 2011-07-25 08:08:17 -0700 Created attachment 101870 Fixed style 441804 20 101870 fishd 2011-07-25 12:51:03 -0700 Comment on attachment 101870 Fixed style View in context: https://bugs.webkit.org/attachment.cgi?id=101870&action=review > Source/WebKit/chromium/public/WebWidget.h:129 > + virtual void setPopupListBoxMinimumRowHeight(int minimumRowHeight) { } do you really need to make this widget-specific? it seems like it could just be a static function on WebPopupMenu that is implemented in terms of modifying a global variable stored in PopupMenuChromium. 441942 21 101933 fsamuel 2011-07-25 15:58:53 -0700 Created attachment 101933 Updated according to fishd 442586 22 101933 fishd 2011-07-26 15:49:51 -0700 Comment on attachment 101933 Updated according to fishd View in context: https://bugs.webkit.org/attachment.cgi?id=101933&action=review yeah, this is basically what i had in mind. one more round. > Source/WebKit/chromium/public/WebPopupMenu.h:44 > + // Sets the minimum height of a popup listbox row. nit: new line above this comment. > Source/WebKit/chromium/public/WebPopupMenu.h:45 > + WEBKIT_API static void setPopupListBoxMinimumRowHeight(int); nit: no need to repeat the word Popup. i'd probably just name this method setMinimumRowHeight since it should be obvious that this could only refer to the rows of the popup menu. 442608 23 102072 fsamuel 2011-07-26 16:22:58 -0700 Created attachment 102072 Fixed a couple of nits 442690 24 102072 webkit.review.bot 2011-07-26 18:50:36 -0700 Comment on attachment 102072 Fixed a couple of nits Rejecting attachment 102072 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=ec2-cq-02', '--port..." exit_code: 2 Last 500 characters of output: ommit message. All changes require a ChangeLog. See: http://webkit.org/coding/contributing.html Found no modified ChangeLogs, cannot create a commit message. All changes require a ChangeLog. See: http://webkit.org/coding/contributing.html Updating OpenSource Current branch master is up to date. Updating chromium port dependencies using gclient... ________ running '/usr/bin/python gyp_webkit' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' Updating webkit projects from gyp files... Full output: http://queues.webkit.org/results/9249630 442925 25 102144 fsamuel 2011-07-27 07:33:53 -0700 Created attachment 102144 Forgot to upload changelog along with patch 442927 26 webkit.review.bot 2011-07-27 07:36:11 -0700 Attachment 102144 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebKit/chromium/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Source/WebCore/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 2 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 442929 27 102145 fsamuel 2011-07-27 07:42:34 -0700 Created attachment 102145 Added the bug report link 443303 28 102145 webkit.review.bot 2011-07-27 20:56:15 -0700 Comment on attachment 102145 Added the bug report link Clearing flags on attachment: 102145 Committed r91896: <http://trac.webkit.org/changeset/91896> 443306 29 webkit.review.bot 2011-07-27 20:56:24 -0700 All reviewed patches have been landed. Closing bug. 101519 2011-07-20 15:18:04 -0700 2011-07-20 15:32:11 -0700 This changes behavior only on certain Chromium Linux platforms. webkitcombopatch text/plain 5402 fsamuel ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BsYXRmb3JtQnJp ZGdlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9QbGF0Zm9ybUJyaWRnZS5o CmluZGV4IGUwMWFlMjYuLjAzOTEzM2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2Nocm9taXVtL1BsYXRmb3JtQnJpZGdlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vY2hyb21pdW0vUGxhdGZvcm1CcmlkZ2UuaApAQCAtMzk3LDYgKzM5Nyw4IEBAIHB1YmxpYzoK ICAgICAvLyBQYWludCB0aGUgZ2l2ZW4gdGhlIGdpdmVuIHRoZW1lIHBhcnQuCiAgICAgc3RhdGlj IHZvaWQgcGFpbnRUaGVtZVBhcnQoR3JhcGhpY3NDb250ZXh0KiwgVGhlbWVQYXJ0LCBUaGVtZVBh aW50U3RhdGUsIGNvbnN0IEludFJlY3QmLCBjb25zdCBUaGVtZVBhaW50RXh0cmFQYXJhbXMqKTsK ICNlbmRpZgorICAgIC8vIEdldCB0aGUgbWluaW11bSByb3cgaGVpZ2h0IGZvciBwb3B1cCBsaXN0 Ym94ZXMuCisgICAgc3RhdGljIGludCBnZXRQb3B1cExpc3RCb3hNaW5pbXVtUm93SGVpZ2h0KCk7 CiAKICAgICAvLyBUcmFjZSBFdmVudCAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogICAgIHN0YXRpYyB2b2lkIHRyYWNlRXZlbnRCZWdpbihj b25zdCBjaGFyKiBuYW1lLCB2b2lkKiwgY29uc3QgY2hhciogZXh0cmEpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uY3BwCmlu ZGV4IDYyOGI5MTkuLjc4MjE0NDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHAKQEAgLTExNzUsMTUgKzExNzUsMTcg QEAgdm9pZCBQb3B1cExpc3RCb3g6OnNldE9yaWdpbmFsSW5kZXgoaW50IGluZGV4KQogCiBpbnQg UG9wdXBMaXN0Qm94OjpnZXRSb3dIZWlnaHQoaW50IGluZGV4KQogeworICAgIGludCBtaW5pbXVt SGVpZ2h0ID0gUmVuZGVyVGhlbWU6OmRlZmF1bHRUaGVtZSgpLT5wb3B1cExpc3RCb3hNaW5pbXVt Um93SGVpZ2h0KCk7CisKICAgICBpZiAoaW5kZXggPCAwKQotICAgICAgICByZXR1cm4gMDsKKyAg ICAgICAgcmV0dXJuIG1pbmltdW1IZWlnaHQ7CiAKICAgICBpZiAobV9wb3B1cENsaWVudC0+aXRl bVN0eWxlKGluZGV4KS5pc0Rpc3BsYXlOb25lKCkpCi0gICAgICAgIHJldHVybiAwOworICAgICAg ICByZXR1cm4gbWluaW11bUhlaWdodDsKIAogICAgIC8vIFNlcGFyYXRvciByb3cgaGVpZ2h0IGlz IHRoZSBzYW1lIHNpemUgYXMgaXRzZWxmLgogICAgIGlmIChtX3BvcHVwQ2xpZW50LT5pdGVtSXNT ZXBhcmF0b3IoaW5kZXgpKQotICAgICAgICByZXR1cm4gc2VwYXJhdG9ySGVpZ2h0OworICAgICAg ICByZXR1cm4gbWF4KHNlcGFyYXRvckhlaWdodCwgbWluaW11bUhlaWdodCk7CiAKICAgICBTdHJp bmcgaWNvbiA9IG1fcG9wdXBDbGllbnQtPml0ZW1JY29uKGluZGV4KTsKICAgICBSZWZQdHI8SW1h Z2U+IGltYWdlKEltYWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJjZShpY29uLnV0ZjgoKS5kYXRhKCkp KTsKQEAgLTExOTIsNyArMTE5NCw4IEBAIGludCBQb3B1cExpc3RCb3g6OmdldFJvd0hlaWdodChp bnQgaW5kZXgpCiAgICAgaW50IGljb25IZWlnaHQgPSAoaW1hZ2UgJiYgIWltYWdlLT5pc051bGwo KSkgPyBpbWFnZS0+cmVjdCgpLmhlaWdodCgpIDogMDsKIAogICAgIGludCBsaW5lUGFkZGluZ0hl aWdodCA9IG1fcG9wdXBDbGllbnQtPm1lbnVTdHlsZSgpLm1lbnVUeXBlKCkgPT0gUG9wdXBNZW51 U3R5bGU6OkF1dG9maWxsUG9wdXAgPyBrTGluZVBhZGRpbmdIZWlnaHQgOiAwOwotICAgIHJldHVy biBtYXgoZm9udEhlaWdodCwgaWNvbkhlaWdodCkgKyBsaW5lUGFkZGluZ0hlaWdodCAqIDI7Cisg ICAgaW50IGNhbGN1bGF0ZWRSb3dIZWlnaHQgPSBtYXgoZm9udEhlaWdodCwgaWNvbkhlaWdodCkg KyBsaW5lUGFkZGluZ0hlaWdodCAqIDI7CisgICAgcmV0dXJuIG1heChjYWxjdWxhdGVkUm93SGVp Z2h0LCBtaW5pbXVtSGVpZ2h0KTsKIH0KIAogSW50UmVjdCBQb3B1cExpc3RCb3g6OmdldFJvd0Jv dW5kcyhpbnQgaW5kZXgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGhlbWUuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5oCmluZGV4 IDM4ZTliNzYuLmE4OTMxOWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJUaGVtZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5o CkBAIC0xNjcsNiArMTY3LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgaW50IHBvcHVwSW50ZXJu YWxQYWRkaW5nVG9wKFJlbmRlclN0eWxlKikgY29uc3QgeyByZXR1cm4gMDsgfQogICAgIHZpcnR1 YWwgaW50IHBvcHVwSW50ZXJuYWxQYWRkaW5nQm90dG9tKFJlbmRlclN0eWxlKikgY29uc3QgeyBy ZXR1cm4gMDsgfQogICAgIHZpcnR1YWwgYm9vbCBwb3B1cE9wdGlvblN1cHBvcnRzVGV4dEluZGVu dCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CisgICAgdmlydHVhbCBpbnQgcG9wdXBMaXN0Qm94 TWluaW11bVJvd0hlaWdodCgpIGNvbnN0IHsgcmV0dXJuIDA7IH0KIAogICAgIHZpcnR1YWwgU2Ny b2xsYmFyQ29udHJvbFNpemUgc2Nyb2xsYmFyQ29udHJvbFNpemVGb3JQYXJ0KENvbnRyb2xQYXJ0 KSB7IHJldHVybiBSZWd1bGFyU2Nyb2xsYmFyOyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtTGludXguY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1MaW51eC5jcHAKaW5kZXggZDM5OTExYi4u NGY4NGQ1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1l Q2hyb21pdW1MaW51eC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRo ZW1lQ2hyb21pdW1MaW51eC5jcHAKQEAgLTE1Nyw2ICsxNTcsMTAgQEAgdm9pZCBSZW5kZXJUaGVt ZUNocm9taXVtTGludXg6OmFkanVzdFNsaWRlclRodW1iU2l6ZShSZW5kZXJTdHlsZSogc3R5bGUp IGNvbnN0CiAgICAgICAgIFJlbmRlclRoZW1lQ2hyb21pdW1Ta2lhOjphZGp1c3RTbGlkZXJUaHVt YlNpemUoc3R5bGUpOwogfQogCitpbnQgUmVuZGVyVGhlbWVDaHJvbWl1bUxpbnV4Ojpwb3B1cExp c3RCb3hNaW5pbXVtUm93SGVpZ2h0KCkgY29uc3QgeworICAgIHJldHVybiBQbGF0Zm9ybUJyaWRn ZTo6Z2V0UG9wdXBMaXN0Qm94TWluaW11bVJvd0hlaWdodCgpOworfQorCiBib29sIFJlbmRlclRo ZW1lQ2hyb21pdW1MaW51eDo6c3VwcG9ydHNDb250cm9sVGludHMoKSBjb25zdAogewogICAgIHJl dHVybiB0cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRo ZW1lQ2hyb21pdW1MaW51eC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1l Q2hyb21pdW1MaW51eC5oCmluZGV4IDA5OTAwMWQuLjllOTM5YWQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtTGludXguaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bUxpbnV4LmgKQEAgLTU2LDYg KzU2LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgICAgIHZpcnR1YWwgdm9pZCBhZGp1 c3RTbGlkZXJUaHVtYlNpemUoUmVuZGVyU3R5bGUqKSBjb25zdDsKIAorICAgICAgICB2aXJ0dWFs IGludCBwb3B1cExpc3RCb3hNaW5pbXVtUm93SGVpZ2h0KCkgY29uc3Q7CisKICAgICAgICAgc3Rh dGljIHZvaWQgc2V0Q2FyZXRCbGlua0ludGVydmFsKGRvdWJsZSBpbnRlcnZhbCk7CiAgICAgICAg IHZpcnR1YWwgZG91YmxlIGNhcmV0QmxpbmtJbnRlcnZhbEludGVybmFsKCkgY29uc3Q7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL2xpbnV4L1dlYlRoZW1lRW5n aW5lLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9saW51eC9XZWJUaGVtZUVuZ2lu ZS5oCmluZGV4IGNjNDc0MjguLjc5ZmFlMTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vcHVibGljL2xpbnV4L1dlYlRoZW1lRW5naW5lLmgKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvbGludXgvV2ViVGhlbWVFbmdpbmUuaApAQCAtMTQ2LDYgKzE0Niw4IEBA IHB1YmxpYzoKICAgICAvLyBQYWludCB0aGUgZ2l2ZW4gdGhlIGdpdmVuIHRoZW1lIHBhcnQuCiAg ICAgdmlydHVhbCB2b2lkIHBhaW50KAogICAgICAgICBXZWJDYW52YXMqLCBQYXJ0LCBTdGF0ZSwg Y29uc3QgV2ViUmVjdCYsIGNvbnN0IEV4dHJhUGFyYW1zKikge30KKyAgICAvLyBHZXQgdGhlIG1p bmltdW0gcm93IGhlaWdodCBmb3IgcG9wdXAgbGlzdGJveGVzLgorICAgIHZpcnR1YWwgaW50IGdl dFBvcHVwTGlzdEJveE1pbmltdW1Sb3dIZWlnaHQoKSBjb25zdCB7IHJldHVybiAwOyB9CiB9Owog CiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL1BsYXRmb3JtQnJpZGdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1Bs YXRmb3JtQnJpZGdlLmNwcAppbmRleCAxMWQ5YmNiLi4yNGVhZjRlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9QbGF0Zm9ybUJyaWRnZS5jcHAKKysrIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1CcmlkZ2UuY3BwCkBAIC05MjIsNiArOTIyLDEzIEBA IHZvaWQgUGxhdGZvcm1CcmlkZ2U6OnBhaW50VGhlbWVQYXJ0KAogCiAjZW5kaWYKIAorLy8gUG9w dXAgTGlzdGJveCAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLQorCitpbnQgUGxhdGZvcm1CcmlkZ2U6OmdldFBvcHVwTGlzdEJveE1p bmltdW1Sb3dIZWlnaHQoKQoreworICAgICByZXR1cm4gd2ViS2l0Q2xpZW50KCktPnRoZW1lRW5n aW5lKCktPmdldFBvcHVwTGlzdEJveE1pbmltdW1Sb3dIZWlnaHQoKTsKK30KKwogLy8gVHJhY2Ug RXZlbnQgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLQogCiB2b2lkIFBsYXRmb3JtQnJpZGdlOjp0cmFjZUV2ZW50QmVnaW4oY29u c3QgY2hhciogbmFtZSwgdm9pZCogaWQsIGNvbnN0IGNoYXIqIGV4dHJhKQo= 101521 2011-07-20 15:32:11 -0700 2011-07-21 12:43:17 -0700 Fixed a small style issue webkitcombopatch text/plain 5403 fsamuel ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BsYXRmb3JtQnJp ZGdlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9QbGF0Zm9ybUJyaWRnZS5o CmluZGV4IGUwMWFlMjYuLjAzOTEzM2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2Nocm9taXVtL1BsYXRmb3JtQnJpZGdlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vY2hyb21pdW0vUGxhdGZvcm1CcmlkZ2UuaApAQCAtMzk3LDYgKzM5Nyw4IEBAIHB1YmxpYzoK ICAgICAvLyBQYWludCB0aGUgZ2l2ZW4gdGhlIGdpdmVuIHRoZW1lIHBhcnQuCiAgICAgc3RhdGlj IHZvaWQgcGFpbnRUaGVtZVBhcnQoR3JhcGhpY3NDb250ZXh0KiwgVGhlbWVQYXJ0LCBUaGVtZVBh aW50U3RhdGUsIGNvbnN0IEludFJlY3QmLCBjb25zdCBUaGVtZVBhaW50RXh0cmFQYXJhbXMqKTsK ICNlbmRpZgorICAgIC8vIEdldCB0aGUgbWluaW11bSByb3cgaGVpZ2h0IGZvciBwb3B1cCBsaXN0 Ym94ZXMuCisgICAgc3RhdGljIGludCBnZXRQb3B1cExpc3RCb3hNaW5pbXVtUm93SGVpZ2h0KCk7 CiAKICAgICAvLyBUcmFjZSBFdmVudCAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogICAgIHN0YXRpYyB2b2lkIHRyYWNlRXZlbnRCZWdpbihj b25zdCBjaGFyKiBuYW1lLCB2b2lkKiwgY29uc3QgY2hhciogZXh0cmEpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uY3BwCmlu ZGV4IDYyOGI5MTkuLjc4MjE0NDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHAKQEAgLTExNzUsMTUgKzExNzUsMTcg QEAgdm9pZCBQb3B1cExpc3RCb3g6OnNldE9yaWdpbmFsSW5kZXgoaW50IGluZGV4KQogCiBpbnQg UG9wdXBMaXN0Qm94OjpnZXRSb3dIZWlnaHQoaW50IGluZGV4KQogeworICAgIGludCBtaW5pbXVt SGVpZ2h0ID0gUmVuZGVyVGhlbWU6OmRlZmF1bHRUaGVtZSgpLT5wb3B1cExpc3RCb3hNaW5pbXVt Um93SGVpZ2h0KCk7CisKICAgICBpZiAoaW5kZXggPCAwKQotICAgICAgICByZXR1cm4gMDsKKyAg ICAgICAgcmV0dXJuIG1pbmltdW1IZWlnaHQ7CiAKICAgICBpZiAobV9wb3B1cENsaWVudC0+aXRl bVN0eWxlKGluZGV4KS5pc0Rpc3BsYXlOb25lKCkpCi0gICAgICAgIHJldHVybiAwOworICAgICAg ICByZXR1cm4gbWluaW11bUhlaWdodDsKIAogICAgIC8vIFNlcGFyYXRvciByb3cgaGVpZ2h0IGlz IHRoZSBzYW1lIHNpemUgYXMgaXRzZWxmLgogICAgIGlmIChtX3BvcHVwQ2xpZW50LT5pdGVtSXNT ZXBhcmF0b3IoaW5kZXgpKQotICAgICAgICByZXR1cm4gc2VwYXJhdG9ySGVpZ2h0OworICAgICAg ICByZXR1cm4gbWF4KHNlcGFyYXRvckhlaWdodCwgbWluaW11bUhlaWdodCk7CiAKICAgICBTdHJp bmcgaWNvbiA9IG1fcG9wdXBDbGllbnQtPml0ZW1JY29uKGluZGV4KTsKICAgICBSZWZQdHI8SW1h Z2U+IGltYWdlKEltYWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJjZShpY29uLnV0ZjgoKS5kYXRhKCkp KTsKQEAgLTExOTIsNyArMTE5NCw4IEBAIGludCBQb3B1cExpc3RCb3g6OmdldFJvd0hlaWdodChp bnQgaW5kZXgpCiAgICAgaW50IGljb25IZWlnaHQgPSAoaW1hZ2UgJiYgIWltYWdlLT5pc051bGwo KSkgPyBpbWFnZS0+cmVjdCgpLmhlaWdodCgpIDogMDsKIAogICAgIGludCBsaW5lUGFkZGluZ0hl aWdodCA9IG1fcG9wdXBDbGllbnQtPm1lbnVTdHlsZSgpLm1lbnVUeXBlKCkgPT0gUG9wdXBNZW51 U3R5bGU6OkF1dG9maWxsUG9wdXAgPyBrTGluZVBhZGRpbmdIZWlnaHQgOiAwOwotICAgIHJldHVy biBtYXgoZm9udEhlaWdodCwgaWNvbkhlaWdodCkgKyBsaW5lUGFkZGluZ0hlaWdodCAqIDI7Cisg ICAgaW50IGNhbGN1bGF0ZWRSb3dIZWlnaHQgPSBtYXgoZm9udEhlaWdodCwgaWNvbkhlaWdodCkg KyBsaW5lUGFkZGluZ0hlaWdodCAqIDI7CisgICAgcmV0dXJuIG1heChjYWxjdWxhdGVkUm93SGVp Z2h0LCBtaW5pbXVtSGVpZ2h0KTsKIH0KIAogSW50UmVjdCBQb3B1cExpc3RCb3g6OmdldFJvd0Jv dW5kcyhpbnQgaW5kZXgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGhlbWUuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5oCmluZGV4 IDM4ZTliNzYuLmE4OTMxOWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJUaGVtZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5o CkBAIC0xNjcsNiArMTY3LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgaW50IHBvcHVwSW50ZXJu YWxQYWRkaW5nVG9wKFJlbmRlclN0eWxlKikgY29uc3QgeyByZXR1cm4gMDsgfQogICAgIHZpcnR1 YWwgaW50IHBvcHVwSW50ZXJuYWxQYWRkaW5nQm90dG9tKFJlbmRlclN0eWxlKikgY29uc3QgeyBy ZXR1cm4gMDsgfQogICAgIHZpcnR1YWwgYm9vbCBwb3B1cE9wdGlvblN1cHBvcnRzVGV4dEluZGVu dCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CisgICAgdmlydHVhbCBpbnQgcG9wdXBMaXN0Qm94 TWluaW11bVJvd0hlaWdodCgpIGNvbnN0IHsgcmV0dXJuIDA7IH0KIAogICAgIHZpcnR1YWwgU2Ny b2xsYmFyQ29udHJvbFNpemUgc2Nyb2xsYmFyQ29udHJvbFNpemVGb3JQYXJ0KENvbnRyb2xQYXJ0 KSB7IHJldHVybiBSZWd1bGFyU2Nyb2xsYmFyOyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtTGludXguY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1MaW51eC5jcHAKaW5kZXggZDM5OTExYi4u YTYwMGI1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1l Q2hyb21pdW1MaW51eC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRo ZW1lQ2hyb21pdW1MaW51eC5jcHAKQEAgLTE1Nyw2ICsxNTcsMTEgQEAgdm9pZCBSZW5kZXJUaGVt ZUNocm9taXVtTGludXg6OmFkanVzdFNsaWRlclRodW1iU2l6ZShSZW5kZXJTdHlsZSogc3R5bGUp IGNvbnN0CiAgICAgICAgIFJlbmRlclRoZW1lQ2hyb21pdW1Ta2lhOjphZGp1c3RTbGlkZXJUaHVt YlNpemUoc3R5bGUpOwogfQogCitpbnQgUmVuZGVyVGhlbWVDaHJvbWl1bUxpbnV4Ojpwb3B1cExp c3RCb3hNaW5pbXVtUm93SGVpZ2h0KCkgY29uc3QKK3sKKyAgICByZXR1cm4gUGxhdGZvcm1Ccmlk Z2U6OmdldFBvcHVwTGlzdEJveE1pbmltdW1Sb3dIZWlnaHQoKTsKK30KKwogYm9vbCBSZW5kZXJU aGVtZUNocm9taXVtTGludXg6OnN1cHBvcnRzQ29udHJvbFRpbnRzKCkgY29uc3QKIHsKICAgICBy ZXR1cm4gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU aGVtZUNocm9taXVtTGludXguaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVt ZUNocm9taXVtTGludXguaAppbmRleCAwOTkwMDFkLi45ZTkzOWFkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bUxpbnV4LmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1MaW51eC5oCkBAIC01Niw2 ICs1Niw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICB2aXJ0dWFsIHZvaWQgYWRq dXN0U2xpZGVyVGh1bWJTaXplKFJlbmRlclN0eWxlKikgY29uc3Q7CiAKKyAgICAgICAgdmlydHVh bCBpbnQgcG9wdXBMaXN0Qm94TWluaW11bVJvd0hlaWdodCgpIGNvbnN0OworCiAgICAgICAgIHN0 YXRpYyB2b2lkIHNldENhcmV0QmxpbmtJbnRlcnZhbChkb3VibGUgaW50ZXJ2YWwpOwogICAgICAg ICB2aXJ0dWFsIGRvdWJsZSBjYXJldEJsaW5rSW50ZXJ2YWxJbnRlcm5hbCgpIGNvbnN0OwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9saW51eC9XZWJUaGVtZUVu Z2luZS5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvbGludXgvV2ViVGhlbWVFbmdp bmUuaAppbmRleCBjYzQ3NDI4Li43OWZhZTEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3B1YmxpYy9saW51eC9XZWJUaGVtZUVuZ2luZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vcHVibGljL2xpbnV4L1dlYlRoZW1lRW5naW5lLmgKQEAgLTE0Niw2ICsxNDYsOCBA QCBwdWJsaWM6CiAgICAgLy8gUGFpbnQgdGhlIGdpdmVuIHRoZSBnaXZlbiB0aGVtZSBwYXJ0Lgog ICAgIHZpcnR1YWwgdm9pZCBwYWludCgKICAgICAgICAgV2ViQ2FudmFzKiwgUGFydCwgU3RhdGUs IGNvbnN0IFdlYlJlY3QmLCBjb25zdCBFeHRyYVBhcmFtcyopIHt9CisgICAgLy8gR2V0IHRoZSBt aW5pbXVtIHJvdyBoZWlnaHQgZm9yIHBvcHVwIGxpc3Rib3hlcy4KKyAgICB2aXJ0dWFsIGludCBn ZXRQb3B1cExpc3RCb3hNaW5pbXVtUm93SGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gMDsgfQogfTsK IAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9QbGF0Zm9ybUJyaWRnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Q bGF0Zm9ybUJyaWRnZS5jcHAKaW5kZXggMTFkOWJjYi4uMjRlYWY0ZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1CcmlkZ2UuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1BsYXRmb3JtQnJpZGdlLmNwcApAQCAtOTIyLDYgKzkyMiwxMyBA QCB2b2lkIFBsYXRmb3JtQnJpZGdlOjpwYWludFRoZW1lUGFydCgKIAogI2VuZGlmCiAKKy8vIFBv cHVwIExpc3Rib3ggLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0KKworaW50IFBsYXRmb3JtQnJpZGdlOjpnZXRQb3B1cExpc3RCb3hN aW5pbXVtUm93SGVpZ2h0KCkKK3sKKyAgICAgcmV0dXJuIHdlYktpdENsaWVudCgpLT50aGVtZUVu Z2luZSgpLT5nZXRQb3B1cExpc3RCb3hNaW5pbXVtUm93SGVpZ2h0KCk7Cit9CisKIC8vIFRyYWNl IEV2ZW50IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0KIAogdm9pZCBQbGF0Zm9ybUJyaWRnZTo6dHJhY2VFdmVudEJlZ2luKGNv bnN0IGNoYXIqIG5hbWUsIHZvaWQqIGlkLCBjb25zdCBjaGFyKiBleHRyYSkK 101630 2011-07-21 12:43:17 -0700 2011-07-21 12:47:07 -0700 Fixed a couple of style issues as suggested by jamesr webkitcombopatch application/octet-stream 3744 fsamuel ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BsYXRmb3JtQnJp ZGdlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9QbGF0Zm9ybUJyaWRnZS5o CmluZGV4IGUwMWFlMjYuLjAzOTEzM2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2Nocm9taXVtL1BsYXRmb3JtQnJpZGdlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vY2hyb21pdW0vUGxhdGZvcm1CcmlkZ2UuaApAQCAtMzk3LDYgKzM5Nyw4IEBAIHB1YmxpYzoK ICAgICAvLyBQYWludCB0aGUgZ2l2ZW4gdGhlIGdpdmVuIHRoZW1lIHBhcnQuCiAgICAgc3RhdGlj IHZvaWQgcGFpbnRUaGVtZVBhcnQoR3JhcGhpY3NDb250ZXh0KiwgVGhlbWVQYXJ0LCBUaGVtZVBh aW50U3RhdGUsIGNvbnN0IEludFJlY3QmLCBjb25zdCBUaGVtZVBhaW50RXh0cmFQYXJhbXMqKTsK ICNlbmRpZgorICAgIC8vIEdldCB0aGUgbWluaW11bSByb3cgaGVpZ2h0IGZvciBwb3B1cCBsaXN0 Ym94ZXMuCisgICAgc3RhdGljIGludCBnZXRQb3B1cExpc3RCb3hNaW5pbXVtUm93SGVpZ2h0KCk7 CiAKICAgICAvLyBUcmFjZSBFdmVudCAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogICAgIHN0YXRpYyB2b2lkIHRyYWNlRXZlbnRCZWdpbihj b25zdCBjaGFyKiBuYW1lLCB2b2lkKiwgY29uc3QgY2hhciogZXh0cmEpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uY3BwCmlu ZGV4IDYyOGI5MTkuLjdjYzc0YzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHAKQEAgLTQ0LDYgKzQ0LDcgQEAKICNp bmNsdWRlICJJbnRSZWN0LmgiCiAjaW5jbHVkZSAiS2V5Ym9hcmRDb2Rlcy5oIgogI2luY2x1ZGUg IlBhZ2UuaCIKKyNpbmNsdWRlICJQbGF0Zm9ybUJyaWRnZS5oIgogI2luY2x1ZGUgIlBsYXRmb3Jt S2V5Ym9hcmRFdmVudC5oIgogI2luY2x1ZGUgIlBsYXRmb3JtTW91c2VFdmVudC5oIgogI2luY2x1 ZGUgIlBsYXRmb3JtU2NyZWVuLmgiCkBAIC0xMTc1LDE1ICsxMTc2LDE3IEBAIHZvaWQgUG9wdXBM aXN0Qm94OjpzZXRPcmlnaW5hbEluZGV4KGludCBpbmRleCkKIAogaW50IFBvcHVwTGlzdEJveDo6 Z2V0Um93SGVpZ2h0KGludCBpbmRleCkKIHsKKyAgICBpbnQgbWluaW11bUhlaWdodCA9IFBsYXRm b3JtQnJpZGdlOjpnZXRQb3B1cExpc3RCb3hNaW5pbXVtUm93SGVpZ2h0KCk7CisKICAgICBpZiAo aW5kZXggPCAwKQotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG1pbmltdW1IZWln aHQ7CiAKICAgICBpZiAobV9wb3B1cENsaWVudC0+aXRlbVN0eWxlKGluZGV4KS5pc0Rpc3BsYXlO b25lKCkpCi0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gbWluaW11bUhlaWdodDsK IAogICAgIC8vIFNlcGFyYXRvciByb3cgaGVpZ2h0IGlzIHRoZSBzYW1lIHNpemUgYXMgaXRzZWxm LgogICAgIGlmIChtX3BvcHVwQ2xpZW50LT5pdGVtSXNTZXBhcmF0b3IoaW5kZXgpKQotICAgICAg ICByZXR1cm4gc2VwYXJhdG9ySGVpZ2h0OworICAgICAgICByZXR1cm4gbWF4KHNlcGFyYXRvckhl aWdodCwgbWluaW11bUhlaWdodCk7CiAKICAgICBTdHJpbmcgaWNvbiA9IG1fcG9wdXBDbGllbnQt Pml0ZW1JY29uKGluZGV4KTsKICAgICBSZWZQdHI8SW1hZ2U+IGltYWdlKEltYWdlOjpsb2FkUGxh dGZvcm1SZXNvdXJjZShpY29uLnV0ZjgoKS5kYXRhKCkpKTsKQEAgLTExOTIsNyArMTE5NSw4IEBA IGludCBQb3B1cExpc3RCb3g6OmdldFJvd0hlaWdodChpbnQgaW5kZXgpCiAgICAgaW50IGljb25I ZWlnaHQgPSAoaW1hZ2UgJiYgIWltYWdlLT5pc051bGwoKSkgPyBpbWFnZS0+cmVjdCgpLmhlaWdo dCgpIDogMDsKIAogICAgIGludCBsaW5lUGFkZGluZ0hlaWdodCA9IG1fcG9wdXBDbGllbnQtPm1l bnVTdHlsZSgpLm1lbnVUeXBlKCkgPT0gUG9wdXBNZW51U3R5bGU6OkF1dG9maWxsUG9wdXAgPyBr TGluZVBhZGRpbmdIZWlnaHQgOiAwOwotICAgIHJldHVybiBtYXgoZm9udEhlaWdodCwgaWNvbkhl aWdodCkgKyBsaW5lUGFkZGluZ0hlaWdodCAqIDI7CisgICAgaW50IGNhbGN1bGF0ZWRSb3dIZWln aHQgPSBtYXgoZm9udEhlaWdodCwgaWNvbkhlaWdodCkgKyBsaW5lUGFkZGluZ0hlaWdodCAqIDI7 CisgICAgcmV0dXJuIG1heChjYWxjdWxhdGVkUm93SGVpZ2h0LCBtaW5pbXVtSGVpZ2h0KTsKIH0K IAogSW50UmVjdCBQb3B1cExpc3RCb3g6OmdldFJvd0JvdW5kcyhpbnQgaW5kZXgpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9saW51eC9XZWJUaGVtZUVuZ2luZS5o IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvbGludXgvV2ViVGhlbWVFbmdpbmUuaApp bmRleCBjYzQ3NDI4Li43OWZhZTEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9saW51eC9XZWJUaGVtZUVuZ2luZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vcHVibGljL2xpbnV4L1dlYlRoZW1lRW5naW5lLmgKQEAgLTE0Niw2ICsxNDYsOCBAQCBwdWJs aWM6CiAgICAgLy8gUGFpbnQgdGhlIGdpdmVuIHRoZSBnaXZlbiB0aGVtZSBwYXJ0LgogICAgIHZp cnR1YWwgdm9pZCBwYWludCgKICAgICAgICAgV2ViQ2FudmFzKiwgUGFydCwgU3RhdGUsIGNvbnN0 IFdlYlJlY3QmLCBjb25zdCBFeHRyYVBhcmFtcyopIHt9CisgICAgLy8gR2V0IHRoZSBtaW5pbXVt IHJvdyBoZWlnaHQgZm9yIHBvcHVwIGxpc3Rib3hlcy4KKyAgICB2aXJ0dWFsIGludCBnZXRQb3B1 cExpc3RCb3hNaW5pbXVtUm93SGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gMDsgfQogfTsKIAogfSAv LyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9QbGF0Zm9ybUJyaWRnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9QbGF0Zm9y bUJyaWRnZS5jcHAKaW5kZXggMTFkOWJjYi4uMjRlYWY0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1CcmlkZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1BsYXRmb3JtQnJpZGdlLmNwcApAQCAtOTIyLDYgKzkyMiwxMyBAQCB2b2lk IFBsYXRmb3JtQnJpZGdlOjpwYWludFRoZW1lUGFydCgKIAogI2VuZGlmCiAKKy8vIFBvcHVwIExp c3Rib3ggLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0KKworaW50IFBsYXRmb3JtQnJpZGdlOjpnZXRQb3B1cExpc3RCb3hNaW5pbXVt Um93SGVpZ2h0KCkKK3sKKyAgICAgcmV0dXJuIHdlYktpdENsaWVudCgpLT50aGVtZUVuZ2luZSgp LT5nZXRQb3B1cExpc3RCb3hNaW5pbXVtUm93SGVpZ2h0KCk7Cit9CisKIC8vIFRyYWNlIEV2ZW50 IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0KIAogdm9pZCBQbGF0Zm9ybUJyaWRnZTo6dHJhY2VFdmVudEJlZ2luKGNvbnN0IGNo YXIqIG5hbWUsIHZvaWQqIGlkLCBjb25zdCBjaGFyKiBleHRyYSkK 101632 2011-07-21 12:47:07 -0700 2011-07-21 13:33:13 -0700 Uploaded previous file in incorrect format webkitcombopatch text/plain 3744 fsamuel ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BsYXRmb3JtQnJp ZGdlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9QbGF0Zm9ybUJyaWRnZS5o CmluZGV4IGUwMWFlMjYuLjAzOTEzM2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2Nocm9taXVtL1BsYXRmb3JtQnJpZGdlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vY2hyb21pdW0vUGxhdGZvcm1CcmlkZ2UuaApAQCAtMzk3LDYgKzM5Nyw4IEBAIHB1YmxpYzoK ICAgICAvLyBQYWludCB0aGUgZ2l2ZW4gdGhlIGdpdmVuIHRoZW1lIHBhcnQuCiAgICAgc3RhdGlj IHZvaWQgcGFpbnRUaGVtZVBhcnQoR3JhcGhpY3NDb250ZXh0KiwgVGhlbWVQYXJ0LCBUaGVtZVBh aW50U3RhdGUsIGNvbnN0IEludFJlY3QmLCBjb25zdCBUaGVtZVBhaW50RXh0cmFQYXJhbXMqKTsK ICNlbmRpZgorICAgIC8vIEdldCB0aGUgbWluaW11bSByb3cgaGVpZ2h0IGZvciBwb3B1cCBsaXN0 Ym94ZXMuCisgICAgc3RhdGljIGludCBnZXRQb3B1cExpc3RCb3hNaW5pbXVtUm93SGVpZ2h0KCk7 CiAKICAgICAvLyBUcmFjZSBFdmVudCAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogICAgIHN0YXRpYyB2b2lkIHRyYWNlRXZlbnRCZWdpbihj b25zdCBjaGFyKiBuYW1lLCB2b2lkKiwgY29uc3QgY2hhciogZXh0cmEpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uY3BwCmlu ZGV4IDYyOGI5MTkuLjdjYzc0YzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHAKQEAgLTQ0LDYgKzQ0LDcgQEAKICNp bmNsdWRlICJJbnRSZWN0LmgiCiAjaW5jbHVkZSAiS2V5Ym9hcmRDb2Rlcy5oIgogI2luY2x1ZGUg IlBhZ2UuaCIKKyNpbmNsdWRlICJQbGF0Zm9ybUJyaWRnZS5oIgogI2luY2x1ZGUgIlBsYXRmb3Jt S2V5Ym9hcmRFdmVudC5oIgogI2luY2x1ZGUgIlBsYXRmb3JtTW91c2VFdmVudC5oIgogI2luY2x1 ZGUgIlBsYXRmb3JtU2NyZWVuLmgiCkBAIC0xMTc1LDE1ICsxMTc2LDE3IEBAIHZvaWQgUG9wdXBM aXN0Qm94OjpzZXRPcmlnaW5hbEluZGV4KGludCBpbmRleCkKIAogaW50IFBvcHVwTGlzdEJveDo6 Z2V0Um93SGVpZ2h0KGludCBpbmRleCkKIHsKKyAgICBpbnQgbWluaW11bUhlaWdodCA9IFBsYXRm b3JtQnJpZGdlOjpnZXRQb3B1cExpc3RCb3hNaW5pbXVtUm93SGVpZ2h0KCk7CisKICAgICBpZiAo aW5kZXggPCAwKQotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG1pbmltdW1IZWln aHQ7CiAKICAgICBpZiAobV9wb3B1cENsaWVudC0+aXRlbVN0eWxlKGluZGV4KS5pc0Rpc3BsYXlO b25lKCkpCi0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gbWluaW11bUhlaWdodDsK IAogICAgIC8vIFNlcGFyYXRvciByb3cgaGVpZ2h0IGlzIHRoZSBzYW1lIHNpemUgYXMgaXRzZWxm LgogICAgIGlmIChtX3BvcHVwQ2xpZW50LT5pdGVtSXNTZXBhcmF0b3IoaW5kZXgpKQotICAgICAg ICByZXR1cm4gc2VwYXJhdG9ySGVpZ2h0OworICAgICAgICByZXR1cm4gbWF4KHNlcGFyYXRvckhl aWdodCwgbWluaW11bUhlaWdodCk7CiAKICAgICBTdHJpbmcgaWNvbiA9IG1fcG9wdXBDbGllbnQt Pml0ZW1JY29uKGluZGV4KTsKICAgICBSZWZQdHI8SW1hZ2U+IGltYWdlKEltYWdlOjpsb2FkUGxh dGZvcm1SZXNvdXJjZShpY29uLnV0ZjgoKS5kYXRhKCkpKTsKQEAgLTExOTIsNyArMTE5NSw4IEBA IGludCBQb3B1cExpc3RCb3g6OmdldFJvd0hlaWdodChpbnQgaW5kZXgpCiAgICAgaW50IGljb25I ZWlnaHQgPSAoaW1hZ2UgJiYgIWltYWdlLT5pc051bGwoKSkgPyBpbWFnZS0+cmVjdCgpLmhlaWdo dCgpIDogMDsKIAogICAgIGludCBsaW5lUGFkZGluZ0hlaWdodCA9IG1fcG9wdXBDbGllbnQtPm1l bnVTdHlsZSgpLm1lbnVUeXBlKCkgPT0gUG9wdXBNZW51U3R5bGU6OkF1dG9maWxsUG9wdXAgPyBr TGluZVBhZGRpbmdIZWlnaHQgOiAwOwotICAgIHJldHVybiBtYXgoZm9udEhlaWdodCwgaWNvbkhl aWdodCkgKyBsaW5lUGFkZGluZ0hlaWdodCAqIDI7CisgICAgaW50IGNhbGN1bGF0ZWRSb3dIZWln aHQgPSBtYXgoZm9udEhlaWdodCwgaWNvbkhlaWdodCkgKyBsaW5lUGFkZGluZ0hlaWdodCAqIDI7 CisgICAgcmV0dXJuIG1heChjYWxjdWxhdGVkUm93SGVpZ2h0LCBtaW5pbXVtSGVpZ2h0KTsKIH0K IAogSW50UmVjdCBQb3B1cExpc3RCb3g6OmdldFJvd0JvdW5kcyhpbnQgaW5kZXgpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9saW51eC9XZWJUaGVtZUVuZ2luZS5o IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvbGludXgvV2ViVGhlbWVFbmdpbmUuaApp bmRleCBjYzQ3NDI4Li43OWZhZTEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9saW51eC9XZWJUaGVtZUVuZ2luZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vcHVibGljL2xpbnV4L1dlYlRoZW1lRW5naW5lLmgKQEAgLTE0Niw2ICsxNDYsOCBAQCBwdWJs aWM6CiAgICAgLy8gUGFpbnQgdGhlIGdpdmVuIHRoZSBnaXZlbiB0aGVtZSBwYXJ0LgogICAgIHZp cnR1YWwgdm9pZCBwYWludCgKICAgICAgICAgV2ViQ2FudmFzKiwgUGFydCwgU3RhdGUsIGNvbnN0 IFdlYlJlY3QmLCBjb25zdCBFeHRyYVBhcmFtcyopIHt9CisgICAgLy8gR2V0IHRoZSBtaW5pbXVt IHJvdyBoZWlnaHQgZm9yIHBvcHVwIGxpc3Rib3hlcy4KKyAgICB2aXJ0dWFsIGludCBnZXRQb3B1 cExpc3RCb3hNaW5pbXVtUm93SGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gMDsgfQogfTsKIAogfSAv LyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9QbGF0Zm9ybUJyaWRnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9QbGF0Zm9y bUJyaWRnZS5jcHAKaW5kZXggMTFkOWJjYi4uMjRlYWY0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1CcmlkZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1BsYXRmb3JtQnJpZGdlLmNwcApAQCAtOTIyLDYgKzkyMiwxMyBAQCB2b2lk IFBsYXRmb3JtQnJpZGdlOjpwYWludFRoZW1lUGFydCgKIAogI2VuZGlmCiAKKy8vIFBvcHVwIExp c3Rib3ggLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0KKworaW50IFBsYXRmb3JtQnJpZGdlOjpnZXRQb3B1cExpc3RCb3hNaW5pbXVt Um93SGVpZ2h0KCkKK3sKKyAgICAgcmV0dXJuIHdlYktpdENsaWVudCgpLT50aGVtZUVuZ2luZSgp LT5nZXRQb3B1cExpc3RCb3hNaW5pbXVtUm93SGVpZ2h0KCk7Cit9CisKIC8vIFRyYWNlIEV2ZW50 IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0KIAogdm9pZCBQbGF0Zm9ybUJyaWRnZTo6dHJhY2VFdmVudEJlZ2luKGNvbnN0IGNo YXIqIG5hbWUsIHZvaWQqIGlkLCBjb25zdCBjaGFyKiBleHRyYSkK 101640 2011-07-21 13:33:13 -0700 2011-07-22 15:43:50 -0700 Got rid of use of 'get' webkitcombopatch text/plain 3729 fsamuel ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BsYXRmb3JtQnJp ZGdlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9QbGF0Zm9ybUJyaWRnZS5o CmluZGV4IGUwMWFlMjYuLjdhZTUwYTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2Nocm9taXVtL1BsYXRmb3JtQnJpZGdlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vY2hyb21pdW0vUGxhdGZvcm1CcmlkZ2UuaApAQCAtMzk3LDYgKzM5Nyw4IEBAIHB1YmxpYzoK ICAgICAvLyBQYWludCB0aGUgZ2l2ZW4gdGhlIGdpdmVuIHRoZW1lIHBhcnQuCiAgICAgc3RhdGlj IHZvaWQgcGFpbnRUaGVtZVBhcnQoR3JhcGhpY3NDb250ZXh0KiwgVGhlbWVQYXJ0LCBUaGVtZVBh aW50U3RhdGUsIGNvbnN0IEludFJlY3QmLCBjb25zdCBUaGVtZVBhaW50RXh0cmFQYXJhbXMqKTsK ICNlbmRpZgorICAgIC8vIEdldCB0aGUgbWluaW11bSByb3cgaGVpZ2h0IGZvciBwb3B1cCBsaXN0 Ym94ZXMuCisgICAgc3RhdGljIGludCBwb3B1cExpc3RCb3hNaW5pbXVtUm93SGVpZ2h0KCk7CiAK ICAgICAvLyBUcmFjZSBFdmVudCAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLQogICAgIHN0YXRpYyB2b2lkIHRyYWNlRXZlbnRCZWdpbihjb25z dCBjaGFyKiBuYW1lLCB2b2lkKiwgY29uc3QgY2hhciogZXh0cmEpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uY3BwCmluZGV4 IDYyOGI5MTkuLjk2MzNlZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2No cm9taXVtL1BvcHVwTWVudUNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHAKQEAgLTQ0LDYgKzQ0LDcgQEAKICNpbmNs dWRlICJJbnRSZWN0LmgiCiAjaW5jbHVkZSAiS2V5Ym9hcmRDb2Rlcy5oIgogI2luY2x1ZGUgIlBh Z2UuaCIKKyNpbmNsdWRlICJQbGF0Zm9ybUJyaWRnZS5oIgogI2luY2x1ZGUgIlBsYXRmb3JtS2V5 Ym9hcmRFdmVudC5oIgogI2luY2x1ZGUgIlBsYXRmb3JtTW91c2VFdmVudC5oIgogI2luY2x1ZGUg IlBsYXRmb3JtU2NyZWVuLmgiCkBAIC0xMTc1LDE1ICsxMTc2LDE3IEBAIHZvaWQgUG9wdXBMaXN0 Qm94OjpzZXRPcmlnaW5hbEluZGV4KGludCBpbmRleCkKIAogaW50IFBvcHVwTGlzdEJveDo6Z2V0 Um93SGVpZ2h0KGludCBpbmRleCkKIHsKKyAgICBpbnQgbWluaW11bUhlaWdodCA9IFBsYXRmb3Jt QnJpZGdlOjpwb3B1cExpc3RCb3hNaW5pbXVtUm93SGVpZ2h0KCk7CisKICAgICBpZiAoaW5kZXgg PCAwKQotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG1pbmltdW1IZWlnaHQ7CiAK ICAgICBpZiAobV9wb3B1cENsaWVudC0+aXRlbVN0eWxlKGluZGV4KS5pc0Rpc3BsYXlOb25lKCkp Ci0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gbWluaW11bUhlaWdodDsKIAogICAg IC8vIFNlcGFyYXRvciByb3cgaGVpZ2h0IGlzIHRoZSBzYW1lIHNpemUgYXMgaXRzZWxmLgogICAg IGlmIChtX3BvcHVwQ2xpZW50LT5pdGVtSXNTZXBhcmF0b3IoaW5kZXgpKQotICAgICAgICByZXR1 cm4gc2VwYXJhdG9ySGVpZ2h0OworICAgICAgICByZXR1cm4gbWF4KHNlcGFyYXRvckhlaWdodCwg bWluaW11bUhlaWdodCk7CiAKICAgICBTdHJpbmcgaWNvbiA9IG1fcG9wdXBDbGllbnQtPml0ZW1J Y29uKGluZGV4KTsKICAgICBSZWZQdHI8SW1hZ2U+IGltYWdlKEltYWdlOjpsb2FkUGxhdGZvcm1S ZXNvdXJjZShpY29uLnV0ZjgoKS5kYXRhKCkpKTsKQEAgLTExOTIsNyArMTE5NSw4IEBAIGludCBQ b3B1cExpc3RCb3g6OmdldFJvd0hlaWdodChpbnQgaW5kZXgpCiAgICAgaW50IGljb25IZWlnaHQg PSAoaW1hZ2UgJiYgIWltYWdlLT5pc051bGwoKSkgPyBpbWFnZS0+cmVjdCgpLmhlaWdodCgpIDog MDsKIAogICAgIGludCBsaW5lUGFkZGluZ0hlaWdodCA9IG1fcG9wdXBDbGllbnQtPm1lbnVTdHls ZSgpLm1lbnVUeXBlKCkgPT0gUG9wdXBNZW51U3R5bGU6OkF1dG9maWxsUG9wdXAgPyBrTGluZVBh ZGRpbmdIZWlnaHQgOiAwOwotICAgIHJldHVybiBtYXgoZm9udEhlaWdodCwgaWNvbkhlaWdodCkg KyBsaW5lUGFkZGluZ0hlaWdodCAqIDI7CisgICAgaW50IGNhbGN1bGF0ZWRSb3dIZWlnaHQgPSBt YXgoZm9udEhlaWdodCwgaWNvbkhlaWdodCkgKyBsaW5lUGFkZGluZ0hlaWdodCAqIDI7CisgICAg cmV0dXJuIG1heChjYWxjdWxhdGVkUm93SGVpZ2h0LCBtaW5pbXVtSGVpZ2h0KTsKIH0KIAogSW50 UmVjdCBQb3B1cExpc3RCb3g6OmdldFJvd0JvdW5kcyhpbnQgaW5kZXgpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9saW51eC9XZWJUaGVtZUVuZ2luZS5oIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvbGludXgvV2ViVGhlbWVFbmdpbmUuaAppbmRleCBj YzQ3NDI4Li5jN2RhNjMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9saW51eC9XZWJUaGVtZUVuZ2luZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVi bGljL2xpbnV4L1dlYlRoZW1lRW5naW5lLmgKQEAgLTE0Niw2ICsxNDYsOCBAQCBwdWJsaWM6CiAg ICAgLy8gUGFpbnQgdGhlIGdpdmVuIHRoZSBnaXZlbiB0aGVtZSBwYXJ0LgogICAgIHZpcnR1YWwg dm9pZCBwYWludCgKICAgICAgICAgV2ViQ2FudmFzKiwgUGFydCwgU3RhdGUsIGNvbnN0IFdlYlJl Y3QmLCBjb25zdCBFeHRyYVBhcmFtcyopIHt9CisgICAgLy8gR2V0IHRoZSBtaW5pbXVtIHJvdyBo ZWlnaHQgZm9yIHBvcHVwIGxpc3Rib3hlcy4KKyAgICB2aXJ0dWFsIGludCBwb3B1cExpc3RCb3hN aW5pbXVtUm93SGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gMDsgfQogfTsKIAogfSAvLyBuYW1lc3Bh Y2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9QbGF0Zm9y bUJyaWRnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9QbGF0Zm9ybUJyaWRnZS5j cHAKaW5kZXggMTFkOWJjYi4uOWFjMWFhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvUGxhdGZvcm1CcmlkZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1BsYXRmb3JtQnJpZGdlLmNwcApAQCAtOTIyLDYgKzkyMiwxMyBAQCB2b2lkIFBsYXRmb3Jt QnJpZGdlOjpwYWludFRoZW1lUGFydCgKIAogI2VuZGlmCiAKKy8vIFBvcHVwIExpc3Rib3ggLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0KKworaW50IFBsYXRmb3JtQnJpZGdlOjpwb3B1cExpc3RCb3hNaW5pbXVtUm93SGVpZ2h0KCkK K3sKKyAgICAgcmV0dXJuIHdlYktpdENsaWVudCgpLT50aGVtZUVuZ2luZSgpLT5wb3B1cExpc3RC b3hNaW5pbXVtUm93SGVpZ2h0KCk7Cit9CisKIC8vIFRyYWNlIEV2ZW50IC0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIAogdm9p ZCBQbGF0Zm9ybUJyaWRnZTo6dHJhY2VFdmVudEJlZ2luKGNvbnN0IGNoYXIqIG5hbWUsIHZvaWQq IGlkLCBjb25zdCBjaGFyKiBleHRyYSkK 101782 2011-07-22 15:43:50 -0700 2011-07-25 08:08:17 -0700 Another approach as suggested by fishd webkitcombopatch text/plain 13309 fsamuel ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BvcHVwTWVudUNo cm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BvcHVwTWVudUNo cm9taXVtLmNwcAppbmRleCA2MjhiOTE5Li5mNGM5NTA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uY3BwCkBAIC05MSw5 ICs5MSw5IEBAIHN0YXRpYyBjb25zdCBQb3B1cENvbnRhaW5lclNldHRpbmdzIGRyb3BEb3duU2V0 dGluZ3MgPSB7CiAvLyBib3ggKCJjb21ib2JveCIgb24gV2luZG93cykuCiBjbGFzcyBQb3B1cExp c3RCb3ggOiBwdWJsaWMgRnJhbWVsZXNzU2Nyb2xsVmlldyB7CiBwdWJsaWM6Ci0gICAgc3RhdGlj IFBhc3NSZWZQdHI8UG9wdXBMaXN0Qm94PiBjcmVhdGUoUG9wdXBNZW51Q2xpZW50KiBjbGllbnQs IGNvbnN0IFBvcHVwQ29udGFpbmVyU2V0dGluZ3MmIHNldHRpbmdzKQorICAgIHN0YXRpYyBQYXNz UmVmUHRyPFBvcHVwTGlzdEJveD4gY3JlYXRlKFBvcHVwTWVudUNsaWVudCogY2xpZW50LCBjb25z dCBQb3B1cENvbnRhaW5lclNldHRpbmdzJiBzZXR0aW5ncywgaW50IG1pbmltdW1Sb3dIZWlnaHQp CiAgICAgewotICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IFBvcHVwTGlzdEJveChjbGllbnQs IHNldHRpbmdzKSk7CisgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgUG9wdXBMaXN0Qm94KGNs aWVudCwgc2V0dGluZ3MsIG1pbmltdW1Sb3dIZWlnaHQpKTsKICAgICB9CiAKICAgICAvLyBGcmFt ZWxlc3NTY3JvbGxWaWV3CkBAIC0xNDUsNiArMTQ1LDggQEAgcHVibGljOgogICAgIC8vIEdldHMg dGhlIGhlaWdodCBvZiBhIHJvdy4KICAgICBpbnQgZ2V0Um93SGVpZ2h0KGludCBpbmRleCk7CiAK KyAgICB2b2lkIHNldE1pbmltdW1Sb3dIZWlnaHQoaW50IG1fbWluaW11bVJvd0hlaWdodCkgeyBt X21pbmltdW1Sb3dIZWlnaHQgPSBtX21pbmltdW1Sb3dIZWlnaHQ7IH0KKwogICAgIHZvaWQgc2V0 TWF4SGVpZ2h0KGludCBtYXhIZWlnaHQpIHsgbV9tYXhIZWlnaHQgPSBtYXhIZWlnaHQ7IH0KIAog ICAgIHZvaWQgc2V0TWF4V2lkdGgoaW50IG1heFdpZHRoKSB7IG1fbWF4V2luZG93V2lkdGggPSBt YXhXaWR0aDsgfQpAQCAtMTU5LDcgKzE2MSw3IEBAIHByaXZhdGU6CiAgICAgZnJpZW5kIGNsYXNz IFBvcHVwQ29udGFpbmVyOwogICAgIGZyaWVuZCBjbGFzcyBSZWZDb3VudGVkPFBvcHVwTGlzdEJv eD47CiAKLSAgICBQb3B1cExpc3RCb3goUG9wdXBNZW51Q2xpZW50KiBjbGllbnQsIGNvbnN0IFBv cHVwQ29udGFpbmVyU2V0dGluZ3MmIHNldHRpbmdzKQorICAgIFBvcHVwTGlzdEJveChQb3B1cE1l bnVDbGllbnQqIGNsaWVudCwgY29uc3QgUG9wdXBDb250YWluZXJTZXR0aW5ncyYgc2V0dGluZ3Ms IGludCBtaW5pbXVtUm93SGVpZ2h0KQogICAgICAgICA6IG1fc2V0dGluZ3Moc2V0dGluZ3MpCiAg ICAgICAgICwgbV9vcmlnaW5hbEluZGV4KDApCiAgICAgICAgICwgbV9zZWxlY3RlZEluZGV4KDAp CkBAIC0xNzEsNiArMTczLDcgQEAgcHJpdmF0ZToKICAgICAgICAgLCBtX3JlcGVhdGluZ0NoYXIo MCkKICAgICAgICAgLCBtX2xhc3RDaGFyVGltZSgwKQogICAgICAgICAsIG1fbWF4V2luZG93V2lk dGgobnVtZXJpY19saW1pdHM8aW50Pjo6bWF4KCkpCisgICAgICAgICwgbV9taW5pbXVtUm93SGVp Z2h0KG1pbmltdW1Sb3dIZWlnaHQpCiAgICAgewogICAgICAgICBzZXRTY3JvbGxiYXJNb2RlcyhT Y3JvbGxiYXJBbHdheXNPZmYsIFNjcm9sbGJhckFsd2F5c09mZik7CiAgICAgfQpAQCAtMjgzLDYg KzI4Niw5IEBAIHByaXZhdGU6CiAKICAgICAvLyBUbyBmb3J3YXJkIGxhc3QgbW91c2UgcmVsZWFz ZSBldmVudC4KICAgICBSZWZQdHI8Tm9kZT4gbV9mb2N1c2VkTm9kZTsKKworICAgIC8vIFRoZSBt aW5pbXVtIGhlaWdodCBvZiBhIHJvdyBvZiB0aGUgbGlzdCBib3guCisgICAgaW50IG1fbWluaW11 bVJvd0hlaWdodDsKIH07CiAKIHN0YXRpYyBQbGF0Zm9ybU1vdXNlRXZlbnQgY29uc3RydWN0UmVs YXRpdmVNb3VzZUV2ZW50KGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYgZSwKQEAgLTMxOSwxNSAr MzI1LDE3IEBAIHN0YXRpYyBQbGF0Zm9ybVdoZWVsRXZlbnQgY29uc3RydWN0UmVsYXRpdmVXaGVl bEV2ZW50KGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYKIC8vIHN0YXRpYwogUGFzc1JlZlB0cjxQ b3B1cENvbnRhaW5lcj4gUG9wdXBDb250YWluZXI6OmNyZWF0ZShQb3B1cE1lbnVDbGllbnQqIGNs aWVudCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg UG9wdXBUeXBlIHBvcHVwVHlwZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgY29uc3QgUG9wdXBDb250YWluZXJTZXR0aW5ncyYgc2V0dGluZ3MpCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFBv cHVwQ29udGFpbmVyU2V0dGluZ3MmIHNldHRpbmdzLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgbWluaW11bVJvd0hlaWdodCkKIHsKLSAgICBy ZXR1cm4gYWRvcHRSZWYobmV3IFBvcHVwQ29udGFpbmVyKGNsaWVudCwgcG9wdXBUeXBlLCBzZXR0 aW5ncykpOworICAgIHJldHVybiBhZG9wdFJlZihuZXcgUG9wdXBDb250YWluZXIoY2xpZW50LCBw b3B1cFR5cGUsIHNldHRpbmdzLCBtaW5pbXVtUm93SGVpZ2h0KSk7CiB9CiAKIFBvcHVwQ29udGFp bmVyOjpQb3B1cENvbnRhaW5lcihQb3B1cE1lbnVDbGllbnQqIGNsaWVudCwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBQb3B1cFR5cGUgcG9wdXBUeXBlLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGNvbnN0IFBvcHVwQ29udGFpbmVyU2V0dGluZ3MmIHNldHRpbmdzKQot ICAgIDogbV9saXN0Qm94KFBvcHVwTGlzdEJveDo6Y3JlYXRlKGNsaWVudCwgc2V0dGluZ3MpKQor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFBvcHVwQ29udGFpbmVyU2V0dGlu Z3MmIHNldHRpbmdzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludCBtaW5pbXVt Um93SGVpZ2h0KQorICAgIDogbV9saXN0Qm94KFBvcHVwTGlzdEJveDo6Y3JlYXRlKGNsaWVudCwg c2V0dGluZ3MsIG1pbmltdW1Sb3dIZWlnaHQpKQogICAgICwgbV9zZXR0aW5ncyhzZXR0aW5ncykK ICAgICAsIG1fcG9wdXBUeXBlKHBvcHVwVHlwZSkKICAgICAsIG1fcG9wdXBPcGVuKGZhbHNlKQpA QCAtMTE3NiwxNCArMTE4NCwxNCBAQCB2b2lkIFBvcHVwTGlzdEJveDo6c2V0T3JpZ2luYWxJbmRl eChpbnQgaW5kZXgpCiBpbnQgUG9wdXBMaXN0Qm94OjpnZXRSb3dIZWlnaHQoaW50IGluZGV4KQog ewogICAgIGlmIChpbmRleCA8IDApCi0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4g bV9taW5pbXVtUm93SGVpZ2h0OwogCiAgICAgaWYgKG1fcG9wdXBDbGllbnQtPml0ZW1TdHlsZShp bmRleCkuaXNEaXNwbGF5Tm9uZSgpKQotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJu IG1fbWluaW11bVJvd0hlaWdodDsKIAogICAgIC8vIFNlcGFyYXRvciByb3cgaGVpZ2h0IGlzIHRo ZSBzYW1lIHNpemUgYXMgaXRzZWxmLgogICAgIGlmIChtX3BvcHVwQ2xpZW50LT5pdGVtSXNTZXBh cmF0b3IoaW5kZXgpKQotICAgICAgICByZXR1cm4gc2VwYXJhdG9ySGVpZ2h0OworICAgICAgICBy ZXR1cm4gbWF4KHNlcGFyYXRvckhlaWdodCwgbV9taW5pbXVtUm93SGVpZ2h0KTsKIAogICAgIFN0 cmluZyBpY29uID0gbV9wb3B1cENsaWVudC0+aXRlbUljb24oaW5kZXgpOwogICAgIFJlZlB0cjxJ bWFnZT4gaW1hZ2UoSW1hZ2U6OmxvYWRQbGF0Zm9ybVJlc291cmNlKGljb24udXRmOCgpLmRhdGEo KSkpOwpAQCAtMTE5Miw3ICsxMjAwLDggQEAgaW50IFBvcHVwTGlzdEJveDo6Z2V0Um93SGVpZ2h0 KGludCBpbmRleCkKICAgICBpbnQgaWNvbkhlaWdodCA9IChpbWFnZSAmJiAhaW1hZ2UtPmlzTnVs bCgpKSA/IGltYWdlLT5yZWN0KCkuaGVpZ2h0KCkgOiAwOwogCiAgICAgaW50IGxpbmVQYWRkaW5n SGVpZ2h0ID0gbV9wb3B1cENsaWVudC0+bWVudVN0eWxlKCkubWVudVR5cGUoKSA9PSBQb3B1cE1l bnVTdHlsZTo6QXV0b2ZpbGxQb3B1cCA/IGtMaW5lUGFkZGluZ0hlaWdodCA6IDA7Ci0gICAgcmV0 dXJuIG1heChmb250SGVpZ2h0LCBpY29uSGVpZ2h0KSArIGxpbmVQYWRkaW5nSGVpZ2h0ICogMjsK KyAgICBpbnQgY2FsY3VsYXRlZFJvd0hlaWdodCA9IG1heChmb250SGVpZ2h0LCBpY29uSGVpZ2h0 KSArIGxpbmVQYWRkaW5nSGVpZ2h0ICogMjsKKyAgICByZXR1cm4gbWF4KGNhbGN1bGF0ZWRSb3dI ZWlnaHQsIG1fbWluaW11bVJvd0hlaWdodCk7CiB9CiAKIEludFJlY3QgUG9wdXBMaXN0Qm94Ojpn ZXRSb3dCb3VuZHMoaW50IGluZGV4KQpAQCAtMTQ3NSw4ICsxNDg0LDkgQEAgYm9vbCBQb3B1cExp c3RCb3g6OmlzUG9pbnRJbkJvdW5kcyhjb25zdCBJbnRQb2ludCYgcG9pbnQpCiAvLyAgICAgICBw b3J0YWJpbGl0eSBsYXllci4gVG8gYWNjZXNzIG1ldGhvZHMgYW5kIHByb3BlcnRpZXMgb24gdGhl CiAvLyAgICAgICBwb3B1cCB3aWRnZXRzLCB1c2UgfHBvcHVwV2luZG93fCBhYm92ZS4KIAotUG9w dXBNZW51Q2hyb21pdW06OlBvcHVwTWVudUNocm9taXVtKFBvcHVwTWVudUNsaWVudCogY2xpZW50 KQorUG9wdXBNZW51Q2hyb21pdW06OlBvcHVwTWVudUNocm9taXVtKFBvcHVwTWVudUNsaWVudCog Y2xpZW50LCBpbnQgbWluaW11bVJvd0hlaWdodCkKICAgICA6IG1fcG9wdXBDbGllbnQoY2xpZW50 KQorICAgICwgbV9taW5pbXVtUm93SGVpZ2h0KG1pbmltdW1Sb3dIZWlnaHQpCiB7CiB9CiAKQEAg LTE0OTIsNyArMTUwMiw3IEBAIFBvcHVwTWVudUNocm9taXVtOjp+UG9wdXBNZW51Q2hyb21pdW0o KQogdm9pZCBQb3B1cE1lbnVDaHJvbWl1bTo6c2hvdyhjb25zdCBJbnRSZWN0JiByLCBGcmFtZVZp ZXcqIHYsIGludCBpbmRleCkKIHsKICAgICBpZiAoIXAucG9wdXApCi0gICAgICAgIHAucG9wdXAg PSBQb3B1cENvbnRhaW5lcjo6Y3JlYXRlKGNsaWVudCgpLCBQb3B1cENvbnRhaW5lcjo6U2VsZWN0 LCBkcm9wRG93blNldHRpbmdzKTsKKyAgICAgICAgcC5wb3B1cCA9IFBvcHVwQ29udGFpbmVyOjpj cmVhdGUoY2xpZW50KCksIFBvcHVwQ29udGFpbmVyOjpTZWxlY3QsIGRyb3BEb3duU2V0dGluZ3Ms IG1fbWluaW11bVJvd0hlaWdodCk7CiAgICAgcC5wb3B1cC0+c2hvd0luUmVjdChyLCB2LCBpbmRl eCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Bv cHVwTWVudUNocm9taXVtLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1 cE1lbnVDaHJvbWl1bS5oCmluZGV4IDQ2YzEyMzMuLmMzOTUxODEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVtLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uaApAQCAtMTA5 LDcgKzEwOSw3IEBAIHB1YmxpYzoKICAgICB9OwogCiAgICAgc3RhdGljIFBhc3NSZWZQdHI8UG9w dXBDb250YWluZXI+IGNyZWF0ZShQb3B1cE1lbnVDbGllbnQqLCBQb3B1cFR5cGUsCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBQb3B1cENvbnRhaW5l clNldHRpbmdzJik7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjb25zdCBQb3B1cENvbnRhaW5lclNldHRpbmdzJiwgaW50KTsKIAogICAgIC8vIFdoZXRoZXIg YSBrZXkgZXZlbnQgc2hvdWxkIGJlIHNlbnQgdG8gdGhpcyBwb3B1cC4KICAgICB2aXJ0dWFsIGJv b2wgaXNJbnRlcmVzdGVkSW5FdmVudEZvcktleShpbnQga2V5Q29kZSk7CkBAIC0xNzUsNyArMTc1 LDcgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBmcmllbmQgY2xhc3MgV1RGOjpSZWZDb3VudGVk PFBvcHVwQ29udGFpbmVyPjsKIAotICAgIFBvcHVwQ29udGFpbmVyKFBvcHVwTWVudUNsaWVudCos IFBvcHVwVHlwZSBwb3B1cFR5cGUsIGNvbnN0IFBvcHVwQ29udGFpbmVyU2V0dGluZ3MmKTsKKyAg ICBQb3B1cENvbnRhaW5lcihQb3B1cE1lbnVDbGllbnQqLCBQb3B1cFR5cGUgcG9wdXBUeXBlLCBj b25zdCBQb3B1cENvbnRhaW5lclNldHRpbmdzJiwgaW50KTsKICAgICB+UG9wdXBDb250YWluZXIo KTsKIAogICAgIC8vIFBhaW50IHRoZSBib3JkZXIuCkBAIC0xOTksNyArMTk5LDcgQEAgcHJpdmF0 ZToKIAogY2xhc3MgUG9wdXBNZW51Q2hyb21pdW0gOiBwdWJsaWMgUG9wdXBNZW51IHsKIHB1Ymxp YzoKLSAgICBQb3B1cE1lbnVDaHJvbWl1bShQb3B1cE1lbnVDbGllbnQqKTsKKyAgICBQb3B1cE1l bnVDaHJvbWl1bShQb3B1cE1lbnVDbGllbnQqLCBpbnQpOwogICAgIH5Qb3B1cE1lbnVDaHJvbWl1 bSgpOwogCiAgICAgdmlydHVhbCB2b2lkIHNob3coY29uc3QgSW50UmVjdCYsIEZyYW1lVmlldyos IGludCBpbmRleCk7CkBAIC0yMTIsNiArMjEyLDcgQEAgcHJpdmF0ZToKIAogICAgIFBvcHVwTWVu dUNsaWVudCogbV9wb3B1cENsaWVudDsKICAgICBQb3B1cE1lbnVQcml2YXRlIHA7CisgICAgaW50 IG1fbWluaW11bVJvd0hlaWdodDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1NlYXJjaFBvcHVwTWVudUNo cm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1NlYXJjaFBvcHVw TWVudUNocm9taXVtLmNwcAppbmRleCBjYTViZWJlLi5hOTc4NTg3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TZWFyY2hQb3B1cE1lbnVDaHJvbWl1bS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2VhcmNoUG9wdXBNZW51Q2hy b21pdW0uY3BwCkBAIC0zNyw4ICszNyw4IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotU2Vh cmNoUG9wdXBNZW51Q2hyb21pdW06OlNlYXJjaFBvcHVwTWVudUNocm9taXVtKFBvcHVwTWVudUNs aWVudCogY2xpZW50KQotICAgIDogbV9wb3B1cChhZG9wdFJlZihuZXcgUG9wdXBNZW51Q2hyb21p dW0oY2xpZW50KSkpCitTZWFyY2hQb3B1cE1lbnVDaHJvbWl1bTo6U2VhcmNoUG9wdXBNZW51Q2hy b21pdW0oUG9wdXBNZW51Q2xpZW50KiBjbGllbnQsIGludCBtaW5pbXVtUm93SGVpZ2h0KQorICAg IDogbV9wb3B1cChhZG9wdFJlZihuZXcgUG9wdXBNZW51Q2hyb21pdW0oY2xpZW50LCBtaW5pbXVt Um93SGVpZ2h0KSkpCiB7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2Nocm9taXVtL1NlYXJjaFBvcHVwTWVudUNocm9taXVtLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9jaHJvbWl1bS9TZWFyY2hQb3B1cE1lbnVDaHJvbWl1bS5oCmluZGV4IDgyN2ZmNjYuLjdm YTMwNGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1NlYXJj aFBvcHVwTWVudUNocm9taXVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21p dW0vU2VhcmNoUG9wdXBNZW51Q2hyb21pdW0uaApAQCAtMjgsNyArMjgsNyBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKIGNsYXNzIFNlYXJjaFBvcHVwTWVudUNocm9taXVtIDogcHVibGljIFNlYXJj aFBvcHVwTWVudSB7CiBwdWJsaWM6Ci0gICAgU2VhcmNoUG9wdXBNZW51Q2hyb21pdW0oUG9wdXBN ZW51Q2xpZW50Kik7CisgICAgU2VhcmNoUG9wdXBNZW51Q2hyb21pdW0oUG9wdXBNZW51Q2xpZW50 KiwgaW50KTsKIAogICAgIHZpcnR1YWwgUG9wdXBNZW51KiBwb3B1cE1lbnUoKTsKICAgICB2aXJ0 dWFsIHZvaWQgc2F2ZVJlY2VudFNlYXJjaGVzKGNvbnN0IEF0b21pY1N0cmluZyYgbmFtZSwgY29u c3QgVmVjdG9yPFN0cmluZz4mIHNlYXJjaEl0ZW1zKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vcHVibGljL1dlYldpZGdldC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViV2lkZ2V0LmgKaW5kZXggZjZlNzNmMS4uYjcxYWYwYSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViV2lkZ2V0LmgKKysrIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9wdWJsaWMvV2ViV2lkZ2V0LmgKQEAgLTEyNiw2ICsxMjYsMTAgQEAgcHVibGlj OgogICAgICAgICBpbnQgc2VsZWN0aW9uU3RhcnQsCiAgICAgICAgIGludCBzZWxlY3Rpb25FbmQp IHsgcmV0dXJuIGZhbHNlOyB9CiAKKyAgICB2aXJ0dWFsIHZvaWQgc2V0UG9wdXBMaXN0Qm94TWlu aW11bVJvd0hlaWdodChpbnQgbWluaW11bVJvd0hlaWdodCkge30KKyAgICAKKyAgICB2aXJ0dWFs IGludCBwb3B1cExpc3RCb3hNaW5pbXVtUm93SGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gMDsgfQor CiAgICAgLy8gQ2FsbGVkIHRvIGluZm9ybSB0aGUgV2ViV2lkZ2V0IHRvIGNvbmZpcm0gYW4gb25n b2luZyBjb21wb3NpdGlvbi4KICAgICAvLyBUaGlzIG1ldGhvZCBpcyBzYW1lIGFzIGNvbmZpcm1D b21wb3NpdGlvbihXZWJTdHJpbmcoKSk7CiAgICAgLy8gUmV0dXJucyB0cnVlIGlmIHRoZXJlIGlz IGFuIG9uZ29pbmcgY29tcG9zaXRpb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L0Nocm9tZUNsaWVudEltcGwuY3BwCmluZGV4IGEzZTliMGYuLjE0YzM5MGUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwCkBAIC05NDMsMTIg Kzk0MywxMiBAQCBQYXNzUmVmUHRyPFBvcHVwTWVudT4gQ2hyb21lQ2xpZW50SW1wbDo6Y3JlYXRl UG9wdXBNZW51KFBvcHVwTWVudUNsaWVudCogY2xpZW50KQogICAgIGlmIChXZWJWaWV3SW1wbDo6 dXNlRXh0ZXJuYWxQb3B1cE1lbnVzKCkpCiAgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgRXh0 ZXJuYWxQb3B1cE1lbnUoY2xpZW50LCBtX3dlYlZpZXctPmNsaWVudCgpKSk7CiAKLSAgICByZXR1 cm4gYWRvcHRSZWYobmV3IFBvcHVwTWVudUNocm9taXVtKGNsaWVudCkpOworICAgIHJldHVybiBh ZG9wdFJlZihuZXcgUG9wdXBNZW51Q2hyb21pdW0oY2xpZW50LCBtX3dlYlZpZXctPnBvcHVwTGlz dEJveE1pbmltdW1Sb3dIZWlnaHQoKSkpOwogfQogCiBQYXNzUmVmUHRyPFNlYXJjaFBvcHVwTWVu dT4gQ2hyb21lQ2xpZW50SW1wbDo6Y3JlYXRlU2VhcmNoUG9wdXBNZW51KFBvcHVwTWVudUNsaWVu dCogY2xpZW50KSBjb25zdAogewotICAgIHJldHVybiBhZG9wdFJlZihuZXcgU2VhcmNoUG9wdXBN ZW51Q2hyb21pdW0oY2xpZW50KSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBTZWFyY2hQb3B1 cE1lbnVDaHJvbWl1bShjbGllbnQsIG1fd2ViVmlldy0+cG9wdXBMaXN0Qm94TWluaW11bVJvd0hl aWdodCgpKSk7CiB9CiAKIGJvb2wgQ2hyb21lQ2xpZW50SW1wbDo6c2hvdWxkUnVuTW9kYWxEaWFs b2dEdXJpbmdQYWdlRGlzbWlzc2FsKGNvbnN0IERpYWxvZ1R5cGUmIGRpYWxvZ1R5cGUsIGNvbnN0 IFN0cmluZyYgZGlhbG9nTWVzc2FnZSwgRnJhbWVMb2FkZXI6OlBhZ2VEaXNtaXNzYWxUeXBlIGRp c21pc3NhbFR5cGUpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJQb3B1cE1lbnVJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBv cHVwTWVudUltcGwuY3BwCmluZGV4IDc3ZDViODIuLjkyYmZhYzcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBvcHVwTWVudUltcGwuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBvcHVwTWVudUltcGwuY3BwCkBAIC0yNTEsNiArMjUxLDEw IEBAIHZvaWQgV2ViUG9wdXBNZW51SW1wbDo6c2V0Rm9jdXMoYm9vbCBlbmFibGUpCiB7CiB9CiAK K3ZvaWQgV2ViUG9wdXBNZW51SW1wbDo6c2V0UG9wdXBMaXN0Qm94TWluaW11bVJvd0hlaWdodChp bnQgbWluaW11bVJvd0hlaWdodCkKK3sKK30KKwogYm9vbCBXZWJQb3B1cE1lbnVJbXBsOjpzZXRD b21wb3NpdGlvbigKICAgICBjb25zdCBXZWJTdHJpbmcmIHRleHQsIGNvbnN0IFdlYlZlY3RvcjxX ZWJDb21wb3NpdGlvblVuZGVybGluZT4mIHVuZGVybGluZXMsCiAgICAgaW50IHNlbGVjdGlvblN0 YXJ0LCBpbnQgc2VsZWN0aW9uRW5kKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViUG9wdXBNZW51SW1wbC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi UG9wdXBNZW51SW1wbC5oCmluZGV4IDgwZTQ2NWUuLjRlZWViYzcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBvcHVwTWVudUltcGwuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJQb3B1cE1lbnVJbXBsLmgKQEAgLTczLDYgKzczLDcgQEAgcHVi bGljOgogICAgIHZpcnR1YWwgYm9vbCBoYW5kbGVJbnB1dEV2ZW50KGNvbnN0IFdlYklucHV0RXZl bnQmKTsKICAgICB2aXJ0dWFsIHZvaWQgbW91c2VDYXB0dXJlTG9zdCgpOwogICAgIHZpcnR1YWwg dm9pZCBzZXRGb2N1cyhib29sIGVuYWJsZSk7CisgICAgdmlydHVhbCB2b2lkIHNldFBvcHVwTGlz dEJveE1pbmltdW1Sb3dIZWlnaHQoaW50IG1pbmltdW1Sb3dIZWlnaHQpOwogICAgIHZpcnR1YWwg Ym9vbCBzZXRDb21wb3NpdGlvbigKICAgICAgICAgY29uc3QgV2ViU3RyaW5nJiB0ZXh0LAogICAg ICAgICBjb25zdCBXZWJWZWN0b3I8V2ViQ29tcG9zaXRpb25VbmRlcmxpbmU+JiB1bmRlcmxpbmVz LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3Bw IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCmluZGV4IDA1YWFi NDMuLmE3ZWY0M2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZp ZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5j cHAKQEAgLTMzNSw2ICszMzUsNyBAQCBXZWJWaWV3SW1wbDo6V2ViVmlld0ltcGwoV2ViVmlld0Ns aWVudCogY2xpZW50KQogICAgICwgbV9jb21wb3NpdG9yQ3JlYXRpb25GYWlsZWQoZmFsc2UpCiAg ICAgLCBtX3JlY3JlYXRpbmdHcmFwaGljc0NvbnRleHQoZmFsc2UpCiAjZW5kaWYKKyAgICAsIG1f cG9wdXBMaXN0Qm94TWluaW11bVJvd0hlaWdodCgwKQogI2lmIEVOQUJMRShJTlBVVF9TUEVFQ0gp CiAgICAgLCBtX3NwZWVjaElucHV0Q2xpZW50KFNwZWVjaElucHV0Q2xpZW50SW1wbDo6Y3JlYXRl KGNsaWVudCkpCiAjZW5kaWYKQEAgLTEzNjAsNiArMTM2MSwxMSBAQCB2b2lkIFdlYlZpZXdJbXBs OjpzZXRGb2N1cyhib29sIGVuYWJsZSkKICAgICB9CiB9CiAKK3ZvaWQgV2ViVmlld0ltcGw6OnNl dFBvcHVwTGlzdEJveE1pbmltdW1Sb3dIZWlnaHQoaW50IG1pbmltdW1Sb3dIZWlnaHQpCit7Cisg ICAgbV9wb3B1cExpc3RCb3hNaW5pbXVtUm93SGVpZ2h0ID0gbWluaW11bVJvd0hlaWdodDsKK30K KwogYm9vbCBXZWJWaWV3SW1wbDo6c2V0Q29tcG9zaXRpb24oCiAgICAgY29uc3QgV2ViU3RyaW5n JiB0ZXh0LAogICAgIGNvbnN0IFdlYlZlY3RvcjxXZWJDb21wb3NpdGlvblVuZGVybGluZT4mIHVu ZGVybGluZXMsCkBAIC0yMTE1LDcgKzIxMjEsOCBAQCB2b2lkIFdlYlZpZXdJbXBsOjphcHBseUF1 dG9maWxsU3VnZ2VzdGlvbnMoCiAgICAgaWYgKCFtX2F1dG9maWxsUG9wdXAuZ2V0KCkpIHsKICAg ICAgICAgbV9hdXRvZmlsbFBvcHVwID0gUG9wdXBDb250YWluZXI6OmNyZWF0ZShtX2F1dG9maWxs UG9wdXBDbGllbnQuZ2V0KCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgUG9wdXBDb250YWluZXI6OlN1Z2dlc3Rpb24sCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYXV0b2ZpbGxQb3B1cFNldHRpbmdzKTsK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhdXRvZmls bFBvcHVwU2V0dGluZ3MsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgcG9wdXBMaXN0Qm94TWluaW11bVJvd0hlaWdodCgpKTsKICAgICB9CiAKICAgICBp ZiAobV9hdXRvZmlsbFBvcHVwU2hvd2luZykgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YlZpZXdJbXBsLmgKaW5kZXggMjlhNjY4Mi4uN2U1ZjEwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJWaWV3SW1wbC5oCkBAIC0xMDQsNiArMTA0LDggQEAgcHVibGljOgogICAgIHZp cnR1YWwgYm9vbCBoYW5kbGVJbnB1dEV2ZW50KGNvbnN0IFdlYklucHV0RXZlbnQmKTsKICAgICB2 aXJ0dWFsIHZvaWQgbW91c2VDYXB0dXJlTG9zdCgpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRGb2N1 cyhib29sIGVuYWJsZSk7CisgICAgdmlydHVhbCB2b2lkIHNldFBvcHVwTGlzdEJveE1pbmltdW1S b3dIZWlnaHQoaW50IG1pbmltdW1Sb3dIZWlnaHQpOworICAgIHZpcnR1YWwgaW50IHBvcHVwTGlz dEJveE1pbmltdW1Sb3dIZWlnaHQoKSBjb25zdCB7IHJldHVybiBtX3BvcHVwTGlzdEJveE1pbmlt dW1Sb3dIZWlnaHQ7IH0KICAgICB2aXJ0dWFsIGJvb2wgc2V0Q29tcG9zaXRpb24oCiAgICAgICAg IGNvbnN0IFdlYlN0cmluZyYgdGV4dCwKICAgICAgICAgY29uc3QgV2ViVmVjdG9yPFdlYkNvbXBv c2l0aW9uVW5kZXJsaW5lPiYgdW5kZXJsaW5lcywKQEAgLTU1Nyw2ICs1NTksOCBAQCBwcml2YXRl OgogI2VuZGlmCiAgICAgc3RhdGljIGNvbnN0IFdlYklucHV0RXZlbnQqIG1fY3VycmVudElucHV0 RXZlbnQ7CiAKKyAgICBpbnQgbV9wb3B1cExpc3RCb3hNaW5pbXVtUm93SGVpZ2h0OworCiAjaWYg RU5BQkxFKElOUFVUX1NQRUVDSCkKICAgICBPd25QdHI8U3BlZWNoSW5wdXRDbGllbnRJbXBsPiBt X3NwZWVjaElucHV0Q2xpZW50OwogI2VuZGlmCg== 101870 2011-07-25 08:08:17 -0700 2011-07-25 15:58:53 -0700 Fixed style webkitcombopatch text/plain 13262 fsamuel ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BvcHVwTWVudUNo cm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BvcHVwTWVudUNo cm9taXVtLmNwcAppbmRleCA2MjhiOTE5Li5mNGM5NTA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uY3BwCkBAIC05MSw5 ICs5MSw5IEBAIHN0YXRpYyBjb25zdCBQb3B1cENvbnRhaW5lclNldHRpbmdzIGRyb3BEb3duU2V0 dGluZ3MgPSB7CiAvLyBib3ggKCJjb21ib2JveCIgb24gV2luZG93cykuCiBjbGFzcyBQb3B1cExp c3RCb3ggOiBwdWJsaWMgRnJhbWVsZXNzU2Nyb2xsVmlldyB7CiBwdWJsaWM6Ci0gICAgc3RhdGlj IFBhc3NSZWZQdHI8UG9wdXBMaXN0Qm94PiBjcmVhdGUoUG9wdXBNZW51Q2xpZW50KiBjbGllbnQs IGNvbnN0IFBvcHVwQ29udGFpbmVyU2V0dGluZ3MmIHNldHRpbmdzKQorICAgIHN0YXRpYyBQYXNz UmVmUHRyPFBvcHVwTGlzdEJveD4gY3JlYXRlKFBvcHVwTWVudUNsaWVudCogY2xpZW50LCBjb25z dCBQb3B1cENvbnRhaW5lclNldHRpbmdzJiBzZXR0aW5ncywgaW50IG1pbmltdW1Sb3dIZWlnaHQp CiAgICAgewotICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IFBvcHVwTGlzdEJveChjbGllbnQs IHNldHRpbmdzKSk7CisgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgUG9wdXBMaXN0Qm94KGNs aWVudCwgc2V0dGluZ3MsIG1pbmltdW1Sb3dIZWlnaHQpKTsKICAgICB9CiAKICAgICAvLyBGcmFt ZWxlc3NTY3JvbGxWaWV3CkBAIC0xNDUsNiArMTQ1LDggQEAgcHVibGljOgogICAgIC8vIEdldHMg dGhlIGhlaWdodCBvZiBhIHJvdy4KICAgICBpbnQgZ2V0Um93SGVpZ2h0KGludCBpbmRleCk7CiAK KyAgICB2b2lkIHNldE1pbmltdW1Sb3dIZWlnaHQoaW50IG1fbWluaW11bVJvd0hlaWdodCkgeyBt X21pbmltdW1Sb3dIZWlnaHQgPSBtX21pbmltdW1Sb3dIZWlnaHQ7IH0KKwogICAgIHZvaWQgc2V0 TWF4SGVpZ2h0KGludCBtYXhIZWlnaHQpIHsgbV9tYXhIZWlnaHQgPSBtYXhIZWlnaHQ7IH0KIAog ICAgIHZvaWQgc2V0TWF4V2lkdGgoaW50IG1heFdpZHRoKSB7IG1fbWF4V2luZG93V2lkdGggPSBt YXhXaWR0aDsgfQpAQCAtMTU5LDcgKzE2MSw3IEBAIHByaXZhdGU6CiAgICAgZnJpZW5kIGNsYXNz IFBvcHVwQ29udGFpbmVyOwogICAgIGZyaWVuZCBjbGFzcyBSZWZDb3VudGVkPFBvcHVwTGlzdEJv eD47CiAKLSAgICBQb3B1cExpc3RCb3goUG9wdXBNZW51Q2xpZW50KiBjbGllbnQsIGNvbnN0IFBv cHVwQ29udGFpbmVyU2V0dGluZ3MmIHNldHRpbmdzKQorICAgIFBvcHVwTGlzdEJveChQb3B1cE1l bnVDbGllbnQqIGNsaWVudCwgY29uc3QgUG9wdXBDb250YWluZXJTZXR0aW5ncyYgc2V0dGluZ3Ms IGludCBtaW5pbXVtUm93SGVpZ2h0KQogICAgICAgICA6IG1fc2V0dGluZ3Moc2V0dGluZ3MpCiAg ICAgICAgICwgbV9vcmlnaW5hbEluZGV4KDApCiAgICAgICAgICwgbV9zZWxlY3RlZEluZGV4KDAp CkBAIC0xNzEsNiArMTczLDcgQEAgcHJpdmF0ZToKICAgICAgICAgLCBtX3JlcGVhdGluZ0NoYXIo MCkKICAgICAgICAgLCBtX2xhc3RDaGFyVGltZSgwKQogICAgICAgICAsIG1fbWF4V2luZG93V2lk dGgobnVtZXJpY19saW1pdHM8aW50Pjo6bWF4KCkpCisgICAgICAgICwgbV9taW5pbXVtUm93SGVp Z2h0KG1pbmltdW1Sb3dIZWlnaHQpCiAgICAgewogICAgICAgICBzZXRTY3JvbGxiYXJNb2RlcyhT Y3JvbGxiYXJBbHdheXNPZmYsIFNjcm9sbGJhckFsd2F5c09mZik7CiAgICAgfQpAQCAtMjgzLDYg KzI4Niw5IEBAIHByaXZhdGU6CiAKICAgICAvLyBUbyBmb3J3YXJkIGxhc3QgbW91c2UgcmVsZWFz ZSBldmVudC4KICAgICBSZWZQdHI8Tm9kZT4gbV9mb2N1c2VkTm9kZTsKKworICAgIC8vIFRoZSBt aW5pbXVtIGhlaWdodCBvZiBhIHJvdyBvZiB0aGUgbGlzdCBib3guCisgICAgaW50IG1fbWluaW11 bVJvd0hlaWdodDsKIH07CiAKIHN0YXRpYyBQbGF0Zm9ybU1vdXNlRXZlbnQgY29uc3RydWN0UmVs YXRpdmVNb3VzZUV2ZW50KGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYgZSwKQEAgLTMxOSwxNSAr MzI1LDE3IEBAIHN0YXRpYyBQbGF0Zm9ybVdoZWVsRXZlbnQgY29uc3RydWN0UmVsYXRpdmVXaGVl bEV2ZW50KGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYKIC8vIHN0YXRpYwogUGFzc1JlZlB0cjxQ b3B1cENvbnRhaW5lcj4gUG9wdXBDb250YWluZXI6OmNyZWF0ZShQb3B1cE1lbnVDbGllbnQqIGNs aWVudCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg UG9wdXBUeXBlIHBvcHVwVHlwZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgY29uc3QgUG9wdXBDb250YWluZXJTZXR0aW5ncyYgc2V0dGluZ3MpCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFBv cHVwQ29udGFpbmVyU2V0dGluZ3MmIHNldHRpbmdzLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgbWluaW11bVJvd0hlaWdodCkKIHsKLSAgICBy ZXR1cm4gYWRvcHRSZWYobmV3IFBvcHVwQ29udGFpbmVyKGNsaWVudCwgcG9wdXBUeXBlLCBzZXR0 aW5ncykpOworICAgIHJldHVybiBhZG9wdFJlZihuZXcgUG9wdXBDb250YWluZXIoY2xpZW50LCBw b3B1cFR5cGUsIHNldHRpbmdzLCBtaW5pbXVtUm93SGVpZ2h0KSk7CiB9CiAKIFBvcHVwQ29udGFp bmVyOjpQb3B1cENvbnRhaW5lcihQb3B1cE1lbnVDbGllbnQqIGNsaWVudCwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBQb3B1cFR5cGUgcG9wdXBUeXBlLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGNvbnN0IFBvcHVwQ29udGFpbmVyU2V0dGluZ3MmIHNldHRpbmdzKQot ICAgIDogbV9saXN0Qm94KFBvcHVwTGlzdEJveDo6Y3JlYXRlKGNsaWVudCwgc2V0dGluZ3MpKQor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFBvcHVwQ29udGFpbmVyU2V0dGlu Z3MmIHNldHRpbmdzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludCBtaW5pbXVt Um93SGVpZ2h0KQorICAgIDogbV9saXN0Qm94KFBvcHVwTGlzdEJveDo6Y3JlYXRlKGNsaWVudCwg c2V0dGluZ3MsIG1pbmltdW1Sb3dIZWlnaHQpKQogICAgICwgbV9zZXR0aW5ncyhzZXR0aW5ncykK ICAgICAsIG1fcG9wdXBUeXBlKHBvcHVwVHlwZSkKICAgICAsIG1fcG9wdXBPcGVuKGZhbHNlKQpA QCAtMTE3NiwxNCArMTE4NCwxNCBAQCB2b2lkIFBvcHVwTGlzdEJveDo6c2V0T3JpZ2luYWxJbmRl eChpbnQgaW5kZXgpCiBpbnQgUG9wdXBMaXN0Qm94OjpnZXRSb3dIZWlnaHQoaW50IGluZGV4KQog ewogICAgIGlmIChpbmRleCA8IDApCi0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4g bV9taW5pbXVtUm93SGVpZ2h0OwogCiAgICAgaWYgKG1fcG9wdXBDbGllbnQtPml0ZW1TdHlsZShp bmRleCkuaXNEaXNwbGF5Tm9uZSgpKQotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJu IG1fbWluaW11bVJvd0hlaWdodDsKIAogICAgIC8vIFNlcGFyYXRvciByb3cgaGVpZ2h0IGlzIHRo ZSBzYW1lIHNpemUgYXMgaXRzZWxmLgogICAgIGlmIChtX3BvcHVwQ2xpZW50LT5pdGVtSXNTZXBh cmF0b3IoaW5kZXgpKQotICAgICAgICByZXR1cm4gc2VwYXJhdG9ySGVpZ2h0OworICAgICAgICBy ZXR1cm4gbWF4KHNlcGFyYXRvckhlaWdodCwgbV9taW5pbXVtUm93SGVpZ2h0KTsKIAogICAgIFN0 cmluZyBpY29uID0gbV9wb3B1cENsaWVudC0+aXRlbUljb24oaW5kZXgpOwogICAgIFJlZlB0cjxJ bWFnZT4gaW1hZ2UoSW1hZ2U6OmxvYWRQbGF0Zm9ybVJlc291cmNlKGljb24udXRmOCgpLmRhdGEo KSkpOwpAQCAtMTE5Miw3ICsxMjAwLDggQEAgaW50IFBvcHVwTGlzdEJveDo6Z2V0Um93SGVpZ2h0 KGludCBpbmRleCkKICAgICBpbnQgaWNvbkhlaWdodCA9IChpbWFnZSAmJiAhaW1hZ2UtPmlzTnVs bCgpKSA/IGltYWdlLT5yZWN0KCkuaGVpZ2h0KCkgOiAwOwogCiAgICAgaW50IGxpbmVQYWRkaW5n SGVpZ2h0ID0gbV9wb3B1cENsaWVudC0+bWVudVN0eWxlKCkubWVudVR5cGUoKSA9PSBQb3B1cE1l bnVTdHlsZTo6QXV0b2ZpbGxQb3B1cCA/IGtMaW5lUGFkZGluZ0hlaWdodCA6IDA7Ci0gICAgcmV0 dXJuIG1heChmb250SGVpZ2h0LCBpY29uSGVpZ2h0KSArIGxpbmVQYWRkaW5nSGVpZ2h0ICogMjsK KyAgICBpbnQgY2FsY3VsYXRlZFJvd0hlaWdodCA9IG1heChmb250SGVpZ2h0LCBpY29uSGVpZ2h0 KSArIGxpbmVQYWRkaW5nSGVpZ2h0ICogMjsKKyAgICByZXR1cm4gbWF4KGNhbGN1bGF0ZWRSb3dI ZWlnaHQsIG1fbWluaW11bVJvd0hlaWdodCk7CiB9CiAKIEludFJlY3QgUG9wdXBMaXN0Qm94Ojpn ZXRSb3dCb3VuZHMoaW50IGluZGV4KQpAQCAtMTQ3NSw4ICsxNDg0LDkgQEAgYm9vbCBQb3B1cExp c3RCb3g6OmlzUG9pbnRJbkJvdW5kcyhjb25zdCBJbnRQb2ludCYgcG9pbnQpCiAvLyAgICAgICBw b3J0YWJpbGl0eSBsYXllci4gVG8gYWNjZXNzIG1ldGhvZHMgYW5kIHByb3BlcnRpZXMgb24gdGhl CiAvLyAgICAgICBwb3B1cCB3aWRnZXRzLCB1c2UgfHBvcHVwV2luZG93fCBhYm92ZS4KIAotUG9w dXBNZW51Q2hyb21pdW06OlBvcHVwTWVudUNocm9taXVtKFBvcHVwTWVudUNsaWVudCogY2xpZW50 KQorUG9wdXBNZW51Q2hyb21pdW06OlBvcHVwTWVudUNocm9taXVtKFBvcHVwTWVudUNsaWVudCog Y2xpZW50LCBpbnQgbWluaW11bVJvd0hlaWdodCkKICAgICA6IG1fcG9wdXBDbGllbnQoY2xpZW50 KQorICAgICwgbV9taW5pbXVtUm93SGVpZ2h0KG1pbmltdW1Sb3dIZWlnaHQpCiB7CiB9CiAKQEAg LTE0OTIsNyArMTUwMiw3IEBAIFBvcHVwTWVudUNocm9taXVtOjp+UG9wdXBNZW51Q2hyb21pdW0o KQogdm9pZCBQb3B1cE1lbnVDaHJvbWl1bTo6c2hvdyhjb25zdCBJbnRSZWN0JiByLCBGcmFtZVZp ZXcqIHYsIGludCBpbmRleCkKIHsKICAgICBpZiAoIXAucG9wdXApCi0gICAgICAgIHAucG9wdXAg PSBQb3B1cENvbnRhaW5lcjo6Y3JlYXRlKGNsaWVudCgpLCBQb3B1cENvbnRhaW5lcjo6U2VsZWN0 LCBkcm9wRG93blNldHRpbmdzKTsKKyAgICAgICAgcC5wb3B1cCA9IFBvcHVwQ29udGFpbmVyOjpj cmVhdGUoY2xpZW50KCksIFBvcHVwQ29udGFpbmVyOjpTZWxlY3QsIGRyb3BEb3duU2V0dGluZ3Ms IG1fbWluaW11bVJvd0hlaWdodCk7CiAgICAgcC5wb3B1cC0+c2hvd0luUmVjdChyLCB2LCBpbmRl eCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Bv cHVwTWVudUNocm9taXVtLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1 cE1lbnVDaHJvbWl1bS5oCmluZGV4IDQ2YzEyMzMuLmIyNTQ0ZDEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVtLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uaApAQCAtMTA5 LDcgKzEwOSw3IEBAIHB1YmxpYzoKICAgICB9OwogCiAgICAgc3RhdGljIFBhc3NSZWZQdHI8UG9w dXBDb250YWluZXI+IGNyZWF0ZShQb3B1cE1lbnVDbGllbnQqLCBQb3B1cFR5cGUsCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBQb3B1cENvbnRhaW5l clNldHRpbmdzJik7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjb25zdCBQb3B1cENvbnRhaW5lclNldHRpbmdzJiwgaW50KTsKIAogICAgIC8vIFdoZXRoZXIg YSBrZXkgZXZlbnQgc2hvdWxkIGJlIHNlbnQgdG8gdGhpcyBwb3B1cC4KICAgICB2aXJ0dWFsIGJv b2wgaXNJbnRlcmVzdGVkSW5FdmVudEZvcktleShpbnQga2V5Q29kZSk7CkBAIC0xNzUsNyArMTc1 LDcgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBmcmllbmQgY2xhc3MgV1RGOjpSZWZDb3VudGVk PFBvcHVwQ29udGFpbmVyPjsKIAotICAgIFBvcHVwQ29udGFpbmVyKFBvcHVwTWVudUNsaWVudCos IFBvcHVwVHlwZSBwb3B1cFR5cGUsIGNvbnN0IFBvcHVwQ29udGFpbmVyU2V0dGluZ3MmKTsKKyAg ICBQb3B1cENvbnRhaW5lcihQb3B1cE1lbnVDbGllbnQqLCBQb3B1cFR5cGUsIGNvbnN0IFBvcHVw Q29udGFpbmVyU2V0dGluZ3MmLCBpbnQpOwogICAgIH5Qb3B1cENvbnRhaW5lcigpOwogCiAgICAg Ly8gUGFpbnQgdGhlIGJvcmRlci4KQEAgLTE5OSw3ICsxOTksNyBAQCBwcml2YXRlOgogCiBjbGFz cyBQb3B1cE1lbnVDaHJvbWl1bSA6IHB1YmxpYyBQb3B1cE1lbnUgewogcHVibGljOgotICAgIFBv cHVwTWVudUNocm9taXVtKFBvcHVwTWVudUNsaWVudCopOworICAgIFBvcHVwTWVudUNocm9taXVt KFBvcHVwTWVudUNsaWVudCosIGludCk7CiAgICAgflBvcHVwTWVudUNocm9taXVtKCk7CiAKICAg ICB2aXJ0dWFsIHZvaWQgc2hvdyhjb25zdCBJbnRSZWN0JiwgRnJhbWVWaWV3KiwgaW50IGluZGV4 KTsKQEAgLTIxMiw2ICsyMTIsNyBAQCBwcml2YXRlOgogCiAgICAgUG9wdXBNZW51Q2xpZW50KiBt X3BvcHVwQ2xpZW50OwogICAgIFBvcHVwTWVudVByaXZhdGUgcDsKKyAgICBpbnQgbV9taW5pbXVt Um93SGVpZ2h0OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2VhcmNoUG9wdXBNZW51Q2hyb21pdW0uY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2VhcmNoUG9wdXBNZW51Q2hyb21p dW0uY3BwCmluZGV4IGNhNWJlYmUuLmE5Nzg1ODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2Nocm9taXVtL1NlYXJjaFBvcHVwTWVudUNocm9taXVtLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TZWFyY2hQb3B1cE1lbnVDaHJvbWl1bS5jcHAK QEAgLTM3LDggKzM3LDggQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1TZWFyY2hQb3B1cE1l bnVDaHJvbWl1bTo6U2VhcmNoUG9wdXBNZW51Q2hyb21pdW0oUG9wdXBNZW51Q2xpZW50KiBjbGll bnQpCi0gICAgOiBtX3BvcHVwKGFkb3B0UmVmKG5ldyBQb3B1cE1lbnVDaHJvbWl1bShjbGllbnQp KSkKK1NlYXJjaFBvcHVwTWVudUNocm9taXVtOjpTZWFyY2hQb3B1cE1lbnVDaHJvbWl1bShQb3B1 cE1lbnVDbGllbnQqIGNsaWVudCwgaW50IG1pbmltdW1Sb3dIZWlnaHQpCisgICAgOiBtX3BvcHVw KGFkb3B0UmVmKG5ldyBQb3B1cE1lbnVDaHJvbWl1bShjbGllbnQsIG1pbmltdW1Sb3dIZWlnaHQp KSkKIHsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0v U2VhcmNoUG9wdXBNZW51Q2hyb21pdW0uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9t aXVtL1NlYXJjaFBvcHVwTWVudUNocm9taXVtLmgKaW5kZXggODI3ZmY2Ni4uN2ZhMzA0YiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2VhcmNoUG9wdXBNZW51 Q2hyb21pdW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TZWFyY2hQ b3B1cE1lbnVDaHJvbWl1bS5oCkBAIC0yOCw3ICsyOCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAogY2xhc3MgU2VhcmNoUG9wdXBNZW51Q2hyb21pdW0gOiBwdWJsaWMgU2VhcmNoUG9wdXBNZW51 IHsKIHB1YmxpYzoKLSAgICBTZWFyY2hQb3B1cE1lbnVDaHJvbWl1bShQb3B1cE1lbnVDbGllbnQq KTsKKyAgICBTZWFyY2hQb3B1cE1lbnVDaHJvbWl1bShQb3B1cE1lbnVDbGllbnQqLCBpbnQpOwog CiAgICAgdmlydHVhbCBQb3B1cE1lbnUqIHBvcHVwTWVudSgpOwogICAgIHZpcnR1YWwgdm9pZCBz YXZlUmVjZW50U2VhcmNoZXMoY29uc3QgQXRvbWljU3RyaW5nJiBuYW1lLCBjb25zdCBWZWN0b3I8 U3RyaW5nPiYgc2VhcmNoSXRlbXMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViV2lkZ2V0LmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJX aWRnZXQuaAppbmRleCBmNmU3M2YxLi5mZDc0NjI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3B1YmxpYy9XZWJXaWRnZXQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9XZWJXaWRnZXQuaApAQCAtMTI2LDYgKzEyNiwxMCBAQCBwdWJsaWM6CiAgICAgICAg IGludCBzZWxlY3Rpb25TdGFydCwKICAgICAgICAgaW50IHNlbGVjdGlvbkVuZCkgeyByZXR1cm4g ZmFsc2U7IH0KIAorICAgIHZpcnR1YWwgdm9pZCBzZXRQb3B1cExpc3RCb3hNaW5pbXVtUm93SGVp Z2h0KGludCBtaW5pbXVtUm93SGVpZ2h0KSB7IH0KKworICAgIHZpcnR1YWwgaW50IHBvcHVwTGlz dEJveE1pbmltdW1Sb3dIZWlnaHQoKSBjb25zdCB7IHJldHVybiAwOyB9CisKICAgICAvLyBDYWxs ZWQgdG8gaW5mb3JtIHRoZSBXZWJXaWRnZXQgdG8gY29uZmlybSBhbiBvbmdvaW5nIGNvbXBvc2l0 aW9uLgogICAgIC8vIFRoaXMgbWV0aG9kIGlzIHNhbWUgYXMgY29uZmlybUNvbXBvc2l0aW9uKFdl YlN0cmluZygpKTsKICAgICAvLyBSZXR1cm5zIHRydWUgaWYgdGhlcmUgaXMgYW4gb25nb2luZyBj b21wb3NpdGlvbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9t ZUNsaWVudEltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50 SW1wbC5jcHAKaW5kZXggYTNlOWIwZi4uMTRjMzkwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHAKQEAgLTk0MywxMiArOTQzLDEyIEBAIFBh c3NSZWZQdHI8UG9wdXBNZW51PiBDaHJvbWVDbGllbnRJbXBsOjpjcmVhdGVQb3B1cE1lbnUoUG9w dXBNZW51Q2xpZW50KiBjbGllbnQpCiAgICAgaWYgKFdlYlZpZXdJbXBsOjp1c2VFeHRlcm5hbFBv cHVwTWVudXMoKSkKICAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBFeHRlcm5hbFBvcHVwTWVu dShjbGllbnQsIG1fd2ViVmlldy0+Y2xpZW50KCkpKTsKIAotICAgIHJldHVybiBhZG9wdFJlZihu ZXcgUG9wdXBNZW51Q2hyb21pdW0oY2xpZW50KSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBQ b3B1cE1lbnVDaHJvbWl1bShjbGllbnQsIG1fd2ViVmlldy0+cG9wdXBMaXN0Qm94TWluaW11bVJv d0hlaWdodCgpKSk7CiB9CiAKIFBhc3NSZWZQdHI8U2VhcmNoUG9wdXBNZW51PiBDaHJvbWVDbGll bnRJbXBsOjpjcmVhdGVTZWFyY2hQb3B1cE1lbnUoUG9wdXBNZW51Q2xpZW50KiBjbGllbnQpIGNv bnN0CiB7Ci0gICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBTZWFyY2hQb3B1cE1lbnVDaHJvbWl1bShj bGllbnQpKTsKKyAgICByZXR1cm4gYWRvcHRSZWYobmV3IFNlYXJjaFBvcHVwTWVudUNocm9taXVt KGNsaWVudCwgbV93ZWJWaWV3LT5wb3B1cExpc3RCb3hNaW5pbXVtUm93SGVpZ2h0KCkpKTsKIH0K IAogYm9vbCBDaHJvbWVDbGllbnRJbXBsOjpzaG91bGRSdW5Nb2RhbERpYWxvZ0R1cmluZ1BhZ2VE aXNtaXNzYWwoY29uc3QgRGlhbG9nVHlwZSYgZGlhbG9nVHlwZSwgY29uc3QgU3RyaW5nJiBkaWFs b2dNZXNzYWdlLCBGcmFtZUxvYWRlcjo6UGFnZURpc21pc3NhbFR5cGUgZGlzbWlzc2FsVHlwZSkg Y29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBvcHVwTWVu dUltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUG9wdXBNZW51SW1wbC5j cHAKaW5kZXggNzdkNWI4Mi4uOTJiZmFjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViUG9wdXBNZW51SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViUG9wdXBNZW51SW1wbC5jcHAKQEAgLTI1MSw2ICsyNTEsMTAgQEAgdm9pZCBXZWJQ b3B1cE1lbnVJbXBsOjpzZXRGb2N1cyhib29sIGVuYWJsZSkKIHsKIH0KIAordm9pZCBXZWJQb3B1 cE1lbnVJbXBsOjpzZXRQb3B1cExpc3RCb3hNaW5pbXVtUm93SGVpZ2h0KGludCBtaW5pbXVtUm93 SGVpZ2h0KQoreworfQorCiBib29sIFdlYlBvcHVwTWVudUltcGw6OnNldENvbXBvc2l0aW9uKAog ICAgIGNvbnN0IFdlYlN0cmluZyYgdGV4dCwgY29uc3QgV2ViVmVjdG9yPFdlYkNvbXBvc2l0aW9u VW5kZXJsaW5lPiYgdW5kZXJsaW5lcywKICAgICBpbnQgc2VsZWN0aW9uU3RhcnQsIGludCBzZWxl Y3Rpb25FbmQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQb3B1 cE1lbnVJbXBsLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQb3B1cE1lbnVJbXBs LmgKaW5kZXggODBlNDY1ZS4uZTNhYTQzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViUG9wdXBNZW51SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYlBvcHVwTWVudUltcGwuaApAQCAtNzMsNiArNzMsNyBAQCBwdWJsaWM6CiAgICAgdmly dHVhbCBib29sIGhhbmRsZUlucHV0RXZlbnQoY29uc3QgV2ViSW5wdXRFdmVudCYpOwogICAgIHZp cnR1YWwgdm9pZCBtb3VzZUNhcHR1cmVMb3N0KCk7CiAgICAgdmlydHVhbCB2b2lkIHNldEZvY3Vz KGJvb2wgZW5hYmxlKTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0UG9wdXBMaXN0Qm94TWluaW11bVJv d0hlaWdodChpbnQpOwogICAgIHZpcnR1YWwgYm9vbCBzZXRDb21wb3NpdGlvbigKICAgICAgICAg Y29uc3QgV2ViU3RyaW5nJiB0ZXh0LAogICAgICAgICBjb25zdCBXZWJWZWN0b3I8V2ViQ29tcG9z aXRpb25VbmRlcmxpbmU+JiB1bmRlcmxpbmVzLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViVmlld0ltcGwuY3BwCmluZGV4IDA1YWFiNDMuLmE3ZWY0M2UgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTMzNSw2ICszMzUsNyBAQCBXZWJWaWV3 SW1wbDo6V2ViVmlld0ltcGwoV2ViVmlld0NsaWVudCogY2xpZW50KQogICAgICwgbV9jb21wb3Np dG9yQ3JlYXRpb25GYWlsZWQoZmFsc2UpCiAgICAgLCBtX3JlY3JlYXRpbmdHcmFwaGljc0NvbnRl eHQoZmFsc2UpCiAjZW5kaWYKKyAgICAsIG1fcG9wdXBMaXN0Qm94TWluaW11bVJvd0hlaWdodCgw KQogI2lmIEVOQUJMRShJTlBVVF9TUEVFQ0gpCiAgICAgLCBtX3NwZWVjaElucHV0Q2xpZW50KFNw ZWVjaElucHV0Q2xpZW50SW1wbDo6Y3JlYXRlKGNsaWVudCkpCiAjZW5kaWYKQEAgLTEzNjAsNiAr MTM2MSwxMSBAQCB2b2lkIFdlYlZpZXdJbXBsOjpzZXRGb2N1cyhib29sIGVuYWJsZSkKICAgICB9 CiB9CiAKK3ZvaWQgV2ViVmlld0ltcGw6OnNldFBvcHVwTGlzdEJveE1pbmltdW1Sb3dIZWlnaHQo aW50IG1pbmltdW1Sb3dIZWlnaHQpCit7CisgICAgbV9wb3B1cExpc3RCb3hNaW5pbXVtUm93SGVp Z2h0ID0gbWluaW11bVJvd0hlaWdodDsKK30KKwogYm9vbCBXZWJWaWV3SW1wbDo6c2V0Q29tcG9z aXRpb24oCiAgICAgY29uc3QgV2ViU3RyaW5nJiB0ZXh0LAogICAgIGNvbnN0IFdlYlZlY3RvcjxX ZWJDb21wb3NpdGlvblVuZGVybGluZT4mIHVuZGVybGluZXMsCkBAIC0yMTE1LDcgKzIxMjEsOCBA QCB2b2lkIFdlYlZpZXdJbXBsOjphcHBseUF1dG9maWxsU3VnZ2VzdGlvbnMoCiAgICAgaWYgKCFt X2F1dG9maWxsUG9wdXAuZ2V0KCkpIHsKICAgICAgICAgbV9hdXRvZmlsbFBvcHVwID0gUG9wdXBD b250YWluZXI6OmNyZWF0ZShtX2F1dG9maWxsUG9wdXBDbGllbnQuZ2V0KCksCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUG9wdXBDb250YWluZXI6OlN1 Z2dlc3Rpb24sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgYXV0b2ZpbGxQb3B1cFNldHRpbmdzKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBhdXRvZmlsbFBvcHVwU2V0dGluZ3MsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcG9wdXBMaXN0Qm94TWluaW11bVJv d0hlaWdodCgpKTsKICAgICB9CiAKICAgICBpZiAobV9hdXRvZmlsbFBvcHVwU2hvd2luZykgewpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaCBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKaW5kZXggMjlhNjY4Mi4uYjY1 ZDgxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwu aAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCkBAIC0xMDQs NiArMTA0LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBoYW5kbGVJbnB1dEV2ZW50KGNv bnN0IFdlYklucHV0RXZlbnQmKTsKICAgICB2aXJ0dWFsIHZvaWQgbW91c2VDYXB0dXJlTG9zdCgp OwogICAgIHZpcnR1YWwgdm9pZCBzZXRGb2N1cyhib29sIGVuYWJsZSk7CisgICAgdmlydHVhbCB2 b2lkIHNldFBvcHVwTGlzdEJveE1pbmltdW1Sb3dIZWlnaHQoaW50KTsKKyAgICB2aXJ0dWFsIGlu dCBwb3B1cExpc3RCb3hNaW5pbXVtUm93SGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gbV9wb3B1cExp c3RCb3hNaW5pbXVtUm93SGVpZ2h0OyB9CiAgICAgdmlydHVhbCBib29sIHNldENvbXBvc2l0aW9u KAogICAgICAgICBjb25zdCBXZWJTdHJpbmcmIHRleHQsCiAgICAgICAgIGNvbnN0IFdlYlZlY3Rv cjxXZWJDb21wb3NpdGlvblVuZGVybGluZT4mIHVuZGVybGluZXMsCkBAIC01NTcsNiArNTU5LDgg QEAgcHJpdmF0ZToKICNlbmRpZgogICAgIHN0YXRpYyBjb25zdCBXZWJJbnB1dEV2ZW50KiBtX2N1 cnJlbnRJbnB1dEV2ZW50OwogCisgICAgaW50IG1fcG9wdXBMaXN0Qm94TWluaW11bVJvd0hlaWdo dDsKKwogI2lmIEVOQUJMRShJTlBVVF9TUEVFQ0gpCiAgICAgT3duUHRyPFNwZWVjaElucHV0Q2xp ZW50SW1wbD4gbV9zcGVlY2hJbnB1dENsaWVudDsKICNlbmRpZgo= 101933 2011-07-25 15:58:53 -0700 2011-07-26 16:22:58 -0700 Updated according to fishd webkitcombopatch text/plain 4034 fsamuel ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BvcHVwTWVudUNo cm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BvcHVwTWVudUNo cm9taXVtLmNwcAppbmRleCA2MjhiOTE5Li4yNzIwMDU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uY3BwCkBAIC02Nyw2 ICs2Nyw4IEBAIHVzaW5nIHN0ZDo6bWF4OwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK2ludCBQ b3B1cE1lbnVDaHJvbWl1bTo6c19taW5pbXVtUm93SGVpZ2h0ID0gMDsKKwogdHlwZWRlZiB1bnNp Z25lZCBsb25nIGxvbmcgVGltZVN0YW1wOwogCiBzdGF0aWMgY29uc3QgaW50IGtNYXhWaXNpYmxl Um93cyA9IDIwOwpAQCAtMTE3NiwxNCArMTE3OCwxNCBAQCB2b2lkIFBvcHVwTGlzdEJveDo6c2V0 T3JpZ2luYWxJbmRleChpbnQgaW5kZXgpCiBpbnQgUG9wdXBMaXN0Qm94OjpnZXRSb3dIZWlnaHQo aW50IGluZGV4KQogewogICAgIGlmIChpbmRleCA8IDApCi0gICAgICAgIHJldHVybiAwOworICAg ICAgICByZXR1cm4gUG9wdXBNZW51Q2hyb21pdW06OnBvcHVwTGlzdEJveE1pbmltdW1Sb3dIZWln aHQoKTsKIAogICAgIGlmIChtX3BvcHVwQ2xpZW50LT5pdGVtU3R5bGUoaW5kZXgpLmlzRGlzcGxh eU5vbmUoKSkKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiBQb3B1cE1lbnVDaHJv bWl1bTo6cG9wdXBMaXN0Qm94TWluaW11bVJvd0hlaWdodCgpOwogCiAgICAgLy8gU2VwYXJhdG9y IHJvdyBoZWlnaHQgaXMgdGhlIHNhbWUgc2l6ZSBhcyBpdHNlbGYuCiAgICAgaWYgKG1fcG9wdXBD bGllbnQtPml0ZW1Jc1NlcGFyYXRvcihpbmRleCkpCi0gICAgICAgIHJldHVybiBzZXBhcmF0b3JI ZWlnaHQ7CisgICAgICAgIHJldHVybiBtYXgoc2VwYXJhdG9ySGVpZ2h0LCBQb3B1cE1lbnVDaHJv bWl1bTo6cG9wdXBMaXN0Qm94TWluaW11bVJvd0hlaWdodCgpKTsKIAogICAgIFN0cmluZyBpY29u ID0gbV9wb3B1cENsaWVudC0+aXRlbUljb24oaW5kZXgpOwogICAgIFJlZlB0cjxJbWFnZT4gaW1h Z2UoSW1hZ2U6OmxvYWRQbGF0Zm9ybVJlc291cmNlKGljb24udXRmOCgpLmRhdGEoKSkpOwpAQCAt MTE5Miw3ICsxMTk0LDggQEAgaW50IFBvcHVwTGlzdEJveDo6Z2V0Um93SGVpZ2h0KGludCBpbmRl eCkKICAgICBpbnQgaWNvbkhlaWdodCA9IChpbWFnZSAmJiAhaW1hZ2UtPmlzTnVsbCgpKSA/IGlt YWdlLT5yZWN0KCkuaGVpZ2h0KCkgOiAwOwogCiAgICAgaW50IGxpbmVQYWRkaW5nSGVpZ2h0ID0g bV9wb3B1cENsaWVudC0+bWVudVN0eWxlKCkubWVudVR5cGUoKSA9PSBQb3B1cE1lbnVTdHlsZTo6 QXV0b2ZpbGxQb3B1cCA/IGtMaW5lUGFkZGluZ0hlaWdodCA6IDA7Ci0gICAgcmV0dXJuIG1heChm b250SGVpZ2h0LCBpY29uSGVpZ2h0KSArIGxpbmVQYWRkaW5nSGVpZ2h0ICogMjsKKyAgICBpbnQg Y2FsY3VsYXRlZFJvd0hlaWdodCA9IG1heChmb250SGVpZ2h0LCBpY29uSGVpZ2h0KSArIGxpbmVQ YWRkaW5nSGVpZ2h0ICogMjsKKyAgICByZXR1cm4gbWF4KGNhbGN1bGF0ZWRSb3dIZWlnaHQsIFBv cHVwTWVudUNocm9taXVtOjpwb3B1cExpc3RCb3hNaW5pbXVtUm93SGVpZ2h0KCkpOwogfQogCiBJ bnRSZWN0IFBvcHVwTGlzdEJveDo6Z2V0Um93Qm91bmRzKGludCBpbmRleCkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVtLmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5oCmluZGV4 IDQ2YzEyMzMuLjkyYzM5ZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2No cm9taXVtL1BvcHVwTWVudUNocm9taXVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Y2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uaApAQCAtMTc1LDcgKzE3NSw3IEBAIHB1YmxpYzoK IHByaXZhdGU6CiAgICAgZnJpZW5kIGNsYXNzIFdURjo6UmVmQ291bnRlZDxQb3B1cENvbnRhaW5l cj47CiAKLSAgICBQb3B1cENvbnRhaW5lcihQb3B1cE1lbnVDbGllbnQqLCBQb3B1cFR5cGUgcG9w dXBUeXBlLCBjb25zdCBQb3B1cENvbnRhaW5lclNldHRpbmdzJik7CisgICAgUG9wdXBDb250YWlu ZXIoUG9wdXBNZW51Q2xpZW50KiwgUG9wdXBUeXBlLCBjb25zdCBQb3B1cENvbnRhaW5lclNldHRp bmdzJik7CiAgICAgflBvcHVwQ29udGFpbmVyKCk7CiAKICAgICAvLyBQYWludCB0aGUgYm9yZGVy LgpAQCAtMjA3LDExICsyMDcsMTYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVG cm9tRWxlbWVudCgpOwogICAgIHZpcnR1YWwgdm9pZCBkaXNjb25uZWN0Q2xpZW50KCk7CiAKKyAg ICBzdGF0aWMgaW50IHBvcHVwTGlzdEJveE1pbmltdW1Sb3dIZWlnaHQoKSB7IHJldHVybiBzX21p bmltdW1Sb3dIZWlnaHQ7IH0KKyAgICBzdGF0aWMgdm9pZCBzZXRQb3B1cExpc3RCb3hNaW5pbXVt Um93SGVpZ2h0KGludCBtaW5pbXVtUm93SGVpZ2h0KSB7IHNfbWluaW11bVJvd0hlaWdodCA9IG1p bmltdW1Sb3dIZWlnaHQ7IH0KKwogcHJpdmF0ZToKICAgICBQb3B1cE1lbnVDbGllbnQqIGNsaWVu dCgpIGNvbnN0IHsgcmV0dXJuIG1fcG9wdXBDbGllbnQ7IH0KIAogICAgIFBvcHVwTWVudUNsaWVu dCogbV9wb3B1cENsaWVudDsKICAgICBQb3B1cE1lbnVQcml2YXRlIHA7CisKKyAgICBzdGF0aWMg aW50IHNfbWluaW11bVJvd0hlaWdodDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlBvcHVwTWVudS5oIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUG9wdXBNZW51LmgKaW5kZXggYzJjZGVj My4uYjdlMTlkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi UG9wdXBNZW51LmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUG9wdXBN ZW51LmgKQEAgLTQxLDYgKzQxLDggQEAgY2xhc3MgV2ViV2lkZ2V0Q2xpZW50OwogY2xhc3MgV2Vi UG9wdXBNZW51IDogcHVibGljIFdlYldpZGdldCB7CiBwdWJsaWM6CiAgICAgV0VCS0lUX0FQSSBz dGF0aWMgV2ViUG9wdXBNZW51KiBjcmVhdGUoV2ViV2lkZ2V0Q2xpZW50Kik7CisgICAgLy8gU2V0 cyB0aGUgbWluaW11bSBoZWlnaHQgb2YgYSBwb3B1cCBsaXN0Ym94IHJvdy4KKyAgICBXRUJLSVRf QVBJIHN0YXRpYyB2b2lkIHNldFBvcHVwTGlzdEJveE1pbmltdW1Sb3dIZWlnaHQoaW50KTsKIH07 CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViUG9wdXBNZW51SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJQb3B1cE1lbnVJbXBsLmNwcAppbmRleCA3N2Q1YjgyLi4zMzk4ODQxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQb3B1cE1lbnVJbXBsLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQb3B1cE1lbnVJbXBsLmNwcApAQCAtMjUxLDYg KzI1MSwxMSBAQCB2b2lkIFdlYlBvcHVwTWVudUltcGw6OnNldEZvY3VzKGJvb2wgZW5hYmxlKQog ewogfQogCit2b2lkIFdlYlBvcHVwTWVudTo6c2V0UG9wdXBMaXN0Qm94TWluaW11bVJvd0hlaWdo dChpbnQgbWluaW11bVJvd0hlaWdodCkKK3sKKyAgICBQb3B1cE1lbnVDaHJvbWl1bTo6c2V0UG9w dXBMaXN0Qm94TWluaW11bVJvd0hlaWdodChtaW5pbXVtUm93SGVpZ2h0KTsKK30KKwogYm9vbCBX ZWJQb3B1cE1lbnVJbXBsOjpzZXRDb21wb3NpdGlvbigKICAgICBjb25zdCBXZWJTdHJpbmcmIHRl eHQsIGNvbnN0IFdlYlZlY3RvcjxXZWJDb21wb3NpdGlvblVuZGVybGluZT4mIHVuZGVybGluZXMs CiAgICAgaW50IHNlbGVjdGlvblN0YXJ0LCBpbnQgc2VsZWN0aW9uRW5kKQo= 102072 2011-07-26 16:22:58 -0700 2011-07-27 07:33:53 -0700 Fixed a couple of nits webkitcombopatch text/plain 3928 fsamuel ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BvcHVwTWVudUNo cm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BvcHVwTWVudUNo cm9taXVtLmNwcAppbmRleCA2MjhiOTE5Li44ODMzMTE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uY3BwCkBAIC02Nyw2 ICs2Nyw4IEBAIHVzaW5nIHN0ZDo6bWF4OwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK2ludCBQ b3B1cE1lbnVDaHJvbWl1bTo6c19taW5pbXVtUm93SGVpZ2h0ID0gMDsKKwogdHlwZWRlZiB1bnNp Z25lZCBsb25nIGxvbmcgVGltZVN0YW1wOwogCiBzdGF0aWMgY29uc3QgaW50IGtNYXhWaXNpYmxl Um93cyA9IDIwOwpAQCAtMTE3NiwxNCArMTE3OCwxNCBAQCB2b2lkIFBvcHVwTGlzdEJveDo6c2V0 T3JpZ2luYWxJbmRleChpbnQgaW5kZXgpCiBpbnQgUG9wdXBMaXN0Qm94OjpnZXRSb3dIZWlnaHQo aW50IGluZGV4KQogewogICAgIGlmIChpbmRleCA8IDApCi0gICAgICAgIHJldHVybiAwOworICAg ICAgICByZXR1cm4gUG9wdXBNZW51Q2hyb21pdW06Om1pbmltdW1Sb3dIZWlnaHQoKTsKIAogICAg IGlmIChtX3BvcHVwQ2xpZW50LT5pdGVtU3R5bGUoaW5kZXgpLmlzRGlzcGxheU5vbmUoKSkKLSAg ICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiBQb3B1cE1lbnVDaHJvbWl1bTo6bWluaW11 bVJvd0hlaWdodCgpOwogCiAgICAgLy8gU2VwYXJhdG9yIHJvdyBoZWlnaHQgaXMgdGhlIHNhbWUg c2l6ZSBhcyBpdHNlbGYuCiAgICAgaWYgKG1fcG9wdXBDbGllbnQtPml0ZW1Jc1NlcGFyYXRvcihp bmRleCkpCi0gICAgICAgIHJldHVybiBzZXBhcmF0b3JIZWlnaHQ7CisgICAgICAgIHJldHVybiBt YXgoc2VwYXJhdG9ySGVpZ2h0LCBQb3B1cE1lbnVDaHJvbWl1bTo6bWluaW11bVJvd0hlaWdodCgp KTsKIAogICAgIFN0cmluZyBpY29uID0gbV9wb3B1cENsaWVudC0+aXRlbUljb24oaW5kZXgpOwog ICAgIFJlZlB0cjxJbWFnZT4gaW1hZ2UoSW1hZ2U6OmxvYWRQbGF0Zm9ybVJlc291cmNlKGljb24u dXRmOCgpLmRhdGEoKSkpOwpAQCAtMTE5Miw3ICsxMTk0LDggQEAgaW50IFBvcHVwTGlzdEJveDo6 Z2V0Um93SGVpZ2h0KGludCBpbmRleCkKICAgICBpbnQgaWNvbkhlaWdodCA9IChpbWFnZSAmJiAh aW1hZ2UtPmlzTnVsbCgpKSA/IGltYWdlLT5yZWN0KCkuaGVpZ2h0KCkgOiAwOwogCiAgICAgaW50 IGxpbmVQYWRkaW5nSGVpZ2h0ID0gbV9wb3B1cENsaWVudC0+bWVudVN0eWxlKCkubWVudVR5cGUo KSA9PSBQb3B1cE1lbnVTdHlsZTo6QXV0b2ZpbGxQb3B1cCA/IGtMaW5lUGFkZGluZ0hlaWdodCA6 IDA7Ci0gICAgcmV0dXJuIG1heChmb250SGVpZ2h0LCBpY29uSGVpZ2h0KSArIGxpbmVQYWRkaW5n SGVpZ2h0ICogMjsKKyAgICBpbnQgY2FsY3VsYXRlZFJvd0hlaWdodCA9IG1heChmb250SGVpZ2h0 LCBpY29uSGVpZ2h0KSArIGxpbmVQYWRkaW5nSGVpZ2h0ICogMjsKKyAgICByZXR1cm4gbWF4KGNh bGN1bGF0ZWRSb3dIZWlnaHQsIFBvcHVwTWVudUNocm9taXVtOjptaW5pbXVtUm93SGVpZ2h0KCkp OwogfQogCiBJbnRSZWN0IFBvcHVwTGlzdEJveDo6Z2V0Um93Qm91bmRzKGludCBpbmRleCkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BvcHVwTWVudUNocm9t aXVtLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1 bS5oCmluZGV4IDQ2YzEyMzMuLjZmZmE5N2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uaApAQCAtMTc1LDcgKzE3NSw3IEBA IHB1YmxpYzoKIHByaXZhdGU6CiAgICAgZnJpZW5kIGNsYXNzIFdURjo6UmVmQ291bnRlZDxQb3B1 cENvbnRhaW5lcj47CiAKLSAgICBQb3B1cENvbnRhaW5lcihQb3B1cE1lbnVDbGllbnQqLCBQb3B1 cFR5cGUgcG9wdXBUeXBlLCBjb25zdCBQb3B1cENvbnRhaW5lclNldHRpbmdzJik7CisgICAgUG9w dXBDb250YWluZXIoUG9wdXBNZW51Q2xpZW50KiwgUG9wdXBUeXBlLCBjb25zdCBQb3B1cENvbnRh aW5lclNldHRpbmdzJik7CiAgICAgflBvcHVwQ29udGFpbmVyKCk7CiAKICAgICAvLyBQYWludCB0 aGUgYm9yZGVyLgpAQCAtMjA3LDExICsyMDcsMTYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9p ZCB1cGRhdGVGcm9tRWxlbWVudCgpOwogICAgIHZpcnR1YWwgdm9pZCBkaXNjb25uZWN0Q2xpZW50 KCk7CiAKKyAgICBzdGF0aWMgaW50IG1pbmltdW1Sb3dIZWlnaHQoKSB7IHJldHVybiBzX21pbmlt dW1Sb3dIZWlnaHQ7IH0KKyAgICBzdGF0aWMgdm9pZCBzZXRNaW5pbXVtUm93SGVpZ2h0KGludCBt aW5pbXVtUm93SGVpZ2h0KSB7IHNfbWluaW11bVJvd0hlaWdodCA9IG1pbmltdW1Sb3dIZWlnaHQ7 IH0KKwogcHJpdmF0ZToKICAgICBQb3B1cE1lbnVDbGllbnQqIGNsaWVudCgpIGNvbnN0IHsgcmV0 dXJuIG1fcG9wdXBDbGllbnQ7IH0KIAogICAgIFBvcHVwTWVudUNsaWVudCogbV9wb3B1cENsaWVu dDsKICAgICBQb3B1cE1lbnVQcml2YXRlIHA7CisKKyAgICBzdGF0aWMgaW50IHNfbWluaW11bVJv d0hlaWdodDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlBvcHVwTWVudS5oIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViUG9wdXBNZW51LmgKaW5kZXggYzJjZGVjMy4uNTNiNjM4MCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUG9wdXBNZW51LmgKKysr IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUG9wdXBNZW51LmgKQEAgLTQxLDYg KzQxLDkgQEAgY2xhc3MgV2ViV2lkZ2V0Q2xpZW50OwogY2xhc3MgV2ViUG9wdXBNZW51IDogcHVi bGljIFdlYldpZGdldCB7CiBwdWJsaWM6CiAgICAgV0VCS0lUX0FQSSBzdGF0aWMgV2ViUG9wdXBN ZW51KiBjcmVhdGUoV2ViV2lkZ2V0Q2xpZW50Kik7CisKKyAgICAvLyBTZXRzIHRoZSBtaW5pbXVt IGhlaWdodCBvZiBhIHBvcHVwIGxpc3Rib3ggcm93LgorICAgIFdFQktJVF9BUEkgc3RhdGljIHZv aWQgc2V0TWluaW11bVJvd0hlaWdodChpbnQpOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQb3B1cE1lbnVJbXBs LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBvcHVwTWVudUltcGwuY3BwCmlu ZGV4IDc3ZDViODIuLjYyZGNkNjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYlBvcHVwTWVudUltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYlBvcHVwTWVudUltcGwuY3BwCkBAIC0yNTEsNiArMjUxLDExIEBAIHZvaWQgV2ViUG9wdXBN ZW51SW1wbDo6c2V0Rm9jdXMoYm9vbCBlbmFibGUpCiB7CiB9CiAKK3ZvaWQgV2ViUG9wdXBNZW51 OjpzZXRNaW5pbXVtUm93SGVpZ2h0KGludCBtaW5pbXVtUm93SGVpZ2h0KQoreworICAgIFBvcHVw TWVudUNocm9taXVtOjpzZXRNaW5pbXVtUm93SGVpZ2h0KG1pbmltdW1Sb3dIZWlnaHQpOworfQor CiBib29sIFdlYlBvcHVwTWVudUltcGw6OnNldENvbXBvc2l0aW9uKAogICAgIGNvbnN0IFdlYlN0 cmluZyYgdGV4dCwgY29uc3QgV2ViVmVjdG9yPFdlYkNvbXBvc2l0aW9uVW5kZXJsaW5lPiYgdW5k ZXJsaW5lcywKICAgICBpbnQgc2VsZWN0aW9uU3RhcnQsIGludCBzZWxlY3Rpb25FbmQpCg== 102144 2011-07-27 07:33:53 -0700 2011-07-27 07:42:34 -0700 Forgot to upload changelog along with patch webkitcombopatch text/plain 5464 fsamuel ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmNmY1NDFhLi42ZDlmMDg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTEtMDctMjcgIEZhZHkgU2FtdWVsICA8ZnNhbXVlbEBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUG9wdXBzIG9uIENocm9taXVtIG5vdyBjaGVjayB0aGUgbWluaW11bSByb3cgaGVpZ2h0 IHNldCB0aHJvdWdoIHRoZSBDaHJvbWl1bSBXZWJLaXQgQVBJIHdoZW4KKyAgICAgICAgY29tcHV0 aW5nIHRoZSBoZWlnaHQgb2YgYSByb3cgaW4gYSBwb3B1cCBsaXN0Ym94LgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4KKworICAg ICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVtLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlBvcHVwTGlzdEJveDo6Z2V0Um93SGVpZ2h0KToKKyAgICAgICAgKiBwbGF0Zm9y bS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5oOgorICAgICAgICAoV2ViQ29yZTo6UG9wdXBN ZW51Q2hyb21pdW06Om1pbmltdW1Sb3dIZWlnaHQpOgorICAgICAgICAoV2ViQ29yZTo6UG9wdXBN ZW51Q2hyb21pdW06OnNldE1pbmltdW1Sb3dIZWlnaHQpOgorCiAyMDExLTA3LTI2ICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZW5kZXJUZXh0OjphYnNvbHV0 ZVJlY3RzRm9yUmFuZ2UoKSBhbmQgYWJzb2x1dGVRdWFkc0ZvclJhbmdlKCkgaGF2ZSBuZWFybHkg ZHVwbGljYXRlIGNvZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9t aXVtL1BvcHVwTWVudUNocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9t aXVtL1BvcHVwTWVudUNocm9taXVtLmNwcAppbmRleCA2MjhiOTE5Li44ODMzMTE4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21p dW0uY3BwCkBAIC02Nyw2ICs2Nyw4IEBAIHVzaW5nIHN0ZDo6bWF4OwogCiBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAKK2ludCBQb3B1cE1lbnVDaHJvbWl1bTo6c19taW5pbXVtUm93SGVpZ2h0ID0gMDsK KwogdHlwZWRlZiB1bnNpZ25lZCBsb25nIGxvbmcgVGltZVN0YW1wOwogCiBzdGF0aWMgY29uc3Qg aW50IGtNYXhWaXNpYmxlUm93cyA9IDIwOwpAQCAtMTE3NiwxNCArMTE3OCwxNCBAQCB2b2lkIFBv cHVwTGlzdEJveDo6c2V0T3JpZ2luYWxJbmRleChpbnQgaW5kZXgpCiBpbnQgUG9wdXBMaXN0Qm94 OjpnZXRSb3dIZWlnaHQoaW50IGluZGV4KQogewogICAgIGlmIChpbmRleCA8IDApCi0gICAgICAg IHJldHVybiAwOworICAgICAgICByZXR1cm4gUG9wdXBNZW51Q2hyb21pdW06Om1pbmltdW1Sb3dI ZWlnaHQoKTsKIAogICAgIGlmIChtX3BvcHVwQ2xpZW50LT5pdGVtU3R5bGUoaW5kZXgpLmlzRGlz cGxheU5vbmUoKSkKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiBQb3B1cE1lbnVD aHJvbWl1bTo6bWluaW11bVJvd0hlaWdodCgpOwogCiAgICAgLy8gU2VwYXJhdG9yIHJvdyBoZWln aHQgaXMgdGhlIHNhbWUgc2l6ZSBhcyBpdHNlbGYuCiAgICAgaWYgKG1fcG9wdXBDbGllbnQtPml0 ZW1Jc1NlcGFyYXRvcihpbmRleCkpCi0gICAgICAgIHJldHVybiBzZXBhcmF0b3JIZWlnaHQ7Cisg ICAgICAgIHJldHVybiBtYXgoc2VwYXJhdG9ySGVpZ2h0LCBQb3B1cE1lbnVDaHJvbWl1bTo6bWlu aW11bVJvd0hlaWdodCgpKTsKIAogICAgIFN0cmluZyBpY29uID0gbV9wb3B1cENsaWVudC0+aXRl bUljb24oaW5kZXgpOwogICAgIFJlZlB0cjxJbWFnZT4gaW1hZ2UoSW1hZ2U6OmxvYWRQbGF0Zm9y bVJlc291cmNlKGljb24udXRmOCgpLmRhdGEoKSkpOwpAQCAtMTE5Miw3ICsxMTk0LDggQEAgaW50 IFBvcHVwTGlzdEJveDo6Z2V0Um93SGVpZ2h0KGludCBpbmRleCkKICAgICBpbnQgaWNvbkhlaWdo dCA9IChpbWFnZSAmJiAhaW1hZ2UtPmlzTnVsbCgpKSA/IGltYWdlLT5yZWN0KCkuaGVpZ2h0KCkg OiAwOwogCiAgICAgaW50IGxpbmVQYWRkaW5nSGVpZ2h0ID0gbV9wb3B1cENsaWVudC0+bWVudVN0 eWxlKCkubWVudVR5cGUoKSA9PSBQb3B1cE1lbnVTdHlsZTo6QXV0b2ZpbGxQb3B1cCA/IGtMaW5l UGFkZGluZ0hlaWdodCA6IDA7Ci0gICAgcmV0dXJuIG1heChmb250SGVpZ2h0LCBpY29uSGVpZ2h0 KSArIGxpbmVQYWRkaW5nSGVpZ2h0ICogMjsKKyAgICBpbnQgY2FsY3VsYXRlZFJvd0hlaWdodCA9 IG1heChmb250SGVpZ2h0LCBpY29uSGVpZ2h0KSArIGxpbmVQYWRkaW5nSGVpZ2h0ICogMjsKKyAg ICByZXR1cm4gbWF4KGNhbGN1bGF0ZWRSb3dIZWlnaHQsIFBvcHVwTWVudUNocm9taXVtOjptaW5p bXVtUm93SGVpZ2h0KCkpOwogfQogCiBJbnRSZWN0IFBvcHVwTGlzdEJveDo6Z2V0Um93Qm91bmRz KGludCBpbmRleCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVt L1BvcHVwTWVudUNocm9taXVtLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Q b3B1cE1lbnVDaHJvbWl1bS5oCmluZGV4IDQ2YzEyMzMuLjZmZmE5N2IgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVtLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uaApAQCAt MTc1LDcgKzE3NSw3IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgZnJpZW5kIGNsYXNzIFdURjo6 UmVmQ291bnRlZDxQb3B1cENvbnRhaW5lcj47CiAKLSAgICBQb3B1cENvbnRhaW5lcihQb3B1cE1l bnVDbGllbnQqLCBQb3B1cFR5cGUgcG9wdXBUeXBlLCBjb25zdCBQb3B1cENvbnRhaW5lclNldHRp bmdzJik7CisgICAgUG9wdXBDb250YWluZXIoUG9wdXBNZW51Q2xpZW50KiwgUG9wdXBUeXBlLCBj b25zdCBQb3B1cENvbnRhaW5lclNldHRpbmdzJik7CiAgICAgflBvcHVwQ29udGFpbmVyKCk7CiAK ICAgICAvLyBQYWludCB0aGUgYm9yZGVyLgpAQCAtMjA3LDExICsyMDcsMTYgQEAgcHVibGljOgog ICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVGcm9tRWxlbWVudCgpOwogICAgIHZpcnR1YWwgdm9pZCBk aXNjb25uZWN0Q2xpZW50KCk7CiAKKyAgICBzdGF0aWMgaW50IG1pbmltdW1Sb3dIZWlnaHQoKSB7 IHJldHVybiBzX21pbmltdW1Sb3dIZWlnaHQ7IH0KKyAgICBzdGF0aWMgdm9pZCBzZXRNaW5pbXVt Um93SGVpZ2h0KGludCBtaW5pbXVtUm93SGVpZ2h0KSB7IHNfbWluaW11bVJvd0hlaWdodCA9IG1p bmltdW1Sb3dIZWlnaHQ7IH0KKwogcHJpdmF0ZToKICAgICBQb3B1cE1lbnVDbGllbnQqIGNsaWVu dCgpIGNvbnN0IHsgcmV0dXJuIG1fcG9wdXBDbGllbnQ7IH0KIAogICAgIFBvcHVwTWVudUNsaWVu dCogbV9wb3B1cENsaWVudDsKICAgICBQb3B1cE1lbnVQcml2YXRlIHA7CisKKyAgICBzdGF0aWMg aW50IHNfbWluaW11bVJvd0hlaWdodDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggM2E4MzFiMy4uNzY3NGI0MyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMS0wNy0yNyAgRmFkeSBTYW11ZWwg IDxmc2FtdWVsQGNocm9taXVtLm9yZz4KKworICAgICAgICBBZGRlZCBhIENocm9taXVtIFdlYktp dCBBUEkgbWV0aG9kIHRvIHNldCB0aGUgbWluaW11bSByb3cgaGVpZ2h0IG9mIGEgcG9wdXAgbGlz dGJveC4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IHB1YmxpYy9XZWJQb3B1cE1lbnUuaDoKKyAgICAgICAgKiBzcmMvV2ViUG9wdXBNZW51SW1wbC5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBvcHVwTWVudTo6c2V0TWluaW11bVJvd0hlaWdodCk6 CisKIDIwMTEtMDctMjUgIEFsIFBhdHJpY2sgIDxhcGF0cmlja0BjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmVtb3ZlZCBzdXBwb3J0IGZvciB0aGUgR0xfbGF0Y2hfQ0hST01JVU0gZXh0ZW5zaW9u IHdoaWNoIENocm9taXVtIG5vIGxvbmdlciBzdXBwb3J0cy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlBvcHVwTWVudS5oIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViUG9wdXBNZW51LmgKaW5kZXggYzJjZGVjMy4uNTNiNjM4MCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUG9wdXBNZW51LmgKKysrIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUG9wdXBNZW51LmgKQEAgLTQxLDYgKzQx LDkgQEAgY2xhc3MgV2ViV2lkZ2V0Q2xpZW50OwogY2xhc3MgV2ViUG9wdXBNZW51IDogcHVibGlj IFdlYldpZGdldCB7CiBwdWJsaWM6CiAgICAgV0VCS0lUX0FQSSBzdGF0aWMgV2ViUG9wdXBNZW51 KiBjcmVhdGUoV2ViV2lkZ2V0Q2xpZW50Kik7CisKKyAgICAvLyBTZXRzIHRoZSBtaW5pbXVtIGhl aWdodCBvZiBhIHBvcHVwIGxpc3Rib3ggcm93LgorICAgIFdFQktJVF9BUEkgc3RhdGljIHZvaWQg c2V0TWluaW11bVJvd0hlaWdodChpbnQpOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQb3B1cE1lbnVJbXBsLmNw cCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBvcHVwTWVudUltcGwuY3BwCmluZGV4 IDc3ZDViODIuLjYyZGNkNjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYlBvcHVwTWVudUltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YlBvcHVwTWVudUltcGwuY3BwCkBAIC0yNTEsNiArMjUxLDExIEBAIHZvaWQgV2ViUG9wdXBNZW51 SW1wbDo6c2V0Rm9jdXMoYm9vbCBlbmFibGUpCiB7CiB9CiAKK3ZvaWQgV2ViUG9wdXBNZW51Ojpz ZXRNaW5pbXVtUm93SGVpZ2h0KGludCBtaW5pbXVtUm93SGVpZ2h0KQoreworICAgIFBvcHVwTWVu dUNocm9taXVtOjpzZXRNaW5pbXVtUm93SGVpZ2h0KG1pbmltdW1Sb3dIZWlnaHQpOworfQorCiBi b29sIFdlYlBvcHVwTWVudUltcGw6OnNldENvbXBvc2l0aW9uKAogICAgIGNvbnN0IFdlYlN0cmlu ZyYgdGV4dCwgY29uc3QgV2ViVmVjdG9yPFdlYkNvbXBvc2l0aW9uVW5kZXJsaW5lPiYgdW5kZXJs aW5lcywKICAgICBpbnQgc2VsZWN0aW9uU3RhcnQsIGludCBzZWxlY3Rpb25FbmQpCg== 102145 2011-07-27 07:42:34 -0700 2011-07-27 20:56:15 -0700 Added the bug report link webkitcombopatch text/plain 5574 fsamuel ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmNmY1NDFhLi4zMDAxMThmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTEtMDctMjcgIEZhZHkgU2FtdWVsICA8ZnNhbXVlbEBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUG9wdXBzIG9uIENocm9taXVtIG5vdyBjaGVjayB0aGUgbWluaW11bSByb3cgaGVpZ2h0 IHNldCB0aHJvdWdoIHRoZSBDaHJvbWl1bSBXZWJLaXQgQVBJIHdoZW4KKyAgICAgICAgY29tcHV0 aW5nIHRoZSBoZWlnaHQgb2YgYSByb3cgaW4gYSBwb3B1cCBsaXN0Ym94LgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjQ4OTcKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMuCisKKyAgICAg ICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpQb3B1cExpc3RCb3g6OmdldFJvd0hlaWdodCk6CisgICAgICAgICogcGxhdGZvcm0v Y2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uaDoKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTWVu dUNocm9taXVtOjptaW5pbXVtUm93SGVpZ2h0KToKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTWVu dUNocm9taXVtOjpzZXRNaW5pbXVtUm93SGVpZ2h0KToKKwogMjAxMS0wNy0yNiAgRW1pbCBBIEVr bHVuZCAgPGVhZUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmVuZGVyVGV4dDo6YWJzb2x1dGVS ZWN0c0ZvclJhbmdlKCkgYW5kIGFic29sdXRlUXVhZHNGb3JSYW5nZSgpIGhhdmUgbmVhcmx5IGR1 cGxpY2F0ZSBjb2RlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1 bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1 bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHAKaW5kZXggNjI4YjkxOS4uODgzMzExOCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0uY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVt LmNwcApAQCAtNjcsNiArNjcsOCBAQCB1c2luZyBzdGQ6Om1heDsKIAogbmFtZXNwYWNlIFdlYkNv cmUgewogCitpbnQgUG9wdXBNZW51Q2hyb21pdW06OnNfbWluaW11bVJvd0hlaWdodCA9IDA7CisK IHR5cGVkZWYgdW5zaWduZWQgbG9uZyBsb25nIFRpbWVTdGFtcDsKIAogc3RhdGljIGNvbnN0IGlu dCBrTWF4VmlzaWJsZVJvd3MgPSAyMDsKQEAgLTExNzYsMTQgKzExNzgsMTQgQEAgdm9pZCBQb3B1 cExpc3RCb3g6OnNldE9yaWdpbmFsSW5kZXgoaW50IGluZGV4KQogaW50IFBvcHVwTGlzdEJveDo6 Z2V0Um93SGVpZ2h0KGludCBpbmRleCkKIHsKICAgICBpZiAoaW5kZXggPCAwKQotICAgICAgICBy ZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIFBvcHVwTWVudUNocm9taXVtOjptaW5pbXVtUm93SGVp Z2h0KCk7CiAKICAgICBpZiAobV9wb3B1cENsaWVudC0+aXRlbVN0eWxlKGluZGV4KS5pc0Rpc3Bs YXlOb25lKCkpCi0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gUG9wdXBNZW51Q2hy b21pdW06Om1pbmltdW1Sb3dIZWlnaHQoKTsKIAogICAgIC8vIFNlcGFyYXRvciByb3cgaGVpZ2h0 IGlzIHRoZSBzYW1lIHNpemUgYXMgaXRzZWxmLgogICAgIGlmIChtX3BvcHVwQ2xpZW50LT5pdGVt SXNTZXBhcmF0b3IoaW5kZXgpKQotICAgICAgICByZXR1cm4gc2VwYXJhdG9ySGVpZ2h0OworICAg ICAgICByZXR1cm4gbWF4KHNlcGFyYXRvckhlaWdodCwgUG9wdXBNZW51Q2hyb21pdW06Om1pbmlt dW1Sb3dIZWlnaHQoKSk7CiAKICAgICBTdHJpbmcgaWNvbiA9IG1fcG9wdXBDbGllbnQtPml0ZW1J Y29uKGluZGV4KTsKICAgICBSZWZQdHI8SW1hZ2U+IGltYWdlKEltYWdlOjpsb2FkUGxhdGZvcm1S ZXNvdXJjZShpY29uLnV0ZjgoKS5kYXRhKCkpKTsKQEAgLTExOTIsNyArMTE5NCw4IEBAIGludCBQ b3B1cExpc3RCb3g6OmdldFJvd0hlaWdodChpbnQgaW5kZXgpCiAgICAgaW50IGljb25IZWlnaHQg PSAoaW1hZ2UgJiYgIWltYWdlLT5pc051bGwoKSkgPyBpbWFnZS0+cmVjdCgpLmhlaWdodCgpIDog MDsKIAogICAgIGludCBsaW5lUGFkZGluZ0hlaWdodCA9IG1fcG9wdXBDbGllbnQtPm1lbnVTdHls ZSgpLm1lbnVUeXBlKCkgPT0gUG9wdXBNZW51U3R5bGU6OkF1dG9maWxsUG9wdXAgPyBrTGluZVBh ZGRpbmdIZWlnaHQgOiAwOwotICAgIHJldHVybiBtYXgoZm9udEhlaWdodCwgaWNvbkhlaWdodCkg KyBsaW5lUGFkZGluZ0hlaWdodCAqIDI7CisgICAgaW50IGNhbGN1bGF0ZWRSb3dIZWlnaHQgPSBt YXgoZm9udEhlaWdodCwgaWNvbkhlaWdodCkgKyBsaW5lUGFkZGluZ0hlaWdodCAqIDI7CisgICAg cmV0dXJuIG1heChjYWxjdWxhdGVkUm93SGVpZ2h0LCBQb3B1cE1lbnVDaHJvbWl1bTo6bWluaW11 bVJvd0hlaWdodCgpKTsKIH0KIAogSW50UmVjdCBQb3B1cExpc3RCb3g6OmdldFJvd0JvdW5kcyhp bnQgaW5kZXgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Q b3B1cE1lbnVDaHJvbWl1bS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUG9w dXBNZW51Q2hyb21pdW0uaAppbmRleCA0NmMxMjMzLi42ZmZhOTdiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1bS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BvcHVwTWVudUNocm9taXVtLmgKQEAgLTE3 NSw3ICsxNzUsNyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBXVEY6OlJl ZkNvdW50ZWQ8UG9wdXBDb250YWluZXI+OwogCi0gICAgUG9wdXBDb250YWluZXIoUG9wdXBNZW51 Q2xpZW50KiwgUG9wdXBUeXBlIHBvcHVwVHlwZSwgY29uc3QgUG9wdXBDb250YWluZXJTZXR0aW5n cyYpOworICAgIFBvcHVwQ29udGFpbmVyKFBvcHVwTWVudUNsaWVudCosIFBvcHVwVHlwZSwgY29u c3QgUG9wdXBDb250YWluZXJTZXR0aW5ncyYpOwogICAgIH5Qb3B1cENvbnRhaW5lcigpOwogCiAg ICAgLy8gUGFpbnQgdGhlIGJvcmRlci4KQEAgLTIwNywxMSArMjA3LDE2IEBAIHB1YmxpYzoKICAg ICB2aXJ0dWFsIHZvaWQgdXBkYXRlRnJvbUVsZW1lbnQoKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlz Y29ubmVjdENsaWVudCgpOwogCisgICAgc3RhdGljIGludCBtaW5pbXVtUm93SGVpZ2h0KCkgeyBy ZXR1cm4gc19taW5pbXVtUm93SGVpZ2h0OyB9CisgICAgc3RhdGljIHZvaWQgc2V0TWluaW11bVJv d0hlaWdodChpbnQgbWluaW11bVJvd0hlaWdodCkgeyBzX21pbmltdW1Sb3dIZWlnaHQgPSBtaW5p bXVtUm93SGVpZ2h0OyB9CisKIHByaXZhdGU6CiAgICAgUG9wdXBNZW51Q2xpZW50KiBjbGllbnQo KSBjb25zdCB7IHJldHVybiBtX3BvcHVwQ2xpZW50OyB9CiAKICAgICBQb3B1cE1lbnVDbGllbnQq IG1fcG9wdXBDbGllbnQ7CiAgICAgUG9wdXBNZW51UHJpdmF0ZSBwOworCisgICAgc3RhdGljIGlu dCBzX21pbmltdW1Sb3dIZWlnaHQ7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDNhODMxYjMuLmI0MTViNzEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDctMjcgIEZhZHkgU2FtdWVsICA8 ZnNhbXVlbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQWRkZWQgYSBDaHJvbWl1bSBXZWJLaXQg QVBJIG1ldGhvZCB0byBzZXQgdGhlIG1pbmltdW0gcm93IGhlaWdodCBvZiBhIHBvcHVwIGxpc3Ri b3guCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDg5 NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcHVi bGljL1dlYlBvcHVwTWVudS5oOgorICAgICAgICAqIHNyYy9XZWJQb3B1cE1lbnVJbXBsLmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViUG9wdXBNZW51OjpzZXRNaW5pbXVtUm93SGVpZ2h0KToKKwog MjAxMS0wNy0yNSAgQWwgUGF0cmljayAgPGFwYXRyaWNrQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBSZW1vdmVkIHN1cHBvcnQgZm9yIHRoZSBHTF9sYXRjaF9DSFJPTUlVTSBleHRlbnNpb24gd2hp Y2ggQ2hyb21pdW0gbm8gbG9uZ2VyIHN1cHBvcnRzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9wdWJsaWMvV2ViUG9wdXBNZW51LmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9XZWJQb3B1cE1lbnUuaAppbmRleCBjMmNkZWMzLi41M2I2MzgwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJQb3B1cE1lbnUuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJQb3B1cE1lbnUuaApAQCAtNDEsNiArNDEsOSBA QCBjbGFzcyBXZWJXaWRnZXRDbGllbnQ7CiBjbGFzcyBXZWJQb3B1cE1lbnUgOiBwdWJsaWMgV2Vi V2lkZ2V0IHsKIHB1YmxpYzoKICAgICBXRUJLSVRfQVBJIHN0YXRpYyBXZWJQb3B1cE1lbnUqIGNy ZWF0ZShXZWJXaWRnZXRDbGllbnQqKTsKKworICAgIC8vIFNldHMgdGhlIG1pbmltdW0gaGVpZ2h0 IG9mIGEgcG9wdXAgbGlzdGJveCByb3cuCisgICAgV0VCS0lUX0FQSSBzdGF0aWMgdm9pZCBzZXRN aW5pbXVtUm93SGVpZ2h0KGludCk7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBvcHVwTWVudUltcGwuY3BwIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUG9wdXBNZW51SW1wbC5jcHAKaW5kZXggNzdk NWI4Mi4uNjJkY2Q2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi UG9wdXBNZW51SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUG9w dXBNZW51SW1wbC5jcHAKQEAgLTI1MSw2ICsyNTEsMTEgQEAgdm9pZCBXZWJQb3B1cE1lbnVJbXBs OjpzZXRGb2N1cyhib29sIGVuYWJsZSkKIHsKIH0KIAordm9pZCBXZWJQb3B1cE1lbnU6OnNldE1p bmltdW1Sb3dIZWlnaHQoaW50IG1pbmltdW1Sb3dIZWlnaHQpCit7CisgICAgUG9wdXBNZW51Q2hy b21pdW06OnNldE1pbmltdW1Sb3dIZWlnaHQobWluaW11bVJvd0hlaWdodCk7Cit9CisKIGJvb2wg V2ViUG9wdXBNZW51SW1wbDo6c2V0Q29tcG9zaXRpb24oCiAgICAgY29uc3QgV2ViU3RyaW5nJiB0 ZXh0LCBjb25zdCBXZWJWZWN0b3I8V2ViQ29tcG9zaXRpb25VbmRlcmxpbmU+JiB1bmRlcmxpbmVz LAogICAgIGludCBzZWxlY3Rpb25TdGFydCwgaW50IHNlbGVjdGlvbkVuZCkK