118873 2013-07-18 17:21:26 -0700 Use explicit HTMLFrameElementBase cast and introduce toHTMLFrameElementBase 2013-07-19 02:09:22 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kangil.han kangil.han benjamin commit-queue esprehn+autocc glenn kling koivisto rniwa simon.fraser oldest_to_newest 909925 0 kangil.han 2013-07-18 17:21:26 -0700 Use explicit HTMLFrameElementBase cast 909928 1 207039 kangil.han 2013-07-18 17:30:43 -0700 Created attachment 207039 Patch 909936 2 207039 rniwa 2013-07-18 17:59:48 -0700 Comment on attachment 207039 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=207039&action=review > Source/WebCore/ChangeLog:9 > + It should be HTMLFrameElementBase that embraces both HTMLFrameElement and HTMLIFrameElement. > + This also makes correct toFooElement possible. Can we also fix RenderLayer::scrollRectToVisible not to cast the pointer to HTMLFrameElement? 909937 3 rniwa 2013-07-18 18:00:15 -0700 I also think it'll be valuable to add toHTMLFrameElementBase calls in the same patch. 909950 4 207045 kangil.han 2013-07-18 18:32:08 -0700 Created attachment 207045 Patch 909951 5 kangil.han 2013-07-18 18:34:24 -0700 Took Ryosuke's comment into consideration. 909983 6 207045 rniwa 2013-07-18 20:36:53 -0700 Comment on attachment 207045 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=207045&action=review > Source/WebCore/rendering/RenderLayer.cpp:2267 > -static inline bool frameElementAndViewPermitScroll(HTMLFrameElement* frameElement, FrameView* frameView) > +static inline bool frameElementAndViewPermitScroll(HTMLFrameElementBase* frameElementBase, FrameView* frameView) What I meant to say is that we should fix the caller of this function where we're incorrectly casting HTMLIFrameElement to HTMLFrameElement. 909997 7 207045 rniwa 2013-07-18 21:47:23 -0700 Comment on attachment 207045 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=207045&action=review > Source/WebCore/rendering/RenderFrameBase.cpp:76 > - HTMLFrameElementBase* element = static_cast<HTMLFrameElementBase*>(node()); > + HTMLFrameElementBase* element = toHTMLFrameElementBase(node()); > bool isScrollable = element->scrollingMode() != ScrollbarAlwaysOff; It seems like this local variable is used only once. You might as well as do: toHTMLFrameElementBase(node())->scrollingMode() != ScrollbarAlwaysOff instead. 910010 8 207058 kangil.han 2013-07-18 22:21:01 -0700 Created attachment 207058 Patch 910011 9 kangil.han 2013-07-18 22:23:10 -0700 Took Ryosuke's comment into consideration. 910057 10 207058 commit-queue 2013-07-19 02:09:18 -0700 Comment on attachment 207058 Patch Clearing flags on attachment: 207058 Committed r152889: <http://trac.webkit.org/changeset/152889> 910058 11 commit-queue 2013-07-19 02:09:22 -0700 All reviewed patches have been landed. Closing bug. 207039 2013-07-18 17:30:43 -0700 2013-07-18 18:32:01 -0700 Patch bug-118873-20130719093043.patch text/plain 2859 kangil.han U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyODcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2M3ZjRiYmVmNWFlYmYw YmFmNjc1OTA3Y2ZkYzExYWQxMjQwZjY2My4uMjQ2MjEyZWQxOTVmZWMzNDBjYTZhZTBhODU0YTNi ZDAwMDVlYzQ4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTA3LTE4ICBLYW5n aWwgSGFuICA8a2FuZ2lsLmhhbkBzYW1zdW5nLmNvbT4KKworICAgICAgICBVc2UgZXhwbGljaXQg SFRNTEZyYW1lRWxlbWVudEJhc2UgY2FzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTE4ODczCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgSXQgc2hvdWxkIGJlIEhUTUxGcmFtZUVsZW1lbnRCYXNlIHRoYXQg ZW1icmFjZXMgYm90aCBIVE1MRnJhbWVFbGVtZW50IGFuZCBIVE1MSUZyYW1lRWxlbWVudC4KKyAg ICAgICAgVGhpcyBhbHNvIG1ha2VzIGNvcnJlY3QgdG9Gb29FbGVtZW50IHBvc3NpYmxlLgorCisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmZy YW1lRWxlbWVudEFuZFZpZXdQZXJtaXRTY3JvbGwpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy TGF5ZXI6OnNjcm9sbFJlY3RUb1Zpc2libGUpOgorCiAyMDEzLTA3LTE4ICBBbGV4IENocmlzdGVu c2VuICA8YWNocmlzdGVuc2VuQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXhlZCBjb21waWxlIGVy cm9ycyBmb3Igbm9uLUNhaXJvIHBsYXRmb3JtcyB1c2luZyBFR0wuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyLmNwcAppbmRleCA2YzkyZDc4ZTBkZGJmODg2MzQ4NzRhMTBmYmUz ZGU0OWE5N2U5OWNlLi4zNzY0YWM0ZTUzZmM5OWJmZDQxNmRiODQ1NGRjYzJjZGQ2MjJhYmJhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTIyNjQsMTAgKzIy NjQsMTAgQEAgdm9pZCBSZW5kZXJMYXllcjo6c2Nyb2xsVG8oaW50IHgsIGludCB5KQogICAgICAg ICBmcmFtZS0+bG9hZGVyKCktPmNsaWVudCgpLT5kaWRDaGFuZ2VTY3JvbGxPZmZzZXQoKTsgCiB9 CiAKLXN0YXRpYyBpbmxpbmUgYm9vbCBmcmFtZUVsZW1lbnRBbmRWaWV3UGVybWl0U2Nyb2xsKEhU TUxGcmFtZUVsZW1lbnQqIGZyYW1lRWxlbWVudCwgRnJhbWVWaWV3KiBmcmFtZVZpZXcpIAorc3Rh dGljIGlubGluZSBib29sIGZyYW1lRWxlbWVudEFuZFZpZXdQZXJtaXRTY3JvbGwoSFRNTEZyYW1l RWxlbWVudEJhc2UqIGZyYW1lRWxlbWVudEJhc2UsIEZyYW1lVmlldyogZnJhbWVWaWV3KSAKIHsK ICAgICAvLyBJZiBzY3JvbGxiYXJzIGFyZW4ndCBleHBsaWNpdGx5IGZvcmJpZGRlbiwgcGVybWl0 IHNjcm9sbGluZy4KLSAgICBpZiAoZnJhbWVFbGVtZW50ICYmIGZyYW1lRWxlbWVudC0+c2Nyb2xs aW5nTW9kZSgpICE9IFNjcm9sbGJhckFsd2F5c09mZikKKyAgICBpZiAoZnJhbWVFbGVtZW50QmFz ZSAmJiBmcmFtZUVsZW1lbnRCYXNlLT5zY3JvbGxpbmdNb2RlKCkgIT0gU2Nyb2xsYmFyQWx3YXlz T2ZmKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgIC8vIElmIHNjcm9sbGJhcnMgYXJlIGZv cmJpZGRlbiwgdXNlciBpbml0aWF0ZWQgc2Nyb2xscyBzaG91bGQgb2J2aW91c2x5IGJlIGlnbm9y ZWQuCkBAIC0yMzIwLDEyICsyMzIwLDEyIEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnNjcm9sbFJlY3RU b1Zpc2libGUoY29uc3QgTGF5b3V0UmVjdCYgcmVjdCwgY29uc3QgU2Nyb2xsQWxpZ25tCiAgICAg ICAgICAgICAgICAgb3duZXJFbGVtZW50ID0gcmVuZGVyZXIoKS0+ZG9jdW1lbnQoKS0+b3duZXJF bGVtZW50KCk7CiAKICAgICAgICAgICAgIGlmIChvd25lckVsZW1lbnQgJiYgb3duZXJFbGVtZW50 LT5yZW5kZXJlcigpKSB7Ci0gICAgICAgICAgICAgICAgSFRNTEZyYW1lRWxlbWVudCogZnJhbWVF bGVtZW50ID0gMDsKKyAgICAgICAgICAgICAgICBIVE1MRnJhbWVFbGVtZW50QmFzZSogZnJhbWVF bGVtZW50QmFzZSA9IDA7CiAKICAgICAgICAgICAgICAgICBpZiAob3duZXJFbGVtZW50LT5oYXNU YWdOYW1lKGZyYW1lVGFnKSB8fCBvd25lckVsZW1lbnQtPmhhc1RhZ05hbWUoaWZyYW1lVGFnKSkK LSAgICAgICAgICAgICAgICAgICAgZnJhbWVFbGVtZW50ID0gc3RhdGljX2Nhc3Q8SFRNTEZyYW1l RWxlbWVudCo+KG93bmVyRWxlbWVudCk7CisgICAgICAgICAgICAgICAgICAgIGZyYW1lRWxlbWVu dEJhc2UgPSBzdGF0aWNfY2FzdDxIVE1MRnJhbWVFbGVtZW50QmFzZSo+KG93bmVyRWxlbWVudCk7 CiAKLSAgICAgICAgICAgICAgICBpZiAoZnJhbWVFbGVtZW50QW5kVmlld1Blcm1pdFNjcm9sbChm cmFtZUVsZW1lbnQsIGZyYW1lVmlldykpIHsKKyAgICAgICAgICAgICAgICBpZiAoZnJhbWVFbGVt ZW50QW5kVmlld1Blcm1pdFNjcm9sbChmcmFtZUVsZW1lbnRCYXNlLCBmcmFtZVZpZXcpKSB7CiAg ICAgICAgICAgICAgICAgICAgIExheW91dFJlY3Qgdmlld1JlY3QgPSBmcmFtZVZpZXctPnZpc2li bGVDb250ZW50UmVjdCgpOwogICAgICAgICAgICAgICAgICAgICBMYXlvdXRSZWN0IGV4cG9zZVJl Y3QgPSBnZXRSZWN0VG9FeHBvc2Uodmlld1JlY3QsIHZpZXdSZWN0LCByZWN0LCBhbGlnblgsIGFs aWduWSk7CiAK 207045 2013-07-18 18:32:08 -0700 2013-07-18 22:20:54 -0700 Patch bug-118873-20130719103211.patch text/plain 9718 kangil.han U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyODcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2M3ZjRiYmVmNWFlYmYw YmFmNjc1OTA3Y2ZkYzExYWQxMjQwZjY2My4uNzZhYzM4MDIwOTYzNGE2YjgyYThmNzRkYTdmMDli NjE2YjZkNTEzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEzLTA3LTE4ICBLYW5n aWwgSGFuICA8a2FuZ2lsLmhhbkBzYW1zdW5nLmNvbT4KKworICAgICAgICBVc2UgZXhwbGljaXQg SFRNTEZyYW1lRWxlbWVudEJhc2UgY2FzdCBhbmQgaW50cm9kdWNlIHRvSFRNTEZyYW1lRWxlbWVu dEJhc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEx ODg3MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEl0 IHNob3VsZCBiZSBIVE1MRnJhbWVFbGVtZW50QmFzZSB0aGF0IGVtYnJhY2VzIGJvdGggSFRNTEZy YW1lRWxlbWVudCBhbmQgSFRNTElGcmFtZUVsZW1lbnQuCisgICAgICAgIFRoaXMgYWxzbyBtYWtl cyBjb3JyZWN0IHRvRm9vRWxlbWVudCBwb3NzaWJsZS4KKyAgICAgICAgTmV4dCwgdG8gYXZvaWQg ZGlyZWN0IHVzZSBvZiBzdGF0aWNfY2FzdCwgdGhpcyBwYXRjaCBpbnRyb2R1Y2VzIHRvSFRNTEZy YW1lRWxlbWVudEJhc2UgZm9yIGNvZGUgY2xlYW51cC4KKworICAgICAgICAqIGVkaXRpbmcvRnJh bWVTZWxlY3Rpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2NhbkZvckZvcm0pOgorICAgICAg ICAqIGh0bWwvSFRNTEJvZHlFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxCb2R5 RWxlbWVudDo6ZGlkTm90aWZ5U3VidHJlZUluc2VydGlvbnMpOgorICAgICAgICAqIGh0bWwvSFRN TEZyYW1lRWxlbWVudEJhc2UuaDoKKyAgICAgICAgKFdlYkNvcmU6OnRvSFRNTEZyYW1lRWxlbWVu dEJhc2UpOgorICAgICAgICAqIGxvYWRlci9TdWJmcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpTdWJmcmFtZUxvYWRlcjo6bG9hZFN1YmZyYW1lKToKKyAgICAgICAgKiBwYWdlL0V2 ZW50SGFuZGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjp0YXJnZXRJc0ZyYW1lKToKKyAgICAg ICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6Omlu aXQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGcmFtZUJhc2UuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyRnJhbWVCYXNlOjpsYXlvdXRXaXRoRmxhdHRlbmluZyk6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmZyYW1lRWxl bWVudEFuZFZpZXdQZXJtaXRTY3JvbGwpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6 OnNjcm9sbFJlY3RUb1Zpc2libGUpOgorCiAyMDEzLTA3LTE4ICBBbGV4IENocmlzdGVuc2VuICA8 YWNocmlzdGVuc2VuQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXhlZCBjb21waWxlIGVycm9ycyBm b3Igbm9uLUNhaXJvIHBsYXRmb3JtcyB1c2luZyBFR0wuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcv RnJhbWVTZWxlY3Rpb24uY3BwCmluZGV4IDczYzI4OTgyY2RmYmM5YzcwMDI5ZTNjZTkxNWYzYmI4 ZTQyZjZhOTcuLjFjZDkzYzA1Yjc1YmFmMGNjMTBmMmE3YmIwMjI5YWFhOTMwYmRiYjIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwCkBAIC0xOTc0LDExICsxOTc0 LDkgQEAgc3RhdGljIEhUTUxGb3JtRWxlbWVudCogc2NhbkZvckZvcm0oTm9kZSogc3RhcnQpCiAg ICAgICAgICAgICByZXR1cm4gdG9IVE1MRm9ybUVsZW1lbnQoZWxlbWVudCk7CiAgICAgICAgIGlm IChlbGVtZW50LT5pc0hUTUxFbGVtZW50KCkgJiYgdG9IVE1MRWxlbWVudChlbGVtZW50KS0+aXNG b3JtQ29udHJvbEVsZW1lbnQoKSkKICAgICAgICAgICAgIHJldHVybiBzdGF0aWNfY2FzdDxIVE1M Rm9ybUNvbnRyb2xFbGVtZW50Kj4oZWxlbWVudCktPmZvcm0oKTsKLSAgICAgICAgaWYgKGVsZW1l bnQtPmhhc1RhZ05hbWUoZnJhbWVUYWcpIHx8IGVsZW1lbnQtPmhhc1RhZ05hbWUoaWZyYW1lVGFn KSkgewotICAgICAgICAgICAgTm9kZSogY2hpbGREb2N1bWVudCA9IHN0YXRpY19jYXN0PEhUTUxG cmFtZUVsZW1lbnRCYXNlKj4oZWxlbWVudCktPmNvbnRlbnREb2N1bWVudCgpOwotICAgICAgICAg ICAgaWYgKEhUTUxGb3JtRWxlbWVudCogZnJhbWVSZXN1bHQgPSBzY2FuRm9yRm9ybShjaGlsZERv Y3VtZW50KSkKKyAgICAgICAgaWYgKGVsZW1lbnQtPmhhc1RhZ05hbWUoZnJhbWVUYWcpIHx8IGVs ZW1lbnQtPmhhc1RhZ05hbWUoaWZyYW1lVGFnKSkKKyAgICAgICAgICAgIGlmIChIVE1MRm9ybUVs ZW1lbnQqIGZyYW1lUmVzdWx0ID0gc2NhbkZvckZvcm0odG9IVE1MRnJhbWVFbGVtZW50QmFzZShl bGVtZW50KS0+Y29udGVudERvY3VtZW50KCkpKQogICAgICAgICAgICAgICAgIHJldHVybiBmcmFt ZVJlc3VsdDsKLSAgICAgICAgfQogICAgIH0KICAgICByZXR1cm4gMDsKIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEJvZHlFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTEJvZHlFbGVtZW50LmNwcAppbmRleCA0N2VkNjRkMGY2NGJjYTRiODBmODExYjBj YTM3MjM1MTYzMzdhYjEwLi5mYmU2NDg0ZjdlOTdmODliMWFiOTBkNDA0NGQ5MjUwODkwYzRlZDI0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxCb2R5RWxlbWVudC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQm9keUVsZW1lbnQuY3BwCkBAIC0xNzIsNyArMTcy LDcgQEAgdm9pZCBIVE1MQm9keUVsZW1lbnQ6OmRpZE5vdGlmeVN1YnRyZWVJbnNlcnRpb25zKENv bnRhaW5lck5vZGUqIGluc2VydGlvblBvaW50KQogICAgIC8vIEZJWE1FOiBQZXJoYXBzIHRoaXMg Y29kZSBzaG91bGQgYmUgaW4gYXR0YWNoKCkgaW5zdGVhZCBvZiBoZXJlLgogICAgIEVsZW1lbnQq IG93bmVyRWxlbWVudCA9IGRvY3VtZW50KCktPm93bmVyRWxlbWVudCgpOwogICAgIGlmIChvd25l ckVsZW1lbnQgJiYgKG93bmVyRWxlbWVudC0+aGFzVGFnTmFtZShmcmFtZVRhZykgfHwgb3duZXJF bGVtZW50LT5oYXNUYWdOYW1lKGlmcmFtZVRhZykpKSB7Ci0gICAgICAgIEhUTUxGcmFtZUVsZW1l bnRCYXNlKiBvd25lckZyYW1lRWxlbWVudCA9IHN0YXRpY19jYXN0PEhUTUxGcmFtZUVsZW1lbnRC YXNlKj4ob3duZXJFbGVtZW50KTsKKyAgICAgICAgSFRNTEZyYW1lRWxlbWVudEJhc2UqIG93bmVy RnJhbWVFbGVtZW50ID0gdG9IVE1MRnJhbWVFbGVtZW50QmFzZShvd25lckVsZW1lbnQpOwogICAg ICAgICBpbnQgbWFyZ2luV2lkdGggPSBvd25lckZyYW1lRWxlbWVudC0+bWFyZ2luV2lkdGgoKTsK ICAgICAgICAgaWYgKG1hcmdpbldpZHRoICE9IC0xKQogICAgICAgICAgICAgc2V0QXR0cmlidXRl KG1hcmdpbndpZHRoQXR0ciwgU3RyaW5nOjpudW1iZXIobWFyZ2luV2lkdGgpKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEZyYW1lRWxlbWVudEJhc2UuaCBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTEZyYW1lRWxlbWVudEJhc2UuaAppbmRleCAxYzViMDNhNGU1ODQ3ZDA4 MTVkMjZhZWU5M2VhYWVhZTU4ODIwMWM3Li5jMDk0ZjEyMTAxMmIyN2M4YjA0YjBlZmFjZWY3Njg2 MjBhODBiNWRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxGcmFtZUVsZW1l bnRCYXNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRnJhbWVFbGVtZW50QmFzZS5o CkBAIC04MSw2ICs4MSwxMiBAQCBwcml2YXRlOgogICAgIGJvb2wgbV92aWV3U291cmNlOwogfTsK IAoraW5saW5lIEhUTUxGcmFtZUVsZW1lbnRCYXNlKiB0b0hUTUxGcmFtZUVsZW1lbnRCYXNlKE5v ZGUqIG5vZGUpCit7CisgICAgQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oIW5vZGUg fHwgbm9kZS0+aGFzVGFnTmFtZShIVE1MTmFtZXM6OmZyYW1lVGFnKSB8fCBub2RlLT5oYXNUYWdO YW1lKEhUTUxOYW1lczo6aWZyYW1lVGFnKSk7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PEhUTUxG cmFtZUVsZW1lbnRCYXNlKj4obm9kZSk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAog I2VuZGlmIC8vIEhUTUxGcmFtZUVsZW1lbnRCYXNlX2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9TdWJmcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3Vi ZnJhbWVMb2FkZXIuY3BwCmluZGV4IGY2ODJkMzdjNWVkYmNiMjhkM2UzNTJlMTZhZTk0NjNjNTkw YmRmNjAuLmI5MGVjY2E3OWIwYjA5MzU4NzZhMzc4NzljZGIzMDI5ZWY1ZTc3OTIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJmcmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbG9hZGVyL1N1YmZyYW1lTG9hZGVyLmNwcApAQCAtMzUzLDEwICszNTMsMTAgQEAg RnJhbWUqIFN1YmZyYW1lTG9hZGVyOjpsb2FkU3ViZnJhbWUoSFRNTEZyYW1lT3duZXJFbGVtZW50 KiBvd25lckVsZW1lbnQsIGNvbnN0IEsKICAgICBpbnQgbWFyZ2luV2lkdGggPSAtMTsKICAgICBp bnQgbWFyZ2luSGVpZ2h0ID0gLTE7CiAgICAgaWYgKG93bmVyRWxlbWVudC0+aGFzVGFnTmFtZShm cmFtZVRhZykgfHwgb3duZXJFbGVtZW50LT5oYXNUYWdOYW1lKGlmcmFtZVRhZykpIHsKLSAgICAg ICAgSFRNTEZyYW1lRWxlbWVudEJhc2UqIG8gPSBzdGF0aWNfY2FzdDxIVE1MRnJhbWVFbGVtZW50 QmFzZSo+KG93bmVyRWxlbWVudCk7Ci0gICAgICAgIGFsbG93c1Njcm9sbGluZyA9IG8tPnNjcm9s bGluZ01vZGUoKSAhPSBTY3JvbGxiYXJBbHdheXNPZmY7Ci0gICAgICAgIG1hcmdpbldpZHRoID0g by0+bWFyZ2luV2lkdGgoKTsKLSAgICAgICAgbWFyZ2luSGVpZ2h0ID0gby0+bWFyZ2luSGVpZ2h0 KCk7CisgICAgICAgIEhUTUxGcmFtZUVsZW1lbnRCYXNlKiBmcmFtZUVsZW1lbnRCYXNlID0gdG9I VE1MRnJhbWVFbGVtZW50QmFzZShvd25lckVsZW1lbnQpOworICAgICAgICBhbGxvd3NTY3JvbGxp bmcgPSBmcmFtZUVsZW1lbnRCYXNlLT5zY3JvbGxpbmdNb2RlKCkgIT0gU2Nyb2xsYmFyQWx3YXlz T2ZmOworICAgICAgICBtYXJnaW5XaWR0aCA9IGZyYW1lRWxlbWVudEJhc2UtPm1hcmdpbldpZHRo KCk7CisgICAgICAgIG1hcmdpbkhlaWdodCA9IGZyYW1lRWxlbWVudEJhc2UtPm1hcmdpbkhlaWdo dCgpOwogICAgIH0KIAogICAgIGlmICghb3duZXJFbGVtZW50LT5kb2N1bWVudCgpLT5zZWN1cml0 eU9yaWdpbigpLT5jYW5EaXNwbGF5KHVybCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRXZlbnRIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVy LmNwcAppbmRleCA4ZGUyNTBlNzBjZDg3MjlkZWYzNTgyMzNmYWVkYmViZDdlOTEwMjRkLi5lZTQ1 ODNlYjMwNTM5N2ViYmZmZTA4MGM4ZWMzMDY4MjY4MGZhNDExIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9F dmVudEhhbmRsZXIuY3BwCkBAIC0yMDAzLDcgKzIwMDMsNyBAQCBzdGF0aWMgYm9vbCB0YXJnZXRJ c0ZyYW1lKE5vZGUqIHRhcmdldCwgRnJhbWUqJiBmcmFtZSkKICAgICBpZiAoIXRhcmdldC0+aGFz VGFnTmFtZShmcmFtZVRhZykgJiYgIXRhcmdldC0+aGFzVGFnTmFtZShpZnJhbWVUYWcpKQogICAg ICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBmcmFtZSA9IHN0YXRpY19jYXN0PEhUTUxGcmFtZUVs ZW1lbnRCYXNlKj4odGFyZ2V0KS0+Y29udGVudEZyYW1lKCk7CisgICAgZnJhbWUgPSB0b0hUTUxG cmFtZUVsZW1lbnRCYXNlKHRhcmdldCktPmNvbnRlbnRGcmFtZSgpOwogCiAgICAgcmV0dXJuIHRy dWU7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXggNzBiMjkzMDkxODk3YTc3MTgy MTY2YTYzMDAwMzY0MWY5MzBlYzE2ZC4uYjdlMTE3YThjZmVmMGQ4MGJmOTM2ZmI3Y2YyOGJkNDhi YzMwNzA1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtMzQ3LDcgKzM0Nyw3IEBA IHZvaWQgRnJhbWVWaWV3Ojppbml0KCkKICAgICAvLyBQcm9wYWdhdGUgdGhlIG1hcmdpbndpZHRo L2hlaWdodCBhbmQgc2Nyb2xsaW5nIG1vZGVzIHRvIHRoZSB2aWV3LgogICAgIEVsZW1lbnQqIG93 bmVyRWxlbWVudCA9IG1fZnJhbWUgPyBtX2ZyYW1lLT5vd25lckVsZW1lbnQoKSA6IDA7CiAgICAg aWYgKG93bmVyRWxlbWVudCAmJiAob3duZXJFbGVtZW50LT5oYXNUYWdOYW1lKGZyYW1lVGFnKSB8 fCBvd25lckVsZW1lbnQtPmhhc1RhZ05hbWUoaWZyYW1lVGFnKSkpIHsKLSAgICAgICAgSFRNTEZy YW1lRWxlbWVudEJhc2UqIGZyYW1lRWx0ID0gc3RhdGljX2Nhc3Q8SFRNTEZyYW1lRWxlbWVudEJh c2UqPihvd25lckVsZW1lbnQpOworICAgICAgICBIVE1MRnJhbWVFbGVtZW50QmFzZSogZnJhbWVF bHQgPSB0b0hUTUxGcmFtZUVsZW1lbnRCYXNlKG93bmVyRWxlbWVudCk7CiAgICAgICAgIGlmIChm cmFtZUVsdC0+c2Nyb2xsaW5nTW9kZSgpID09IFNjcm9sbGJhckFsd2F5c09mZikKICAgICAgICAg ICAgIHNldENhbkhhdmVTY3JvbGxiYXJzKGZhbHNlKTsKICAgICAgICAgTGF5b3V0VW5pdCBtYXJn aW5XaWR0aCA9IGZyYW1lRWx0LT5tYXJnaW5XaWR0aCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckZyYW1lQmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyRnJhbWVCYXNlLmNwcAppbmRleCBmMmJlOWY2NDdhMjMzZmM3MDcyZGFmMzM1 NTc3ODBlM2ZkMTE5MjlhLi4zMDU0NWY1NmYxNjNiZDdkMjYxMWZkNzgwMzIzNWI5YTI2Y2Y5MTA4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRnJhbWVCYXNlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRnJhbWVCYXNlLmNwcApAQCAt NzIsNyArNzIsNyBAQCB2b2lkIFJlbmRlckZyYW1lQmFzZTo6bGF5b3V0V2l0aEZsYXR0ZW5pbmco Ym9vbCBoYXNGaXhlZFdpZHRoLCBib29sIGhhc0ZpeGVkSGVpZwogICAgIC8vIHdlIG9iZXkgdGhl bSBhbmQgZG8gbm90IGV4cGFuZC4gV2l0aCBmcmFtZSBmbGF0dGVuaW5nCiAgICAgLy8gbm8gc3Vi ZnJhbWUgbXVjaCBldmVyIGJlY29tZSBzY3JvbGxhYmxlLgogCi0gICAgSFRNTEZyYW1lRWxlbWVu dEJhc2UqIGVsZW1lbnQgPSBzdGF0aWNfY2FzdDxIVE1MRnJhbWVFbGVtZW50QmFzZSo+KG5vZGUo KSk7CisgICAgSFRNTEZyYW1lRWxlbWVudEJhc2UqIGVsZW1lbnQgPSB0b0hUTUxGcmFtZUVsZW1l bnRCYXNlKG5vZGUoKSk7CiAgICAgYm9vbCBpc1Njcm9sbGFibGUgPSBlbGVtZW50LT5zY3JvbGxp bmdNb2RlKCkgIT0gU2Nyb2xsYmFyQWx3YXlzT2ZmOwogCiAgICAgLy8gY29uc2lkZXIgaWZyYW1l IGluc2V0IGJvcmRlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5k ZXggNmM5MmQ3OGUwZGRiZjg4NjM0ODc0YTEwZmJlM2RlNDlhOTdlOTljZS4uMmFhMmJkYzYzZDI4 NjVjNTc2OGI1NDU5MjY0YTBkMmFiNmE0M2UxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXIuY3BwCkBAIC0yMjY0LDEwICsyMjY0LDEwIEBAIHZvaWQgUmVuZGVyTGF5ZXI6 OnNjcm9sbFRvKGludCB4LCBpbnQgeSkKICAgICAgICAgZnJhbWUtPmxvYWRlcigpLT5jbGllbnQo KS0+ZGlkQ2hhbmdlU2Nyb2xsT2Zmc2V0KCk7IAogfQogCi1zdGF0aWMgaW5saW5lIGJvb2wgZnJh bWVFbGVtZW50QW5kVmlld1Blcm1pdFNjcm9sbChIVE1MRnJhbWVFbGVtZW50KiBmcmFtZUVsZW1l bnQsIEZyYW1lVmlldyogZnJhbWVWaWV3KSAKK3N0YXRpYyBpbmxpbmUgYm9vbCBmcmFtZUVsZW1l bnRBbmRWaWV3UGVybWl0U2Nyb2xsKEhUTUxGcmFtZUVsZW1lbnRCYXNlKiBmcmFtZUVsZW1lbnRC YXNlLCBGcmFtZVZpZXcqIGZyYW1lVmlldykgCiB7CiAgICAgLy8gSWYgc2Nyb2xsYmFycyBhcmVu J3QgZXhwbGljaXRseSBmb3JiaWRkZW4sIHBlcm1pdCBzY3JvbGxpbmcuCi0gICAgaWYgKGZyYW1l RWxlbWVudCAmJiBmcmFtZUVsZW1lbnQtPnNjcm9sbGluZ01vZGUoKSAhPSBTY3JvbGxiYXJBbHdh eXNPZmYpCisgICAgaWYgKGZyYW1lRWxlbWVudEJhc2UgJiYgZnJhbWVFbGVtZW50QmFzZS0+c2Ny b2xsaW5nTW9kZSgpICE9IFNjcm9sbGJhckFsd2F5c09mZikKICAgICAgICAgcmV0dXJuIHRydWU7 CiAKICAgICAvLyBJZiBzY3JvbGxiYXJzIGFyZSBmb3JiaWRkZW4sIHVzZXIgaW5pdGlhdGVkIHNj cm9sbHMgc2hvdWxkIG9idmlvdXNseSBiZSBpZ25vcmVkLgpAQCAtMjMyMCwxMiArMjMyMCwxMiBA QCB2b2lkIFJlbmRlckxheWVyOjpzY3JvbGxSZWN0VG9WaXNpYmxlKGNvbnN0IExheW91dFJlY3Qm IHJlY3QsIGNvbnN0IFNjcm9sbEFsaWdubQogICAgICAgICAgICAgICAgIG93bmVyRWxlbWVudCA9 IHJlbmRlcmVyKCktPmRvY3VtZW50KCktPm93bmVyRWxlbWVudCgpOwogCiAgICAgICAgICAgICBp ZiAob3duZXJFbGVtZW50ICYmIG93bmVyRWxlbWVudC0+cmVuZGVyZXIoKSkgewotICAgICAgICAg ICAgICAgIEhUTUxGcmFtZUVsZW1lbnQqIGZyYW1lRWxlbWVudCA9IDA7CisgICAgICAgICAgICAg ICAgSFRNTEZyYW1lRWxlbWVudEJhc2UqIGZyYW1lRWxlbWVudEJhc2UgPSAwOwogCiAgICAgICAg ICAgICAgICAgaWYgKG93bmVyRWxlbWVudC0+aGFzVGFnTmFtZShmcmFtZVRhZykgfHwgb3duZXJF bGVtZW50LT5oYXNUYWdOYW1lKGlmcmFtZVRhZykpCi0gICAgICAgICAgICAgICAgICAgIGZyYW1l RWxlbWVudCA9IHN0YXRpY19jYXN0PEhUTUxGcmFtZUVsZW1lbnQqPihvd25lckVsZW1lbnQpOwor ICAgICAgICAgICAgICAgICAgICBmcmFtZUVsZW1lbnRCYXNlID0gdG9IVE1MRnJhbWVFbGVtZW50 QmFzZShvd25lckVsZW1lbnQpOwogCi0gICAgICAgICAgICAgICAgaWYgKGZyYW1lRWxlbWVudEFu ZFZpZXdQZXJtaXRTY3JvbGwoZnJhbWVFbGVtZW50LCBmcmFtZVZpZXcpKSB7CisgICAgICAgICAg ICAgICAgaWYgKGZyYW1lRWxlbWVudEFuZFZpZXdQZXJtaXRTY3JvbGwoZnJhbWVFbGVtZW50QmFz ZSwgZnJhbWVWaWV3KSkgewogICAgICAgICAgICAgICAgICAgICBMYXlvdXRSZWN0IHZpZXdSZWN0 ID0gZnJhbWVWaWV3LT52aXNpYmxlQ29udGVudFJlY3QoKTsKICAgICAgICAgICAgICAgICAgICAg TGF5b3V0UmVjdCBleHBvc2VSZWN0ID0gZ2V0UmVjdFRvRXhwb3NlKHZpZXdSZWN0LCB2aWV3UmVj dCwgcmVjdCwgYWxpZ25YLCBhbGlnblkpOwogCg== 207058 2013-07-18 22:21:01 -0700 2013-07-19 02:09:18 -0700 Patch bug-118873-20130719142104.patch text/plain 9798 kangil.han U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyODg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmI3ZDUzMTA3ODRmYjY1 YmEwMDVmM2U0Y2Q3YTRhMmQ4OGY2YTViNS4uZjFjMDQyNTRlMWQ4YTBhOWZiZjQxNGE2MWZlZGI0 NmUyNGVjOGNmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEzLTA3LTE4ICBLYW5n aWwgSGFuICA8a2FuZ2lsLmhhbkBzYW1zdW5nLmNvbT4KKworICAgICAgICBVc2UgZXhwbGljaXQg SFRNTEZyYW1lRWxlbWVudEJhc2UgY2FzdCBhbmQgaW50cm9kdWNlIHRvSFRNTEZyYW1lRWxlbWVu dEJhc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEx ODg3MworCisgICAgICAgIFJldmlld2VkIGJ5IFJ5b3N1a2UgTml3YS4KKworICAgICAgICBJdCBz aG91bGQgYmUgSFRNTEZyYW1lRWxlbWVudEJhc2UgdGhhdCBlbWJyYWNlcyBib3RoIEhUTUxGcmFt ZUVsZW1lbnQgYW5kIEhUTUxJRnJhbWVFbGVtZW50LgorICAgICAgICBUaGlzIGFsc28gbWFrZXMg Y29ycmVjdCB0b0Zvb0VsZW1lbnQgcG9zc2libGUuCisgICAgICAgIE5leHQsIHRvIGF2b2lkIGRp cmVjdCB1c2Ugb2Ygc3RhdGljX2Nhc3QsIHRoaXMgcGF0Y2ggaW50cm9kdWNlcyB0b0hUTUxGcmFt ZUVsZW1lbnRCYXNlIGZvciBjb2RlIGNsZWFudXAuCisKKyAgICAgICAgKiBlZGl0aW5nL0ZyYW1l U2VsZWN0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnNjYW5Gb3JGb3JtKToKKyAgICAgICAg KiBodG1sL0hUTUxCb2R5RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MQm9keUVs ZW1lbnQ6OmRpZE5vdGlmeVN1YnRyZWVJbnNlcnRpb25zKToKKyAgICAgICAgKiBodG1sL0hUTUxG cmFtZUVsZW1lbnRCYXNlLmg6CisgICAgICAgIChXZWJDb3JlOjp0b0hUTUxGcmFtZUVsZW1lbnRC YXNlKToKKyAgICAgICAgKiBsb2FkZXIvU3ViZnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6U3ViZnJhbWVMb2FkZXI6OmxvYWRTdWJmcmFtZSk6CisgICAgICAgICogcGFnZS9FdmVu dEhhbmRsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6dGFyZ2V0SXNGcmFtZSk6CisgICAgICAg ICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojppbml0 KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRnJhbWVCYXNlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckZyYW1lQmFzZTo6bGF5b3V0V2l0aEZsYXR0ZW5pbmcpOgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpmcmFtZUVsZW1l bnRBbmRWaWV3UGVybWl0U2Nyb2xsKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpz Y3JvbGxSZWN0VG9WaXNpYmxlKToKKwogMjAxMy0wNy0xOCAgS3dhbmcgWXVsIFNlbyAgPHNreXVs QGNvbXBhbnkxMDAubmV0PgogCiAgICAgICAgIFdvcmtlckdsb2JhbFNjb3BlIHNob3VsZCBzdXBw b3J0IG9ub2ZmbGluZS9vbm9ubGluZSBldmVudCBoYW5kbGVycwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL0ZyYW1lU2VsZWN0aW9uLmNwcAppbmRleCA3M2MyODk4MmNkZmJjOWM3MDAyOWUzY2U5MTVm M2JiOGU0MmY2YTk3Li4xY2Q5M2MwNWI3NWJhZjBjYzEwZjJhN2JiMDIyOWFhYTkzMGJkYmIyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmNwcApAQCAtMTk3NCwxMSAr MTk3NCw5IEBAIHN0YXRpYyBIVE1MRm9ybUVsZW1lbnQqIHNjYW5Gb3JGb3JtKE5vZGUqIHN0YXJ0 KQogICAgICAgICAgICAgcmV0dXJuIHRvSFRNTEZvcm1FbGVtZW50KGVsZW1lbnQpOwogICAgICAg ICBpZiAoZWxlbWVudC0+aXNIVE1MRWxlbWVudCgpICYmIHRvSFRNTEVsZW1lbnQoZWxlbWVudCkt PmlzRm9ybUNvbnRyb2xFbGVtZW50KCkpCiAgICAgICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8 SFRNTEZvcm1Db250cm9sRWxlbWVudCo+KGVsZW1lbnQpLT5mb3JtKCk7Ci0gICAgICAgIGlmIChl bGVtZW50LT5oYXNUYWdOYW1lKGZyYW1lVGFnKSB8fCBlbGVtZW50LT5oYXNUYWdOYW1lKGlmcmFt ZVRhZykpIHsKLSAgICAgICAgICAgIE5vZGUqIGNoaWxkRG9jdW1lbnQgPSBzdGF0aWNfY2FzdDxI VE1MRnJhbWVFbGVtZW50QmFzZSo+KGVsZW1lbnQpLT5jb250ZW50RG9jdW1lbnQoKTsKLSAgICAg ICAgICAgIGlmIChIVE1MRm9ybUVsZW1lbnQqIGZyYW1lUmVzdWx0ID0gc2NhbkZvckZvcm0oY2hp bGREb2N1bWVudCkpCisgICAgICAgIGlmIChlbGVtZW50LT5oYXNUYWdOYW1lKGZyYW1lVGFnKSB8 fCBlbGVtZW50LT5oYXNUYWdOYW1lKGlmcmFtZVRhZykpCisgICAgICAgICAgICBpZiAoSFRNTEZv cm1FbGVtZW50KiBmcmFtZVJlc3VsdCA9IHNjYW5Gb3JGb3JtKHRvSFRNTEZyYW1lRWxlbWVudEJh c2UoZWxlbWVudCktPmNvbnRlbnREb2N1bWVudCgpKSkKICAgICAgICAgICAgICAgICByZXR1cm4g ZnJhbWVSZXN1bHQ7Ci0gICAgICAgIH0KICAgICB9CiAgICAgcmV0dXJuIDA7CiB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxCb2R5RWxlbWVudC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxCb2R5RWxlbWVudC5jcHAKaW5kZXggNDdlZDY0ZDBmNjRiY2E0YjgwZjgx MWIwY2EzNzIzNTE2MzM3YWIxMC4uZmJlNjQ4NGY3ZTk3Zjg5YjFhYjkwZDQwNDRkOTI1MDg5MGM0 ZWQyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQm9keUVsZW1lbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEJvZHlFbGVtZW50LmNwcApAQCAtMTcyLDcg KzE3Miw3IEBAIHZvaWQgSFRNTEJvZHlFbGVtZW50OjpkaWROb3RpZnlTdWJ0cmVlSW5zZXJ0aW9u cyhDb250YWluZXJOb2RlKiBpbnNlcnRpb25Qb2ludCkKICAgICAvLyBGSVhNRTogUGVyaGFwcyB0 aGlzIGNvZGUgc2hvdWxkIGJlIGluIGF0dGFjaCgpIGluc3RlYWQgb2YgaGVyZS4KICAgICBFbGVt ZW50KiBvd25lckVsZW1lbnQgPSBkb2N1bWVudCgpLT5vd25lckVsZW1lbnQoKTsKICAgICBpZiAo b3duZXJFbGVtZW50ICYmIChvd25lckVsZW1lbnQtPmhhc1RhZ05hbWUoZnJhbWVUYWcpIHx8IG93 bmVyRWxlbWVudC0+aGFzVGFnTmFtZShpZnJhbWVUYWcpKSkgewotICAgICAgICBIVE1MRnJhbWVF bGVtZW50QmFzZSogb3duZXJGcmFtZUVsZW1lbnQgPSBzdGF0aWNfY2FzdDxIVE1MRnJhbWVFbGVt ZW50QmFzZSo+KG93bmVyRWxlbWVudCk7CisgICAgICAgIEhUTUxGcmFtZUVsZW1lbnRCYXNlKiBv d25lckZyYW1lRWxlbWVudCA9IHRvSFRNTEZyYW1lRWxlbWVudEJhc2Uob3duZXJFbGVtZW50KTsK ICAgICAgICAgaW50IG1hcmdpbldpZHRoID0gb3duZXJGcmFtZUVsZW1lbnQtPm1hcmdpbldpZHRo KCk7CiAgICAgICAgIGlmIChtYXJnaW5XaWR0aCAhPSAtMSkKICAgICAgICAgICAgIHNldEF0dHJp YnV0ZShtYXJnaW53aWR0aEF0dHIsIFN0cmluZzo6bnVtYmVyKG1hcmdpbldpZHRoKSk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxGcmFtZUVsZW1lbnRCYXNlLmggYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxGcmFtZUVsZW1lbnRCYXNlLmgKaW5kZXggMWM1YjAzYTRlNTg0 N2QwODE1ZDI2YWVlOTNlYWFlYWU1ODgyMDFjNy4uYzA5NGYxMjEwMTJiMjdjOGIwNGIwZWZhY2Vm NzY4NjIwYTgwYjVkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRnJhbWVF bGVtZW50QmFzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEZyYW1lRWxlbWVudEJh c2UuaApAQCAtODEsNiArODEsMTIgQEAgcHJpdmF0ZToKICAgICBib29sIG1fdmlld1NvdXJjZTsK IH07CiAKK2lubGluZSBIVE1MRnJhbWVFbGVtZW50QmFzZSogdG9IVE1MRnJhbWVFbGVtZW50QmFz ZShOb2RlKiBub2RlKQoreworICAgIEFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKCFu b2RlIHx8IG5vZGUtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjpmcmFtZVRhZykgfHwgbm9kZS0+aGFz VGFnTmFtZShIVE1MTmFtZXM6OmlmcmFtZVRhZykpOworICAgIHJldHVybiBzdGF0aWNfY2FzdDxI VE1MRnJhbWVFbGVtZW50QmFzZSo+KG5vZGUpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3Jl CiAKICNlbmRpZiAvLyBIVE1MRnJhbWVFbGVtZW50QmFzZV9oCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvU3ViZnJhbWVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L1N1YmZyYW1lTG9hZGVyLmNwcAppbmRleCBmNjgyZDM3YzVlZGJjYjI4ZDNlMzUyZTE2YWU5NDYz YzU5MGJkZjYwLi5iOTBlY2NhNzliMGIwOTM1ODc2YTM3ODc5Y2RiMzAyOWVmNWU3NzkyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3ViZnJhbWVMb2FkZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9TdWJmcmFtZUxvYWRlci5jcHAKQEAgLTM1MywxMCArMzUzLDEw IEBAIEZyYW1lKiBTdWJmcmFtZUxvYWRlcjo6bG9hZFN1YmZyYW1lKEhUTUxGcmFtZU93bmVyRWxl bWVudCogb3duZXJFbGVtZW50LCBjb25zdCBLCiAgICAgaW50IG1hcmdpbldpZHRoID0gLTE7CiAg ICAgaW50IG1hcmdpbkhlaWdodCA9IC0xOwogICAgIGlmIChvd25lckVsZW1lbnQtPmhhc1RhZ05h bWUoZnJhbWVUYWcpIHx8IG93bmVyRWxlbWVudC0+aGFzVGFnTmFtZShpZnJhbWVUYWcpKSB7Ci0g ICAgICAgIEhUTUxGcmFtZUVsZW1lbnRCYXNlKiBvID0gc3RhdGljX2Nhc3Q8SFRNTEZyYW1lRWxl bWVudEJhc2UqPihvd25lckVsZW1lbnQpOwotICAgICAgICBhbGxvd3NTY3JvbGxpbmcgPSBvLT5z Y3JvbGxpbmdNb2RlKCkgIT0gU2Nyb2xsYmFyQWx3YXlzT2ZmOwotICAgICAgICBtYXJnaW5XaWR0 aCA9IG8tPm1hcmdpbldpZHRoKCk7Ci0gICAgICAgIG1hcmdpbkhlaWdodCA9IG8tPm1hcmdpbkhl aWdodCgpOworICAgICAgICBIVE1MRnJhbWVFbGVtZW50QmFzZSogZnJhbWVFbGVtZW50QmFzZSA9 IHRvSFRNTEZyYW1lRWxlbWVudEJhc2Uob3duZXJFbGVtZW50KTsKKyAgICAgICAgYWxsb3dzU2Ny b2xsaW5nID0gZnJhbWVFbGVtZW50QmFzZS0+c2Nyb2xsaW5nTW9kZSgpICE9IFNjcm9sbGJhckFs d2F5c09mZjsKKyAgICAgICAgbWFyZ2luV2lkdGggPSBmcmFtZUVsZW1lbnRCYXNlLT5tYXJnaW5X aWR0aCgpOworICAgICAgICBtYXJnaW5IZWlnaHQgPSBmcmFtZUVsZW1lbnRCYXNlLT5tYXJnaW5I ZWlnaHQoKTsKICAgICB9CiAKICAgICBpZiAoIW93bmVyRWxlbWVudC0+ZG9jdW1lbnQoKS0+c2Vj dXJpdHlPcmlnaW4oKS0+Y2FuRGlzcGxheSh1cmwpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFu ZGxlci5jcHAKaW5kZXggOGRlMjUwZTcwY2Q4NzI5ZGVmMzU4MjMzZmFlZGJlYmQ3ZTkxMDI0ZC4u ZWU0NTgzZWIzMDUzOTdlYmJmZmUwODBjOGVjMzA2ODI2ODBmYTQxMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRXZlbnRIYW5kbGVyLmNwcApAQCAtMjAwMyw3ICsyMDAzLDcgQEAgc3RhdGljIGJvb2wgdGFy Z2V0SXNGcmFtZShOb2RlKiB0YXJnZXQsIEZyYW1lKiYgZnJhbWUpCiAgICAgaWYgKCF0YXJnZXQt Pmhhc1RhZ05hbWUoZnJhbWVUYWcpICYmICF0YXJnZXQtPmhhc1RhZ05hbWUoaWZyYW1lVGFnKSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgZnJhbWUgPSBzdGF0aWNfY2FzdDxIVE1MRnJh bWVFbGVtZW50QmFzZSo+KHRhcmdldCktPmNvbnRlbnRGcmFtZSgpOworICAgIGZyYW1lID0gdG9I VE1MRnJhbWVFbGVtZW50QmFzZSh0YXJnZXQpLT5jb250ZW50RnJhbWUoKTsKIAogICAgIHJldHVy biB0cnVlOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmluZGV4IDcwYjI5MzA5MTg5N2E3 NzE4MjE2NmE2MzAwMDM2NDFmOTMwZWMxNmQuLmI3ZTExN2E4Y2ZlZjBkODBiZjkzNmZiN2NmMjhi ZDQ4YmMzMDcwNTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKQEAgLTM0Nyw3ICszNDcs NyBAQCB2b2lkIEZyYW1lVmlldzo6aW5pdCgpCiAgICAgLy8gUHJvcGFnYXRlIHRoZSBtYXJnaW53 aWR0aC9oZWlnaHQgYW5kIHNjcm9sbGluZyBtb2RlcyB0byB0aGUgdmlldy4KICAgICBFbGVtZW50 KiBvd25lckVsZW1lbnQgPSBtX2ZyYW1lID8gbV9mcmFtZS0+b3duZXJFbGVtZW50KCkgOiAwOwog ICAgIGlmIChvd25lckVsZW1lbnQgJiYgKG93bmVyRWxlbWVudC0+aGFzVGFnTmFtZShmcmFtZVRh ZykgfHwgb3duZXJFbGVtZW50LT5oYXNUYWdOYW1lKGlmcmFtZVRhZykpKSB7Ci0gICAgICAgIEhU TUxGcmFtZUVsZW1lbnRCYXNlKiBmcmFtZUVsdCA9IHN0YXRpY19jYXN0PEhUTUxGcmFtZUVsZW1l bnRCYXNlKj4ob3duZXJFbGVtZW50KTsKKyAgICAgICAgSFRNTEZyYW1lRWxlbWVudEJhc2UqIGZy YW1lRWx0ID0gdG9IVE1MRnJhbWVFbGVtZW50QmFzZShvd25lckVsZW1lbnQpOwogICAgICAgICBp ZiAoZnJhbWVFbHQtPnNjcm9sbGluZ01vZGUoKSA9PSBTY3JvbGxiYXJBbHdheXNPZmYpCiAgICAg ICAgICAgICBzZXRDYW5IYXZlU2Nyb2xsYmFycyhmYWxzZSk7CiAgICAgICAgIExheW91dFVuaXQg bWFyZ2luV2lkdGggPSBmcmFtZUVsdC0+bWFyZ2luV2lkdGgoKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGcmFtZUJhc2UuY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckZyYW1lQmFzZS5jcHAKaW5kZXggZjJiZTlmNjQ3YTIzM2ZjNzA3MmRh ZjMzNTU3NzgwZTNmZDExOTI5YS4uOTRjMDkwMDJjZGZlZTE2ODE5MzVlNzVhMzcwYTZkNmQ0Zjkx YzBjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZyYW1lQmFz ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZyYW1lQmFzZS5jcHAK QEAgLTcyLDggKzcyLDcgQEAgdm9pZCBSZW5kZXJGcmFtZUJhc2U6OmxheW91dFdpdGhGbGF0dGVu aW5nKGJvb2wgaGFzRml4ZWRXaWR0aCwgYm9vbCBoYXNGaXhlZEhlaWcKICAgICAvLyB3ZSBvYmV5 IHRoZW0gYW5kIGRvIG5vdCBleHBhbmQuIFdpdGggZnJhbWUgZmxhdHRlbmluZwogICAgIC8vIG5v IHN1YmZyYW1lIG11Y2ggZXZlciBiZWNvbWUgc2Nyb2xsYWJsZS4KIAotICAgIEhUTUxGcmFtZUVs ZW1lbnRCYXNlKiBlbGVtZW50ID0gc3RhdGljX2Nhc3Q8SFRNTEZyYW1lRWxlbWVudEJhc2UqPihu b2RlKCkpOwotICAgIGJvb2wgaXNTY3JvbGxhYmxlID0gZWxlbWVudC0+c2Nyb2xsaW5nTW9kZSgp ICE9IFNjcm9sbGJhckFsd2F5c09mZjsKKyAgICBib29sIGlzU2Nyb2xsYWJsZSA9IHRvSFRNTEZy YW1lRWxlbWVudEJhc2Uobm9kZSgpKS0+c2Nyb2xsaW5nTW9kZSgpICE9IFNjcm9sbGJhckFsd2F5 c09mZjsKIAogICAgIC8vIGNvbnNpZGVyIGlmcmFtZSBpbnNldCBib3JkZXIKICAgICBpbnQgaEJv cmRlciA9IGJvcmRlckxlZnQoKSArIGJvcmRlclJpZ2h0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyLmNwcAppbmRleCA2YzkyZDc4ZTBkZGJmODg2MzQ4NzRhMTBmYmUzZGU0 OWE5N2U5OWNlLi4yYWEyYmRjNjNkMjg2NWM1NzY4YjU0NTkyNjRhMGQyYWI2YTQzZTFhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTIyNjQsMTAgKzIyNjQs MTAgQEAgdm9pZCBSZW5kZXJMYXllcjo6c2Nyb2xsVG8oaW50IHgsIGludCB5KQogICAgICAgICBm cmFtZS0+bG9hZGVyKCktPmNsaWVudCgpLT5kaWRDaGFuZ2VTY3JvbGxPZmZzZXQoKTsgCiB9CiAK LXN0YXRpYyBpbmxpbmUgYm9vbCBmcmFtZUVsZW1lbnRBbmRWaWV3UGVybWl0U2Nyb2xsKEhUTUxG cmFtZUVsZW1lbnQqIGZyYW1lRWxlbWVudCwgRnJhbWVWaWV3KiBmcmFtZVZpZXcpIAorc3RhdGlj IGlubGluZSBib29sIGZyYW1lRWxlbWVudEFuZFZpZXdQZXJtaXRTY3JvbGwoSFRNTEZyYW1lRWxl bWVudEJhc2UqIGZyYW1lRWxlbWVudEJhc2UsIEZyYW1lVmlldyogZnJhbWVWaWV3KSAKIHsKICAg ICAvLyBJZiBzY3JvbGxiYXJzIGFyZW4ndCBleHBsaWNpdGx5IGZvcmJpZGRlbiwgcGVybWl0IHNj cm9sbGluZy4KLSAgICBpZiAoZnJhbWVFbGVtZW50ICYmIGZyYW1lRWxlbWVudC0+c2Nyb2xsaW5n TW9kZSgpICE9IFNjcm9sbGJhckFsd2F5c09mZikKKyAgICBpZiAoZnJhbWVFbGVtZW50QmFzZSAm JiBmcmFtZUVsZW1lbnRCYXNlLT5zY3JvbGxpbmdNb2RlKCkgIT0gU2Nyb2xsYmFyQWx3YXlzT2Zm KQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgIC8vIElmIHNjcm9sbGJhcnMgYXJlIGZvcmJp ZGRlbiwgdXNlciBpbml0aWF0ZWQgc2Nyb2xscyBzaG91bGQgb2J2aW91c2x5IGJlIGlnbm9yZWQu CkBAIC0yMzIwLDEyICsyMzIwLDEyIEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnNjcm9sbFJlY3RUb1Zp c2libGUoY29uc3QgTGF5b3V0UmVjdCYgcmVjdCwgY29uc3QgU2Nyb2xsQWxpZ25tCiAgICAgICAg ICAgICAgICAgb3duZXJFbGVtZW50ID0gcmVuZGVyZXIoKS0+ZG9jdW1lbnQoKS0+b3duZXJFbGVt ZW50KCk7CiAKICAgICAgICAgICAgIGlmIChvd25lckVsZW1lbnQgJiYgb3duZXJFbGVtZW50LT5y ZW5kZXJlcigpKSB7Ci0gICAgICAgICAgICAgICAgSFRNTEZyYW1lRWxlbWVudCogZnJhbWVFbGVt ZW50ID0gMDsKKyAgICAgICAgICAgICAgICBIVE1MRnJhbWVFbGVtZW50QmFzZSogZnJhbWVFbGVt ZW50QmFzZSA9IDA7CiAKICAgICAgICAgICAgICAgICBpZiAob3duZXJFbGVtZW50LT5oYXNUYWdO YW1lKGZyYW1lVGFnKSB8fCBvd25lckVsZW1lbnQtPmhhc1RhZ05hbWUoaWZyYW1lVGFnKSkKLSAg ICAgICAgICAgICAgICAgICAgZnJhbWVFbGVtZW50ID0gc3RhdGljX2Nhc3Q8SFRNTEZyYW1lRWxl bWVudCo+KG93bmVyRWxlbWVudCk7CisgICAgICAgICAgICAgICAgICAgIGZyYW1lRWxlbWVudEJh c2UgPSB0b0hUTUxGcmFtZUVsZW1lbnRCYXNlKG93bmVyRWxlbWVudCk7CiAKLSAgICAgICAgICAg ICAgICBpZiAoZnJhbWVFbGVtZW50QW5kVmlld1Blcm1pdFNjcm9sbChmcmFtZUVsZW1lbnQsIGZy YW1lVmlldykpIHsKKyAgICAgICAgICAgICAgICBpZiAoZnJhbWVFbGVtZW50QW5kVmlld1Blcm1p dFNjcm9sbChmcmFtZUVsZW1lbnRCYXNlLCBmcmFtZVZpZXcpKSB7CiAgICAgICAgICAgICAgICAg ICAgIExheW91dFJlY3Qgdmlld1JlY3QgPSBmcmFtZVZpZXctPnZpc2libGVDb250ZW50UmVjdCgp OwogICAgICAgICAgICAgICAgICAgICBMYXlvdXRSZWN0IGV4cG9zZVJlY3QgPSBnZXRSZWN0VG9F eHBvc2Uodmlld1JlY3QsIHZpZXdSZWN0LCByZWN0LCBhbGlnblgsIGFsaWduWSk7CiAK