64223 2011-07-08 18:27:46 -0700 WebFrame should have a method to determine its visual emptiness 2012-08-16 13:45:36 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Mac (Intel) OS X 10.6 RESOLVED FIXED P2 Normal --- 0 ian webkit-unassigned ap beidson joepeck koivisto webkit.review.bot zalan oldest_to_newest 434433 0 ian 2011-07-08 18:27:46 -0700 Steps to reproduce: 1. Fire up dtrace, set probes for didFirstVisuallyNonEmptyLayout and dispatchDidCommitLoad. 2. Load http://news.ycombinator.com or another site that is cacheable in the page cache. 3. Click on a link. 4. Go back. Notice that the load has committed, but didFirstVisuallyNonEmptyLayout never happens. 434436 1 100197 ian 2011-07-08 18:35:28 -0700 Created attachment 100197 proposed patch 434437 2 ian 2011-07-08 18:36:13 -0700 <rdar://problem/9434637> 434650 3 100197 bfulgham 2011-07-10 19:21:44 -0700 Comment on attachment 100197 proposed patch Do any of the other layout state flags need to be reset as well? E.g., m_hasPendingPostLayoutTasks seems like it might fall into the same bad state. 435076 4 ian 2011-07-11 11:54:19 -0700 (In reply to comment #3) > (From update of attachment 100197 [details]) > Do any of the other layout state flags need to be reset as well? E.g., m_hasPendingPostLayoutTasks seems like it might fall into the same bad state. I'm not sure, maybe someone more familiar with WebCore layout can answer that. The issue here is that m_firstVisuallyNonEmptyLayoutCallbackPending is only set once, in FrameView's constructor. I guess the assumption was that page loads correspond to new FrameViews. This assumption is broken when a page is restored from the b/f cache. 435187 5 ap 2011-07-11 13:56:23 -0700 This fix looks rather scary to me. There is a ton of callbacks that are not made when a page comes back from b/f cache, and that even includes most basic loading callbacks. Sending didFirstVisuallyNonEmptyLayout alone could be confusing to clients. 438214 6 ian 2011-07-16 17:35:29 -0700 We can get the same result by asking the WebFrame if it's visually non-empty when the load commits. Updating bug title. 438224 7 101108 ian 2011-07-16 18:05:54 -0700 Created attachment 101108 proposed patch 438330 8 101108 mitz 2011-07-17 21:53:52 -0700 Comment on attachment 101108 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=101108&action=review > Source/WebKit/mac/WebView/WebFramePrivate.h:77 > - (BOOL)_firstLayoutDone; > +- (BOOL)_didFirstVisuallyNonEmptyLayout; I’d call this _firstVisuallyNonEmptyLayoutDone. I think a message named did… often implies that the sender did something and is notifying the receiver of that. Perhaps a better name for both would have been hasDone…. 438331 9 101108 mitz 2011-07-17 21:54:43 -0700 Comment on attachment 101108 proposed patch Clearing the cq flag because of my naming suggestion. 438434 10 koivisto 2011-07-18 06:35:07 -0700 Does this issue actually exist anymore? I believe we dispatch didFirstVisuallyNonEmptyLayout for cached pages too after http://trac.webkit.org/changeset/90900 (and the followup in 91027). GDB seems to agree. 438642 11 101108 ian 2011-07-18 12:37:46 -0700 Comment on attachment 101108 proposed patch This is no longer necessary. 441855 12 ian 2011-07-25 14:10:03 -0700 Apparently this is necessary after all. I'll post a more up-to-date patch. 441870 13 101912 ian 2011-07-25 14:36:14 -0700 Created attachment 101912 proposed patch 442005 14 101912 webkit.review.bot 2011-07-25 17:12:42 -0700 Comment on attachment 101912 proposed patch Clearing flags on attachment: 101912 Committed r91727: <http://trac.webkit.org/changeset/91727> 442006 15 webkit.review.bot 2011-07-25 17:12:47 -0700 All reviewed patches have been landed. Closing bug. 100197 2011-07-08 18:35:28 -0700 2011-07-16 18:05:54 -0700 proposed patch 64223-1.patch text/plain 2038 ian SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkwNjc1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDctMDggIElhbiBIZW5k ZXJzb24gIDxpYW5oQGFwcGxlLmNvbT4KKworICAgICAgICBCYWNrL2ZvcndhcmQgbmF2aWdhdGlv biB1c2luZyB0aGUgcGFnZSBjYWNoZSBkb2Vzbid0IHRyaWdnZXIgZGlkRmlyc3RWaXN1YWxseU5v bkVtcHR5TGF5b3V0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD02NDIyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogaGlzdG9yeS9DYWNoZWRGcmFtZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRG cmFtZTo6Q2FjaGVkRnJhbWUpOgorICAgICAgICBXaGVuIHB1dHRpbmcgYSBmcmFtZSBpbnRvIHRo ZSBwYWdlIGNhY2hlLCByZXNldCBpdHMgdmlzdWFsbHkgbm9uLWVtcHR5CisgICAgICAgIGxheW91 dCBmbGFnIHNvIGl0IHdpbGwgc2VuZCB0aGUgZGVsZWdhdGUgY2FsbGJhY2sgYWZ0ZXIgYmVpbmcg cmVzdG9yZWQKKyAgICAgICAgZnJvbSB0aGUgY2FjaGUuCisgICAgICAgICogcGFnZS9GcmFtZVZp ZXcuaDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6cmVzZXRWaXN1YWxseU5vbkVtcHR5 TGF5b3V0Q2FsbGJhY2spOgorCiAyMDExLTA3LTA4ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFz ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIENsZWFuIHVwIFJlbmRlcldpZGdldDo6ZGVzdHJveSgp IHRvIHNoYXJlIG1vcmUgY29kZQpJbmRleDogU291cmNlL1dlYkNvcmUvaGlzdG9yeS9DYWNoZWRG cmFtZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaGlzdG9yeS9DYWNoZWRGcmFt ZS5jcHAJKHJldmlzaW9uIDkwNjcxKQorKysgU291cmNlL1dlYkNvcmUvaGlzdG9yeS9DYWNoZWRG cmFtZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE1Niw2ICsxNTYsOCBAQAogICAgIC8vIEN1c3Rv bSBzY3JvbGxiYXIgcmVuZGVyZXJzIHdpbGwgZ2V0IHJlYXR0YWNoZWQgd2hlbiB0aGUgZG9jdW1l bnQgY29tZXMgb3V0IG9mIHRoZSBwYWdlIGNhY2hlCiAgICAgbV92aWV3LT5kZXRhY2hDdXN0b21T Y3JvbGxiYXJzKCk7CiAKKyAgICBtX3ZpZXctPnJlc2V0VmlzdWFsbHlOb25FbXB0eUxheW91dENh bGxiYWNrKCk7CisKICAgICBtX2RvY3VtZW50LT5kb2N1bWVudFdpbGxCZWNvbWVJbmFjdGl2ZSgp OwogICAgIGZyYW1lLT5jbGVhclRpbWVycygpOwogICAgIG1fZG9jdW1lbnQtPnNldEluUGFnZUNh Y2hlKHRydWUpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCShyZXZpc2lvbiA5MDY3MSkK KysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTIy Nyw2ICsyMjcsOCBAQAogICAgIHZvaWQgdXBkYXRlTGF5b3V0QW5kU3R5bGVJZk5lZWRlZFJlY3Vy c2l2ZSgpOwogICAgIHZvaWQgZmx1c2hEZWZlcnJlZFJlcGFpbnRzKCk7CiAKKyAgICB2b2lkIHJl c2V0VmlzdWFsbHlOb25FbXB0eUxheW91dENhbGxiYWNrKCkgeyBtX2ZpcnN0VmlzdWFsbHlOb25F bXB0eUxheW91dENhbGxiYWNrUGVuZGluZyA9IHRydWU7IH0KKwogICAgIHZvaWQgc2V0SXNWaXN1 YWxseU5vbkVtcHR5KCkgeyBtX2lzVmlzdWFsbHlOb25FbXB0eSA9IHRydWU7IH0KIAogICAgIHZv aWQgZm9yY2VMYXlvdXQoYm9vbCBhbGxvd1N1YnRyZWUgPSBmYWxzZSk7Cg== 101108 2011-07-16 18:05:54 -0700 2011-07-25 14:36:14 -0700 proposed patch 64223-2.patch text/plain 3271 ian SW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxMTU5KQorKysgU291cmNlL1dlYktpdC9t YWMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDctMTYg IElhbiBIZW5kZXJzb24gIDxpYW5oQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJGcmFtZSBzaG91 bGQgaGF2ZSBhIG1ldGhvZCB0byBkZXRlcm1pbmUgaXRzIHZpc3VhbCBlbXB0aW5lc3MKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY0MjIzCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJWaWV3L1dlYkZy YW1lLm1tOgorICAgICAgICAoLVtXZWJGcmFtZSBfZGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5 b3V0XSk6IFBpcGUgdGhlCisgICAgICAgIGlzVmlzdWFsbHlOb25FbXB0eSBtZXRob2QgdGhyb3Vn aCBXZWJLaXQuCisgICAgICAgICogV2ViVmlldy9XZWJGcmFtZVByaXZhdGUuaDoKKwogMjAxMS0w Ny0xNSAgUHJhdGlrIFNvbGFua2kgIDxwc29sYW5raUBhcHBsZS5jb20+CiAKICAgICAgICAgUGFy dCBvZiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjM2NzQKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViRnJhbWVQcml2YXRlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJGcmFtZVByaXZhdGUuaAkocmV2aXNpb24g OTExNTcpCisrKyBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lUHJpdmF0ZS5oCSh3 b3JraW5nIGNvcHkpCkBAIC03NCw2ICs3NCw3IEBACiAtIChOU0NvbG9yICopX2JvZHlCYWNrZ3Jv dW5kQ29sb3I7CiAtIChCT09MKV9pc0ZyYW1lU2V0OwogLSAoQk9PTClfZmlyc3RMYXlvdXREb25l OworLSAoQk9PTClfZGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0OwogLSAoV2ViRnJhbWVM b2FkVHlwZSlfbG9hZFR5cGU7CiAKIC8vIFRoZXNlIG1ldGhvZHMgdGFrZSBhbmQgcmV0dXJuIE5T UmFuZ2VzIGJhc2VkIG9uIHRoZSByb290IGVkaXRhYmxlIGVsZW1lbnQgYXMgdGhlIHBvc2l0aW9u YWwgYmFzZS4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViRnJhbWUubW0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJGcmFtZS5tbQkocmV2aXNp b24gOTExNTcpCisrKyBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lLm1tCSh3b3Jr aW5nIGNvcHkpCkBAIC05MTMsNiArOTEzLDEzIEBACiAgICAgcmV0dXJuIF9wcml2YXRlLT5jb3Jl RnJhbWUtPmxvYWRlcigpLT5zdGF0ZU1hY2hpbmUoKS0+Zmlyc3RMYXlvdXREb25lKCk7CiB9CiAK Ky0gKEJPT0wpX2RpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dAoreworICAgIGlmIChGcmFt ZVZpZXcqIHZpZXcgPSBfcHJpdmF0ZS0+Y29yZUZyYW1lLT52aWV3KCkpCisgICAgICAgIHJldHVy biB2aWV3LT5pc1Zpc3VhbGx5Tm9uRW1wdHkoKTsKKyAgICByZXR1cm4gTk87Cit9CisKIC0gKFdl YkZyYW1lTG9hZFR5cGUpX2xvYWRUeXBlCiB7CiAgICAgcmV0dXJuIChXZWJGcmFtZUxvYWRUeXBl KV9wcml2YXRlLT5jb3JlRnJhbWUtPmxvYWRlcigpLT5sb2FkVHlwZSgpOwpJbmRleDogU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwkocmV2aXNpb24gOTExNTkpCisrKyBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcg Y29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAxMS0wNy0xNiAgSWFuIEhlbmRlcnNvbiAgPGlhbmhA YXBwbGUuY29tPgorCisgICAgICAgIFdlYkZyYW1lIHNob3VsZCBoYXZlIGEgbWV0aG9kIHRvIGRl dGVybWluZSBpdHMgdmlzdWFsIGVtcHRpbmVzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjQyMjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3Lmg6CisgICAgICAgIChXZWJDb3Jl OjpGcmFtZVZpZXc6OmlzVmlzdWFsbHlOb25FbXB0eSk6IEFkZCBhbiBhY2Nlc3NvciB0byBGcmFt ZVZpZXcKKyAgICAgICAgc28gd2UgY2FuIHRlbGwgd2hldGhlciBpdCdzIHZpc3VhbGx5IG5vbi1l bXB0eS4KKwogMjAxMS0wNy0xNiAgRW5yaWNhIENhc3VjY2kgIDxlbnJpY2FAYXBwbGUuY29tPgog CiAgICAgICAgIFJFR1JFU1NJT046IFByZXNzaW5nIHJldHVybiBpbiBhIHBhcnRpY3VsYXIgZG9j dW1lbnQgc2VuZHMgdGhlIGN1cnNvciB0byB0aGUgZW5kIG9mIHRoZSBkb2N1bWVudC4KSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGFnZS9GcmFtZVZpZXcuaAkocmV2aXNpb24gOTExNTcpCisrKyBTb3VyY2UvV2ViQ29y ZS9wYWdlL0ZyYW1lVmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC0yMzAsNiArMjMwLDcgQEAKICAg ICB2b2lkIGluY3JlbWVudFZpc3VhbGx5Tm9uRW1wdHlDaGFyYWN0ZXJDb3VudCh1bnNpZ25lZCk7 CiAgICAgdm9pZCBpbmNyZW1lbnRWaXN1YWxseU5vbkVtcHR5UGl4ZWxDb3VudChjb25zdCBJbnRT aXplJik7CiAgICAgdm9pZCBzZXRJc1Zpc3VhbGx5Tm9uRW1wdHkoKSB7IG1faXNWaXN1YWxseU5v bkVtcHR5ID0gdHJ1ZTsgfQorICAgIGJvb2wgaXNWaXN1YWxseU5vbkVtcHR5KCkgY29uc3QgeyBy ZXR1cm4gbV9pc1Zpc3VhbGx5Tm9uRW1wdHk7IH0KIAogICAgIHZvaWQgZm9yY2VMYXlvdXQoYm9v bCBhbGxvd1N1YnRyZWUgPSBmYWxzZSk7CiAgICAgdm9pZCBmb3JjZUxheW91dEZvclBhZ2luYXRp b24oY29uc3QgRmxvYXRTaXplJiBwYWdlU2l6ZSwgZmxvYXQgbWF4aW11bVNocmlua0ZhY3Rvciwg QWRqdXN0Vmlld1NpemVPck5vdCk7Cg== 101912 2011-07-25 14:36:14 -0700 2011-07-25 17:12:42 -0700 proposed patch 64223-3.patch text/plain 3201 ian SW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxNzA1KQorKysgU291cmNlL1dlYktpdC9t YWMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDctMjUg IElhbiBIZW5kZXJzb24gIDxpYW5oQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJGcmFtZSBzaG91 bGQgaGF2ZSBhIG1ldGhvZCB0byBkZXRlcm1pbmUgaXRzIHZpc3VhbCBlbXB0aW5lc3MKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY0MjIzCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJWaWV3L1dlYkZy YW1lLm1tOgorICAgICAgICAoLVtXZWJGcmFtZSBfaXNWaXN1YWxseU5vbkVtcHR5XSk6IFBpcGUg dGhlIGlzVmlzdWFsbHlOb25FbXB0eSBtZXRob2QKKyAgICAgICAgdGhyb3VnaCBXZWJLaXQuCisg ICAgICAgICogV2ViVmlldy9XZWJGcmFtZVByaXZhdGUuaDoKKwogMjAxMS0wNy0xOSAgTGVvIFlh bmcgIDxsZW95YW5nLndlYmtpdEBnbWFpbC5jb20+CiAKICAgICAgICAgU1ZHOiBNaXNzaW5nIGlt cGxlbWVudGF0aW9uIG9mIDxhbHRHbHlwaERlZj4sIDxhbHRHbHlwaEl0ZW0+IGFuZCA8Z2x5cGhS ZWY+CkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lUHJpdmF0ZS5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViRnJhbWVQcml2YXRlLmgJ KHJldmlzaW9uIDkxNzA1KQorKysgU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJGcmFtZVBy aXZhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtNzQsNiArNzQsNyBAQAogLSAoTlNDb2xvciAqKV9i b2R5QmFja2dyb3VuZENvbG9yOwogLSAoQk9PTClfaXNGcmFtZVNldDsKIC0gKEJPT0wpX2ZpcnN0 TGF5b3V0RG9uZTsKKy0gKEJPT0wpX2lzVmlzdWFsbHlOb25FbXB0eTsKIC0gKFdlYkZyYW1lTG9h ZFR5cGUpX2xvYWRUeXBlOwogCiAvLyBUaGVzZSBtZXRob2RzIHRha2UgYW5kIHJldHVybiBOU1Jh bmdlcyBiYXNlZCBvbiB0aGUgcm9vdCBlZGl0YWJsZSBlbGVtZW50IGFzIHRoZSBwb3NpdGlvbmFs IGJhc2UuCkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lLm1tCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViRnJhbWUubW0JKHJldmlzaW9u IDkxNzA1KQorKysgU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJGcmFtZS5tbQkod29ya2lu ZyBjb3B5KQpAQCAtOTEzLDYgKzkxMywxMyBAQAogICAgIHJldHVybiBfcHJpdmF0ZS0+Y29yZUZy YW1lLT5sb2FkZXIoKS0+c3RhdGVNYWNoaW5lKCktPmZpcnN0TGF5b3V0RG9uZSgpOwogfQogCist IChCT09MKV9pc1Zpc3VhbGx5Tm9uRW1wdHkKK3sKKyAgICBpZiAoRnJhbWVWaWV3KiB2aWV3ID0g X3ByaXZhdGUtPmNvcmVGcmFtZS0+dmlldygpKQorICAgICAgICByZXR1cm4gdmlldy0+aXNWaXN1 YWxseU5vbkVtcHR5KCk7CisgICAgcmV0dXJuIE5POworfQorCiAtIChXZWJGcmFtZUxvYWRUeXBl KV9sb2FkVHlwZQogewogICAgIHJldHVybiAoV2ViRnJhbWVMb2FkVHlwZSlfcHJpdmF0ZS0+Y29y ZUZyYW1lLT5sb2FkZXIoKS0+bG9hZFR5cGUoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkx NzA1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMTQgQEAKKzIwMTEtMDctMTYgIElhbiBIZW5kZXJzb24gIDxpYW5oQGFwcGxlLmNvbT4KKwor ICAgICAgICBXZWJGcmFtZSBzaG91bGQgaGF2ZSBhIG1ldGhvZCB0byBkZXRlcm1pbmUgaXRzIHZp c3VhbCBlbXB0aW5lc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTY0MjIzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBwYWdlL0ZyYW1lVmlldy5oOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojpp c1Zpc3VhbGx5Tm9uRW1wdHkpOiBBZGQgYW4gYWNjZXNzb3IgdG8gRnJhbWVWaWV3CisgICAgICAg IHNvIHdlIGNhbiB0ZWxsIHdoZXRoZXIgaXQncyB2aXN1YWxseSBub24tZW1wdHkuCisKIDIwMTEt MDctMjUgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29tPgogCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTEyNQpJbmRleDogU291cmNlL1dlYkNv cmUvcGFnZS9GcmFtZVZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0Zy YW1lVmlldy5oCShyZXZpc2lvbiA5MTcwNSkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVW aWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTIzMiw2ICsyMzIsNyBAQAogICAgIHZvaWQgaW5jcmVt ZW50VmlzdWFsbHlOb25FbXB0eUNoYXJhY3RlckNvdW50KHVuc2lnbmVkKTsKICAgICB2b2lkIGlu Y3JlbWVudFZpc3VhbGx5Tm9uRW1wdHlQaXhlbENvdW50KGNvbnN0IEludFNpemUmKTsKICAgICB2 b2lkIHNldElzVmlzdWFsbHlOb25FbXB0eSgpIHsgbV9pc1Zpc3VhbGx5Tm9uRW1wdHkgPSB0cnVl OyB9CisgICAgYm9vbCBpc1Zpc3VhbGx5Tm9uRW1wdHkoKSBjb25zdCB7IHJldHVybiBtX2lzVmlz dWFsbHlOb25FbXB0eTsgfQogCiAgICAgdm9pZCBmb3JjZUxheW91dChib29sIGFsbG93U3VidHJl ZSA9IGZhbHNlKTsKICAgICB2b2lkIGZvcmNlTGF5b3V0Rm9yUGFnaW5hdGlvbihjb25zdCBGbG9h dFNpemUmIHBhZ2VTaXplLCBmbG9hdCBtYXhpbXVtU2hyaW5rRmFjdG9yLCBBZGp1c3RWaWV3U2l6 ZU9yTm90KTsK