51228 2010-12-16 20:06:07 -0800 WebKit2: Clicking in a selected text field does not clear the selection and set the caret (because WebKit2 doesn't set PlatformMouseEvent::m_activatedWebView?) 2011-01-04 19:08:25 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Windows XP RESOLVED FIXED InRadar, PlatformOnly P2 Normal --- 1 aroben jeffm andersca commit-queue jeffm sam webkit.review.bot oldest_to_newest 323585 0 aroben 2010-12-16 20:06:07 -0800 To reproduce: 1. Go to data:text/html,<input value=abcdefghijkl> 2. Select the text in the text field 3. Click in the middle of the selected text The text remains selected, and no caret is inserted. 323586 1 aroben 2010-12-16 20:06:37 -0800 I believe this is because WebKit2 isn't setting PlatformMouseEvent::m_activatedWebView. Classic WebKit sets PlatformMouseEvent::m_activatedWebView to true when this is the first mouse event since we received WM_MOUSEACTIVATE, and to false otherwise. WebKit2 doesn't set this flag at all; it just uses PlatformMouseEvent's default constructor (which leaves this member completely uninitialized!). This can lead to selection problems, as this member is used to decide whether to reset selection or not. 323592 2 aroben 2010-12-16 20:15:58 -0800 <rdar://problem/8780985> 329044 3 77897 jeffm 2011-01-04 10:28:18 -0800 Created attachment 77897 Patch to plumb through whether the click activated the WebView to match WebKit1 behavior. Patch to plumb through whether the click activated the WebView to match WebKit1 behavior is attached. 329059 4 webkit.review.bot 2011-01-04 10:39:47 -0800 Attachment 77897 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'WebCore/ChangeLog', u'WebCore/platform/PlatformMouseEvent.h', u'WebKit2/ChangeLog', u'WebKit2/Shared/WebEvent.h', u'WebKit2/Shared/WebEventConversion.cpp', u'WebKit2/Shared/WebMouseEvent.cpp', u'WebKit2/Shared/win/WebEventFactory.cpp', u'WebKit2/Shared/win/WebEventFactory.h', u'WebKit2/UIProcess/win/WebView.cpp', u'WebKit2/UIProcess/win/WebView.h']" exit_code: 1 WebKit2/Shared/win/WebEventFactory.h:38: The parameter name "hwnd" adds no information, so it should be removed. [readability/parameter_name] [5] WebKit2/Shared/win/WebEventFactory.h:38: The parameter name "wparam" adds no information, so it should be removed. [readability/parameter_name] [5] WebKit2/Shared/win/WebEventFactory.h:38: The parameter name "lparam" adds no information, so it should be removed. [readability/parameter_name] [5] WebCore/platform/PlatformMouseEvent.h:89: Missing space after , [whitespace/comma] [3] WebCore/platform/PlatformMouseEvent.h:111: Missing space after , [whitespace/comma] [3] Total errors found: 5 in 10 files If any of these errors are false positives, please file a bug against check-webkit-style. 329064 5 77897 aroben 2011-01-04 10:44:49 -0800 Comment on attachment 77897 Patch to plumb through whether the click activated the WebView to match WebKit1 behavior. View in context: https://bugs.webkit.org/attachment.cgi?id=77897&action=review It's unfortunate to have so many Windows-specific #ifdefs in here. Maybe if we unified the way the various platforms represent this information in WebCore the patch would be cleaner. Surprisingly, it looks like only Mac and Windows implement EventHandler::eventActivatedView. It would be good to fix PlatformMouseEvent's default constructor to initialize m_activatedWebView, too, but that could be done in a separate patch. I think Sam or Anders should give this a once-over. > WebCore/platform/PlatformMouseEvent.h:89 > + ,m_eventNumber(0) Missing space here. > WebCore/platform/PlatformMouseEvent.h:91 > +#endif > +#if PLATFORM(WIN) Maybe #elif would be better. > WebCore/platform/PlatformMouseEvent.h:113 > +#if PLATFORM(MAC) > + ,m_eventNumber(0) > +#endif > +#if PLATFORM(WIN) Same comments here. 329077 6 77906 jeffm 2011-01-04 10:51:43 -0800 Created attachment 77906 Patch to plumb through whether the click activated the WebView to match WebKit1 behavior. Attached new patch to fix WebKit code style issues. 329081 7 jeffm 2011-01-04 10:55:30 -0800 (In reply to comment #5) > (From update of attachment 77897 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=77897&action=review > > It's unfortunate to have so many Windows-specific #ifdefs in here. Maybe if we unified the way the various platforms represent this information in WebCore the patch would be cleaner. Surprisingly, it looks like only Mac and Windows implement EventHandler::eventActivatedView. I wasn't sure what the design philosophy should be here. Obviously, it wouldn't hurt to have the platform-specific member variables be in all platforms, their values just wouldn't be used. > > It would be good to fix PlatformMouseEvent's default constructor to initialize m_activatedWebView, too, but that could be done in a separate patch. > > I think Sam or Anders should give this a once-over. > > > WebCore/platform/PlatformMouseEvent.h:89 > > + ,m_eventNumber(0) > > Missing space here. I uploaded a new patch to fix the code-style warnings. > > > WebCore/platform/PlatformMouseEvent.h:91 > > +#endif > > +#if PLATFORM(WIN) > > Maybe #elif would be better. > > > WebCore/platform/PlatformMouseEvent.h:113 > > +#if PLATFORM(MAC) > > + ,m_eventNumber(0) > > +#endif > > +#if PLATFORM(WIN) > > Same comments here. OK, I'll attach a new patch with these changes soon. 329087 8 jeffm 2011-01-04 11:00:58 -0800 (In reply to comment #5) > It would be good to fix PlatformMouseEvent's default constructor to initialize m_activatedWebView, too, but that could be done in a separate patch. Could you be more specific? I did change the default constructor to initialize m_activatedWebView, unless you're talking about a different method. 329091 9 aroben 2011-01-04 11:06:41 -0800 (In reply to comment #8) > (In reply to comment #5) > > It would be good to fix PlatformMouseEvent's default constructor to initialize m_activatedWebView, too, but that could be done in a separate patch. > > Could you be more specific? I did change the default constructor to initialize m_activatedWebView, unless you're talking about a different method. Sorry, I got confused. Thanks for fixing it! 329100 10 77911 jeffm 2011-01-04 11:22:39 -0800 Created attachment 77911 Patch to plumb through whether the click activated the WebView to match WebKit1 behavior. New patch attached with fixes from Adam's review. 329110 11 77911 darin 2011-01-04 11:46:34 -0800 Comment on attachment 77911 Patch to plumb through whether the click activated the WebView to match WebKit1 behavior. View in context: https://bugs.webkit.org/attachment.cgi?id=77911&action=review The substance of this looks great. All my comments are about naming and minor style issues. So r=me but you might want to do some renames based on my suggestion; they are optional. > WebKit2/Shared/WebEvent.h:115 > WebMouseEvent(Type, Button, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, Modifiers, double timestamp); > +#if PLATFORM(WIN) > + WebMouseEvent(Type, Button, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, Modifiers, double timestamp, bool activatedWebView); > +#endif It’s a little annoying to have all these #ifdefs. Is there any way to make this a platform-independent concept even if it’s not needed elsewhere? Is this really about HWND activation? Is there a similar concept on other platforms? > WebKit2/Shared/WebEvent.h:142 > + bool m_activatedWebView; This name sounds like it could be a web view, rather than a boolean. Is there a less ambiguous alternate name we could come up with? I noticed the name comes from existing code, but I still don’t really like it. Given the other code below, maybe the name for this is m_isMouseActivateEvent? Is there any need to mention WebView? > WebKit2/Shared/win/WebEventFactory.h:40 > - static WebMouseEvent createWebMouseEvent(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam); > - static WebWheelEvent createWebWheelEvent(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam); > - static WebKeyboardEvent createWebKeyboardEvent(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam); > + static WebMouseEvent createWebMouseEvent(HWND, UINT, WPARAM, LPARAM, bool); > + static WebWheelEvent createWebWheelEvent(HWND, UINT, WPARAM, LPARAM); > + static WebKeyboardEvent createWebKeyboardEvent(HWND, UINT, WPARAM, LPARAM); While we do leave off argument names when the say nothing, I think the name “message” here added value and should not be removed, and the new bool definitely needs an argument name. > WebKit2/UIProcess/win/WebView.h:149 > + bool m_mouseActivated; For booleans we try to use names that finish a noun or adjective phrase, like “web view [xxx]”. This one doesn’t. Because “web view mouse activated” doesn’t. Maybe the name m_wasActivatedByMouseEvent? Or m_isHandlingMouseActivateEvent? 329180 12 jeffm 2011-01-04 13:37:31 -0800 (In reply to comment #11) > It’s a little annoying to have all these #ifdefs. Is there any way to make this a platform-independent concept even if it’s not needed elsewhere? Is this really about HWND activation? Is there a similar concept on other platforms? In comments to me outside of this bug, Anders indicated that he was OK with this being platform specific. However, both you and Adam brought this up, and Adam did mention in comments above that both Mac and Windows implement EventHandler::eventActivatedView. However, I haven't investigated this further, this is probably better looked at in a separate patch. > > > WebKit2/Shared/WebEvent.h:142 > > + bool m_activatedWebView; > > This name sounds like it could be a web view, rather than a boolean. Is there a less ambiguous alternate name we could come up with? I noticed the name comes from existing code, but I still don’t really like it. > > Given the other code below, maybe the name for this is m_isMouseActivateEvent? Is there any need to mention WebView? Anders suggested m_didActivateWebView, which is what I'm going to use. > > > WebKit2/Shared/win/WebEventFactory.h:40 > > - static WebMouseEvent createWebMouseEvent(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam); > > - static WebWheelEvent createWebWheelEvent(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam); > > - static WebKeyboardEvent createWebKeyboardEvent(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam); > > + static WebMouseEvent createWebMouseEvent(HWND, UINT, WPARAM, LPARAM, bool); > > + static WebWheelEvent createWebWheelEvent(HWND, UINT, WPARAM, LPARAM); > > + static WebKeyboardEvent createWebKeyboardEvent(HWND, UINT, WPARAM, LPARAM); > > While we do leave off argument names when the say nothing, I think the name “message” here added value and should not be removed, and the new bool definitely needs an argument name. I will fix this. > > > WebKit2/UIProcess/win/WebView.h:149 > > + bool m_mouseActivated; > > For booleans we try to use names that finish a noun or adjective phrase, like “web view [xxx]”. This one doesn’t. Because “web view mouse activated” doesn’t. Maybe the name m_wasActivatedByMouseEvent? Or m_isHandlingMouseActivateEvent? I was copying the existing name used in WK1, but I agree. I will change this m_wasActivatedByMouseEvent and setMouseActivated() to setWasActivatedByMouseEvent() in both the WK1 and WK2 versions. New patch coming soon. 329216 13 77931 jeffm 2011-01-04 14:21:18 -0800 Created attachment 77931 Patch to plumb through whether the click activated the WebView to match WebKit1 behavior. Updates based on Darin's comments. 329374 14 77931 commit-queue 2011-01-04 19:08:18 -0800 Comment on attachment 77931 Patch to plumb through whether the click activated the WebView to match WebKit1 behavior. Clearing flags on attachment: 77931 Committed r75040: <http://trac.webkit.org/changeset/75040> 329375 15 commit-queue 2011-01-04 19:08:25 -0800 All reviewed patches have been landed. Closing bug. 77897 2011-01-04 10:28:18 -0800 2011-01-04 10:49:59 -0800 Patch to plumb through whether the click activated the WebView to match WebKit1 behavior. 51228.patch text/plain 11579 jeffm SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NDk3MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMTEtMDEtMDQgIEplZmYgTWlsbGVyICA8amVmZm1AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluaXRp YWxpemUgcGxhdGZvcm0tc3BlY2lmaWMgbWVtYmVyIHZhcmlhYmxlcyBpbiBQbGF0Zm9ybU1vdXNl RXZlbnQgY29uc3RydWN0b3JzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NTEyMjgKKworICAgICAgICAqIHBsYXRmb3JtL1BsYXRmb3JtTW91c2VFdmVu dC5oOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1Nb3VzZUV2ZW50OjpQbGF0Zm9ybU1vdXNl RXZlbnQpOgorCiAyMDExLTAxLTA0ICBUb255IEdlbnRpbGNvcmUgIDx0b255Z0BjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXguCkluZGV4OiBXZWJDb3JlL3BsYXRm b3JtL1BsYXRmb3JtTW91c2VFdmVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0v UGxhdGZvcm1Nb3VzZUV2ZW50LmgJKHJldmlzaW9uIDc0OTY3KQorKysgV2ViQ29yZS9wbGF0Zm9y bS9QbGF0Zm9ybU1vdXNlRXZlbnQuaAkod29ya2luZyBjb3B5KQpAQCAtODUsNiArODUsMTIgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAgLCBtX21ldGFLZXkoZmFsc2UpCiAgICAg ICAgICAgICAsIG1fdGltZXN0YW1wKDApCiAgICAgICAgICAgICAsIG1fbW9kaWZpZXJGbGFncygw KQorI2lmIFBMQVRGT1JNKE1BQykKKyAgICAgICAgICAgICxtX2V2ZW50TnVtYmVyKDApCisjZW5k aWYKKyNpZiBQTEFURk9STShXSU4pCisgICAgICAgICAgICAsIG1fYWN0aXZhdGVkV2ViVmlldyhm YWxzZSkKKyNlbmRpZgogICAgICAgICB7CiAgICAgICAgIH0KIApAQCAtMTAxLDYgKzEwNywxMiBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgICAgICAsIG1fbWV0YUtleShtZXRhKQogICAg ICAgICAgICAgLCBtX3RpbWVzdGFtcCh0aW1lc3RhbXApCiAgICAgICAgICAgICAsIG1fbW9kaWZp ZXJGbGFncygwKQorI2lmIFBMQVRGT1JNKE1BQykKKyAgICAgICAgICAgICxtX2V2ZW50TnVtYmVy KDApCisjZW5kaWYKKyNpZiBQTEFURk9STShXSU4pCisgICAgICAgICAgICAsIG1fYWN0aXZhdGVk V2ViVmlldyhmYWxzZSkKKyNlbmRpZgogICAgICAgICB7CiAgICAgICAgIH0KIApJbmRleDogV2Vi S2l0Mi9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9u IDc0OTczKQorKysgV2ViS2l0Mi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwz OSBAQAorMjAxMS0wMS0wNCAgSmVmZiBNaWxsZXIgIDxqZWZmbUBhcHBsZS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW91c2UgZXZlbnRzIGlu IFdlYktpdDIgb24gV2luZG93cyBuZWVkIHRvIGtub3cgd2hldGhlciB0aGUgY2xpY2sgYWN0aXZh dGVkIHRoZSBXZWJWaWV3IHRvIG1hdGNoIFdlYktpdDEgYmVoYXZpb3IuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MTIyOAorCisgICAgICAgICogU2hh cmVkL1dlYkV2ZW50Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6OmFjdGl2YXRl ZFdlYlZpZXcpOgorICAgICAgICBBZGQgbV9hY3RpdmF0ZWRXZWJWaWV3IHRvIFdlYk1vdXNlRXZl bnQgb24gV2luZG93cy4KKyAgICAgICAgCisgICAgICAgICogU2hhcmVkL1dlYkV2ZW50Q29udmVy c2lvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYktpdDJQbGF0Zm9ybU1vdXNlRXZlbnQ6Oldl YktpdDJQbGF0Zm9ybU1vdXNlRXZlbnQpOgorICAgICAgICBQcm9wYWdhdGUgd2hldGhlciB0aGUg Y2xpY2sgYWN0aXZhdGVkIHRoZSBXZWJWaWV3IHdoZW4gY29udmVydGluZyB0byBhIFBsYXRmb3Jt TW91c2VFdmVudC4KKyAgICAgICAgCisgICAgICAgICogU2hhcmVkL1dlYk1vdXNlRXZlbnQuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJNb3VzZUV2ZW50OjpXZWJNb3VzZUV2ZW50KToKKyAgICAg ICAgQWRkIG1fYWN0aXZhdGVkV2ViVmlldyB0byBXZWJNb3VzZUV2ZW50IG9uIFdpbmRvd3MuCisg ICAgICAgIAorICAgICAgICAoV2ViS2l0OjpXZWJNb3VzZUV2ZW50OjplbmNvZGUpOgorICAgICAg ICAoV2ViS2l0OjpXZWJNb3VzZUV2ZW50OjpkZWNvZGUpOgorICAgICAgICBFbmNvZGUgYW5kIGRl Y29kZSBuZXcgbV9hY3RpdmF0ZWRXZWJWaWV3IG1lbWJlciB2YXJpYWJsZS4KKyAgICAgICAgCisg ICAgICAgICogU2hhcmVkL3dpbi9XZWJFdmVudEZhY3RvcnkuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJFdmVudEZhY3Rvcnk6OmNyZWF0ZVdlYk1vdXNlRXZlbnQpOgorICAgICAgICAqIFNoYXJl ZC93aW4vV2ViRXZlbnRGYWN0b3J5Lmg6CisgICAgICAgIEFkZCBhY3RpdmF0ZWRXZWJWaWV3IHBh cmFtZXRlciB0byBjcmVhdGVXZWJNb3VzZUV2ZW50KCkuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv d2luL1dlYlZpZXcuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3Ojp3bmRQcm9jKToKKyAg ICAgICAgKFdlYktpdDo6V2ViVmlldzo6V2ViVmlldyk6CisgICAgICAgIChXZWJLaXQ6OldlYlZp ZXc6Om9uTW91c2VFdmVudCk6CisgICAgICAgICogVUlQcm9jZXNzL3dpbi9XZWJWaWV3Lmg6Cisg ICAgICAgIChXZWJLaXQ6OldlYlZpZXc6OnNldE1vdXNlQWN0aXZhdGVkKToKKyAgICAgICAgS2Vl cCB0cmFjayBvZiB3aGV0aGVyIHRoZSBjbGljayBhY3RpdmF0ZWQgdGhlIFdlYlZpZXcuCisKIDIw MTEtMDEtMDQgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IERhcmluIEFkbGVyLgpJbmRleDogV2ViS2l0Mi9TaGFyZWQvV2ViRXZlbnQuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXQyL1NoYXJlZC9XZWJFdmVudC5oCShyZXZpc2lvbiA3NDk2NykK KysrIFdlYktpdDIvU2hhcmVkL1dlYkV2ZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTExMCw2ICsx MTAsOSBAQCBwdWJsaWM6CiAgICAgV2ViTW91c2VFdmVudCgpIHsgfQogCiAgICAgV2ViTW91c2VF dmVudChUeXBlLCBCdXR0b24sIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBwb3NpdGlvbiwgY29u c3QgV2ViQ29yZTo6SW50UG9pbnQmIGdsb2JhbFBvc2l0aW9uLCBmbG9hdCBkZWx0YVgsIGZsb2F0 IGRlbHRhWSwgZmxvYXQgZGVsdGFaLCBpbnQgY2xpY2tDb3VudCwgTW9kaWZpZXJzLCBkb3VibGUg dGltZXN0YW1wKTsKKyNpZiBQTEFURk9STShXSU4pCisgICAgV2ViTW91c2VFdmVudChUeXBlLCBC dXR0b24sIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBwb3NpdGlvbiwgY29uc3QgV2ViQ29yZTo6 SW50UG9pbnQmIGdsb2JhbFBvc2l0aW9uLCBmbG9hdCBkZWx0YVgsIGZsb2F0IGRlbHRhWSwgZmxv YXQgZGVsdGFaLCBpbnQgY2xpY2tDb3VudCwgTW9kaWZpZXJzLCBkb3VibGUgdGltZXN0YW1wLCBi b29sIGFjdGl2YXRlZFdlYlZpZXcpOworI2VuZGlmCiAKICAgICBCdXR0b24gYnV0dG9uKCkgY29u c3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8QnV0dG9uPihtX2J1dHRvbik7IH0KICAgICBjb25zdCBX ZWJDb3JlOjpJbnRQb2ludCYgcG9zaXRpb24oKSBjb25zdCB7IHJldHVybiBtX3Bvc2l0aW9uOyB9 CkBAIC0xMTgsNiArMTIxLDkgQEAgcHVibGljOgogICAgIGZsb2F0IGRlbHRhWSgpIGNvbnN0IHsg cmV0dXJuIG1fZGVsdGFZOyB9CiAgICAgZmxvYXQgZGVsdGFaKCkgY29uc3QgeyByZXR1cm4gbV9k ZWx0YVo7IH0KICAgICBpbnQzMl90IGNsaWNrQ291bnQoKSBjb25zdCB7IHJldHVybiBtX2NsaWNr Q291bnQ7IH0KKyNpZiBQTEFURk9STShXSU4pCisgICAgYm9vbCBhY3RpdmF0ZWRXZWJWaWV3KCkg Y29uc3QgeyByZXR1cm4gbV9hY3RpdmF0ZWRXZWJWaWV3OyB9CisjZW5kaWYKIAogICAgIHZvaWQg ZW5jb2RlKENvcmVJUEM6OkFyZ3VtZW50RW5jb2RlciopIGNvbnN0OwogICAgIHN0YXRpYyBib29s IGRlY29kZShDb3JlSVBDOjpBcmd1bWVudERlY29kZXIqLCBXZWJNb3VzZUV2ZW50Jik7CkBAIC0x MzIsNiArMTM4LDkgQEAgcHJpdmF0ZToKICAgICBmbG9hdCBtX2RlbHRhWTsKICAgICBmbG9hdCBt X2RlbHRhWjsKICAgICBpbnQzMl90IG1fY2xpY2tDb3VudDsKKyNpZiBQTEFURk9STShXSU4pCisg ICAgYm9vbCBtX2FjdGl2YXRlZFdlYlZpZXc7CisjZW5kaWYKIH07CiAKIC8vIEZJWE1FOiBNb3Zl IHRoaXMgY2xhc3MgdG8gaXRzIG93biBoZWFkZXIgZmlsZS4KSW5kZXg6IFdlYktpdDIvU2hhcmVk L1dlYkV2ZW50Q29udmVyc2lvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9TaGFyZWQvV2Vi RXZlbnRDb252ZXJzaW9uLmNwcAkocmV2aXNpb24gNzQ5NjcpCisrKyBXZWJLaXQyL1NoYXJlZC9X ZWJFdmVudENvbnZlcnNpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04Myw2ICs4MywxMCBAQCBw dWJsaWM6CiAgICAgICAgICAgICBtX21vZGlmaWVyRmxhZ3MgfD0gV2ViRXZlbnQ6OkFsdEtleTsK ICAgICAgICAgaWYgKG1fbWV0YUtleSkKICAgICAgICAgICAgIG1fbW9kaWZpZXJGbGFncyB8PSBX ZWJFdmVudDo6TWV0YUtleTsKKworI2lmIFBMQVRGT1JNKFdJTikKKyAgICAgICAgbV9hY3RpdmF0 ZWRXZWJWaWV3ID0gd2ViRXZlbnQuYWN0aXZhdGVkV2ViVmlldygpOworI2VuZGlmCiAgICAgfQog fTsKIApJbmRleDogV2ViS2l0Mi9TaGFyZWQvV2ViTW91c2VFdmVudC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViS2l0Mi9TaGFyZWQvV2ViTW91c2VFdmVudC5jcHAJKHJldmlzaW9uIDc0OTY3KQorKysg V2ViS2l0Mi9TaGFyZWQvV2ViTW91c2VFdmVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQxLDE1 ICs0MSwzOSBAQCBXZWJNb3VzZUV2ZW50OjpXZWJNb3VzZUV2ZW50KFR5cGUgdHlwZSwKICAgICAs IG1fZGVsdGFZKGRlbHRhWSkKICAgICAsIG1fZGVsdGFaKGRlbHRhWikKICAgICAsIG1fY2xpY2tD b3VudChjbGlja0NvdW50KQorI2lmIFBMQVRGT1JNKFdJTikKKyAgICAsIG1fYWN0aXZhdGVkV2Vi VmlldyhmYWxzZSkKKyNlbmRpZgogewogICAgIEFTU0VSVChpc01vdXNlRXZlbnRUeXBlKHR5cGUp KTsKIH0KIAorI2lmIFBMQVRGT1JNKFdJTikKK1dlYk1vdXNlRXZlbnQ6OldlYk1vdXNlRXZlbnQo VHlwZSB0eXBlLCBCdXR0b24gYnV0dG9uLCBjb25zdCBJbnRQb2ludCYgcG9zaXRpb24sIGNvbnN0 IEludFBvaW50JiBnbG9iYWxQb3NpdGlvbiwgZmxvYXQgZGVsdGFYLCBmbG9hdCBkZWx0YVksIGZs b2F0IGRlbHRhWiwgaW50IGNsaWNrQ291bnQsIE1vZGlmaWVycyBtb2RpZmllcnMsIGRvdWJsZSB0 aW1lc3RhbXAsIGJvb2wgYWN0aXZhdGVkV2ViVmlldykKKyAgICA6IFdlYkV2ZW50KHR5cGUsIG1v ZGlmaWVycywgdGltZXN0YW1wKQorICAgICwgbV9idXR0b24oYnV0dG9uKQorICAgICwgbV9wb3Np dGlvbihwb3NpdGlvbikKKyAgICAsIG1fZ2xvYmFsUG9zaXRpb24oZ2xvYmFsUG9zaXRpb24pCisg ICAgLCBtX2RlbHRhWChkZWx0YVgpCisgICAgLCBtX2RlbHRhWShkZWx0YVkpCisgICAgLCBtX2Rl bHRhWihkZWx0YVopCisgICAgLCBtX2NsaWNrQ291bnQoY2xpY2tDb3VudCkKKyAgICAsIG1fYWN0 aXZhdGVkV2ViVmlldyhhY3RpdmF0ZWRXZWJWaWV3KQoreworICAgIEFTU0VSVChpc01vdXNlRXZl bnRUeXBlKHR5cGUpKTsKK30KKyNlbmRpZgorCiB2b2lkIFdlYk1vdXNlRXZlbnQ6OmVuY29kZShD b3JlSVBDOjpBcmd1bWVudEVuY29kZXIqIGVuY29kZXIpIGNvbnN0CiB7CiAgICAgV2ViRXZlbnQ6 OmVuY29kZShlbmNvZGVyKTsKIAorI2lmIFBMQVRGT1JNKFdJTikKKyAgICAvLyBJbmNsdWRlIG1f YWN0aXZhdGVkV2ViVmlldyBvbiBXaW5kb3dzLgorICAgIGVuY29kZXItPmVuY29kZShDb3JlSVBD OjpJbihtX2J1dHRvbiwgbV9wb3NpdGlvbiwgbV9nbG9iYWxQb3NpdGlvbiwgbV9kZWx0YVgsIG1f ZGVsdGFZLCBtX2RlbHRhWiwgbV9jbGlja0NvdW50LCBtX2FjdGl2YXRlZFdlYlZpZXcpKTsKKyNl bHNlCiAgICAgZW5jb2Rlci0+ZW5jb2RlKENvcmVJUEM6OkluKG1fYnV0dG9uLCBtX3Bvc2l0aW9u LCBtX2dsb2JhbFBvc2l0aW9uLCBtX2RlbHRhWCwgbV9kZWx0YVksIG1fZGVsdGFaLCBtX2NsaWNr Q291bnQpKTsKKyNlbmRpZgogfQogCiBib29sIFdlYk1vdXNlRXZlbnQ6OmRlY29kZShDb3JlSVBD OjpBcmd1bWVudERlY29kZXIqIGRlY29kZXIsIFdlYk1vdXNlRXZlbnQmIHQpCkBAIC01Nyw3ICs4 MSwxMiBAQCBib29sIFdlYk1vdXNlRXZlbnQ6OmRlY29kZShDb3JlSVBDOjpBcmd1CiAgICAgaWYg KCFXZWJFdmVudDo6ZGVjb2RlKGRlY29kZXIsIHQpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAK KyNpZiBQTEFURk9STShXSU4pCisgICAgLy8gSW5jbHVkZSBtX2FjdGl2YXRlZFdlYlZpZXcgb24g V2luZG93cy4KKyAgICByZXR1cm4gZGVjb2Rlci0+ZGVjb2RlKENvcmVJUEM6Ok91dCh0Lm1fYnV0 dG9uLCB0Lm1fcG9zaXRpb24sIHQubV9nbG9iYWxQb3NpdGlvbiwgdC5tX2RlbHRhWCwgdC5tX2Rl bHRhWSwgdC5tX2RlbHRhWiwgdC5tX2NsaWNrQ291bnQsIHQubV9hY3RpdmF0ZWRXZWJWaWV3KSk7 CisjZWxzZQogICAgIHJldHVybiBkZWNvZGVyLT5kZWNvZGUoQ29yZUlQQzo6T3V0KHQubV9idXR0 b24sIHQubV9wb3NpdGlvbiwgdC5tX2dsb2JhbFBvc2l0aW9uLCB0Lm1fZGVsdGFYLCB0Lm1fZGVs dGFZLCB0Lm1fZGVsdGFaLCB0Lm1fY2xpY2tDb3VudCkpOworI2VuZGlmCiB9CiAKIGJvb2wgV2Vi TW91c2VFdmVudDo6aXNNb3VzZUV2ZW50VHlwZShUeXBlIHR5cGUpCkluZGV4OiBXZWJLaXQyL1No YXJlZC93aW4vV2ViRXZlbnRGYWN0b3J5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1NoYXJl ZC93aW4vV2ViRXZlbnRGYWN0b3J5LmNwcAkocmV2aXNpb24gNzQ5NjcpCisrKyBXZWJLaXQyL1No YXJlZC93aW4vV2ViRXZlbnRGYWN0b3J5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzIzLDcgKzMy Myw3IEBAIHN0YXRpYyBTdHJpbmcga2V5SWRlbnRpZmllckZyb21FdmVudChXUEEKICAgICB9CiB9 CiAKLVdlYk1vdXNlRXZlbnQgV2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWJNb3VzZUV2ZW50KEhX TkQgaFduZCwgVUlOVCBtZXNzYWdlLCBXUEFSQU0gd1BhcmFtLCBMUEFSQU0gbFBhcmFtKQorV2Vi TW91c2VFdmVudCBXZWJFdmVudEZhY3Rvcnk6OmNyZWF0ZVdlYk1vdXNlRXZlbnQoSFdORCBoV25k LCBVSU5UIG1lc3NhZ2UsIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYW0sIGJvb2wgYWN0aXZh dGVkV2ViVmlldykKIHsKICAgICBXZWJFdmVudDo6VHlwZSB0eXBlOwogICAgIFdlYk1vdXNlRXZl bnQ6OkJ1dHRvbiBidXR0b24gPSBXZWJNb3VzZUV2ZW50OjpOb0J1dHRvbjsKQEAgLTM5MSw3ICsz OTEsNyBAQCBXZWJNb3VzZUV2ZW50IFdlYkV2ZW50RmFjdG9yeTo6Y3JlYXRlV2ViCiAgICAgaW50 IGNsaWNrQ291bnQgPSBXZWJLaXQ6OmNsaWNrQ291bnQodHlwZSwgYnV0dG9uLCBwb3NpdGlvbiwg dGltZXN0YW1wKTsKICAgICBXZWJFdmVudDo6TW9kaWZpZXJzIG1vZGlmaWVycyA9IG1vZGlmaWVy c0ZvckV2ZW50KHdQYXJhbSk7CiAKLSAgICByZXR1cm4gV2ViTW91c2VFdmVudCh0eXBlLCBidXR0 b24sIHBvc2l0aW9uLCBnbG9iYWxQb3NpdGlvbiwgMCwgMCwgMCwgY2xpY2tDb3VudCwgbW9kaWZp ZXJzLCB0aW1lc3RhbXApOworICAgIHJldHVybiBXZWJNb3VzZUV2ZW50KHR5cGUsIGJ1dHRvbiwg cG9zaXRpb24sIGdsb2JhbFBvc2l0aW9uLCAwLCAwLCAwLCBjbGlja0NvdW50LCBtb2RpZmllcnMs IHRpbWVzdGFtcCwgYWN0aXZhdGVkV2ViVmlldyk7CiB9CiAKIFdlYldoZWVsRXZlbnQgV2ViRXZl bnRGYWN0b3J5OjpjcmVhdGVXZWJXaGVlbEV2ZW50KEhXTkQgaFduZCwgVUlOVCBtZXNzYWdlLCBX UEFSQU0gd1BhcmFtLCBMUEFSQU0gbFBhcmFtKQpJbmRleDogV2ViS2l0Mi9TaGFyZWQvd2luL1dl YkV2ZW50RmFjdG9yeS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvU2hhcmVkL3dpbi9XZWJFdmVu dEZhY3RvcnkuaAkocmV2aXNpb24gNzQ5NjcpCisrKyBXZWJLaXQyL1NoYXJlZC93aW4vV2ViRXZl bnRGYWN0b3J5LmgJKHdvcmtpbmcgY29weSkKQEAgLTM1LDcgKzM1LDcgQEAgbmFtZXNwYWNlIFdl YktpdCB7CiAKIGNsYXNzIFdlYkV2ZW50RmFjdG9yeSB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFdl Yk1vdXNlRXZlbnQgY3JlYXRlV2ViTW91c2VFdmVudChIV05EIGh3bmQsIFVJTlQgbWVzc2FnZSwg V1BBUkFNIHdwYXJhbSwgTFBBUkFNIGxwYXJhbSk7CisgICAgc3RhdGljIFdlYk1vdXNlRXZlbnQg Y3JlYXRlV2ViTW91c2VFdmVudChIV05EIGh3bmQsIFVJTlQgbWVzc2FnZSwgV1BBUkFNIHdwYXJh bSwgTFBBUkFNIGxwYXJhbSwgYm9vbCBhY3RpdmF0ZWRXZWJWaWV3KTsKICAgICBzdGF0aWMgV2Vi V2hlZWxFdmVudCBjcmVhdGVXZWJXaGVlbEV2ZW50KEhXTkQgaHduZCwgVUlOVCBtZXNzYWdlLCBX UEFSQU0gd3BhcmFtLCBMUEFSQU0gbHBhcmFtKTsKICAgICBzdGF0aWMgV2ViS2V5Ym9hcmRFdmVu dCBjcmVhdGVXZWJLZXlib2FyZEV2ZW50KEhXTkQgaHduZCwgVUlOVCBtZXNzYWdlLCBXUEFSQU0g d3BhcmFtLCBMUEFSQU0gbHBhcmFtKTsKIH07CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy93aW4v V2ViVmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcu Y3BwCShyZXZpc2lvbiA3NDk2NykKKysrIFdlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTE2LDYgKzExNiwxMCBAQCBMUkVTVUxUIFdlYlZpZXc6Ondu ZFByb2MoSFdORCBoV25kLCBVSU5UCiAgICAgICAgIGNhc2UgV01fUFJJTlRDTElFTlQ6CiAgICAg ICAgICAgICBsUmVzdWx0ID0gb25QcmludENsaWVudEV2ZW50KGhXbmQsIG1lc3NhZ2UsIHdQYXJh bSwgbFBhcmFtLCBoYW5kbGVkKTsKICAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFdN X01PVVNFQUNUSVZBVEU6CisgICAgICAgICAgICBzZXRNb3VzZUFjdGl2YXRlZCh0cnVlKTsKKyAg ICAgICAgICAgIGhhbmRsZWQgPSBmYWxzZTsKKyAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBj YXNlIFdNX01PVVNFTU9WRToKICAgICAgICAgY2FzZSBXTV9MQlVUVE9ORE9XTjoKICAgICAgICAg Y2FzZSBXTV9NQlVUVE9ORE9XTjoKQEAgLTIyNCw2ICsyMjgsNyBAQCBXZWJWaWV3OjpXZWJWaWV3 KFJFQ1QgcmVjdCwgV2ViQ29udGV4dCoKICAgICAsIG1fd2ViQ29yZUN1cnNvcigwKQogICAgICwg bV9vdmVycmlkZUN1cnNvcigwKQogICAgICwgbV90cmFja2luZ01vdXNlTGVhdmUoZmFsc2UpCisg ICAgLCBtX21vdXNlQWN0aXZhdGVkKGZhbHNlKQogICAgICwgbV9pc0JlaW5nRGVzdHJveWVkKGZh bHNlKQogICAgICwgbV9pbklNRUNvbXBvc2l0aW9uKDApCiB7CkBAIC0zMTcsNiArMzIyLDkgQEAg dm9pZCBXZWJWaWV3Ojp3aW5kb3dBbmNlc3RyeURpZENoYW5nZSgpCiAKIExSRVNVTFQgV2ViVmll dzo6b25Nb3VzZUV2ZW50KEhXTkQgaFduZCwgVUlOVCBtZXNzYWdlLCBXUEFSQU0gd1BhcmFtLCBM UEFSQU0gbFBhcmFtLCBib29sJiBoYW5kbGVkKQogeworICAgIFdlYk1vdXNlRXZlbnQgbW91c2VF dmVudCA9IFdlYkV2ZW50RmFjdG9yeTo6Y3JlYXRlV2ViTW91c2VFdmVudChoV25kLCBtZXNzYWdl LCB3UGFyYW0sIGxQYXJhbSwgbV9tb3VzZUFjdGl2YXRlZCk7CisgICAgc2V0TW91c2VBY3RpdmF0 ZWQoZmFsc2UpOworICAgIAogICAgIHN3aXRjaCAobWVzc2FnZSkgewogICAgICAgICBjYXNlIFdN X0xCVVRUT05ET1dOOgogICAgICAgICBjYXNlIFdNX01CVVRUT05ET1dOOgpAQCAtMzQzLDcgKzM1 MSw2IEBAIExSRVNVTFQgV2ViVmlldzo6b25Nb3VzZUV2ZW50KEhXTkQgaFduZCwKICAgICAgICAg ICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIH0KIAotICAgIFdlYk1vdXNlRXZlbnQgbW91 c2VFdmVudCA9IFdlYkV2ZW50RmFjdG9yeTo6Y3JlYXRlV2ViTW91c2VFdmVudChoV25kLCBtZXNz YWdlLCB3UGFyYW0sIGxQYXJhbSk7CiAgICAgbV9wYWdlLT5oYW5kbGVNb3VzZUV2ZW50KG1vdXNl RXZlbnQpOwogCiAgICAgaGFuZGxlZCA9IHRydWU7CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy93 aW4vV2ViVmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3 LmgJKHJldmlzaW9uIDc0OTY3KQorKysgV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuaAko d29ya2luZyBjb3B5KQpAQCAtNjYsNiArNjYsNyBAQCBwcml2YXRlOgogICAgIHN0YXRpYyBMUkVT VUxUIENBTExCQUNLIFdlYlZpZXdXbmRQcm9jKEhXTkQsIFVJTlQsIFdQQVJBTSwgTFBBUkFNKTsK ICAgICBMUkVTVUxUIHduZFByb2MoSFdORCBoV25kLCBVSU5UIG1lc3NhZ2UsIFdQQVJBTSB3UGFy YW0sIExQQVJBTSBsUGFyYW0pOwogCisgICAgdm9pZCBzZXRNb3VzZUFjdGl2YXRlZChib29sIGZs YWcpIHsgbV9tb3VzZUFjdGl2YXRlZCA9IGZsYWc7IH0KICAgICBMUkVTVUxUIG9uTW91c2VFdmVu dChIV05EIGhXbmQsIFVJTlQgbWVzc2FnZSwgV1BBUkFNLCBMUEFSQU0sIGJvb2wmIGhhbmRsZWQp OwogICAgIExSRVNVTFQgb25XaGVlbEV2ZW50KEhXTkQgaFduZCwgVUlOVCBtZXNzYWdlLCBXUEFS QU0sIExQQVJBTSwgYm9vbCYgaGFuZGxlZCk7CiAgICAgTFJFU1VMVCBvbktleUV2ZW50KEhXTkQg aFduZCwgVUlOVCBtZXNzYWdlLCBXUEFSQU0sIExQQVJBTSwgYm9vbCYgaGFuZGxlZCk7CkBAIC0x NDUsNiArMTQ2LDcgQEAgcHJpdmF0ZToKICAgICBIQ1VSU09SIG1fd2ViQ29yZUN1cnNvcjsKICAg ICBIQ1VSU09SIG1fb3ZlcnJpZGVDdXJzb3I7CiAKKyAgICBib29sIG1fbW91c2VBY3RpdmF0ZWQ7 CiAgICAgYm9vbCBtX3RyYWNraW5nTW91c2VMZWF2ZTsKICAgICBib29sIG1faXNCZWluZ0Rlc3Ry b3llZDsKIAo= 77906 2011-01-04 10:51:43 -0800 2011-01-04 10:57:33 -0800 Patch to plumb through whether the click activated the WebView to match WebKit1 behavior. 51228.patch text/plain 11718 jeffm SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NDk3MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMTEtMDEtMDQgIEplZmYgTWlsbGVyICA8amVmZm1AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluaXRp YWxpemUgcGxhdGZvcm0tc3BlY2lmaWMgbWVtYmVyIHZhcmlhYmxlcyBpbiBQbGF0Zm9ybU1vdXNl RXZlbnQgY29uc3RydWN0b3JzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NTEyMjgKKworICAgICAgICAqIHBsYXRmb3JtL1BsYXRmb3JtTW91c2VFdmVu dC5oOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1Nb3VzZUV2ZW50OjpQbGF0Zm9ybU1vdXNl RXZlbnQpOgorCiAyMDExLTAxLTA0ICBUb255IEdlbnRpbGNvcmUgIDx0b255Z0BjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXguCkluZGV4OiBXZWJDb3JlL3BsYXRm b3JtL1BsYXRmb3JtTW91c2VFdmVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0v UGxhdGZvcm1Nb3VzZUV2ZW50LmgJKHJldmlzaW9uIDc0OTczKQorKysgV2ViQ29yZS9wbGF0Zm9y bS9QbGF0Zm9ybU1vdXNlRXZlbnQuaAkod29ya2luZyBjb3B5KQpAQCAtODUsNiArODUsMTIgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAgLCBtX21ldGFLZXkoZmFsc2UpCiAgICAg ICAgICAgICAsIG1fdGltZXN0YW1wKDApCiAgICAgICAgICAgICAsIG1fbW9kaWZpZXJGbGFncygw KQorI2lmIFBMQVRGT1JNKE1BQykKKyAgICAgICAgICAgICwgbV9ldmVudE51bWJlcigwKQorI2Vu ZGlmCisjaWYgUExBVEZPUk0oV0lOKQorICAgICAgICAgICAgLCBtX2FjdGl2YXRlZFdlYlZpZXco ZmFsc2UpCisjZW5kaWYKICAgICAgICAgewogICAgICAgICB9CiAKQEAgLTEwMSw2ICsxMDcsMTIg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAgLCBtX21ldGFLZXkobWV0YSkKICAg ICAgICAgICAgICwgbV90aW1lc3RhbXAodGltZXN0YW1wKQogICAgICAgICAgICAgLCBtX21vZGlm aWVyRmxhZ3MoMCkKKyNpZiBQTEFURk9STShNQUMpCisgICAgICAgICAgICAsIG1fZXZlbnROdW1i ZXIoMCkKKyNlbmRpZgorI2lmIFBMQVRGT1JNKFdJTikKKyAgICAgICAgICAgICwgbV9hY3RpdmF0 ZWRXZWJWaWV3KGZhbHNlKQorI2VuZGlmCiAgICAgICAgIHsKICAgICAgICAgfQogCkluZGV4OiBX ZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL0NoYW5nZUxvZwkocmV2aXNp b24gNzQ5NzMpCisrKyBXZWJLaXQyL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDM5IEBACisyMDExLTAxLTA0ICBKZWZmIE1pbGxlciAgPGplZmZtQGFwcGxlLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3VzZSBldmVudHMg aW4gV2ViS2l0MiBvbiBXaW5kb3dzIG5lZWQgdG8ga25vdyB3aGV0aGVyIHRoZSBjbGljayBhY3Rp dmF0ZWQgdGhlIFdlYlZpZXcgdG8gbWF0Y2ggV2ViS2l0MSBiZWhhdmlvci4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUxMjI4CisKKyAgICAgICAgKiBT aGFyZWQvV2ViRXZlbnQuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViTW91c2VFdmVudDo6YWN0aXZh dGVkV2ViVmlldyk6CisgICAgICAgIEFkZCBtX2FjdGl2YXRlZFdlYlZpZXcgdG8gV2ViTW91c2VF dmVudCBvbiBXaW5kb3dzLgorICAgICAgICAKKyAgICAgICAgKiBTaGFyZWQvV2ViRXZlbnRDb252 ZXJzaW9uLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViS2l0MlBsYXRmb3JtTW91c2VFdmVudDo6 V2ViS2l0MlBsYXRmb3JtTW91c2VFdmVudCk6CisgICAgICAgIFByb3BhZ2F0ZSB3aGV0aGVyIHRo ZSBjbGljayBhY3RpdmF0ZWQgdGhlIFdlYlZpZXcgd2hlbiBjb252ZXJ0aW5nIHRvIGEgUGxhdGZv cm1Nb3VzZUV2ZW50LgorICAgICAgICAKKyAgICAgICAgKiBTaGFyZWQvV2ViTW91c2VFdmVudC5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6OldlYk1vdXNlRXZlbnQpOgorICAg ICAgICBBZGQgbV9hY3RpdmF0ZWRXZWJWaWV3IHRvIFdlYk1vdXNlRXZlbnQgb24gV2luZG93cy4K KyAgICAgICAgCisgICAgICAgIChXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6OmVuY29kZSk6CisgICAg ICAgIChXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6OmRlY29kZSk6CisgICAgICAgIEVuY29kZSBhbmQg ZGVjb2RlIG5ldyBtX2FjdGl2YXRlZFdlYlZpZXcgbWVtYmVyIHZhcmlhYmxlLgorICAgICAgICAK KyAgICAgICAgKiBTaGFyZWQvd2luL1dlYkV2ZW50RmFjdG9yeS5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYkV2ZW50RmFjdG9yeTo6Y3JlYXRlV2ViTW91c2VFdmVudCk6CisgICAgICAgICogU2hh cmVkL3dpbi9XZWJFdmVudEZhY3RvcnkuaDoKKyAgICAgICAgQWRkIGFjdGl2YXRlZFdlYlZpZXcg cGFyYW1ldGVyIHRvIGNyZWF0ZVdlYk1vdXNlRXZlbnQoKS4KKworICAgICAgICAqIFVJUHJvY2Vz cy93aW4vV2ViVmlldy5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXc6OnduZFByb2MpOgor ICAgICAgICAoV2ViS2l0OjpXZWJWaWV3OjpXZWJWaWV3KToKKyAgICAgICAgKFdlYktpdDo6V2Vi Vmlldzo6b25Nb3VzZUV2ZW50KToKKyAgICAgICAgKiBVSVByb2Nlc3Mvd2luL1dlYlZpZXcuaDoK KyAgICAgICAgKFdlYktpdDo6V2ViVmlldzo6c2V0TW91c2VBY3RpdmF0ZWQpOgorICAgICAgICBL ZWVwIHRyYWNrIG9mIHdoZXRoZXIgdGhlIGNsaWNrIGFjdGl2YXRlZCB0aGUgV2ViVmlldy4KKwog MjAxMS0wMS0wNCAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBXZWJLaXQyL1NoYXJlZC9XZWJFdmVudC5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdDIvU2hhcmVkL1dlYkV2ZW50LmgJKHJldmlzaW9uIDc0OTcz KQorKysgV2ViS2l0Mi9TaGFyZWQvV2ViRXZlbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMTEwLDYg KzExMCw5IEBAIHB1YmxpYzoKICAgICBXZWJNb3VzZUV2ZW50KCkgeyB9CiAKICAgICBXZWJNb3Vz ZUV2ZW50KFR5cGUsIEJ1dHRvbiwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIHBvc2l0aW9uLCBj b25zdCBXZWJDb3JlOjpJbnRQb2ludCYgZ2xvYmFsUG9zaXRpb24sIGZsb2F0IGRlbHRhWCwgZmxv YXQgZGVsdGFZLCBmbG9hdCBkZWx0YVosIGludCBjbGlja0NvdW50LCBNb2RpZmllcnMsIGRvdWJs ZSB0aW1lc3RhbXApOworI2lmIFBMQVRGT1JNKFdJTikKKyAgICBXZWJNb3VzZUV2ZW50KFR5cGUs IEJ1dHRvbiwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIHBvc2l0aW9uLCBjb25zdCBXZWJDb3Jl OjpJbnRQb2ludCYgZ2xvYmFsUG9zaXRpb24sIGZsb2F0IGRlbHRhWCwgZmxvYXQgZGVsdGFZLCBm bG9hdCBkZWx0YVosIGludCBjbGlja0NvdW50LCBNb2RpZmllcnMsIGRvdWJsZSB0aW1lc3RhbXAs IGJvb2wgYWN0aXZhdGVkV2ViVmlldyk7CisjZW5kaWYKIAogICAgIEJ1dHRvbiBidXR0b24oKSBj b25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxCdXR0b24+KG1fYnV0dG9uKTsgfQogICAgIGNvbnN0 IFdlYkNvcmU6OkludFBvaW50JiBwb3NpdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fcG9zaXRpb247 IH0KQEAgLTExOCw2ICsxMjEsOSBAQCBwdWJsaWM6CiAgICAgZmxvYXQgZGVsdGFZKCkgY29uc3Qg eyByZXR1cm4gbV9kZWx0YVk7IH0KICAgICBmbG9hdCBkZWx0YVooKSBjb25zdCB7IHJldHVybiBt X2RlbHRhWjsgfQogICAgIGludDMyX3QgY2xpY2tDb3VudCgpIGNvbnN0IHsgcmV0dXJuIG1fY2xp Y2tDb3VudDsgfQorI2lmIFBMQVRGT1JNKFdJTikKKyAgICBib29sIGFjdGl2YXRlZFdlYlZpZXco KSBjb25zdCB7IHJldHVybiBtX2FjdGl2YXRlZFdlYlZpZXc7IH0KKyNlbmRpZgogCiAgICAgdm9p ZCBlbmNvZGUoQ29yZUlQQzo6QXJndW1lbnRFbmNvZGVyKikgY29uc3Q7CiAgICAgc3RhdGljIGJv b2wgZGVjb2RlKENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciosIFdlYk1vdXNlRXZlbnQmKTsKQEAg LTEzMiw2ICsxMzgsOSBAQCBwcml2YXRlOgogICAgIGZsb2F0IG1fZGVsdGFZOwogICAgIGZsb2F0 IG1fZGVsdGFaOwogICAgIGludDMyX3QgbV9jbGlja0NvdW50OworI2lmIFBMQVRGT1JNKFdJTikK KyAgICBib29sIG1fYWN0aXZhdGVkV2ViVmlldzsKKyNlbmRpZgogfTsKIAogLy8gRklYTUU6IE1v dmUgdGhpcyBjbGFzcyB0byBpdHMgb3duIGhlYWRlciBmaWxlLgpJbmRleDogV2ViS2l0Mi9TaGFy ZWQvV2ViRXZlbnRDb252ZXJzaW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1NoYXJlZC9X ZWJFdmVudENvbnZlcnNpb24uY3BwCShyZXZpc2lvbiA3NDk3MykKKysrIFdlYktpdDIvU2hhcmVk L1dlYkV2ZW50Q29udmVyc2lvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgzLDYgKzgzLDEwIEBA IHB1YmxpYzoKICAgICAgICAgICAgIG1fbW9kaWZpZXJGbGFncyB8PSBXZWJFdmVudDo6QWx0S2V5 OwogICAgICAgICBpZiAobV9tZXRhS2V5KQogICAgICAgICAgICAgbV9tb2RpZmllckZsYWdzIHw9 IFdlYkV2ZW50OjpNZXRhS2V5OworCisjaWYgUExBVEZPUk0oV0lOKQorICAgICAgICBtX2FjdGl2 YXRlZFdlYlZpZXcgPSB3ZWJFdmVudC5hY3RpdmF0ZWRXZWJWaWV3KCk7CisjZW5kaWYKICAgICB9 CiB9OwogCkluZGV4OiBXZWJLaXQyL1NoYXJlZC9XZWJNb3VzZUV2ZW50LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQyL1NoYXJlZC9XZWJNb3VzZUV2ZW50LmNwcAkocmV2aXNpb24gNzQ5NzMpCisr KyBXZWJLaXQyL1NoYXJlZC9XZWJNb3VzZUV2ZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDEs MTUgKzQxLDM5IEBAIFdlYk1vdXNlRXZlbnQ6OldlYk1vdXNlRXZlbnQoVHlwZSB0eXBlLAogICAg ICwgbV9kZWx0YVkoZGVsdGFZKQogICAgICwgbV9kZWx0YVooZGVsdGFaKQogICAgICwgbV9jbGlj a0NvdW50KGNsaWNrQ291bnQpCisjaWYgUExBVEZPUk0oV0lOKQorICAgICwgbV9hY3RpdmF0ZWRX ZWJWaWV3KGZhbHNlKQorI2VuZGlmCiB7CiAgICAgQVNTRVJUKGlzTW91c2VFdmVudFR5cGUodHlw ZSkpOwogfQogCisjaWYgUExBVEZPUk0oV0lOKQorV2ViTW91c2VFdmVudDo6V2ViTW91c2VFdmVu dChUeXBlIHR5cGUsIEJ1dHRvbiBidXR0b24sIGNvbnN0IEludFBvaW50JiBwb3NpdGlvbiwgY29u c3QgSW50UG9pbnQmIGdsb2JhbFBvc2l0aW9uLCBmbG9hdCBkZWx0YVgsIGZsb2F0IGRlbHRhWSwg ZmxvYXQgZGVsdGFaLCBpbnQgY2xpY2tDb3VudCwgTW9kaWZpZXJzIG1vZGlmaWVycywgZG91Ymxl IHRpbWVzdGFtcCwgYm9vbCBhY3RpdmF0ZWRXZWJWaWV3KQorICAgIDogV2ViRXZlbnQodHlwZSwg bW9kaWZpZXJzLCB0aW1lc3RhbXApCisgICAgLCBtX2J1dHRvbihidXR0b24pCisgICAgLCBtX3Bv c2l0aW9uKHBvc2l0aW9uKQorICAgICwgbV9nbG9iYWxQb3NpdGlvbihnbG9iYWxQb3NpdGlvbikK KyAgICAsIG1fZGVsdGFYKGRlbHRhWCkKKyAgICAsIG1fZGVsdGFZKGRlbHRhWSkKKyAgICAsIG1f ZGVsdGFaKGRlbHRhWikKKyAgICAsIG1fY2xpY2tDb3VudChjbGlja0NvdW50KQorICAgICwgbV9h Y3RpdmF0ZWRXZWJWaWV3KGFjdGl2YXRlZFdlYlZpZXcpCit7CisgICAgQVNTRVJUKGlzTW91c2VF dmVudFR5cGUodHlwZSkpOworfQorI2VuZGlmCisKIHZvaWQgV2ViTW91c2VFdmVudDo6ZW5jb2Rl KENvcmVJUEM6OkFyZ3VtZW50RW5jb2RlciogZW5jb2RlcikgY29uc3QKIHsKICAgICBXZWJFdmVu dDo6ZW5jb2RlKGVuY29kZXIpOwogCisjaWYgUExBVEZPUk0oV0lOKQorICAgIC8vIEluY2x1ZGUg bV9hY3RpdmF0ZWRXZWJWaWV3IG9uIFdpbmRvd3MuCisgICAgZW5jb2Rlci0+ZW5jb2RlKENvcmVJ UEM6OkluKG1fYnV0dG9uLCBtX3Bvc2l0aW9uLCBtX2dsb2JhbFBvc2l0aW9uLCBtX2RlbHRhWCwg bV9kZWx0YVksIG1fZGVsdGFaLCBtX2NsaWNrQ291bnQsIG1fYWN0aXZhdGVkV2ViVmlldykpOwor I2Vsc2UKICAgICBlbmNvZGVyLT5lbmNvZGUoQ29yZUlQQzo6SW4obV9idXR0b24sIG1fcG9zaXRp b24sIG1fZ2xvYmFsUG9zaXRpb24sIG1fZGVsdGFYLCBtX2RlbHRhWSwgbV9kZWx0YVosIG1fY2xp Y2tDb3VudCkpOworI2VuZGlmCiB9CiAKIGJvb2wgV2ViTW91c2VFdmVudDo6ZGVjb2RlKENvcmVJ UEM6OkFyZ3VtZW50RGVjb2RlciogZGVjb2RlciwgV2ViTW91c2VFdmVudCYgdCkKQEAgLTU3LDcg KzgxLDEyIEBAIGJvb2wgV2ViTW91c2VFdmVudDo6ZGVjb2RlKENvcmVJUEM6OkFyZ3UKICAgICBp ZiAoIVdlYkV2ZW50OjpkZWNvZGUoZGVjb2RlciwgdCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsK IAorI2lmIFBMQVRGT1JNKFdJTikKKyAgICAvLyBJbmNsdWRlIG1fYWN0aXZhdGVkV2ViVmlldyBv biBXaW5kb3dzLgorICAgIHJldHVybiBkZWNvZGVyLT5kZWNvZGUoQ29yZUlQQzo6T3V0KHQubV9i dXR0b24sIHQubV9wb3NpdGlvbiwgdC5tX2dsb2JhbFBvc2l0aW9uLCB0Lm1fZGVsdGFYLCB0Lm1f ZGVsdGFZLCB0Lm1fZGVsdGFaLCB0Lm1fY2xpY2tDb3VudCwgdC5tX2FjdGl2YXRlZFdlYlZpZXcp KTsKKyNlbHNlCiAgICAgcmV0dXJuIGRlY29kZXItPmRlY29kZShDb3JlSVBDOjpPdXQodC5tX2J1 dHRvbiwgdC5tX3Bvc2l0aW9uLCB0Lm1fZ2xvYmFsUG9zaXRpb24sIHQubV9kZWx0YVgsIHQubV9k ZWx0YVksIHQubV9kZWx0YVosIHQubV9jbGlja0NvdW50KSk7CisjZW5kaWYKIH0KIAogYm9vbCBX ZWJNb3VzZUV2ZW50Ojppc01vdXNlRXZlbnRUeXBlKFR5cGUgdHlwZSkKSW5kZXg6IFdlYktpdDIv U2hhcmVkL3dpbi9XZWJFdmVudEZhY3RvcnkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvU2hh cmVkL3dpbi9XZWJFdmVudEZhY3RvcnkuY3BwCShyZXZpc2lvbiA3NDk3MykKKysrIFdlYktpdDIv U2hhcmVkL3dpbi9XZWJFdmVudEZhY3RvcnkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMjMsNyAr MzIzLDcgQEAgc3RhdGljIFN0cmluZyBrZXlJZGVudGlmaWVyRnJvbUV2ZW50KFdQQQogICAgIH0K IH0KIAotV2ViTW91c2VFdmVudCBXZWJFdmVudEZhY3Rvcnk6OmNyZWF0ZVdlYk1vdXNlRXZlbnQo SFdORCBoV25kLCBVSU5UIG1lc3NhZ2UsIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYW0pCitX ZWJNb3VzZUV2ZW50IFdlYkV2ZW50RmFjdG9yeTo6Y3JlYXRlV2ViTW91c2VFdmVudChIV05EIGhX bmQsIFVJTlQgbWVzc2FnZSwgV1BBUkFNIHdQYXJhbSwgTFBBUkFNIGxQYXJhbSwgYm9vbCBhY3Rp dmF0ZWRXZWJWaWV3KQogewogICAgIFdlYkV2ZW50OjpUeXBlIHR5cGU7CiAgICAgV2ViTW91c2VF dmVudDo6QnV0dG9uIGJ1dHRvbiA9IFdlYk1vdXNlRXZlbnQ6Ok5vQnV0dG9uOwpAQCAtMzkxLDcg KzM5MSw3IEBAIFdlYk1vdXNlRXZlbnQgV2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWIKICAgICBp bnQgY2xpY2tDb3VudCA9IFdlYktpdDo6Y2xpY2tDb3VudCh0eXBlLCBidXR0b24sIHBvc2l0aW9u LCB0aW1lc3RhbXApOwogICAgIFdlYkV2ZW50OjpNb2RpZmllcnMgbW9kaWZpZXJzID0gbW9kaWZp ZXJzRm9yRXZlbnQod1BhcmFtKTsKIAotICAgIHJldHVybiBXZWJNb3VzZUV2ZW50KHR5cGUsIGJ1 dHRvbiwgcG9zaXRpb24sIGdsb2JhbFBvc2l0aW9uLCAwLCAwLCAwLCBjbGlja0NvdW50LCBtb2Rp ZmllcnMsIHRpbWVzdGFtcCk7CisgICAgcmV0dXJuIFdlYk1vdXNlRXZlbnQodHlwZSwgYnV0dG9u LCBwb3NpdGlvbiwgZ2xvYmFsUG9zaXRpb24sIDAsIDAsIDAsIGNsaWNrQ291bnQsIG1vZGlmaWVy cywgdGltZXN0YW1wLCBhY3RpdmF0ZWRXZWJWaWV3KTsKIH0KIAogV2ViV2hlZWxFdmVudCBXZWJF dmVudEZhY3Rvcnk6OmNyZWF0ZVdlYldoZWVsRXZlbnQoSFdORCBoV25kLCBVSU5UIG1lc3NhZ2Us IFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYW0pCkluZGV4OiBXZWJLaXQyL1NoYXJlZC93aW4v V2ViRXZlbnRGYWN0b3J5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9TaGFyZWQvd2luL1dlYkV2 ZW50RmFjdG9yeS5oCShyZXZpc2lvbiA3NDk3MykKKysrIFdlYktpdDIvU2hhcmVkL3dpbi9XZWJF dmVudEZhY3RvcnkuaAkod29ya2luZyBjb3B5KQpAQCAtMzUsOSArMzUsOSBAQCBuYW1lc3BhY2Ug V2ViS2l0IHsKIAogY2xhc3MgV2ViRXZlbnRGYWN0b3J5IHsKIHB1YmxpYzoKLSAgICBzdGF0aWMg V2ViTW91c2VFdmVudCBjcmVhdGVXZWJNb3VzZUV2ZW50KEhXTkQgaHduZCwgVUlOVCBtZXNzYWdl LCBXUEFSQU0gd3BhcmFtLCBMUEFSQU0gbHBhcmFtKTsKLSAgICBzdGF0aWMgV2ViV2hlZWxFdmVu dCBjcmVhdGVXZWJXaGVlbEV2ZW50KEhXTkQgaHduZCwgVUlOVCBtZXNzYWdlLCBXUEFSQU0gd3Bh cmFtLCBMUEFSQU0gbHBhcmFtKTsKLSAgICBzdGF0aWMgV2ViS2V5Ym9hcmRFdmVudCBjcmVhdGVX ZWJLZXlib2FyZEV2ZW50KEhXTkQgaHduZCwgVUlOVCBtZXNzYWdlLCBXUEFSQU0gd3BhcmFtLCBM UEFSQU0gbHBhcmFtKTsKKyAgICBzdGF0aWMgV2ViTW91c2VFdmVudCBjcmVhdGVXZWJNb3VzZUV2 ZW50KEhXTkQsIFVJTlQsIFdQQVJBTSwgTFBBUkFNLCBib29sKTsKKyAgICBzdGF0aWMgV2ViV2hl ZWxFdmVudCBjcmVhdGVXZWJXaGVlbEV2ZW50KEhXTkQsIFVJTlQsIFdQQVJBTSwgTFBBUkFNKTsK KyAgICBzdGF0aWMgV2ViS2V5Ym9hcmRFdmVudCBjcmVhdGVXZWJLZXlib2FyZEV2ZW50KEhXTkQs IFVJTlQsIFdQQVJBTSwgTFBBUkFNKTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRl eDogV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcAkocmV2aXNpb24gNzQ5NzMpCisrKyBXZWJLaXQy L1VJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExNiw2ICsxMTYs MTAgQEAgTFJFU1VMVCBXZWJWaWV3Ojp3bmRQcm9jKEhXTkQgaFduZCwgVUlOVAogICAgICAgICBj YXNlIFdNX1BSSU5UQ0xJRU5UOgogICAgICAgICAgICAgbFJlc3VsdCA9IG9uUHJpbnRDbGllbnRF dmVudChoV25kLCBtZXNzYWdlLCB3UGFyYW0sIGxQYXJhbSwgaGFuZGxlZCk7CiAgICAgICAgICAg ICBicmVhazsKKyAgICAgICAgY2FzZSBXTV9NT1VTRUFDVElWQVRFOgorICAgICAgICAgICAgc2V0 TW91c2VBY3RpdmF0ZWQodHJ1ZSk7CisgICAgICAgICAgICBoYW5kbGVkID0gZmFsc2U7CisgICAg ICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBXTV9NT1VTRU1PVkU6CiAgICAgICAgIGNhc2Ug V01fTEJVVFRPTkRPV046CiAgICAgICAgIGNhc2UgV01fTUJVVFRPTkRPV046CkBAIC0yMjQsNiAr MjI4LDcgQEAgV2ViVmlldzo6V2ViVmlldyhSRUNUIHJlY3QsIFdlYkNvbnRleHQqCiAgICAgLCBt X3dlYkNvcmVDdXJzb3IoMCkKICAgICAsIG1fb3ZlcnJpZGVDdXJzb3IoMCkKICAgICAsIG1fdHJh Y2tpbmdNb3VzZUxlYXZlKGZhbHNlKQorICAgICwgbV9tb3VzZUFjdGl2YXRlZChmYWxzZSkKICAg ICAsIG1faXNCZWluZ0Rlc3Ryb3llZChmYWxzZSkKICAgICAsIG1faW5JTUVDb21wb3NpdGlvbigw KQogewpAQCAtMzE3LDYgKzMyMiw5IEBAIHZvaWQgV2ViVmlldzo6d2luZG93QW5jZXN0cnlEaWRD aGFuZ2UoKQogCiBMUkVTVUxUIFdlYlZpZXc6Om9uTW91c2VFdmVudChIV05EIGhXbmQsIFVJTlQg bWVzc2FnZSwgV1BBUkFNIHdQYXJhbSwgTFBBUkFNIGxQYXJhbSwgYm9vbCYgaGFuZGxlZCkKIHsK KyAgICBXZWJNb3VzZUV2ZW50IG1vdXNlRXZlbnQgPSBXZWJFdmVudEZhY3Rvcnk6OmNyZWF0ZVdl Yk1vdXNlRXZlbnQoaFduZCwgbWVzc2FnZSwgd1BhcmFtLCBsUGFyYW0sIG1fbW91c2VBY3RpdmF0 ZWQpOworICAgIHNldE1vdXNlQWN0aXZhdGVkKGZhbHNlKTsKKyAgICAKICAgICBzd2l0Y2ggKG1l c3NhZ2UpIHsKICAgICAgICAgY2FzZSBXTV9MQlVUVE9ORE9XTjoKICAgICAgICAgY2FzZSBXTV9N QlVUVE9ORE9XTjoKQEAgLTM0Myw3ICszNTEsNiBAQCBMUkVTVUxUIFdlYlZpZXc6Om9uTW91c2VF dmVudChIV05EIGhXbmQsCiAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICB9 CiAKLSAgICBXZWJNb3VzZUV2ZW50IG1vdXNlRXZlbnQgPSBXZWJFdmVudEZhY3Rvcnk6OmNyZWF0 ZVdlYk1vdXNlRXZlbnQoaFduZCwgbWVzc2FnZSwgd1BhcmFtLCBsUGFyYW0pOwogICAgIG1fcGFn ZS0+aGFuZGxlTW91c2VFdmVudChtb3VzZUV2ZW50KTsKIAogICAgIGhhbmRsZWQgPSB0cnVlOwpJ bmRleDogV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJL aXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5oCShyZXZpc2lvbiA3NDk3MykKKysrIFdlYktpdDIv VUlQcm9jZXNzL3dpbi9XZWJWaWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTY2LDYgKzY2LDcgQEAg cHJpdmF0ZToKICAgICBzdGF0aWMgTFJFU1VMVCBDQUxMQkFDSyBXZWJWaWV3V25kUHJvYyhIV05E LCBVSU5ULCBXUEFSQU0sIExQQVJBTSk7CiAgICAgTFJFU1VMVCB3bmRQcm9jKEhXTkQgaFduZCwg VUlOVCBtZXNzYWdlLCBXUEFSQU0gd1BhcmFtLCBMUEFSQU0gbFBhcmFtKTsKIAorICAgIHZvaWQg c2V0TW91c2VBY3RpdmF0ZWQoYm9vbCBmbGFnKSB7IG1fbW91c2VBY3RpdmF0ZWQgPSBmbGFnOyB9 CiAgICAgTFJFU1VMVCBvbk1vdXNlRXZlbnQoSFdORCBoV25kLCBVSU5UIG1lc3NhZ2UsIFdQQVJB TSwgTFBBUkFNLCBib29sJiBoYW5kbGVkKTsKICAgICBMUkVTVUxUIG9uV2hlZWxFdmVudChIV05E IGhXbmQsIFVJTlQgbWVzc2FnZSwgV1BBUkFNLCBMUEFSQU0sIGJvb2wmIGhhbmRsZWQpOwogICAg IExSRVNVTFQgb25LZXlFdmVudChIV05EIGhXbmQsIFVJTlQgbWVzc2FnZSwgV1BBUkFNLCBMUEFS QU0sIGJvb2wmIGhhbmRsZWQpOwpAQCAtMTQ1LDYgKzE0Niw3IEBAIHByaXZhdGU6CiAgICAgSENV UlNPUiBtX3dlYkNvcmVDdXJzb3I7CiAgICAgSENVUlNPUiBtX292ZXJyaWRlQ3Vyc29yOwogCisg ICAgYm9vbCBtX21vdXNlQWN0aXZhdGVkOwogICAgIGJvb2wgbV90cmFja2luZ01vdXNlTGVhdmU7 CiAgICAgYm9vbCBtX2lzQmVpbmdEZXN0cm95ZWQ7CiAK 77911 2011-01-04 11:22:39 -0800 2011-01-04 13:38:15 -0800 Patch to plumb through whether the click activated the WebView to match WebKit1 behavior. 51228.patch text/plain 11895 jeffm SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NDk3OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMTEtMDEtMDQgIEplZmYgTWlsbGVyICA8amVmZm1AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluaXRp YWxpemUgcGxhdGZvcm0tc3BlY2lmaWMgbWVtYmVyIHZhcmlhYmxlcyBpbiBQbGF0Zm9ybU1vdXNl RXZlbnQgY29uc3RydWN0b3JzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NTEyMjgKKworICAgICAgICAqIHBsYXRmb3JtL1BsYXRmb3JtTW91c2VFdmVu dC5oOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1Nb3VzZUV2ZW50OjpQbGF0Zm9ybU1vdXNl RXZlbnQpOgorCiAyMDExLTAxLTA0ICBUb255IEdlbnRpbGNvcmUgIDx0b255Z0BjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXguCkluZGV4OiBXZWJDb3JlL3BsYXRm b3JtL1BsYXRmb3JtTW91c2VFdmVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0v UGxhdGZvcm1Nb3VzZUV2ZW50LmgJKHJldmlzaW9uIDc0OTc5KQorKysgV2ViQ29yZS9wbGF0Zm9y bS9QbGF0Zm9ybU1vdXNlRXZlbnQuaAkod29ya2luZyBjb3B5KQpAQCAtODUsNiArODUsMTEgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAgLCBtX21ldGFLZXkoZmFsc2UpCiAgICAg ICAgICAgICAsIG1fdGltZXN0YW1wKDApCiAgICAgICAgICAgICAsIG1fbW9kaWZpZXJGbGFncygw KQorI2lmIFBMQVRGT1JNKE1BQykKKyAgICAgICAgICAgICwgbV9ldmVudE51bWJlcigwKQorI2Vs aWYgUExBVEZPUk0oV0lOKQorICAgICAgICAgICAgLCBtX2FjdGl2YXRlZFdlYlZpZXcoZmFsc2Up CisjZW5kaWYKICAgICAgICAgewogICAgICAgICB9CiAKQEAgLTEwMSw2ICsxMDYsMTEgQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAgLCBtX21ldGFLZXkobWV0YSkKICAgICAgICAg ICAgICwgbV90aW1lc3RhbXAodGltZXN0YW1wKQogICAgICAgICAgICAgLCBtX21vZGlmaWVyRmxh Z3MoMCkKKyNpZiBQTEFURk9STShNQUMpCisgICAgICAgICAgICAsIG1fZXZlbnROdW1iZXIoMCkK KyNlbGlmIFBMQVRGT1JNKFdJTikKKyAgICAgICAgICAgICwgbV9hY3RpdmF0ZWRXZWJWaWV3KGZh bHNlKQorI2VuZGlmCiAgICAgICAgIHsKICAgICAgICAgfQogCkBAIC0xODIsOSArMTkyLDcgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogCiAjaWYgUExBVEZPUk0oTUFDKQogICAgICAgICBpbnQgbV9l dmVudE51bWJlcjsKLSNlbmRpZgotCi0jaWYgUExBVEZPUk0oV0lOKQorI2VsaWYgUExBVEZPUk0o V0lOKQogICAgICAgICBib29sIG1fYWN0aXZhdGVkV2ViVmlldzsKICNlbmRpZgogICAgIH07Cklu ZGV4OiBXZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL0NoYW5nZUxvZwko cmV2aXNpb24gNzQ5NzkpCisrKyBXZWJLaXQyL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAt MSwzICsxLDM5IEBACisyMDExLTAxLTA0ICBKZWZmIE1pbGxlciAgPGplZmZtQGFwcGxlLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3VzZSBl dmVudHMgaW4gV2ViS2l0MiBvbiBXaW5kb3dzIG5lZWQgdG8ga25vdyB3aGV0aGVyIHRoZSBjbGlj ayBhY3RpdmF0ZWQgdGhlIFdlYlZpZXcgdG8gbWF0Y2ggV2ViS2l0MSBiZWhhdmlvci4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUxMjI4CisKKyAgICAg ICAgKiBTaGFyZWQvV2ViRXZlbnQuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViTW91c2VFdmVudDo6 YWN0aXZhdGVkV2ViVmlldyk6CisgICAgICAgIEFkZCBtX2FjdGl2YXRlZFdlYlZpZXcgdG8gV2Vi TW91c2VFdmVudCBvbiBXaW5kb3dzLgorICAgICAgICAKKyAgICAgICAgKiBTaGFyZWQvV2ViRXZl bnRDb252ZXJzaW9uLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViS2l0MlBsYXRmb3JtTW91c2VF dmVudDo6V2ViS2l0MlBsYXRmb3JtTW91c2VFdmVudCk6CisgICAgICAgIFByb3BhZ2F0ZSB3aGV0 aGVyIHRoZSBjbGljayBhY3RpdmF0ZWQgdGhlIFdlYlZpZXcgd2hlbiBjb252ZXJ0aW5nIHRvIGEg UGxhdGZvcm1Nb3VzZUV2ZW50LgorICAgICAgICAKKyAgICAgICAgKiBTaGFyZWQvV2ViTW91c2VF dmVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6OldlYk1vdXNlRXZlbnQp OgorICAgICAgICBBZGQgbV9hY3RpdmF0ZWRXZWJWaWV3IHRvIFdlYk1vdXNlRXZlbnQgb24gV2lu ZG93cy4KKyAgICAgICAgCisgICAgICAgIChXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6OmVuY29kZSk6 CisgICAgICAgIChXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6OmRlY29kZSk6CisgICAgICAgIEVuY29k ZSBhbmQgZGVjb2RlIG5ldyBtX2FjdGl2YXRlZFdlYlZpZXcgbWVtYmVyIHZhcmlhYmxlLgorICAg ICAgICAKKyAgICAgICAgKiBTaGFyZWQvd2luL1dlYkV2ZW50RmFjdG9yeS5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYkV2ZW50RmFjdG9yeTo6Y3JlYXRlV2ViTW91c2VFdmVudCk6CisgICAgICAg ICogU2hhcmVkL3dpbi9XZWJFdmVudEZhY3RvcnkuaDoKKyAgICAgICAgQWRkIGFjdGl2YXRlZFdl YlZpZXcgcGFyYW1ldGVyIHRvIGNyZWF0ZVdlYk1vdXNlRXZlbnQoKS4KKworICAgICAgICAqIFVJ UHJvY2Vzcy93aW4vV2ViVmlldy5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXc6OnduZFBy b2MpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3OjpXZWJWaWV3KToKKyAgICAgICAgKFdlYktp dDo6V2ViVmlldzo6b25Nb3VzZUV2ZW50KToKKyAgICAgICAgKiBVSVByb2Nlc3Mvd2luL1dlYlZp ZXcuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlldzo6c2V0TW91c2VBY3RpdmF0ZWQpOgorICAg ICAgICBLZWVwIHRyYWNrIG9mIHdoZXRoZXIgdGhlIGNsaWNrIGFjdGl2YXRlZCB0aGUgV2ViVmll dy4KKwogMjAxMS0wMS0wNCAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBXZWJLaXQyL1NoYXJlZC9XZWJF dmVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvU2hhcmVkL1dlYkV2ZW50LmgJKHJldmlzaW9u IDc0OTc5KQorKysgV2ViS2l0Mi9TaGFyZWQvV2ViRXZlbnQuaAkod29ya2luZyBjb3B5KQpAQCAt MTEwLDYgKzExMCw5IEBAIHB1YmxpYzoKICAgICBXZWJNb3VzZUV2ZW50KCkgeyB9CiAKICAgICBX ZWJNb3VzZUV2ZW50KFR5cGUsIEJ1dHRvbiwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIHBvc2l0 aW9uLCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgZ2xvYmFsUG9zaXRpb24sIGZsb2F0IGRlbHRh WCwgZmxvYXQgZGVsdGFZLCBmbG9hdCBkZWx0YVosIGludCBjbGlja0NvdW50LCBNb2RpZmllcnMs IGRvdWJsZSB0aW1lc3RhbXApOworI2lmIFBMQVRGT1JNKFdJTikKKyAgICBXZWJNb3VzZUV2ZW50 KFR5cGUsIEJ1dHRvbiwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIHBvc2l0aW9uLCBjb25zdCBX ZWJDb3JlOjpJbnRQb2ludCYgZ2xvYmFsUG9zaXRpb24sIGZsb2F0IGRlbHRhWCwgZmxvYXQgZGVs dGFZLCBmbG9hdCBkZWx0YVosIGludCBjbGlja0NvdW50LCBNb2RpZmllcnMsIGRvdWJsZSB0aW1l c3RhbXAsIGJvb2wgYWN0aXZhdGVkV2ViVmlldyk7CisjZW5kaWYKIAogICAgIEJ1dHRvbiBidXR0 b24oKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxCdXR0b24+KG1fYnV0dG9uKTsgfQogICAg IGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBwb3NpdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fcG9z aXRpb247IH0KQEAgLTExOCw2ICsxMjEsOSBAQCBwdWJsaWM6CiAgICAgZmxvYXQgZGVsdGFZKCkg Y29uc3QgeyByZXR1cm4gbV9kZWx0YVk7IH0KICAgICBmbG9hdCBkZWx0YVooKSBjb25zdCB7IHJl dHVybiBtX2RlbHRhWjsgfQogICAgIGludDMyX3QgY2xpY2tDb3VudCgpIGNvbnN0IHsgcmV0dXJu IG1fY2xpY2tDb3VudDsgfQorI2lmIFBMQVRGT1JNKFdJTikKKyAgICBib29sIGFjdGl2YXRlZFdl YlZpZXcoKSBjb25zdCB7IHJldHVybiBtX2FjdGl2YXRlZFdlYlZpZXc7IH0KKyNlbmRpZgogCiAg ICAgdm9pZCBlbmNvZGUoQ29yZUlQQzo6QXJndW1lbnRFbmNvZGVyKikgY29uc3Q7CiAgICAgc3Rh dGljIGJvb2wgZGVjb2RlKENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciosIFdlYk1vdXNlRXZlbnQm KTsKQEAgLTEzMiw2ICsxMzgsOSBAQCBwcml2YXRlOgogICAgIGZsb2F0IG1fZGVsdGFZOwogICAg IGZsb2F0IG1fZGVsdGFaOwogICAgIGludDMyX3QgbV9jbGlja0NvdW50OworI2lmIFBMQVRGT1JN KFdJTikKKyAgICBib29sIG1fYWN0aXZhdGVkV2ViVmlldzsKKyNlbmRpZgogfTsKIAogLy8gRklY TUU6IE1vdmUgdGhpcyBjbGFzcyB0byBpdHMgb3duIGhlYWRlciBmaWxlLgpJbmRleDogV2ViS2l0 Mi9TaGFyZWQvV2ViRXZlbnRDb252ZXJzaW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1No YXJlZC9XZWJFdmVudENvbnZlcnNpb24uY3BwCShyZXZpc2lvbiA3NDk3OSkKKysrIFdlYktpdDIv U2hhcmVkL1dlYkV2ZW50Q29udmVyc2lvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgzLDYgKzgz LDEwIEBAIHB1YmxpYzoKICAgICAgICAgICAgIG1fbW9kaWZpZXJGbGFncyB8PSBXZWJFdmVudDo6 QWx0S2V5OwogICAgICAgICBpZiAobV9tZXRhS2V5KQogICAgICAgICAgICAgbV9tb2RpZmllckZs YWdzIHw9IFdlYkV2ZW50OjpNZXRhS2V5OworCisjaWYgUExBVEZPUk0oV0lOKQorICAgICAgICBt X2FjdGl2YXRlZFdlYlZpZXcgPSB3ZWJFdmVudC5hY3RpdmF0ZWRXZWJWaWV3KCk7CisjZW5kaWYK ICAgICB9CiB9OwogCkluZGV4OiBXZWJLaXQyL1NoYXJlZC9XZWJNb3VzZUV2ZW50LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJLaXQyL1NoYXJlZC9XZWJNb3VzZUV2ZW50LmNwcAkocmV2aXNpb24gNzQ5 NzkpCisrKyBXZWJLaXQyL1NoYXJlZC9XZWJNb3VzZUV2ZW50LmNwcAkod29ya2luZyBjb3B5KQpA QCAtNDEsMTUgKzQxLDM5IEBAIFdlYk1vdXNlRXZlbnQ6OldlYk1vdXNlRXZlbnQoVHlwZSB0eXBl LAogICAgICwgbV9kZWx0YVkoZGVsdGFZKQogICAgICwgbV9kZWx0YVooZGVsdGFaKQogICAgICwg bV9jbGlja0NvdW50KGNsaWNrQ291bnQpCisjaWYgUExBVEZPUk0oV0lOKQorICAgICwgbV9hY3Rp dmF0ZWRXZWJWaWV3KGZhbHNlKQorI2VuZGlmCiB7CiAgICAgQVNTRVJUKGlzTW91c2VFdmVudFR5 cGUodHlwZSkpOwogfQogCisjaWYgUExBVEZPUk0oV0lOKQorV2ViTW91c2VFdmVudDo6V2ViTW91 c2VFdmVudChUeXBlIHR5cGUsIEJ1dHRvbiBidXR0b24sIGNvbnN0IEludFBvaW50JiBwb3NpdGlv biwgY29uc3QgSW50UG9pbnQmIGdsb2JhbFBvc2l0aW9uLCBmbG9hdCBkZWx0YVgsIGZsb2F0IGRl bHRhWSwgZmxvYXQgZGVsdGFaLCBpbnQgY2xpY2tDb3VudCwgTW9kaWZpZXJzIG1vZGlmaWVycywg ZG91YmxlIHRpbWVzdGFtcCwgYm9vbCBhY3RpdmF0ZWRXZWJWaWV3KQorICAgIDogV2ViRXZlbnQo dHlwZSwgbW9kaWZpZXJzLCB0aW1lc3RhbXApCisgICAgLCBtX2J1dHRvbihidXR0b24pCisgICAg LCBtX3Bvc2l0aW9uKHBvc2l0aW9uKQorICAgICwgbV9nbG9iYWxQb3NpdGlvbihnbG9iYWxQb3Np dGlvbikKKyAgICAsIG1fZGVsdGFYKGRlbHRhWCkKKyAgICAsIG1fZGVsdGFZKGRlbHRhWSkKKyAg ICAsIG1fZGVsdGFaKGRlbHRhWikKKyAgICAsIG1fY2xpY2tDb3VudChjbGlja0NvdW50KQorICAg ICwgbV9hY3RpdmF0ZWRXZWJWaWV3KGFjdGl2YXRlZFdlYlZpZXcpCit7CisgICAgQVNTRVJUKGlz TW91c2VFdmVudFR5cGUodHlwZSkpOworfQorI2VuZGlmCisKIHZvaWQgV2ViTW91c2VFdmVudDo6 ZW5jb2RlKENvcmVJUEM6OkFyZ3VtZW50RW5jb2RlciogZW5jb2RlcikgY29uc3QKIHsKICAgICBX ZWJFdmVudDo6ZW5jb2RlKGVuY29kZXIpOwogCisjaWYgUExBVEZPUk0oV0lOKQorICAgIC8vIElu Y2x1ZGUgbV9hY3RpdmF0ZWRXZWJWaWV3IG9uIFdpbmRvd3MuCisgICAgZW5jb2Rlci0+ZW5jb2Rl KENvcmVJUEM6OkluKG1fYnV0dG9uLCBtX3Bvc2l0aW9uLCBtX2dsb2JhbFBvc2l0aW9uLCBtX2Rl bHRhWCwgbV9kZWx0YVksIG1fZGVsdGFaLCBtX2NsaWNrQ291bnQsIG1fYWN0aXZhdGVkV2ViVmll dykpOworI2Vsc2UKICAgICBlbmNvZGVyLT5lbmNvZGUoQ29yZUlQQzo6SW4obV9idXR0b24sIG1f cG9zaXRpb24sIG1fZ2xvYmFsUG9zaXRpb24sIG1fZGVsdGFYLCBtX2RlbHRhWSwgbV9kZWx0YVos IG1fY2xpY2tDb3VudCkpOworI2VuZGlmCiB9CiAKIGJvb2wgV2ViTW91c2VFdmVudDo6ZGVjb2Rl KENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciogZGVjb2RlciwgV2ViTW91c2VFdmVudCYgdCkKQEAg LTU3LDcgKzgxLDEyIEBAIGJvb2wgV2ViTW91c2VFdmVudDo6ZGVjb2RlKENvcmVJUEM6OkFyZ3UK ICAgICBpZiAoIVdlYkV2ZW50OjpkZWNvZGUoZGVjb2RlciwgdCkpCiAgICAgICAgIHJldHVybiBm YWxzZTsKIAorI2lmIFBMQVRGT1JNKFdJTikKKyAgICAvLyBJbmNsdWRlIG1fYWN0aXZhdGVkV2Vi VmlldyBvbiBXaW5kb3dzLgorICAgIHJldHVybiBkZWNvZGVyLT5kZWNvZGUoQ29yZUlQQzo6T3V0 KHQubV9idXR0b24sIHQubV9wb3NpdGlvbiwgdC5tX2dsb2JhbFBvc2l0aW9uLCB0Lm1fZGVsdGFY LCB0Lm1fZGVsdGFZLCB0Lm1fZGVsdGFaLCB0Lm1fY2xpY2tDb3VudCwgdC5tX2FjdGl2YXRlZFdl YlZpZXcpKTsKKyNlbHNlCiAgICAgcmV0dXJuIGRlY29kZXItPmRlY29kZShDb3JlSVBDOjpPdXQo dC5tX2J1dHRvbiwgdC5tX3Bvc2l0aW9uLCB0Lm1fZ2xvYmFsUG9zaXRpb24sIHQubV9kZWx0YVgs IHQubV9kZWx0YVksIHQubV9kZWx0YVosIHQubV9jbGlja0NvdW50KSk7CisjZW5kaWYKIH0KIAog Ym9vbCBXZWJNb3VzZUV2ZW50Ojppc01vdXNlRXZlbnRUeXBlKFR5cGUgdHlwZSkKSW5kZXg6IFdl YktpdDIvU2hhcmVkL3dpbi9XZWJFdmVudEZhY3RvcnkuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dDIvU2hhcmVkL3dpbi9XZWJFdmVudEZhY3RvcnkuY3BwCShyZXZpc2lvbiA3NDk3OSkKKysrIFdl YktpdDIvU2hhcmVkL3dpbi9XZWJFdmVudEZhY3RvcnkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0z MjMsNyArMzIzLDcgQEAgc3RhdGljIFN0cmluZyBrZXlJZGVudGlmaWVyRnJvbUV2ZW50KFdQQQog ICAgIH0KIH0KIAotV2ViTW91c2VFdmVudCBXZWJFdmVudEZhY3Rvcnk6OmNyZWF0ZVdlYk1vdXNl RXZlbnQoSFdORCBoV25kLCBVSU5UIG1lc3NhZ2UsIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFy YW0pCitXZWJNb3VzZUV2ZW50IFdlYkV2ZW50RmFjdG9yeTo6Y3JlYXRlV2ViTW91c2VFdmVudChI V05EIGhXbmQsIFVJTlQgbWVzc2FnZSwgV1BBUkFNIHdQYXJhbSwgTFBBUkFNIGxQYXJhbSwgYm9v bCBhY3RpdmF0ZWRXZWJWaWV3KQogewogICAgIFdlYkV2ZW50OjpUeXBlIHR5cGU7CiAgICAgV2Vi TW91c2VFdmVudDo6QnV0dG9uIGJ1dHRvbiA9IFdlYk1vdXNlRXZlbnQ6Ok5vQnV0dG9uOwpAQCAt MzkxLDcgKzM5MSw3IEBAIFdlYk1vdXNlRXZlbnQgV2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWIK ICAgICBpbnQgY2xpY2tDb3VudCA9IFdlYktpdDo6Y2xpY2tDb3VudCh0eXBlLCBidXR0b24sIHBv c2l0aW9uLCB0aW1lc3RhbXApOwogICAgIFdlYkV2ZW50OjpNb2RpZmllcnMgbW9kaWZpZXJzID0g bW9kaWZpZXJzRm9yRXZlbnQod1BhcmFtKTsKIAotICAgIHJldHVybiBXZWJNb3VzZUV2ZW50KHR5 cGUsIGJ1dHRvbiwgcG9zaXRpb24sIGdsb2JhbFBvc2l0aW9uLCAwLCAwLCAwLCBjbGlja0NvdW50 LCBtb2RpZmllcnMsIHRpbWVzdGFtcCk7CisgICAgcmV0dXJuIFdlYk1vdXNlRXZlbnQodHlwZSwg YnV0dG9uLCBwb3NpdGlvbiwgZ2xvYmFsUG9zaXRpb24sIDAsIDAsIDAsIGNsaWNrQ291bnQsIG1v ZGlmaWVycywgdGltZXN0YW1wLCBhY3RpdmF0ZWRXZWJWaWV3KTsKIH0KIAogV2ViV2hlZWxFdmVu dCBXZWJFdmVudEZhY3Rvcnk6OmNyZWF0ZVdlYldoZWVsRXZlbnQoSFdORCBoV25kLCBVSU5UIG1l c3NhZ2UsIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYW0pCkluZGV4OiBXZWJLaXQyL1NoYXJl ZC93aW4vV2ViRXZlbnRGYWN0b3J5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9TaGFyZWQvd2lu L1dlYkV2ZW50RmFjdG9yeS5oCShyZXZpc2lvbiA3NDk3OSkKKysrIFdlYktpdDIvU2hhcmVkL3dp bi9XZWJFdmVudEZhY3RvcnkuaAkod29ya2luZyBjb3B5KQpAQCAtMzUsOSArMzUsOSBAQCBuYW1l c3BhY2UgV2ViS2l0IHsKIAogY2xhc3MgV2ViRXZlbnRGYWN0b3J5IHsKIHB1YmxpYzoKLSAgICBz dGF0aWMgV2ViTW91c2VFdmVudCBjcmVhdGVXZWJNb3VzZUV2ZW50KEhXTkQgaHduZCwgVUlOVCBt ZXNzYWdlLCBXUEFSQU0gd3BhcmFtLCBMUEFSQU0gbHBhcmFtKTsKLSAgICBzdGF0aWMgV2ViV2hl ZWxFdmVudCBjcmVhdGVXZWJXaGVlbEV2ZW50KEhXTkQgaHduZCwgVUlOVCBtZXNzYWdlLCBXUEFS QU0gd3BhcmFtLCBMUEFSQU0gbHBhcmFtKTsKLSAgICBzdGF0aWMgV2ViS2V5Ym9hcmRFdmVudCBj cmVhdGVXZWJLZXlib2FyZEV2ZW50KEhXTkQgaHduZCwgVUlOVCBtZXNzYWdlLCBXUEFSQU0gd3Bh cmFtLCBMUEFSQU0gbHBhcmFtKTsKKyAgICBzdGF0aWMgV2ViTW91c2VFdmVudCBjcmVhdGVXZWJN b3VzZUV2ZW50KEhXTkQsIFVJTlQsIFdQQVJBTSwgTFBBUkFNLCBib29sKTsKKyAgICBzdGF0aWMg V2ViV2hlZWxFdmVudCBjcmVhdGVXZWJXaGVlbEV2ZW50KEhXTkQsIFVJTlQsIFdQQVJBTSwgTFBB UkFNKTsKKyAgICBzdGF0aWMgV2ViS2V5Ym9hcmRFdmVudCBjcmVhdGVXZWJLZXlib2FyZEV2ZW50 KEhXTkQsIFVJTlQsIFdQQVJBTSwgTFBBUkFNKTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktp dApJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcAkocmV2aXNpb24gNzQ5NzkpCisrKyBX ZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExNiw2 ICsxMTYsMTAgQEAgTFJFU1VMVCBXZWJWaWV3Ojp3bmRQcm9jKEhXTkQgaFduZCwgVUlOVAogICAg ICAgICBjYXNlIFdNX1BSSU5UQ0xJRU5UOgogICAgICAgICAgICAgbFJlc3VsdCA9IG9uUHJpbnRD bGllbnRFdmVudChoV25kLCBtZXNzYWdlLCB3UGFyYW0sIGxQYXJhbSwgaGFuZGxlZCk7CiAgICAg ICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBXTV9NT1VTRUFDVElWQVRFOgorICAgICAgICAg ICAgc2V0TW91c2VBY3RpdmF0ZWQodHJ1ZSk7CisgICAgICAgICAgICBoYW5kbGVkID0gZmFsc2U7 CisgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBXTV9NT1VTRU1PVkU6CiAgICAgICAg IGNhc2UgV01fTEJVVFRPTkRPV046CiAgICAgICAgIGNhc2UgV01fTUJVVFRPTkRPV046CkBAIC0y MjQsNiArMjI4LDcgQEAgV2ViVmlldzo6V2ViVmlldyhSRUNUIHJlY3QsIFdlYkNvbnRleHQqCiAg ICAgLCBtX3dlYkNvcmVDdXJzb3IoMCkKICAgICAsIG1fb3ZlcnJpZGVDdXJzb3IoMCkKICAgICAs IG1fdHJhY2tpbmdNb3VzZUxlYXZlKGZhbHNlKQorICAgICwgbV9tb3VzZUFjdGl2YXRlZChmYWxz ZSkKICAgICAsIG1faXNCZWluZ0Rlc3Ryb3llZChmYWxzZSkKICAgICAsIG1faW5JTUVDb21wb3Np dGlvbigwKQogewpAQCAtMzE3LDYgKzMyMiw5IEBAIHZvaWQgV2ViVmlldzo6d2luZG93QW5jZXN0 cnlEaWRDaGFuZ2UoKQogCiBMUkVTVUxUIFdlYlZpZXc6Om9uTW91c2VFdmVudChIV05EIGhXbmQs IFVJTlQgbWVzc2FnZSwgV1BBUkFNIHdQYXJhbSwgTFBBUkFNIGxQYXJhbSwgYm9vbCYgaGFuZGxl ZCkKIHsKKyAgICBXZWJNb3VzZUV2ZW50IG1vdXNlRXZlbnQgPSBXZWJFdmVudEZhY3Rvcnk6OmNy ZWF0ZVdlYk1vdXNlRXZlbnQoaFduZCwgbWVzc2FnZSwgd1BhcmFtLCBsUGFyYW0sIG1fbW91c2VB Y3RpdmF0ZWQpOworICAgIHNldE1vdXNlQWN0aXZhdGVkKGZhbHNlKTsKKyAgICAKICAgICBzd2l0 Y2ggKG1lc3NhZ2UpIHsKICAgICAgICAgY2FzZSBXTV9MQlVUVE9ORE9XTjoKICAgICAgICAgY2Fz ZSBXTV9NQlVUVE9ORE9XTjoKQEAgLTM0Myw3ICszNTEsNiBAQCBMUkVTVUxUIFdlYlZpZXc6Om9u TW91c2VFdmVudChIV05EIGhXbmQsCiAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsK ICAgICB9CiAKLSAgICBXZWJNb3VzZUV2ZW50IG1vdXNlRXZlbnQgPSBXZWJFdmVudEZhY3Rvcnk6 OmNyZWF0ZVdlYk1vdXNlRXZlbnQoaFduZCwgbWVzc2FnZSwgd1BhcmFtLCBsUGFyYW0pOwogICAg IG1fcGFnZS0+aGFuZGxlTW91c2VFdmVudChtb3VzZUV2ZW50KTsKIAogICAgIGhhbmRsZWQgPSB0 cnVlOwpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5oCShyZXZpc2lvbiA3NDk3OSkKKysrIFdl YktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTY2LDYgKzY2 LDcgQEAgcHJpdmF0ZToKICAgICBzdGF0aWMgTFJFU1VMVCBDQUxMQkFDSyBXZWJWaWV3V25kUHJv YyhIV05ELCBVSU5ULCBXUEFSQU0sIExQQVJBTSk7CiAgICAgTFJFU1VMVCB3bmRQcm9jKEhXTkQg aFduZCwgVUlOVCBtZXNzYWdlLCBXUEFSQU0gd1BhcmFtLCBMUEFSQU0gbFBhcmFtKTsKIAorICAg IHZvaWQgc2V0TW91c2VBY3RpdmF0ZWQoYm9vbCBmbGFnKSB7IG1fbW91c2VBY3RpdmF0ZWQgPSBm bGFnOyB9CiAgICAgTFJFU1VMVCBvbk1vdXNlRXZlbnQoSFdORCBoV25kLCBVSU5UIG1lc3NhZ2Us IFdQQVJBTSwgTFBBUkFNLCBib29sJiBoYW5kbGVkKTsKICAgICBMUkVTVUxUIG9uV2hlZWxFdmVu dChIV05EIGhXbmQsIFVJTlQgbWVzc2FnZSwgV1BBUkFNLCBMUEFSQU0sIGJvb2wmIGhhbmRsZWQp OwogICAgIExSRVNVTFQgb25LZXlFdmVudChIV05EIGhXbmQsIFVJTlQgbWVzc2FnZSwgV1BBUkFN LCBMUEFSQU0sIGJvb2wmIGhhbmRsZWQpOwpAQCAtMTQ1LDYgKzE0Niw3IEBAIHByaXZhdGU6CiAg ICAgSENVUlNPUiBtX3dlYkNvcmVDdXJzb3I7CiAgICAgSENVUlNPUiBtX292ZXJyaWRlQ3Vyc29y OwogCisgICAgYm9vbCBtX21vdXNlQWN0aXZhdGVkOwogICAgIGJvb2wgbV90cmFja2luZ01vdXNl TGVhdmU7CiAgICAgYm9vbCBtX2lzQmVpbmdEZXN0cm95ZWQ7CiAK 77931 2011-01-04 14:21:18 -0800 2011-01-04 19:08:18 -0800 Patch to plumb through whether the click activated the WebView to match WebKit1 behavior. 51228.patch text/plain 14844 jeffm SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NTAwMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjcgQEAKKzIwMTEtMDEtMDQgIEplZmYgTWlsbGVyICA8amVmZm1AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1lbWJl ciB2YXJpYWJsZSBhbmQgbWV0aG9kIG5hbWluZyBjbGVhbnVwIHRvIGJlIGNvbnNpc3RlbnQgd2l0 aCBXZWJLaXQyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NTEyMjgKKworICAgICAgICAqIHBhZ2Uvd2luL0V2ZW50SGFuZGxlcldpbi5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmV2ZW50QWN0aXZhdGVkVmlldyk6CisgICAgICAg IFJlbmFtZSBhY3RpdmF0ZWRXZWJWaWV3KCkgdG8gZGlkQWN0aXZhdGVXZWJWaWV3KCkuCisgICAg ICAgIAorICAgICAgICAqIHBsYXRmb3JtL1BsYXRmb3JtTW91c2VFdmVudC5oOgorICAgICAgICBS ZW5hbWUgbV9hY3RpdmF0ZWRXZWJWaWV3IHRvIG1fZGlkQWN0aXZhdGVXZWJWaWV3LgorICAgICAg ICAKKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtTW91c2VFdmVudDo6UGxhdGZvcm1Nb3VzZUV2 ZW50KToKKyAgICAgICAgSW5pdGlhbGl6ZSBwbGF0Zm9ybS1zcGVjaWZpYyBtZW1iZXIgdmFyaWFi bGVzIGluIFBsYXRmb3JtTW91c2VFdmVudCBjb25zdHJ1Y3RvcnMuCisgICAgICAgIAorICAgICAg ICAoV2ViQ29yZTo6UGxhdGZvcm1Nb3VzZUV2ZW50OjpkaWRBY3RpdmF0ZVdlYlZpZXcpOgorICAg ICAgICBSZW5hbWUgYWN0aXZhdGVkV2ViVmlldygpIHRvIGRpZEFjdGl2YXRlV2ViVmlldygpLgor CisgICAgICAgICogcGxhdGZvcm0vd2luL1BsYXRmb3JtTW91c2VFdmVudFdpbi5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpQbGF0Zm9ybU1vdXNlRXZlbnQ6OlBsYXRmb3JtTW91c2VFdmVudCk6Cisg ICAgICAgIFJlbmFtZSBtX2FjdGl2YXRlZFdlYlZpZXcgdG8gbV9kaWRBY3RpdmF0ZVdlYlZpZXcu CisKIDIwMTEtMDEtMDQgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IGEgc3BlbGwgY2hlY2tlci4KSW5kZXg6IFdlYkNvcmUvcGFnZS93aW4v RXZlbnRIYW5kbGVyV2luLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2Uvd2luL0V2ZW50 SGFuZGxlcldpbi5jcHAJKHJldmlzaW9uIDc1MDAyKQorKysgV2ViQ29yZS9wYWdlL3dpbi9FdmVu dEhhbmRsZXJXaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04OCw3ICs4OCw3IEBAIGJvb2wgRXZl bnRIYW5kbGVyOjp0YWJzVG9BbGxDb250cm9scyhLZXkKIAogYm9vbCBFdmVudEhhbmRsZXI6OmV2 ZW50QWN0aXZhdGVkVmlldyhjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQmIGV2ZW50KSBjb25zdAog ewotICAgIHJldHVybiBldmVudC5hY3RpdmF0ZWRXZWJWaWV3KCk7CisgICAgcmV0dXJuIGV2ZW50 LmRpZEFjdGl2YXRlV2ViVmlldygpOwogfQogCiBQYXNzUmVmUHRyPENsaXBib2FyZD4gRXZlbnRI YW5kbGVyOjpjcmVhdGVEcmFnZ2luZ0NsaXBib2FyZCgpIGNvbnN0CkluZGV4OiBXZWJDb3JlL3Bs YXRmb3JtL1BsYXRmb3JtTW91c2VFdmVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZv cm0vUGxhdGZvcm1Nb3VzZUV2ZW50LmgJKHJldmlzaW9uIDc1MDAyKQorKysgV2ViQ29yZS9wbGF0 Zm9ybS9QbGF0Zm9ybU1vdXNlRXZlbnQuaAkod29ya2luZyBjb3B5KQpAQCAtODUsNiArODUsMTEg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAgLCBtX21ldGFLZXkoZmFsc2UpCiAg ICAgICAgICAgICAsIG1fdGltZXN0YW1wKDApCiAgICAgICAgICAgICAsIG1fbW9kaWZpZXJGbGFn cygwKQorI2lmIFBMQVRGT1JNKE1BQykKKyAgICAgICAgICAgICwgbV9ldmVudE51bWJlcigwKQor I2VsaWYgUExBVEZPUk0oV0lOKQorICAgICAgICAgICAgLCBtX2RpZEFjdGl2YXRlV2ViVmlldyhm YWxzZSkKKyNlbmRpZgogICAgICAgICB7CiAgICAgICAgIH0KIApAQCAtMTAxLDYgKzEwNiwxMSBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgICAgICAsIG1fbWV0YUtleShtZXRhKQogICAg ICAgICAgICAgLCBtX3RpbWVzdGFtcCh0aW1lc3RhbXApCiAgICAgICAgICAgICAsIG1fbW9kaWZp ZXJGbGFncygwKQorI2lmIFBMQVRGT1JNKE1BQykKKyAgICAgICAgICAgICwgbV9ldmVudE51bWJl cigwKQorI2VsaWYgUExBVEZPUk0oV0lOKQorICAgICAgICAgICAgLCBtX2RpZEFjdGl2YXRlV2Vi VmlldyhmYWxzZSkKKyNlbmRpZgogICAgICAgICB7CiAgICAgICAgIH0KIApAQCAtMTUwLDkgKzE2 MCw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICNlbmRpZgogCiAjaWYgUExBVEZPUk0oV0lOKQot ICAgICAgICBQbGF0Zm9ybU1vdXNlRXZlbnQoSFdORCwgVUlOVCwgV1BBUkFNLCBMUEFSQU0sIGJv b2wgYWN0aXZhdGVkV2ViVmlldyA9IGZhbHNlKTsKKyAgICAgICAgUGxhdGZvcm1Nb3VzZUV2ZW50 KEhXTkQsIFVJTlQsIFdQQVJBTSwgTFBBUkFNLCBib29sIGRpZEFjdGl2YXRlV2ViVmlldyA9IGZh bHNlKTsKICAgICAgICAgdm9pZCBzZXRDbGlja0NvdW50KGludCBjb3VudCkgeyBtX2NsaWNrQ291 bnQgPSBjb3VudDsgfQotICAgICAgICBib29sIGFjdGl2YXRlZFdlYlZpZXcoKSBjb25zdCB7IHJl dHVybiBtX2FjdGl2YXRlZFdlYlZpZXc7IH0KKyAgICAgICAgYm9vbCBkaWRBY3RpdmF0ZVdlYlZp ZXcoKSBjb25zdCB7IHJldHVybiBtX2RpZEFjdGl2YXRlV2ViVmlldzsgfQogI2VuZGlmCiAKICNp ZiBQTEFURk9STShXWCkKQEAgLTE4MiwxMCArMTkyLDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog CiAjaWYgUExBVEZPUk0oTUFDKQogICAgICAgICBpbnQgbV9ldmVudE51bWJlcjsKLSNlbmRpZgot Ci0jaWYgUExBVEZPUk0oV0lOKQotICAgICAgICBib29sIG1fYWN0aXZhdGVkV2ViVmlldzsKKyNl bGlmIFBMQVRGT1JNKFdJTikKKyAgICAgICAgYm9vbCBtX2RpZEFjdGl2YXRlV2ViVmlldzsKICNl bmRpZgogICAgIH07CiAKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vd2luL1BsYXRmb3JtTW91c2VF dmVudFdpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS93aW4vUGxhdGZvcm1N b3VzZUV2ZW50V2luLmNwcAkocmV2aXNpb24gNzUwMDIpCisrKyBXZWJDb3JlL3BsYXRmb3JtL3dp bi9QbGF0Zm9ybU1vdXNlRXZlbnRXaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03Nyw3ICs3Nyw3 IEBAIHN0YXRpYyBNb3VzZUV2ZW50VHlwZSBtZXNzYWdlVG9FdmVudFR5cGUKICAgICAgICAgICAg IHJldHVybiBNb3VzZUV2ZW50TW92ZWQ7CiAgICAgfQogfQotUGxhdGZvcm1Nb3VzZUV2ZW50OjpQ bGF0Zm9ybU1vdXNlRXZlbnQoSFdORCBoV25kLCBVSU5UIG1lc3NhZ2UsIFdQQVJBTSB3UGFyYW0s IExQQVJBTSBsUGFyYW0sIGJvb2wgYWN0aXZhdGVkV2ViVmlldykKK1BsYXRmb3JtTW91c2VFdmVu dDo6UGxhdGZvcm1Nb3VzZUV2ZW50KEhXTkQgaFduZCwgVUlOVCBtZXNzYWdlLCBXUEFSQU0gd1Bh cmFtLCBMUEFSQU0gbFBhcmFtLCBib29sIGRpZEFjdGl2YXRlV2ViVmlldykKICAgICA6IG1fcG9z aXRpb24ocG9zaXRpb25Gb3JFdmVudChoV25kLCBsUGFyYW0pKQogICAgICwgbV9nbG9iYWxQb3Np dGlvbihnbG9iYWxQb3NpdGlvbkZvckV2ZW50KGhXbmQsIGxQYXJhbSkpCiAgICAgLCBtX2NsaWNr Q291bnQoMCkKQEAgLTg1LDcgKzg1LDcgQEAgUGxhdGZvcm1Nb3VzZUV2ZW50OjpQbGF0Zm9ybU1v dXNlRXZlbnQoSAogICAgICwgbV9jdHJsS2V5KHdQYXJhbSAmIE1LX0NPTlRST0wpCiAgICAgLCBt X2FsdEtleShHZXRLZXlTdGF0ZShWS19NRU5VKSAmIEhJR0hfQklUX01BU0tfU0hPUlQpCiAgICAg LCBtX21ldGFLZXkobV9hbHRLZXkpIC8vIEZJWE1FOiBXZSdsbCBoYXZlIHRvIHRlc3Qgb3RoZXIg YnJvd3NlcnMKLSAgICAsIG1fYWN0aXZhdGVkV2ViVmlldyhhY3RpdmF0ZWRXZWJWaWV3KQorICAg ICwgbV9kaWRBY3RpdmF0ZVdlYlZpZXcoZGlkQWN0aXZhdGVXZWJWaWV3KQogICAgICwgbV9ldmVu dFR5cGUobWVzc2FnZVRvRXZlbnRUeXBlKG1lc3NhZ2UpKQogICAgICwgbV9tb2RpZmllckZsYWdz KHdQYXJhbSkKIHsKSW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dDIvQ2hhbmdlTG9nCShyZXZpc2lvbiA3NTAwMikKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMzkgQEAKKzIwMTEtMDEtMDQgIEplZmYgTWlsbGVyICA8amVm Zm1AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIE1vdXNlIGV2ZW50cyBpbiBXZWJLaXQyIG9uIFdpbmRvd3MgbmVlZCB0byBrbm93IHdo ZXRoZXIgdGhlIGNsaWNrIGFjdGl2YXRlZCB0aGUgV2ViVmlldyB0byBtYXRjaCBXZWJLaXQxIGJl aGF2aW9yLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTEyMjgKKworICAgICAgICAqIFNoYXJlZC9XZWJFdmVudC5oOgorICAgICAgICAoV2ViS2l0OjpX ZWJNb3VzZUV2ZW50OjpkaWRBY3RpdmF0ZVdlYlZpZXcpOgorICAgICAgICBBZGQgbV9kaWRBY3Rp dmF0ZVdlYlZpZXcgdG8gV2ViTW91c2VFdmVudCBvbiBXaW5kb3dzLgorCisgICAgICAgICogU2hh cmVkL1dlYkV2ZW50Q29udmVyc2lvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYktpdDJQbGF0 Zm9ybU1vdXNlRXZlbnQ6OldlYktpdDJQbGF0Zm9ybU1vdXNlRXZlbnQpOgorICAgICAgICBQcm9w YWdhdGUgd2hldGhlciB0aGUgY2xpY2sgYWN0aXZhdGVkIHRoZSBXZWJWaWV3IHdoZW4gY29udmVy dGluZyB0byBhIFBsYXRmb3JtTW91c2VFdmVudC4KKworICAgICAgICAqIFNoYXJlZC9XZWJNb3Vz ZUV2ZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViTW91c2VFdmVudDo6V2ViTW91c2VFdmVu dCk6CisgICAgICAgIEFkZCBtX2RpZEFjdGl2YXRlV2ViVmlldyB0byBXZWJNb3VzZUV2ZW50IG9u IFdpbmRvd3MuCisKKyAgICAgICAgKFdlYktpdDo6V2ViTW91c2VFdmVudDo6ZW5jb2RlKToKKyAg ICAgICAgKFdlYktpdDo6V2ViTW91c2VFdmVudDo6ZGVjb2RlKToKKyAgICAgICAgRW5jb2RlIGFu ZCBkZWNvZGUgbmV3IG1fZGlkQWN0aXZhdGVXZWJWaWV3IG1lbWJlciB2YXJpYWJsZS4KKworICAg ICAgICAqIFNoYXJlZC93aW4vV2ViRXZlbnRGYWN0b3J5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWJNb3VzZUV2ZW50KToKKyAgICAgICAgKiBTaGFyZWQv d2luL1dlYkV2ZW50RmFjdG9yeS5oOgorICAgICAgICBBZGQgZGlkQWN0aXZhdGVXZWJWaWV3IHBh cmFtZXRlciB0byBjcmVhdGVXZWJNb3VzZUV2ZW50KCkuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv d2luL1dlYlZpZXcuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3Ojp3bmRQcm9jKToKKyAg ICAgICAgKFdlYktpdDo6V2ViVmlldzo6V2ViVmlldyk6CisgICAgICAgIChXZWJLaXQ6OldlYlZp ZXc6Om9uTW91c2VFdmVudCk6CisgICAgICAgICogVUlQcm9jZXNzL3dpbi9XZWJWaWV3Lmg6Cisg ICAgICAgIChXZWJLaXQ6OldlYlZpZXc6OnNldFdhc0FjdGl2YXRlZEJ5TW91c2VFdmVudCk6Cisg ICAgICAgIEtlZXAgdHJhY2sgb2Ygd2hldGhlciB0aGUgY2xpY2sgYWN0aXZhdGVkIHRoZSBXZWJW aWV3LgorCiAyMDExLTAxLTA0ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAog ICAgICAgICBSdWJiZXJzdGFtcGVkIGJ5IEFuZGVycyBDYXJsc3Nvbi4KSW5kZXg6IFdlYktpdDIv U2hhcmVkL1dlYkV2ZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9TaGFyZWQvV2ViRXZlbnQu aAkocmV2aXNpb24gNzUwMDIpCisrKyBXZWJLaXQyL1NoYXJlZC9XZWJFdmVudC5oCSh3b3JraW5n IGNvcHkpCkBAIC0xMTAsNiArMTEwLDkgQEAgcHVibGljOgogICAgIFdlYk1vdXNlRXZlbnQoKSB7 IH0KIAogICAgIFdlYk1vdXNlRXZlbnQoVHlwZSwgQnV0dG9uLCBjb25zdCBXZWJDb3JlOjpJbnRQ b2ludCYgcG9zaXRpb24sIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBnbG9iYWxQb3NpdGlvbiwg ZmxvYXQgZGVsdGFYLCBmbG9hdCBkZWx0YVksIGZsb2F0IGRlbHRhWiwgaW50IGNsaWNrQ291bnQs IE1vZGlmaWVycywgZG91YmxlIHRpbWVzdGFtcCk7CisjaWYgUExBVEZPUk0oV0lOKQorICAgIFdl Yk1vdXNlRXZlbnQoVHlwZSwgQnV0dG9uLCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgcG9zaXRp b24sIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBnbG9iYWxQb3NpdGlvbiwgZmxvYXQgZGVsdGFY LCBmbG9hdCBkZWx0YVksIGZsb2F0IGRlbHRhWiwgaW50IGNsaWNrQ291bnQsIE1vZGlmaWVycywg ZG91YmxlIHRpbWVzdGFtcCwgYm9vbCBkaWRBY3RpdmF0ZVdlYlZpZXcpOworI2VuZGlmCiAKICAg ICBCdXR0b24gYnV0dG9uKCkgY29uc3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8QnV0dG9uPihtX2J1 dHRvbik7IH0KICAgICBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgcG9zaXRpb24oKSBjb25zdCB7 IHJldHVybiBtX3Bvc2l0aW9uOyB9CkBAIC0xMTgsNiArMTIxLDkgQEAgcHVibGljOgogICAgIGZs b2F0IGRlbHRhWSgpIGNvbnN0IHsgcmV0dXJuIG1fZGVsdGFZOyB9CiAgICAgZmxvYXQgZGVsdGFa KCkgY29uc3QgeyByZXR1cm4gbV9kZWx0YVo7IH0KICAgICBpbnQzMl90IGNsaWNrQ291bnQoKSBj b25zdCB7IHJldHVybiBtX2NsaWNrQ291bnQ7IH0KKyNpZiBQTEFURk9STShXSU4pCisgICAgYm9v bCBkaWRBY3RpdmF0ZVdlYlZpZXcoKSBjb25zdCB7IHJldHVybiBtX2RpZEFjdGl2YXRlV2ViVmll dzsgfQorI2VuZGlmCiAKICAgICB2b2lkIGVuY29kZShDb3JlSVBDOjpBcmd1bWVudEVuY29kZXIq KSBjb25zdDsKICAgICBzdGF0aWMgYm9vbCBkZWNvZGUoQ29yZUlQQzo6QXJndW1lbnREZWNvZGVy KiwgV2ViTW91c2VFdmVudCYpOwpAQCAtMTMyLDYgKzEzOCw5IEBAIHByaXZhdGU6CiAgICAgZmxv YXQgbV9kZWx0YVk7CiAgICAgZmxvYXQgbV9kZWx0YVo7CiAgICAgaW50MzJfdCBtX2NsaWNrQ291 bnQ7CisjaWYgUExBVEZPUk0oV0lOKQorICAgIGJvb2wgbV9kaWRBY3RpdmF0ZVdlYlZpZXc7Cisj ZW5kaWYKIH07CiAKIC8vIEZJWE1FOiBNb3ZlIHRoaXMgY2xhc3MgdG8gaXRzIG93biBoZWFkZXIg ZmlsZS4KSW5kZXg6IFdlYktpdDIvU2hhcmVkL1dlYkV2ZW50Q29udmVyc2lvbi5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0Mi9TaGFyZWQvV2ViRXZlbnRDb252ZXJzaW9uLmNwcAkocmV2aXNpb24g NzUwMDIpCisrKyBXZWJLaXQyL1NoYXJlZC9XZWJFdmVudENvbnZlcnNpb24uY3BwCSh3b3JraW5n IGNvcHkpCkBAIC04Myw2ICs4MywxMCBAQCBwdWJsaWM6CiAgICAgICAgICAgICBtX21vZGlmaWVy RmxhZ3MgfD0gV2ViRXZlbnQ6OkFsdEtleTsKICAgICAgICAgaWYgKG1fbWV0YUtleSkKICAgICAg ICAgICAgIG1fbW9kaWZpZXJGbGFncyB8PSBXZWJFdmVudDo6TWV0YUtleTsKKworI2lmIFBMQVRG T1JNKFdJTikKKyAgICAgICAgbV9kaWRBY3RpdmF0ZVdlYlZpZXcgPSB3ZWJFdmVudC5kaWRBY3Rp dmF0ZVdlYlZpZXcoKTsKKyNlbmRpZgogICAgIH0KIH07CiAKSW5kZXg6IFdlYktpdDIvU2hhcmVk L1dlYk1vdXNlRXZlbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvU2hhcmVkL1dlYk1vdXNl RXZlbnQuY3BwCShyZXZpc2lvbiA3NTAwMikKKysrIFdlYktpdDIvU2hhcmVkL1dlYk1vdXNlRXZl bnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MSwxNSArNDEsMzkgQEAgV2ViTW91c2VFdmVudDo6 V2ViTW91c2VFdmVudChUeXBlIHR5cGUsCiAgICAgLCBtX2RlbHRhWShkZWx0YVkpCiAgICAgLCBt X2RlbHRhWihkZWx0YVopCiAgICAgLCBtX2NsaWNrQ291bnQoY2xpY2tDb3VudCkKKyNpZiBQTEFU Rk9STShXSU4pCisgICAgLCBtX2RpZEFjdGl2YXRlV2ViVmlldyhmYWxzZSkKKyNlbmRpZgogewog ICAgIEFTU0VSVChpc01vdXNlRXZlbnRUeXBlKHR5cGUpKTsKIH0KIAorI2lmIFBMQVRGT1JNKFdJ TikKK1dlYk1vdXNlRXZlbnQ6OldlYk1vdXNlRXZlbnQoVHlwZSB0eXBlLCBCdXR0b24gYnV0dG9u LCBjb25zdCBJbnRQb2ludCYgcG9zaXRpb24sIGNvbnN0IEludFBvaW50JiBnbG9iYWxQb3NpdGlv biwgZmxvYXQgZGVsdGFYLCBmbG9hdCBkZWx0YVksIGZsb2F0IGRlbHRhWiwgaW50IGNsaWNrQ291 bnQsIE1vZGlmaWVycyBtb2RpZmllcnMsIGRvdWJsZSB0aW1lc3RhbXAsIGJvb2wgZGlkQWN0aXZh dGVXZWJWaWV3KQorICAgIDogV2ViRXZlbnQodHlwZSwgbW9kaWZpZXJzLCB0aW1lc3RhbXApCisg ICAgLCBtX2J1dHRvbihidXR0b24pCisgICAgLCBtX3Bvc2l0aW9uKHBvc2l0aW9uKQorICAgICwg bV9nbG9iYWxQb3NpdGlvbihnbG9iYWxQb3NpdGlvbikKKyAgICAsIG1fZGVsdGFYKGRlbHRhWCkK KyAgICAsIG1fZGVsdGFZKGRlbHRhWSkKKyAgICAsIG1fZGVsdGFaKGRlbHRhWikKKyAgICAsIG1f Y2xpY2tDb3VudChjbGlja0NvdW50KQorICAgICwgbV9kaWRBY3RpdmF0ZVdlYlZpZXcoZGlkQWN0 aXZhdGVXZWJWaWV3KQoreworICAgIEFTU0VSVChpc01vdXNlRXZlbnRUeXBlKHR5cGUpKTsKK30K KyNlbmRpZgorCiB2b2lkIFdlYk1vdXNlRXZlbnQ6OmVuY29kZShDb3JlSVBDOjpBcmd1bWVudEVu Y29kZXIqIGVuY29kZXIpIGNvbnN0CiB7CiAgICAgV2ViRXZlbnQ6OmVuY29kZShlbmNvZGVyKTsK IAorI2lmIFBMQVRGT1JNKFdJTikKKyAgICAvLyBJbmNsdWRlIG1fZGlkQWN0aXZhdGVXZWJWaWV3 IG9uIFdpbmRvd3MuCisgICAgZW5jb2Rlci0+ZW5jb2RlKENvcmVJUEM6OkluKG1fYnV0dG9uLCBt X3Bvc2l0aW9uLCBtX2dsb2JhbFBvc2l0aW9uLCBtX2RlbHRhWCwgbV9kZWx0YVksIG1fZGVsdGFa LCBtX2NsaWNrQ291bnQsIG1fZGlkQWN0aXZhdGVXZWJWaWV3KSk7CisjZWxzZQogICAgIGVuY29k ZXItPmVuY29kZShDb3JlSVBDOjpJbihtX2J1dHRvbiwgbV9wb3NpdGlvbiwgbV9nbG9iYWxQb3Np dGlvbiwgbV9kZWx0YVgsIG1fZGVsdGFZLCBtX2RlbHRhWiwgbV9jbGlja0NvdW50KSk7CisjZW5k aWYKIH0KIAogYm9vbCBXZWJNb3VzZUV2ZW50OjpkZWNvZGUoQ29yZUlQQzo6QXJndW1lbnREZWNv ZGVyKiBkZWNvZGVyLCBXZWJNb3VzZUV2ZW50JiB0KQpAQCAtNTcsNyArODEsMTIgQEAgYm9vbCBX ZWJNb3VzZUV2ZW50OjpkZWNvZGUoQ29yZUlQQzo6QXJndQogICAgIGlmICghV2ViRXZlbnQ6OmRl Y29kZShkZWNvZGVyLCB0KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCisjaWYgUExBVEZPUk0o V0lOKQorICAgIC8vIEluY2x1ZGUgbV9kaWRBY3RpdmF0ZVdlYlZpZXcgb24gV2luZG93cy4KKyAg ICByZXR1cm4gZGVjb2Rlci0+ZGVjb2RlKENvcmVJUEM6Ok91dCh0Lm1fYnV0dG9uLCB0Lm1fcG9z aXRpb24sIHQubV9nbG9iYWxQb3NpdGlvbiwgdC5tX2RlbHRhWCwgdC5tX2RlbHRhWSwgdC5tX2Rl bHRhWiwgdC5tX2NsaWNrQ291bnQsIHQubV9kaWRBY3RpdmF0ZVdlYlZpZXcpKTsKKyNlbHNlCiAg ICAgcmV0dXJuIGRlY29kZXItPmRlY29kZShDb3JlSVBDOjpPdXQodC5tX2J1dHRvbiwgdC5tX3Bv c2l0aW9uLCB0Lm1fZ2xvYmFsUG9zaXRpb24sIHQubV9kZWx0YVgsIHQubV9kZWx0YVksIHQubV9k ZWx0YVosIHQubV9jbGlja0NvdW50KSk7CisjZW5kaWYKIH0KIAogYm9vbCBXZWJNb3VzZUV2ZW50 Ojppc01vdXNlRXZlbnRUeXBlKFR5cGUgdHlwZSkKSW5kZXg6IFdlYktpdDIvU2hhcmVkL3dpbi9X ZWJFdmVudEZhY3RvcnkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvU2hhcmVkL3dpbi9XZWJF dmVudEZhY3RvcnkuY3BwCShyZXZpc2lvbiA3NTAwMikKKysrIFdlYktpdDIvU2hhcmVkL3dpbi9X ZWJFdmVudEZhY3RvcnkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMjMsNyArMzIzLDcgQEAgc3Rh dGljIFN0cmluZyBrZXlJZGVudGlmaWVyRnJvbUV2ZW50KFdQQQogICAgIH0KIH0KIAotV2ViTW91 c2VFdmVudCBXZWJFdmVudEZhY3Rvcnk6OmNyZWF0ZVdlYk1vdXNlRXZlbnQoSFdORCBoV25kLCBV SU5UIG1lc3NhZ2UsIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYW0pCitXZWJNb3VzZUV2ZW50 IFdlYkV2ZW50RmFjdG9yeTo6Y3JlYXRlV2ViTW91c2VFdmVudChIV05EIGhXbmQsIFVJTlQgbWVz c2FnZSwgV1BBUkFNIHdQYXJhbSwgTFBBUkFNIGxQYXJhbSwgYm9vbCBkaWRBY3RpdmF0ZVdlYlZp ZXcpCiB7CiAgICAgV2ViRXZlbnQ6OlR5cGUgdHlwZTsKICAgICBXZWJNb3VzZUV2ZW50OjpCdXR0 b24gYnV0dG9uID0gV2ViTW91c2VFdmVudDo6Tm9CdXR0b247CkBAIC0zOTEsNyArMzkxLDcgQEAg V2ViTW91c2VFdmVudCBXZWJFdmVudEZhY3Rvcnk6OmNyZWF0ZVdlYgogICAgIGludCBjbGlja0Nv dW50ID0gV2ViS2l0OjpjbGlja0NvdW50KHR5cGUsIGJ1dHRvbiwgcG9zaXRpb24sIHRpbWVzdGFt cCk7CiAgICAgV2ViRXZlbnQ6Ok1vZGlmaWVycyBtb2RpZmllcnMgPSBtb2RpZmllcnNGb3JFdmVu dCh3UGFyYW0pOwogCi0gICAgcmV0dXJuIFdlYk1vdXNlRXZlbnQodHlwZSwgYnV0dG9uLCBwb3Np dGlvbiwgZ2xvYmFsUG9zaXRpb24sIDAsIDAsIDAsIGNsaWNrQ291bnQsIG1vZGlmaWVycywgdGlt ZXN0YW1wKTsKKyAgICByZXR1cm4gV2ViTW91c2VFdmVudCh0eXBlLCBidXR0b24sIHBvc2l0aW9u LCBnbG9iYWxQb3NpdGlvbiwgMCwgMCwgMCwgY2xpY2tDb3VudCwgbW9kaWZpZXJzLCB0aW1lc3Rh bXAsIGRpZEFjdGl2YXRlV2ViVmlldyk7CiB9CiAKIFdlYldoZWVsRXZlbnQgV2ViRXZlbnRGYWN0 b3J5OjpjcmVhdGVXZWJXaGVlbEV2ZW50KEhXTkQgaFduZCwgVUlOVCBtZXNzYWdlLCBXUEFSQU0g d1BhcmFtLCBMUEFSQU0gbFBhcmFtKQpJbmRleDogV2ViS2l0Mi9TaGFyZWQvd2luL1dlYkV2ZW50 RmFjdG9yeS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvU2hhcmVkL3dpbi9XZWJFdmVudEZhY3Rv cnkuaAkocmV2aXNpb24gNzUwMDIpCisrKyBXZWJLaXQyL1NoYXJlZC93aW4vV2ViRXZlbnRGYWN0 b3J5LmgJKHdvcmtpbmcgY29weSkKQEAgLTM1LDkgKzM1LDkgQEAgbmFtZXNwYWNlIFdlYktpdCB7 CiAKIGNsYXNzIFdlYkV2ZW50RmFjdG9yeSB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFdlYk1vdXNl RXZlbnQgY3JlYXRlV2ViTW91c2VFdmVudChIV05EIGh3bmQsIFVJTlQgbWVzc2FnZSwgV1BBUkFN IHdwYXJhbSwgTFBBUkFNIGxwYXJhbSk7Ci0gICAgc3RhdGljIFdlYldoZWVsRXZlbnQgY3JlYXRl V2ViV2hlZWxFdmVudChIV05EIGh3bmQsIFVJTlQgbWVzc2FnZSwgV1BBUkFNIHdwYXJhbSwgTFBB UkFNIGxwYXJhbSk7Ci0gICAgc3RhdGljIFdlYktleWJvYXJkRXZlbnQgY3JlYXRlV2ViS2V5Ym9h cmRFdmVudChIV05EIGh3bmQsIFVJTlQgbWVzc2FnZSwgV1BBUkFNIHdwYXJhbSwgTFBBUkFNIGxw YXJhbSk7CisgICAgc3RhdGljIFdlYk1vdXNlRXZlbnQgY3JlYXRlV2ViTW91c2VFdmVudChIV05E LCBVSU5UIG1lc3NhZ2UsIFdQQVJBTSwgTFBBUkFNLCBib29sIGRpZEFjdGl2YXRlV2ViVmlldyk7 CisgICAgc3RhdGljIFdlYldoZWVsRXZlbnQgY3JlYXRlV2ViV2hlZWxFdmVudChIV05ELCBVSU5U IG1lc3NhZ2UsIFdQQVJBTSwgTFBBUkFNKTsKKyAgICBzdGF0aWMgV2ViS2V5Ym9hcmRFdmVudCBj cmVhdGVXZWJLZXlib2FyZEV2ZW50KEhXTkQsIFVJTlQgbWVzc2FnZSwgV1BBUkFNLCBMUEFSQU0p OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy93 aW4vV2ViVmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZp ZXcuY3BwCShyZXZpc2lvbiA3NTAwMikKKysrIFdlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE2LDYgKzExNiwxMCBAQCBMUkVTVUxUIFdlYlZpZXc6 OnduZFByb2MoSFdORCBoV25kLCBVSU5UCiAgICAgICAgIGNhc2UgV01fUFJJTlRDTElFTlQ6CiAg ICAgICAgICAgICBsUmVzdWx0ID0gb25QcmludENsaWVudEV2ZW50KGhXbmQsIG1lc3NhZ2UsIHdQ YXJhbSwgbFBhcmFtLCBoYW5kbGVkKTsKICAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNl IFdNX01PVVNFQUNUSVZBVEU6CisgICAgICAgICAgICBzZXRXYXNBY3RpdmF0ZWRCeU1vdXNlRXZl bnQodHJ1ZSk7CisgICAgICAgICAgICBoYW5kbGVkID0gZmFsc2U7CisgICAgICAgICAgICBicmVh azsKICAgICAgICAgY2FzZSBXTV9NT1VTRU1PVkU6CiAgICAgICAgIGNhc2UgV01fTEJVVFRPTkRP V046CiAgICAgICAgIGNhc2UgV01fTUJVVFRPTkRPV046CkBAIC0yMjQsNiArMjI4LDcgQEAgV2Vi Vmlldzo6V2ViVmlldyhSRUNUIHJlY3QsIFdlYkNvbnRleHQqCiAgICAgLCBtX3dlYkNvcmVDdXJz b3IoMCkKICAgICAsIG1fb3ZlcnJpZGVDdXJzb3IoMCkKICAgICAsIG1fdHJhY2tpbmdNb3VzZUxl YXZlKGZhbHNlKQorICAgICwgbV93YXNBY3RpdmF0ZWRCeU1vdXNlRXZlbnQoZmFsc2UpCiAgICAg LCBtX2lzQmVpbmdEZXN0cm95ZWQoZmFsc2UpCiAgICAgLCBtX2luSU1FQ29tcG9zaXRpb24oMCkK IHsKQEAgLTMxNyw2ICszMjIsOSBAQCB2b2lkIFdlYlZpZXc6OndpbmRvd0FuY2VzdHJ5RGlkQ2hh bmdlKCkKIAogTFJFU1VMVCBXZWJWaWV3Ojpvbk1vdXNlRXZlbnQoSFdORCBoV25kLCBVSU5UIG1l c3NhZ2UsIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYW0sIGJvb2wmIGhhbmRsZWQpCiB7Cisg ICAgV2ViTW91c2VFdmVudCBtb3VzZUV2ZW50ID0gV2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWJN b3VzZUV2ZW50KGhXbmQsIG1lc3NhZ2UsIHdQYXJhbSwgbFBhcmFtLCBtX3dhc0FjdGl2YXRlZEJ5 TW91c2VFdmVudCk7CisgICAgc2V0V2FzQWN0aXZhdGVkQnlNb3VzZUV2ZW50KGZhbHNlKTsKKyAg ICAKICAgICBzd2l0Y2ggKG1lc3NhZ2UpIHsKICAgICAgICAgY2FzZSBXTV9MQlVUVE9ORE9XTjoK ICAgICAgICAgY2FzZSBXTV9NQlVUVE9ORE9XTjoKQEAgLTM0Myw3ICszNTEsNiBAQCBMUkVTVUxU IFdlYlZpZXc6Om9uTW91c2VFdmVudChIV05EIGhXbmQsCiAgICAgICAgICAgICBBU1NFUlRfTk9U X1JFQUNIRUQoKTsKICAgICB9CiAKLSAgICBXZWJNb3VzZUV2ZW50IG1vdXNlRXZlbnQgPSBXZWJF dmVudEZhY3Rvcnk6OmNyZWF0ZVdlYk1vdXNlRXZlbnQoaFduZCwgbWVzc2FnZSwgd1BhcmFtLCBs UGFyYW0pOwogICAgIG1fcGFnZS0+aGFuZGxlTW91c2VFdmVudChtb3VzZUV2ZW50KTsKIAogICAg IGhhbmRsZWQgPSB0cnVlOwpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5oCShyZXZpc2lvbiA3 NTAwMikKKysrIFdlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmgJKHdvcmtpbmcgY29weSkK QEAgLTY2LDYgKzY2LDcgQEAgcHJpdmF0ZToKICAgICBzdGF0aWMgTFJFU1VMVCBDQUxMQkFDSyBX ZWJWaWV3V25kUHJvYyhIV05ELCBVSU5ULCBXUEFSQU0sIExQQVJBTSk7CiAgICAgTFJFU1VMVCB3 bmRQcm9jKEhXTkQgaFduZCwgVUlOVCBtZXNzYWdlLCBXUEFSQU0gd1BhcmFtLCBMUEFSQU0gbFBh cmFtKTsKIAorICAgIHZvaWQgc2V0V2FzQWN0aXZhdGVkQnlNb3VzZUV2ZW50KGJvb2wgZmxhZykg eyBtX3dhc0FjdGl2YXRlZEJ5TW91c2VFdmVudCA9IGZsYWc7IH0KICAgICBMUkVTVUxUIG9uTW91 c2VFdmVudChIV05EIGhXbmQsIFVJTlQgbWVzc2FnZSwgV1BBUkFNLCBMUEFSQU0sIGJvb2wmIGhh bmRsZWQpOwogICAgIExSRVNVTFQgb25XaGVlbEV2ZW50KEhXTkQgaFduZCwgVUlOVCBtZXNzYWdl LCBXUEFSQU0sIExQQVJBTSwgYm9vbCYgaGFuZGxlZCk7CiAgICAgTFJFU1VMVCBvbktleUV2ZW50 KEhXTkQgaFduZCwgVUlOVCBtZXNzYWdlLCBXUEFSQU0sIExQQVJBTSwgYm9vbCYgaGFuZGxlZCk7 CkBAIC0xNDUsNiArMTQ2LDcgQEAgcHJpdmF0ZToKICAgICBIQ1VSU09SIG1fd2ViQ29yZUN1cnNv cjsKICAgICBIQ1VSU09SIG1fb3ZlcnJpZGVDdXJzb3I7CiAKKyAgICBib29sIG1fd2FzQWN0aXZh dGVkQnlNb3VzZUV2ZW50OwogICAgIGJvb2wgbV90cmFja2luZ01vdXNlTGVhdmU7CiAgICAgYm9v bCBtX2lzQmVpbmdEZXN0cm95ZWQ7CiAK