31115 2009-11-04 06:20:39 -0800 [Qt] QWebView, QGraphicsWebView and QWebFrame setHtml() should be better documented 2010-08-24 07:31:47 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All All RESOLVED FIXED Qt P3 Normal --- 29457 29461 29876 31552 1 jedrzej.nowacki menard commit-queue hausmann tonikitoo vestbo oldest_to_newest 160423 0 jedrzej.nowacki 2009-11-04 06:20:39 -0800 Hi, I think that the QWebFrame::setHtml() should be removed from the public API or at least marked as obsolete/internal. Justification: a. The name is confusing. Many users think that the method can be used for XHTML too or for HTML with XHTML extensions. Even if sometimes it works (bug 29540), it is wrong, because implementation force a mime type (text/html). b. The method is redundant. It can be easily replaced by the QWebFrame::setContent(), which behave in the same manner with a defaults arguments. c. The name is confusing. The setHtml() "Sets the content of the web view to the specified html" and the setContent() "Sets the content of the web view to the specified content data", so what is difference between specified html and content data? In my opinion "setContent" is a better name. d. There is no way to override default mime type setting, even if given source code is a correct XHTML or SVG file with DOCTYPE information. e. The setContent() method is more flexible. For example it permits to create a SVG based interface. f. The load function is better choice if user have an URL. It is more "intelligent", because it can guess a mime type from file name or HTTP header (the information is lost if user load the file manually). So it maybe worth to encourage users to use the load() if they can. Connected bugs: 29457, 29461 (29540) 165541 1 tonikitoo 2009-11-20 19:01:49 -0800 I agree that merging setHtml and setContent might be a good thing to be done at some point. 165586 2 hausmann 2009-11-21 00:56:35 -0800 While I agree that setHtml() may not be a very "pure" function to have (give the XHTML relation you mentioned for example), I still think it is a good thing to have. * The function is consistent with the rest of Qt (QTextEdit::setHtml, QTextDocument::setHtml, QGraphicsTextItem::setHtml). Qt developers love the fact that our API is consistent. The unspoken guideline is that an experienced Qt developer shouldn't have to read the documentation of a class in order to use it. That is why completely different classes like QTabBar, QComboBox or QListWidget have a count() function. They're not called numTabs(), numItems() or numListItems(), which would be a slightly tighter name. Instead they share the same name so that the API remains concise. * setHtml() is also very convenient. We say that with the Qt API common things should be easy and special tasks should be possible. Populating a widget to render web content with a given string of HTML falls clearly into the former category. It is less error prone than calling setContent(htmlString, "text/htlm"). Oh, oops, that should've been "text/html", but I only found out at run-time because my text didn't show :) * To satisfy the use-case of a more advanced task we added setContent(), which is harder to use but also more flexible. 166481 3 43851 jedrzej.nowacki 2009-11-25 09:11:10 -0800 Created attachment 43851 documentation change v1 (In reply to comment #2) > * The function is consistent with the rest of Qt (QTextEdit::setHtml, > QTextDocument::setHtml, QGraphicsTextItem::setHtml). Qt developers love the > fact that our API is consistent. This is nice point :-), but on the other hand classes mentioned by you are much simpler (implementation & functionality). I think it's clear that you shouldn't put SVG into the QTextEdit, but for the QWebPage it is not so obvious. Moreover Qt had to be not only simple, but should "force" right application design. As setHtml is a nice shortcut, I don't think that it must be used on the first place. Developers need to know what actually they want to process (SVG, HTML, XHTML...). > * setHtml() is also very convenient. We say that with the Qt API common things > should be easy and special tasks should be possible. Populating a widget to > render web content with a given string of HTML falls clearly into the former > category. Yes it should be, but as we don't provide unified access for XHTML and HTML it is a source of problems. > * To satisfy the use-case of a more advanced task we added setContent(), which > is harder to use but also more flexible. So I prepared a little patch for it. I don't think, we should close the discussion. 166555 4 tonikitoo 2009-11-25 14:19:52 -0800 jedrzej, i like the docs and think this change is enough to sort the confusion out. I just think you should change QGraphicsWebView's setHtml content docs too :-) in WebKit/qt/Api/qwebview.cpp changing bug subject accordingly to the direction the solution is taking ... 257666 5 62944 menard 2010-07-29 07:36:42 -0700 Created attachment 62944 Patch for the doc fix, with QGraphicsWebView as well 257669 6 62944 kenneth 2010-07-29 07:40:19 -0700 Comment on attachment 62944 Patch for the doc fix, with QGraphicsWebView as well WebKit/qt/Api/qgraphicswebview.cpp:715 + setContent() should be used instead Misses a dot at the end - both places it is used. WebKit/qt/Api/qgraphicswebview.cpp:714 + \warning This function works only for HTML, for other mime types (ex. XHTML, SVG) I would use 'ie.' instead of ex. I believe that is more English. 257675 7 62946 menard 2010-07-29 08:01:26 -0700 Created attachment 62946 Patch for the doc fix, with QGraphicsWebView as well - v2 257686 8 62946 tonikitoo 2010-07-29 08:13:44 -0700 Comment on attachment 62946 Patch for the doc fix, with QGraphicsWebView as well - v2 r=me 257690 9 menard 2010-07-29 08:17:29 -0700 *** Bug 29461 has been marked as a duplicate of this bug. *** 257725 10 62946 commit-queue 2010-07-29 09:30:02 -0700 Comment on attachment 62946 Patch for the doc fix, with QGraphicsWebView as well - v2 Clearing flags on attachment: 62946 Committed r64284: <http://trac.webkit.org/changeset/64284> 257726 11 commit-queue 2010-07-29 09:30:07 -0700 All reviewed patches have been landed. Closing bug. 259957 12 hausmann 2010-08-04 03:39:31 -0700 Revision r64284 cherry-picked into qtwebkit-2.1 with commit 20c90a1df97b9ca403a562e19624b2245de4c09e 43851 2009-11-25 09:11:10 -0800 2010-07-29 07:36:42 -0700 documentation change v1 doc.diff text/plain 2406 jedrzej.nowacki ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcCBiL1dlYktpdC9xdC9BcGkv cXdlYmZyYW1lLmNwcAppbmRleCBhNTFmODlkLi5jN2ZmN2EyIDEwMDY0NAotLS0gYS9XZWJLaXQv cXQvQXBpL3F3ZWJmcmFtZS5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwCkBA IC03NDEsOSArNzQxLDE0IEBAIHZvaWQgUVdlYkZyYW1lOjpsb2FkKGNvbnN0IFFOZXR3b3JrUmVx dWVzdCAmcmVxLAogICBzY3JpcHQgY2FuIGJlIHNwZWNpZmllZCB0aHJvdWdoIHRoZSBjaGFyc2V0 IGF0dHJpYnV0ZSBvZiB0aGUgSFRNTCBzY3JpcHQgdGFnLiBJdCBpcyBhbHNvIHBvc3NpYmxlCiAg IGZvciB0aGUgZW5jb2RpbmcgdG8gYmUgc3BlY2lmaWVkIGJ5IHdlYiBzZXJ2ZXIuCiAKKyAgVGhp cyBpcyBhIGNvbnZlbmllbmNlIGZ1bmN0aW9uIGVxdWl2YWxlbnQgdG8gc2V0Q29udGVudChodG1s LCAidGV4dC9odG1sIiwgYmFzZVVybCkuCisKICAgXG5vdGUgVGhpcyBtZXRob2Qgd2lsbCBub3Qg YWZmZWN0IHNlc3Npb24gb3IgZ2xvYmFsIGhpc3RvcnkgZm9yIHRoZSBmcmFtZS4KIAotICBcc2Eg dG9IdG1sKCksIHNldENvbnRlbnQoKQorICBcd2FybmluZyBUaGlzIGZ1bmN0aW9uIHdvcmtzIG9u bHkgZm9yIEhUTUwsIGZvciBvdGhlciBtaW1lIHR5cGVzIChleC4gWEhUTUwsIFNWRykKKyAgc2V0 Q29udGVudCgpIHNob3VsZCBiZSB1c2VkIGluc3RlYWQuCisKKyAgXHNhIHRvSHRtbCgpLCBzZXRD b250ZW50KCksIGxvYWQoKQogKi8KIHZvaWQgUVdlYkZyYW1lOjpzZXRIdG1sKGNvbnN0IFFTdHJp bmcgJmh0bWwsIGNvbnN0IFFVcmwgJmJhc2VVcmwpCiB7CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQv QXBpL3F3ZWJ2aWV3LmNwcCBiL1dlYktpdC9xdC9BcGkvcXdlYnZpZXcuY3BwCmluZGV4IDdiYzMx NjguLmVmNTJmYzkgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcXdlYnZpZXcuY3BwCisrKyBi L1dlYktpdC9xdC9BcGkvcXdlYnZpZXcuY3BwCkBAIC0yOTEsNyArMjkxLDEyIEBAIHZvaWQgUVdl YlZpZXc6OmxvYWQoY29uc3QgUU5ldHdvcmtSZXF1ZXN0ICZyZXF1ZXN0LAogICAgIHRocm91Z2gg dGhlIGNoYXJzZXQgYXR0cmlidXRlIG9mIHRoZSBIVE1MIHNjcmlwdCB0YWcuIEFsdGVybmF0aXZl bHksIHRoZQogICAgIGVuY29kaW5nIGNhbiBhbHNvIGJlIHNwZWNpZmllZCBieSB0aGUgd2ViIHNl cnZlci4KIAotICAgIFxzYSBsb2FkKCksIHNldENvbnRlbnQoKSwgUVdlYkZyYW1lOjp0b0h0bWwo KQorICAgIFRoaXMgaXMgYSBjb252ZW5pZW5jZSBmdW5jdGlvbiBlcXVpdmFsZW50IHRvIHNldENv bnRlbnQoaHRtbCwgInRleHQvaHRtbCIsIGJhc2VVcmwpLgorCisgICAgXHdhcm5pbmcgVGhpcyBm dW5jdGlvbiB3b3JrcyBvbmx5IGZvciBIVE1MLCBmb3Igb3RoZXIgbWltZSB0eXBlcyAoZXguIFhI VE1MLCBTVkcpCisgICAgc2V0Q29udGVudCgpIHNob3VsZCBiZSB1c2VkIGluc3RlYWQKKyAgICAK KyAgICBcc2EgbG9hZCgpLCBzZXRDb250ZW50KCksIFFXZWJGcmFtZTo6dG9IdG1sKCksIFFXZWJG cmFtZTo6c2V0Q29udGVudCgpCiAqLwogdm9pZCBRV2ViVmlldzo6c2V0SHRtbChjb25zdCBRU3Ry aW5nICZodG1sLCBjb25zdCBRVXJsICZiYXNlVXJsKQogewpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0 L0NoYW5nZUxvZyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggYWQ0MjNlOC4uZjNiZGRlMyAx MDA2NDQKLS0tIGEvV2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9XZWJLaXQvcXQvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMjAgQEAKKzIwMDktMTEtMjUgIEplZHJ6ZWogTm93YWNraSAgPGplZHJ6ZWou bm93YWNraUBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgUVdlYkZyYW1lIGFuZCBRV2ViVmlldyBkb2N1bWVudGF0aW9uIGZpeC4KKyAg ICAgICAgCisgICAgICAgIFRoZSBRV2ViRnJhbWUgYW5kIHRoZSBRV2ViVmlldyBzZXRIdG1sKCkg bWV0aG9kcyBhcmUgYSBiaXQgY29uZnVzaW5nLgorICAgICAgICBUaGVyZSBhcmUgYSBmZXcgcmVn aXN0ZXJlZCBidWdzIGluIFdlYmtpdCdzIGJ1Z3ppbGxhIHRoYXQgc291cmNlIGlzCisgICAgICAg IGluIGEgYmFkIHVzYWdlIG9mIHRoZSBmdW5jdGlvbi4KKyAgICAgICAgCisgICAgICAgIEFkZGl0 aW9uYWwgaW5mb3JtYXRpb24gd2VyZSBhZGRlZC4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzExMTUKKworICAgICAgICAqIEFwaS9xd2ViZnJhbWUu Y3BwOgorICAgICAgICAqIEFwaS9xd2Vidmlldy5jcHA6CisKIDIwMDktMTEtMjMgIERhdmlkIEJv ZGRpZSAgPGRib2RkaWVAdHJvbGx0ZWNoLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1v biBIYXVzbWFubi4K 62944 2010-07-29 07:36:42 -0700 2010-07-29 08:01:26 -0700 Patch for the doc fix, with QGraphicsWebView as well docfix.diff text/plain 3269 menard ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAgYi9XZWJLaXQv cXQvQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwCmluZGV4IDg1M2U2MzcuLjVjY2NiMDcgMTAwNjQ0 Ci0tLSBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAKKysrIGIvV2ViS2l0L3F0 L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcApAQCAtNzA5LDcgKzcwOSwxMiBAQCB2b2lkIFFHcmFw aGljc1dlYlZpZXc6OmxvYWQoY29uc3QgUU5ldHdvcmtSZXF1ZXN0JiByZXF1ZXN0LAogICAgIHRo cm91Z2ggdGhlIGNoYXJzZXQgYXR0cmlidXRlIG9mIHRoZSBIVE1MIHNjcmlwdCB0YWcuIEFsdGVy bmF0aXZlbHksIHRoZQogICAgIGVuY29kaW5nIGNhbiBhbHNvIGJlIHNwZWNpZmllZCBieSB0aGUg d2ViIHNlcnZlci4KIAotICAgIFxzYSBsb2FkKCksIHNldENvbnRlbnQoKSwgUVdlYkZyYW1lOjp0 b0h0bWwoKQorICAgIFRoaXMgaXMgYSBjb252ZW5pZW5jZSBmdW5jdGlvbiBlcXVpdmFsZW50IHRv IHNldENvbnRlbnQoaHRtbCwgInRleHQvaHRtbCIsIGJhc2VVcmwpLgorCisgICAgXHdhcm5pbmcg VGhpcyBmdW5jdGlvbiB3b3JrcyBvbmx5IGZvciBIVE1MLCBmb3Igb3RoZXIgbWltZSB0eXBlcyAo ZXguIFhIVE1MLCBTVkcpCisgICAgc2V0Q29udGVudCgpIHNob3VsZCBiZSB1c2VkIGluc3RlYWQK KworICAgIFxzYSBsb2FkKCksIHNldENvbnRlbnQoKSwgUVdlYkZyYW1lOjp0b0h0bWwoKSwgUVdl YkZyYW1lOjpzZXRDb250ZW50KCkKICovCiB2b2lkIFFHcmFwaGljc1dlYlZpZXc6OnNldEh0bWwo Y29uc3QgUVN0cmluZyYgaHRtbCwgY29uc3QgUVVybCYgYmFzZVVybCkKIHsKZGlmZiAtLWdpdCBh L1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcCBiL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNw cAppbmRleCBmMTBkNWI0Li4xMTFkYTMwIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3F3ZWJm cmFtZS5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwCkBAIC03OTMsOSArNzkz LDE0IEBAIHZvaWQgUVdlYkZyYW1lOjpsb2FkKGNvbnN0IFFOZXR3b3JrUmVxdWVzdCAmcmVxLAog ICBzY3JpcHQgY2FuIGJlIHNwZWNpZmllZCB0aHJvdWdoIHRoZSBjaGFyc2V0IGF0dHJpYnV0ZSBv ZiB0aGUgSFRNTCBzY3JpcHQgdGFnLiBJdCBpcyBhbHNvIHBvc3NpYmxlCiAgIGZvciB0aGUgZW5j b2RpbmcgdG8gYmUgc3BlY2lmaWVkIGJ5IHdlYiBzZXJ2ZXIuCiAKKyAgVGhpcyBpcyBhIGNvbnZl bmllbmNlIGZ1bmN0aW9uIGVxdWl2YWxlbnQgdG8gc2V0Q29udGVudChodG1sLCAidGV4dC9odG1s IiwgYmFzZVVybCkuCisKICAgXG5vdGUgVGhpcyBtZXRob2Qgd2lsbCBub3QgYWZmZWN0IHNlc3Np b24gb3IgZ2xvYmFsIGhpc3RvcnkgZm9yIHRoZSBmcmFtZS4KIAotICBcc2EgdG9IdG1sKCksIHNl dENvbnRlbnQoKQorICBcd2FybmluZyBUaGlzIGZ1bmN0aW9uIHdvcmtzIG9ubHkgZm9yIEhUTUws IGZvciBvdGhlciBtaW1lIHR5cGVzIChleC4gWEhUTUwsIFNWRykKKyAgc2V0Q29udGVudCgpIHNo b3VsZCBiZSB1c2VkIGluc3RlYWQuCisKKyAgXHNhIHRvSHRtbCgpLCBzZXRDb250ZW50KCksIGxv YWQoKQogKi8KIHZvaWQgUVdlYkZyYW1lOjpzZXRIdG1sKGNvbnN0IFFTdHJpbmcgJmh0bWwsIGNv bnN0IFFVcmwgJmJhc2VVcmwpCiB7CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3 LmNwcCBiL1dlYktpdC9xdC9BcGkvcXdlYnZpZXcuY3BwCmluZGV4IDU2NzMzMjYuLjU2MTVkODYg MTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcXdlYnZpZXcuY3BwCisrKyBiL1dlYktpdC9xdC9B cGkvcXdlYnZpZXcuY3BwCkBAIC00NzAsNyArNDcwLDEyIEBAIHZvaWQgUVdlYlZpZXc6OmxvYWQo Y29uc3QgUU5ldHdvcmtSZXF1ZXN0ICZyZXF1ZXN0LAogICAgIHRocm91Z2ggdGhlIGNoYXJzZXQg YXR0cmlidXRlIG9mIHRoZSBIVE1MIHNjcmlwdCB0YWcuIEFsdGVybmF0aXZlbHksIHRoZQogICAg IGVuY29kaW5nIGNhbiBhbHNvIGJlIHNwZWNpZmllZCBieSB0aGUgd2ViIHNlcnZlci4KIAotICAg IFxzYSBsb2FkKCksIHNldENvbnRlbnQoKSwgUVdlYkZyYW1lOjp0b0h0bWwoKQorICAgIFRoaXMg aXMgYSBjb252ZW5pZW5jZSBmdW5jdGlvbiBlcXVpdmFsZW50IHRvIHNldENvbnRlbnQoaHRtbCwg InRleHQvaHRtbCIsIGJhc2VVcmwpLgorCisgICAgXHdhcm5pbmcgVGhpcyBmdW5jdGlvbiB3b3Jr cyBvbmx5IGZvciBIVE1MLCBmb3Igb3RoZXIgbWltZSB0eXBlcyAoZXguIFhIVE1MLCBTVkcpCisg ICAgc2V0Q29udGVudCgpIHNob3VsZCBiZSB1c2VkIGluc3RlYWQKKworICAgIFxzYSBsb2FkKCks IHNldENvbnRlbnQoKSwgUVdlYkZyYW1lOjp0b0h0bWwoKSwgUVdlYkZyYW1lOjpzZXRDb250ZW50 KCkKICovCiB2b2lkIFFXZWJWaWV3OjpzZXRIdG1sKGNvbnN0IFFTdHJpbmcgJmh0bWwsIGNvbnN0 IFFVcmwgJmJhc2VVcmwpCiB7CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2Vi S2l0L3F0L0NoYW5nZUxvZwppbmRleCBjZGU1YTViLi4xNWU3ZDQ0IDEwMDY0NAotLS0gYS9XZWJL aXQvcXQvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBA QAorMjAxMC0wNy0yOSAgQWxleGlzIE1lbmFyZCAgPGFsZXhpcy5tZW5hcmRAbm9raWEuY29tPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFFXZWJGcmFt ZSBhbmQgUVdlYlZpZXcgZG9jdW1lbnRhdGlvbiBmaXguCisKKyAgICAgICAgVGhlIFFXZWJGcmFt ZSBhbmQgdGhlIFFXZWJWaWV3IHNldEh0bWwoKSBtZXRob2RzIGFyZSBhIGJpdCBjb25mdXNpbmcu CisgICAgICAgIFRoZXJlIGFyZSBhIGZldyByZWdpc3RlcmVkIGJ1Z3MgaW4gV2Via2l0J3MgYnVn emlsbGEgdGhhdCBzb3VyY2UgaXMKKyAgICAgICAgaW4gYSBiYWQgdXNhZ2Ugb2YgdGhlIGZ1bmN0 aW9uLgorICAgICAgICBBZGRpdGlvbmFsIGluZm9ybWF0aW9uIHdlcmUgYWRkZWQuCisKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxMTE1CisKKworICAg ICAgICAqIEFwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKiBBcGkvcXdlYmZyYW1l LmNwcDoKKyAgICAgICAgKiBBcGkvcXdlYnZpZXcuY3BwOgorCiAyMDEwLTA3LTI3ICBTaW1vbiBI YXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBi eSBUb3IgQXJuZSBWZXN0YsO4Lgo= 62946 2010-07-29 08:01:26 -0700 2010-07-29 09:30:01 -0700 Patch for the doc fix, with QGraphicsWebView as well - v2 docfix.diff text/plain 3272 menard ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAgYi9XZWJLaXQv cXQvQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwCmluZGV4IDg1M2U2MzcuLjU5YmI3YTkgMTAwNjQ0 Ci0tLSBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAKKysrIGIvV2ViS2l0L3F0 L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcApAQCAtNzA5LDcgKzcwOSwxMiBAQCB2b2lkIFFHcmFw aGljc1dlYlZpZXc6OmxvYWQoY29uc3QgUU5ldHdvcmtSZXF1ZXN0JiByZXF1ZXN0LAogICAgIHRo cm91Z2ggdGhlIGNoYXJzZXQgYXR0cmlidXRlIG9mIHRoZSBIVE1MIHNjcmlwdCB0YWcuIEFsdGVy bmF0aXZlbHksIHRoZQogICAgIGVuY29kaW5nIGNhbiBhbHNvIGJlIHNwZWNpZmllZCBieSB0aGUg d2ViIHNlcnZlci4KIAotICAgIFxzYSBsb2FkKCksIHNldENvbnRlbnQoKSwgUVdlYkZyYW1lOjp0 b0h0bWwoKQorICAgIFRoaXMgaXMgYSBjb252ZW5pZW5jZSBmdW5jdGlvbiBlcXVpdmFsZW50IHRv IHNldENvbnRlbnQoaHRtbCwgInRleHQvaHRtbCIsIGJhc2VVcmwpLgorCisgICAgXHdhcm5pbmcg VGhpcyBmdW5jdGlvbiB3b3JrcyBvbmx5IGZvciBIVE1MLCBmb3Igb3RoZXIgbWltZSB0eXBlcyAo aS5lLiBYSFRNTCwgU1ZHKQorICAgIHNldENvbnRlbnQoKSBzaG91bGQgYmUgdXNlZCBpbnN0ZWFk LgorCisgICAgXHNhIGxvYWQoKSwgc2V0Q29udGVudCgpLCBRV2ViRnJhbWU6OnRvSHRtbCgpLCBR V2ViRnJhbWU6OnNldENvbnRlbnQoKQogKi8KIHZvaWQgUUdyYXBoaWNzV2ViVmlldzo6c2V0SHRt bChjb25zdCBRU3RyaW5nJiBodG1sLCBjb25zdCBRVXJsJiBiYXNlVXJsKQogewpkaWZmIC0tZ2l0 IGEvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUu Y3BwCmluZGV4IGYxMGQ1YjQuLmU5MDM2N2UgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcXdl YmZyYW1lLmNwcAorKysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKQEAgLTc5Myw5ICs3 OTMsMTQgQEAgdm9pZCBRV2ViRnJhbWU6OmxvYWQoY29uc3QgUU5ldHdvcmtSZXF1ZXN0ICZyZXEs CiAgIHNjcmlwdCBjYW4gYmUgc3BlY2lmaWVkIHRocm91Z2ggdGhlIGNoYXJzZXQgYXR0cmlidXRl IG9mIHRoZSBIVE1MIHNjcmlwdCB0YWcuIEl0IGlzIGFsc28gcG9zc2libGUKICAgZm9yIHRoZSBl bmNvZGluZyB0byBiZSBzcGVjaWZpZWQgYnkgd2ViIHNlcnZlci4KIAorICBUaGlzIGlzIGEgY29u dmVuaWVuY2UgZnVuY3Rpb24gZXF1aXZhbGVudCB0byBzZXRDb250ZW50KGh0bWwsICJ0ZXh0L2h0 bWwiLCBiYXNlVXJsKS4KKwogICBcbm90ZSBUaGlzIG1ldGhvZCB3aWxsIG5vdCBhZmZlY3Qgc2Vz c2lvbiBvciBnbG9iYWwgaGlzdG9yeSBmb3IgdGhlIGZyYW1lLgogCi0gIFxzYSB0b0h0bWwoKSwg c2V0Q29udGVudCgpCisgIFx3YXJuaW5nIFRoaXMgZnVuY3Rpb24gd29ya3Mgb25seSBmb3IgSFRN TCwgZm9yIG90aGVyIG1pbWUgdHlwZXMgKGkuZS4gWEhUTUwsIFNWRykKKyAgc2V0Q29udGVudCgp IHNob3VsZCBiZSB1c2VkIGluc3RlYWQuCisKKyAgXHNhIHRvSHRtbCgpLCBzZXRDb250ZW50KCks IGxvYWQoKQogKi8KIHZvaWQgUVdlYkZyYW1lOjpzZXRIdG1sKGNvbnN0IFFTdHJpbmcgJmh0bWws IGNvbnN0IFFVcmwgJmJhc2VVcmwpCiB7CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJ2 aWV3LmNwcCBiL1dlYktpdC9xdC9BcGkvcXdlYnZpZXcuY3BwCmluZGV4IDU2NzMzMjYuLjcyZTI5 OGUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcXdlYnZpZXcuY3BwCisrKyBiL1dlYktpdC9x dC9BcGkvcXdlYnZpZXcuY3BwCkBAIC00NzAsNyArNDcwLDEyIEBAIHZvaWQgUVdlYlZpZXc6Omxv YWQoY29uc3QgUU5ldHdvcmtSZXF1ZXN0ICZyZXF1ZXN0LAogICAgIHRocm91Z2ggdGhlIGNoYXJz ZXQgYXR0cmlidXRlIG9mIHRoZSBIVE1MIHNjcmlwdCB0YWcuIEFsdGVybmF0aXZlbHksIHRoZQog ICAgIGVuY29kaW5nIGNhbiBhbHNvIGJlIHNwZWNpZmllZCBieSB0aGUgd2ViIHNlcnZlci4KIAot ICAgIFxzYSBsb2FkKCksIHNldENvbnRlbnQoKSwgUVdlYkZyYW1lOjp0b0h0bWwoKQorICAgIFRo aXMgaXMgYSBjb252ZW5pZW5jZSBmdW5jdGlvbiBlcXVpdmFsZW50IHRvIHNldENvbnRlbnQoaHRt bCwgInRleHQvaHRtbCIsIGJhc2VVcmwpLgorCisgICAgXHdhcm5pbmcgVGhpcyBmdW5jdGlvbiB3 b3JrcyBvbmx5IGZvciBIVE1MLCBmb3Igb3RoZXIgbWltZSB0eXBlcyAoaS5lLiBYSFRNTCwgU1ZH KQorICAgIHNldENvbnRlbnQoKSBzaG91bGQgYmUgdXNlZCBpbnN0ZWFkLgorCisgICAgXHNhIGxv YWQoKSwgc2V0Q29udGVudCgpLCBRV2ViRnJhbWU6OnRvSHRtbCgpLCBRV2ViRnJhbWU6OnNldENv bnRlbnQoKQogKi8KIHZvaWQgUVdlYlZpZXc6OnNldEh0bWwoY29uc3QgUVN0cmluZyAmaHRtbCwg Y29uc3QgUVVybCAmYmFzZVVybCkKIHsKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cg Yi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IGNkZTVhNWIuLmFkNzE2ZGYgMTAwNjQ0Ci0tLSBh L1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDIwIEBACisyMDEwLTA3LTI5ICBBbGV4aXMgTWVuYXJkICA8YWxleGlzLm1lbmFyZEBub2tpYS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUVdl YkZyYW1lIGFuZCBRV2ViVmlldyBkb2N1bWVudGF0aW9uIGZpeC4KKworICAgICAgICBUaGUgUVdl YkZyYW1lIGFuZCB0aGUgUVdlYlZpZXcgc2V0SHRtbCgpIG1ldGhvZHMgYXJlIGEgYml0IGNvbmZ1 c2luZy4KKyAgICAgICAgVGhlcmUgYXJlIGEgZmV3IHJlZ2lzdGVyZWQgYnVncyBpbiBXZWJraXQn cyBidWd6aWxsYSB0aGF0IHNvdXJjZSBpcworICAgICAgICBpbiBhIGJhZCB1c2FnZSBvZiB0aGUg ZnVuY3Rpb24uCisgICAgICAgIEFkZGl0aW9uYWwgaW5mb3JtYXRpb24gd2VyZSBhZGRlZC4KKwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzExMTUKKwor ICAgICAgICAqIEFwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKiBBcGkvcXdlYmZy YW1lLmNwcDoKKyAgICAgICAgKiBBcGkvcXdlYnZpZXcuY3BwOgorCiAyMDEwLTA3LTI3ICBTaW1v biBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBUb3IgQXJuZSBWZXN0YsO4Lgo=