130391 2014-03-18 05:27:31 -0700 [EFL] [WK2] Replacing zoom functionality of MiniBrowser from scale_set to page_zoom_set 2014-06-04 01:35:28 -0700 1 1 1 Unclassified WebKit UI Events 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 a.badowski webkit-unassigned bunhere cdumez commit-queue gyuyoung.kim hw1008.kim sergio oldest_to_newest 991622 0 a.badowski 2014-03-18 05:27:31 -0700 After loading stackoverflow.com and several times zoom out (Ctrl - MiniBrowser, such as zoom 0.67), the subsequent increase or decrease of the width of the entire window shows the following errors: 1) dark-gray rectangles in the header and footer decrease / increase disproportionately in relation to changes in the width of the window. 2) a significant reduction of the width of the window, but the window is large enough for it to fit the contents of the page, a large margin arises on the right side and the content of the web site is truncated. None of these errors do not arise in the chromium browser or the mozilla browser. These dark-gray rectangles occupy the entire width of the browser window. 992066 1 a.badowski 2014-03-19 03:32:55 -0700 3)In contrast to chromium browser and mozilla browser window dimension change in the above circumstances will, that there is no left margin 994219 2 227762 a.badowski 2014-03-25 09:49:22 -0700 Created attachment 227762 proposed patch Fixing described bugs. 994432 3 227762 jinwoo7.song 2014-03-25 16:33:23 -0700 Comment on attachment 227762 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=227762&action=review > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:240 > +Eina_Bool ewk_view_zoom_set(Evas_Object* ewkView, double zoomFactor) It would be clear to name as *ewk_view_page_zoom_factor_set*. > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:248 > +double ewk_view_zoom_get(const Evas_Object* ewkView) It would be clear to name as *ewk_view_page_zoom_factor_get*. > Source/WebKit2/UIProcess/API/efl/ewk_view.h:576 > + * Sets zoom of the current page. s/zoom/zoom factor/ > Source/WebKit2/UIProcess/API/efl/ewk_view.h:583 > +EAPI Eina_Bool ewk_view_zoom_set(Evas_Object *o, double zoomFactor); s/zoomFactor/zoom_factor > Source/WebKit2/UIProcess/API/efl/ewk_view.h:586 > + * Queries the current zom factor of the page. typo: s/zom/zoom 994452 4 227762 ryuan.choi 2014-03-25 17:35:04 -0700 Comment on attachment 227762 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=227762&action=review > Source/WebKit2/ChangeLog:9 > + Fixing an improper zooming in EFL WK2 by using WKPageSetPageZoomFactor via ewk_view_zoom_set > + instead WKPageSetScaleFactor via ewk_view_scale_set. page_zoom_set and scale_set is based on different requirement. I don't object to introduce page_zoom_set but I don't want to avoid a bug of scale_set if it has. >> Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:240 >> +Eina_Bool ewk_view_zoom_set(Evas_Object* ewkView, double zoomFactor) > > It would be clear to name as *ewk_view_page_zoom_factor_set*. We already use ewk_view_page_zoom_set for ewebkit. If it is not important, I'd like to keep the consistency. 994535 5 a.badowski 2014-03-26 02:53:32 -0700 (In reply to comment #3) > (From update of attachment 227762 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=227762&action=review > > > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:240 > > +Eina_Bool ewk_view_zoom_set(Evas_Object* ewkView, double zoomFactor) > > It would be clear to name as *ewk_view_page_zoom_factor_set*. > > > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:248 > > +double ewk_view_zoom_get(const Evas_Object* ewkView) > > It would be clear to name as *ewk_view_page_zoom_factor_get*. > > > Source/WebKit2/UIProcess/API/efl/ewk_view.h:576 > > + * Sets zoom of the current page. > > s/zoom/zoom factor/ > > > Source/WebKit2/UIProcess/API/efl/ewk_view.h:583 > > +EAPI Eina_Bool ewk_view_zoom_set(Evas_Object *o, double zoomFactor); > > s/zoomFactor/zoom_factor > > > Source/WebKit2/UIProcess/API/efl/ewk_view.h:586 > > + * Queries the current zom factor of the page. > > typo: s/zom/zoom There is no problem other names for the proposed functions, especially if it will help keep consistency. 994544 6 a.badowski 2014-03-26 03:21:51 -0700 (In reply to comment #4) > (From update of attachment 227762 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=227762&action=review > > > Source/WebKit2/ChangeLog:9 > > + Fixing an improper zooming in EFL WK2 by using WKPageSetPageZoomFactor via ewk_view_zoom_set > > + instead WKPageSetScaleFactor via ewk_view_scale_set. > > page_zoom_set and scale_set is based on different requirement. > > I don't object to introduce page_zoom_set but I don't want to avoid a bug of scale_set if it has. > > >> Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:240 > >> +Eina_Bool ewk_view_zoom_set(Evas_Object* ewkView, double zoomFactor) > > > > It would be clear to name as *ewk_view_page_zoom_factor_set*. > > We already use ewk_view_page_zoom_set for ewebkit. > > If it is not important, I'd like to keep the consistency. There is no problem other names for the proposed functions, especially if it will help keep consistency. (In reply to comment #4) > (From update of attachment 227762 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=227762&action=review > > > Source/WebKit2/ChangeLog:9 > > + Fixing an improper zooming in EFL WK2 by using WKPageSetPageZoomFactor via ewk_view_zoom_set > > + instead WKPageSetScaleFactor via ewk_view_scale_set. > > page_zoom_set and scale_set is based on different requirement. > > I don't object to introduce page_zoom_set but I don't want to avoid a bug of scale_set if it has. > > >> Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:240 > >> +Eina_Bool ewk_view_zoom_set(Evas_Object* ewkView, double zoomFactor) > > > > It would be clear to name as *ewk_view_page_zoom_factor_set*. > > We already use ewk_view_page_zoom_set for ewebkit. > > If it is not important, I'd like to keep the consistency. There is no problem other names for the proposed functions, especially if it will help keep consistency. As for the error function ewk_view_scale_set, it is like a slightly different problem than the solution to the reported error. I suggest turn it off as another reported error on webkit.org. I'll try to define this bug. 994929 7 227949 a.badowski 2014-03-27 09:04:21 -0700 Created attachment 227949 proposed patch 2 Changing of the function names according to opinions of Ryuan Choi and Jinwoo Song. The problem of a defective function ewk_view_scale_set I enrolled as a new bug 130838. 995178 8 227949 ryuan.choi 2014-03-27 17:43:00 -0700 Comment on attachment 227949 proposed patch 2 View in context: https://bugs.webkit.org/attachment.cgi?id=227949&action=review > Source/WebKit2/ChangeLog:3 > + [EFL] Page rendering is not proper when zooming and resizing. I am still not sure whether this patch is to fix "Page rendering is not proper when zooming and resizing". Let's change the bug title properly. And [EFL][WK2] is correct prefix, IMO. > Source/WebKit2/ChangeLog:13 > + (ewk_view_page_zoom_factor_set): > + (ewk_view_page_zoom_factor_get): Sorry, after discussed with jinwoo. We'd better to use ewk_view_page_zoom_set/get. > Source/WebKit2/UIProcess/API/efl/ewk_view.h:576 > + * Sets zoom of the current page. s/zoom/zoom factor/ > Source/WebKit2/UIProcess/API/efl/ewk_view.h:583 > +EAPI Eina_Bool ewk_view_page_zoom_factor_set(Evas_Object *o, double zoomFactor); s/zoomFactor/zoom_factor/ > Source/WebKit2/UIProcess/API/efl/ewk_view.h:586 > + * Queries the current zom factor of the page. s/zom/zoom/ > Tools/ChangeLog:9 > + Fixing an improper zooming in EFL WK2 by using WKPageSetPageZoomFactor via ewk_view_page_zoom_factor_set > + instead WKPageSetScaleFactor via ewk_view_scale_set. This is not fixing improper zooming in EFL WK2. It's replacing zoom functionality of MiniBrowser from scale_set to page_zoom_set (maybe: because it looks more desired behaviour of zoom_level_set). 996317 9 228294 a.badowski 2014-04-01 09:30:37 -0700 Created attachment 228294 proposed patch 3 996554 10 228294 gyuyoung.kim 2014-04-01 17:58:50 -0700 Comment on attachment 228294 proposed patch 3 View in context: https://bugs.webkit.org/attachment.cgi?id=228294&action=review > Source/WebKit2/ChangeLog:7 > + Missing patch description. > Source/WebKit2/UIProcess/API/efl/ewk_view.h:583 > +EAPI Eina_Bool ewk_view_page_zoom_set(Evas_Object *o, double zoomFactor); Wrong EFL parameter style. Look at https://trac.webkit.org/wiki/EFLWebKitCodingStyle > Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp:1102 > ++ Remove + > Tools/ChangeLog:7 > + ditto. 996729 11 228401 a.badowski 2014-04-02 09:24:58 -0700 Created attachment 228401 proposed patch 4 996921 12 228401 jinwoo7.song 2014-04-02 17:01:31 -0700 Comment on attachment 228401 proposed patch 4 View in context: https://bugs.webkit.org/attachment.cgi?id=228401&action=review > Source/WebKit2/ChangeLog:9 > + to ewk_view_page_zoom_set. Adding to the API functions: ewk_view_page_set and s/ewk_view_page_set/ewk_view_page_zoom_set > Source/WebKit2/ChangeLog:10 > + ewk_view_page_get to call appropriate WK functions. s/ewk_view_page_get/ewk_view_page_zoom_get > Source/WebKit2/UIProcess/API/efl/ewk_view.h:586 > + * Queries the current zom factor of the page. typo; s/zom/zoom 996954 13 228401 gyuyoung.kim 2014-04-02 18:46:25 -0700 Comment on attachment 228401 proposed patch 4 View in context: https://bugs.webkit.org/attachment.cgi?id=228401&action=review r- due to some nits. > Source/WebKit2/ChangeLog:3 > + [EFL] [WK2] Replacing zoom functionality of MiniBrowser from scale_set to page_zoom_set. Unnecessary a space between [EFL] and [WK2] > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:245 > + WKPageSetPageZoomFactor(impl->wkPage(), zoomFactor); Add a new line. 997073 14 228487 a.badowski 2014-04-03 01:19:09 -0700 Created attachment 228487 proposed patch 5 Thank you for review. There's a new patch. 997146 15 228487 gyuyoung.kim 2014-04-03 06:11:45 -0700 Comment on attachment 228487 proposed patch 5 View in context: https://bugs.webkit.org/attachment.cgi?id=228487&action=review LGTM. > Tools/ChangeLog:3 > + [EFL] [WK2] Replacing zoom functionality of MiniBrowser from scale_set to page_zoom_set. Unneeded space between [EFL] [WK2]. 997156 16 228505 a.badowski 2014-04-03 06:57:56 -0700 Created attachment 228505 proposed patch 6 Thank you for review. This is a patch to commit. 997175 17 228505 commit-queue 2014-04-03 08:33:37 -0700 Comment on attachment 228505 proposed patch 6 Clearing flags on attachment: 228505 Committed r166718: <http://trac.webkit.org/changeset/166718> 997176 18 commit-queue 2014-04-03 08:33:42 -0700 All reviewed patches have been landed. Closing bug. 1013261 19 227949 ossy 2014-06-04 00:52:47 -0700 Comment on attachment 227949 proposed patch 2 Cleared review? from obsolete attachment 227949 so that this bug does not appear in http://webkit.org/pending-review. If you would like this patch reviewed, please attach it to a new bug (or re-open this bug before marking it for review again). 1013271 20 a.badowski 2014-06-04 01:35:28 -0700 (In reply to comment #19) > (From update of attachment 227949 [details]) > Cleared review? from obsolete attachment 227949 [details] so that this bug does not appear in http://webkit.org/pending-review. If you would like this patch reviewed, please attach it to a new bug (or re-open this bug before marking it for review again). I'm sorry for the trouble I had apparently left the patch with the ? sign. 227762 2014-03-25 09:49:22 -0700 2014-03-27 09:04:21 -0700 proposed patch diff_org_130391_2.txt text/plain 5574 a.badowski ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBhZjA3YzU0Li4wNGZmOWVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTQtMDMtMjUgIEFuZHJ6ZWogQmFkb3dza2kgIDxhLmJhZG93c2tpQHNhbXN1bmcuY29t PgorCisgICAgICAgIFtFRkxdIFBhZ2UgcmVuZGVyaW5nIGlzIG5vdCBwcm9wZXIgd2hlbiB6b29t aW5nIGFuZCByZXNpemluZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEzMDM5MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEZpeGluZyBhbiBpbXByb3BlciB6b29taW5nIGluIEVGTCBXSzIgYnkgdXNpbmcg V0tQYWdlU2V0UGFnZVpvb21GYWN0b3IgdmlhIGV3a192aWV3X3pvb21fc2V0CisgICAgICAgIGlu c3RlYWQgV0tQYWdlU2V0U2NhbGVGYWN0b3IgdmlhIGV3a192aWV3X3NjYWxlX3NldC4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcDoKKyAgICAgICAgKGV3a192aWV3 X3pvb21fc2V0KToKKyAgICAgICAgKGV3a192aWV3X3pvb21fZ2V0KToKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL3Rl c3RzL3Rlc3RfZXdrMl92aWV3LmNwcDoKKyAgICAgICAgKFRFU1RfRik6CisKIDIwMTQtMDMtMjQg TWljaGHFgiBQYWt1xYJhIHZlbCBSdXRrYSAgPG0ucGFrdWxhQHNhbXN1bmcuY29tPgogCiAgICAg ICAgIFtFRkxdW1dLMl0gQWRkIGFuIEFQSSB0byBzZXQgcHJvY2VzcyBtb2RlbApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCmluZGV4IDFiYzQxZmMuLjcw YmFiNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192 aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5j cHAKQEAgLTIzNyw2ICsyMzcsMjEgQEAgZG91YmxlIGV3a192aWV3X3NjYWxlX2dldChjb25zdCBF dmFzX09iamVjdCogZXdrVmlldykKICAgICByZXR1cm4gV0tQYWdlR2V0U2NhbGVGYWN0b3IoaW1w bC0+d2tQYWdlKCkpOwogfQogCitFaW5hX0Jvb2wgZXdrX3ZpZXdfem9vbV9zZXQoRXZhc19PYmpl Y3QqIGV3a1ZpZXcsIGRvdWJsZSB6b29tRmFjdG9yKQoreworICAgIEVXS19WSUVXX0lNUExfR0VU X09SX1JFVFVSTihld2tWaWV3LCBpbXBsLCBmYWxzZSk7CisKKyAgICBXS1BhZ2VTZXRQYWdlWm9v bUZhY3RvcihpbXBsLT53a1BhZ2UoKSwgem9vbUZhY3Rvcik7CisgICAgcmV0dXJuIHRydWU7Cit9 CisKK2RvdWJsZSBld2tfdmlld196b29tX2dldChjb25zdCBFdmFzX09iamVjdCogZXdrVmlldykK K3sKKyAgICBFV0tfVklFV19JTVBMX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgaW1wbCwgLTEpOwor CisgICAgcmV0dXJuIFdLUGFnZUdldFBhZ2Vab29tRmFjdG9yKGltcGwtPndrUGFnZSgpKTsKK30K KwogRWluYV9Cb29sIGV3a192aWV3X2RldmljZV9waXhlbF9yYXRpb19zZXQoRXZhc19PYmplY3Qq IGV3a1ZpZXcsIGZsb2F0IHJhdGlvKQogewogICAgIEVXS19WSUVXX0lNUExfR0VUX09SX1JFVFVS Tihld2tWaWV3LCBpbXBsLCBmYWxzZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX3ZpZXcuaAppbmRleCAxNDY5NzY0Li5mMTcxMDhiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKQEAgLTU3Myw2ICs1NzMsMjggQEAgRUFQSSBF aW5hX0Jvb2wgZXdrX3ZpZXdfc2NhbGVfc2V0KEV2YXNfT2JqZWN0ICpvLCBkb3VibGUgc2NhbGVG YWN0b3IsIGludCB4LCBpbnQKIEVBUEkgZG91YmxlIGV3a192aWV3X3NjYWxlX2dldChjb25zdCBF dmFzX09iamVjdCAqbyk7CiAKIC8qKgorICogU2V0cyB6b29tIG9mIHRoZSBjdXJyZW50IHBhZ2Uu CisgKgorICogQHBhcmFtIG8gdmlldyBvYmplY3QgdG8gc2V0IHRoZSB6b29tIGxldmVsCisgKiBA cGFyYW0gem9vbV9mYWN0b3IgYSBuZXcgbGV2ZWwgdG8gc2V0CisgKgorICogQHJldHVybiBAYyBF SU5BX1RSVUUgb24gc3VjY2VzcyBvciBAYyBFSU5BX0ZBTFNFIG90aGVyd2lzZQorICovCitFQVBJ IEVpbmFfQm9vbCBld2tfdmlld196b29tX3NldChFdmFzX09iamVjdCAqbywgZG91YmxlIHpvb21G YWN0b3IpOworCisvKioKKyAqIFF1ZXJpZXMgdGhlIGN1cnJlbnQgem9tIGZhY3RvciBvZiB0aGUg cGFnZS4KKyAqCisgKiBJdCByZXR1cm5zIHByZXZpb3VzIHpvb20gZmFjdG9yIGFmdGVyIGV3a192 aWV3X3pvb21fc2V0IGlzIGNhbGxlZCBpbW1lZGlhdGVseQorICogdW50aWwgem9vbSBmYWN0b3Ig b2YgcGFnZSBpcyByZWFsbHkgY2hhbmdlZC4KKyAqCisgKiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0 byBnZXQgdGhlIHpvb20gZmFjdG9yCisgKgorICogQHJldHVybiBjdXJyZW50IHpvb20gZmFjdG9y IGluIHVzZSBvbiBzdWNjZXNzIG9yIEBjIC0xLjAgb24gZmFpbHVyZQorICovCitFQVBJIGRvdWJs ZSBld2tfdmlld196b29tX2dldChjb25zdCBFdmFzX09iamVjdCAqbyk7CisKKy8qKgogICogUXVl cmllcyB0aGUgcmF0aW8gYmV0d2VlbiB0aGUgQ1NTIHVuaXRzIGFuZCBkZXZpY2UgcGl4ZWxzIHdo ZW4gdGhlIGNvbnRlbnQgaXMgdW5zY2FsZWQuCiAgKgogICogV2hlbiBkZXNpZ25pbmcgdG91Y2gt ZnJpZW5kbHkgY29udGVudHMsIGtub3dpbmcgdGhlIGFwcHJveGltYXRlZCB0YXJnZXQgc2l6ZSBv biBhIGRldmljZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv dGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwCmluZGV4IDJkYzU2NWIuLjRjYTY2ZDAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92 aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0 X2V3azJfdmlldy5jcHAKQEAgLTEwODMsMyArMTA4MywxNyBAQCBURVNUX0YoRVdLMlZpZXdUZXN0 LCBld2tfdmlld19sYXlvdXRfZml4ZWQpCiAgICAgRVhQRUNUX1RSVUUoZXdrX3ZpZXdfbGF5b3V0 X2ZpeGVkX3NldCh3ZWJWaWV3KCksIHRydWUpKTsKICAgICBFWFBFQ1RfVFJVRShld2tfdmlld19s YXlvdXRfZml4ZWRfZ2V0KHdlYlZpZXcoKSkpOwogfQorCitURVNUX0YoRVdLMlZpZXdUZXN0LCBl d2tfdmlld196b29tX3NldCkKK3sKKyAgICBBU1NFUlRfVFJVRShsb2FkVXJsU3luYyhlbnZpcm9u bWVudC0+ZGVmYXVsdFRlc3RQYWdlVXJsKCkpKTsKKworICAgIC8vIERlZmF1bHQgem9vbSBmYWN0 b3IgaXMgMS4wCisgICAgQVNTRVJUX0ZMT0FUX0VRKDEsIGV3a192aWV3X3pvb21fZ2V0KHdlYlZp ZXcoKSkpOworCisgICAgQVNTRVJUX1RSVUUoZXdrX3ZpZXdfem9vbV9zZXQod2ViVmlldygpLCAw LjY3KSk7CisgICAgQVNTRVJUX0ZMT0FUX0VRKDAuNjcsIGV3a192aWV3X3pvb21fZ2V0KHdlYlZp ZXcoKSkpOworCisgICAgQVNTRVJUX1RSVUUoZXdrX3ZpZXdfem9vbV9zZXQod2ViVmlldygpLCAx KSk7CisgICAgQVNTRVJUX0ZMT0FUX0VRKDEsIGV3a192aWV3X3pvb21fZ2V0KHdlYlZpZXcoKSkp OworfQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4 IGIyYmE4MGIuLjA2NGQ0ODggMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29s cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxNC0wMy0yNSAgQW5kcnplaiBCYWRvd3Nr aSAgPGEuYmFkb3dza2lAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gUGFnZSByZW5kZXJp bmcgaXMgbm90IHByb3BlciB3aGVuIHpvb21pbmcgYW5kIHJlc2l6aW5nLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwMzkxCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4aW5nIGFuIGltcHJvcGVyIHpv b21pbmcgaW4gRUZMIFdLMiBieSB1c2luZyBXS1BhZ2VTZXRQYWdlWm9vbUZhY3RvciB2aWEgZXdr X3ZpZXdfem9vbV9zZXQKKyAgICAgICAgaW5zdGVhZCBXS1BhZ2VTZXRTY2FsZUZhY3RvciB2aWEg ZXdrX3ZpZXdfc2NhbGVfc2V0LgorCisgICAgICAgICogTWluaUJyb3dzZXIvZWZsL21haW4uYzoK KwogMjAxNC0wMy0yNCAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CiAKICAgICAgICAg Rml4IHRoZSBpT1MgYnVpbGQgb2YgVGVzdFdlYktpdEFQSS4KZGlmZiAtLWdpdCBhL1Rvb2xzL01p bmlCcm93c2VyL2VmbC9tYWluLmMgYi9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCmluZGV4 IDVkY2UwOGMuLmEwNDYwNTYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWlu LmMKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwpAQCAtNzEsMTQgKzcxLDcgQEAg em9vbV9sZXZlbF9zZXQoRXZhc19PYmplY3QgKndlYnZpZXcsIGludCBsZXZlbCkKICAgICBpZiAo bGV2ZWwgPCAwICB8fCBsZXZlbCA+PSBzaXplb2Yoem9vbUxldmVscykgLyBzaXplb2YoZmxvYXQp KQogICAgICAgICByZXR1cm4gRUlOQV9GQUxTRTsKIAotICAgIEV2YXNfQ29vcmQgb3gsIG95LCBt eCwgbXksIGN4LCBjeTsKLSAgICBldmFzX3BvaW50ZXJfY2FudmFzX3h5X2dldChldmFzX29iamVj dF9ldmFzX2dldCh3ZWJ2aWV3KSwgJm14LCAmbXkpOyAvLyBHZXQgY3VycmVudCBtb3VzZSBwb3Np dGlvbiBvbiB3aW5kb3cuCi0gICAgZXZhc19vYmplY3RfZ2VvbWV0cnlfZ2V0KHdlYnZpZXcsICZv eCwgJm95LCBOVUxMLCBOVUxMKTsgLy8gR2V0IHdlYnZpZXcncyBwb3NpdGlvbiBvbiB3aW5kb3cu Ci0gICAgY3ggPSBteCAtIG94OyAvLyBjdXJyZW50IHggcG9zaXRpb24gPSBtb3VzZSB4IHBvc2l0 aW9uIC0gd2VidmlldyB4IHBvc2l0aW9uCi0gICAgY3kgPSBteSAtIG95OyAvLyBjdXJyZW50IHkg cG9zaXRpb24gPSBtb3VzZSB5IHBvc2l0aW9uIC0gd2VidmlldyB5IHBvc2l0aW9uCi0KLSAgICBF aW5hX0Jvb2wgcmVzdWx0ID0gZXdrX3ZpZXdfc2NhbGVfc2V0KHdlYnZpZXcsIHpvb21MZXZlbHNb bGV2ZWxdLCBjeCwgY3kpOwotICAgIHJldHVybiByZXN1bHQ7CisgICAgcmV0dXJuIGV3a192aWV3 X3pvb21fc2V0KHdlYnZpZXcsIHpvb21MZXZlbHNbbGV2ZWxdKTsKIH0KIAogc3RhdGljIEV3a19W aWV3X1NtYXJ0X0NsYXNzICptaW5pQnJvd3NlclZpZXdTbWFydENsYXNzKCkK 227949 2014-03-27 09:04:21 -0700 2014-06-04 00:52:47 -0700 proposed patch 2 diff_org_130391_3.txt text/plain 5780 a.badowski ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAzNmQ4YTVkLi4wYzIxNzQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTQtMDMtMjcgIEFuZHJ6ZWogQmFkb3dza2kgIDxhLmJhZG93c2tpQHNhbXN1bmcuY29t PgorCisgICAgICAgIFtFRkxdIFBhZ2UgcmVuZGVyaW5nIGlzIG5vdCBwcm9wZXIgd2hlbiB6b29t aW5nIGFuZCByZXNpemluZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEzMDM5MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEZpeGluZyBhbiBpbXByb3BlciB6b29taW5nIGluIEVGTCBXSzIgYnkgdXNpbmcg V0tQYWdlU2V0UGFnZVpvb21GYWN0b3IgdmlhIGV3a192aWV3X3BhZ2Vfem9vbV9mYWN0b3Jfc2V0 CisgICAgICAgIGluc3RlYWQgV0tQYWdlU2V0U2NhbGVGYWN0b3IgdmlhIGV3a192aWV3X3NjYWxl X3NldC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcDoKKyAgICAg ICAgKGV3a192aWV3X3BhZ2Vfem9vbV9mYWN0b3Jfc2V0KToKKyAgICAgICAgKGV3a192aWV3X3Bh Z2Vfem9vbV9mYWN0b3JfZ2V0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmll dy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNw cDoKKyAgICAgICAgKFRFU1RfRik6CisKIDIwMTQtMDMtMjcgIEphZSBIeXVuIFBhcmsgIDxqYWVw YXJrQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVtb3ZlIExheWVyVHJlZUNvbnRleHRDYWlyby5j cHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3 LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAppbmRl eCAxYmM0MWZjLi5jZTZmZmU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9ld2tfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX3ZpZXcuY3BwCkBAIC0yMzcsNiArMjM3LDIxIEBAIGRvdWJsZSBld2tfdmlld19zY2Fs ZV9nZXQoY29uc3QgRXZhc19PYmplY3QqIGV3a1ZpZXcpCiAgICAgcmV0dXJuIFdLUGFnZUdldFNj YWxlRmFjdG9yKGltcGwtPndrUGFnZSgpKTsKIH0KIAorRWluYV9Cb29sIGV3a192aWV3X3BhZ2Vf em9vbV9mYWN0b3Jfc2V0KEV2YXNfT2JqZWN0KiBld2tWaWV3LCBkb3VibGUgem9vbUZhY3RvcikK K3sKKyAgICBFV0tfVklFV19JTVBMX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgaW1wbCwgZmFsc2Up OworCisgICAgV0tQYWdlU2V0UGFnZVpvb21GYWN0b3IoaW1wbC0+d2tQYWdlKCksIHpvb21GYWN0 b3IpOworICAgIHJldHVybiB0cnVlOworfQorCitkb3VibGUgZXdrX3ZpZXdfcGFnZV96b29tX2Zh Y3Rvcl9nZXQoY29uc3QgRXZhc19PYmplY3QqIGV3a1ZpZXcpCit7CisgICAgRVdLX1ZJRVdfSU1Q TF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIGltcGwsIC0xKTsKKworICAgIHJldHVybiBXS1BhZ2VH ZXRQYWdlWm9vbUZhY3RvcihpbXBsLT53a1BhZ2UoKSk7Cit9CisKIEVpbmFfQm9vbCBld2tfdmll d19kZXZpY2VfcGl4ZWxfcmF0aW9fc2V0KEV2YXNfT2JqZWN0KiBld2tWaWV3LCBmbG9hdCByYXRp bykKIHsKICAgICBFV0tfVklFV19JTVBMX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgaW1wbCwgZmFs c2UpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3Zp ZXcuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKaW5kZXgg MTQ2OTc2NC4uNTIzNzQzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX3ZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9l d2tfdmlldy5oCkBAIC01NzMsNiArNTczLDI4IEBAIEVBUEkgRWluYV9Cb29sIGV3a192aWV3X3Nj YWxlX3NldChFdmFzX09iamVjdCAqbywgZG91YmxlIHNjYWxlRmFjdG9yLCBpbnQgeCwgaW50CiBF QVBJIGRvdWJsZSBld2tfdmlld19zY2FsZV9nZXQoY29uc3QgRXZhc19PYmplY3QgKm8pOwogCiAv KioKKyAqIFNldHMgem9vbSBvZiB0aGUgY3VycmVudCBwYWdlLgorICoKKyAqIEBwYXJhbSBvIHZp ZXcgb2JqZWN0IHRvIHNldCB0aGUgem9vbSBsZXZlbAorICogQHBhcmFtIHpvb21fZmFjdG9yIGEg bmV3IGxldmVsIHRvIHNldAorICoKKyAqIEByZXR1cm4gQGMgRUlOQV9UUlVFIG9uIHN1Y2Nlc3Mg b3IgQGMgRUlOQV9GQUxTRSBvdGhlcndpc2UKKyAqLworRUFQSSBFaW5hX0Jvb2wgZXdrX3ZpZXdf cGFnZV96b29tX2ZhY3Rvcl9zZXQoRXZhc19PYmplY3QgKm8sIGRvdWJsZSB6b29tRmFjdG9yKTsK KworLyoqCisgKiBRdWVyaWVzIHRoZSBjdXJyZW50IHpvbSBmYWN0b3Igb2YgdGhlIHBhZ2UuCisg KgorICogSXQgcmV0dXJucyBwcmV2aW91cyB6b29tIGZhY3RvciBhZnRlciBld2tfdmlld19wYWdl X3pvb21fZmFjdG9yX3NldCBpcyBjYWxsZWQgaW1tZWRpYXRlbHkKKyAqIHVudGlsIHpvb20gZmFj dG9yIG9mIHBhZ2UgaXMgcmVhbGx5IGNoYW5nZWQuCisgKgorICogQHBhcmFtIG8gdmlldyBvYmpl Y3QgdG8gZ2V0IHRoZSB6b29tIGZhY3RvcgorICoKKyAqIEByZXR1cm4gY3VycmVudCB6b29tIGZh Y3RvciBpbiB1c2Ugb24gc3VjY2VzcyBvciBAYyAtMS4wIG9uIGZhaWx1cmUKKyAqLworRUFQSSBk b3VibGUgZXdrX3ZpZXdfcGFnZV96b29tX2ZhY3Rvcl9nZXQoY29uc3QgRXZhc19PYmplY3QgKm8p OworCisvKioKICAqIFF1ZXJpZXMgdGhlIHJhdGlvIGJldHdlZW4gdGhlIENTUyB1bml0cyBhbmQg ZGV2aWNlIHBpeGVscyB3aGVuIHRoZSBjb250ZW50IGlzIHVuc2NhbGVkLgogICoKICAqIFdoZW4g ZGVzaWduaW5nIHRvdWNoLWZyaWVuZGx5IGNvbnRlbnRzLCBrbm93aW5nIHRoZSBhcHByb3hpbWF0 ZWQgdGFyZ2V0IHNpemUgb24gYSBkZXZpY2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcAppbmRleCAyZGM1NjVi Li45ZTU0NjMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90 ZXN0cy90ZXN0X2V3azJfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwCkBAIC0xMDgzLDMgKzEwODMsMTcgQEAgVEVT VF9GKEVXSzJWaWV3VGVzdCwgZXdrX3ZpZXdfbGF5b3V0X2ZpeGVkKQogICAgIEVYUEVDVF9UUlVF KGV3a192aWV3X2xheW91dF9maXhlZF9zZXQod2ViVmlldygpLCB0cnVlKSk7CiAgICAgRVhQRUNU X1RSVUUoZXdrX3ZpZXdfbGF5b3V0X2ZpeGVkX2dldCh3ZWJWaWV3KCkpKTsKIH0KKworVEVTVF9G KEVXSzJWaWV3VGVzdCwgZXdrX3ZpZXdfcGFnZV96b29tX2ZhY3Rvcl9zZXQpCit7CisgICAgQVNT RVJUX1RSVUUobG9hZFVybFN5bmMoZW52aXJvbm1lbnQtPmRlZmF1bHRUZXN0UGFnZVVybCgpKSk7 CisKKyAgICAvLyBEZWZhdWx0IHpvb20gZmFjdG9yIGlzIDEuMAorICAgIEFTU0VSVF9GTE9BVF9F USgxLCBld2tfdmlld19wYWdlX3pvb21fZmFjdG9yX2dldCh3ZWJWaWV3KCkpKTsKKworICAgIEFT U0VSVF9UUlVFKGV3a192aWV3X3BhZ2Vfem9vbV9mYWN0b3Jfc2V0KHdlYlZpZXcoKSwgMC42Nykp OworICAgIEFTU0VSVF9GTE9BVF9FUSgwLjY3LCBld2tfdmlld19wYWdlX3pvb21fZmFjdG9yX2dl dCh3ZWJWaWV3KCkpKTsKKworICAgIEFTU0VSVF9UUlVFKGV3a192aWV3X3BhZ2Vfem9vbV9mYWN0 b3Jfc2V0KHdlYlZpZXcoKSwgMSkpOworICAgIEFTU0VSVF9GTE9BVF9FUSgxLCBld2tfdmlld19w YWdlX3pvb21fZmFjdG9yX2dldCh3ZWJWaWV3KCkpKTsKK30KZGlmZiAtLWdpdCBhL1Rvb2xzL0No YW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA2NDVmMzUzLi43MDM1NmY5IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTQtMDMtMjcgIEFuZHJ6ZWogQmFkb3dza2kgIDxhLmJhZG93c2tpQHNhbXN1bmcuY29t PgorCisgICAgICAgIFtFRkxdIFBhZ2UgcmVuZGVyaW5nIGlzIG5vdCBwcm9wZXIgd2hlbiB6b29t aW5nIGFuZCByZXNpemluZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEzMDM5MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEZpeGluZyBhbiBpbXByb3BlciB6b29taW5nIGluIEVGTCBXSzIgYnkgdXNpbmcg V0tQYWdlU2V0UGFnZVpvb21GYWN0b3IgdmlhIGV3a192aWV3X3BhZ2Vfem9vbV9mYWN0b3Jfc2V0 CisgICAgICAgIGluc3RlYWQgV0tQYWdlU2V0U2NhbGVGYWN0b3IgdmlhIGV3a192aWV3X3NjYWxl X3NldC4KKworICAgICAgICAqIE1pbmlCcm93c2VyL2VmbC9tYWluLmM6CisKIDIwMTQtMDMtMjYg IEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFtDb2NvYV0gRXhwb3Nl IERvd25sb2FkQ2xpZW50OjpkaWRGYWlsKCkgYW5kIERvd25sb2FkQ2xpZW50OjpkaWRDYW5jZWwo KQpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYyBiL1Rvb2xzL01pbmlC cm93c2VyL2VmbC9tYWluLmMKaW5kZXggNWRjZTA4Yy4uZWI5NzM1MSAxMDA2NDQKLS0tIGEvVG9v bHMvTWluaUJyb3dzZXIvZWZsL21haW4uYworKysgYi9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFp bi5jCkBAIC03MSwxNCArNzEsNyBAQCB6b29tX2xldmVsX3NldChFdmFzX09iamVjdCAqd2Vidmll dywgaW50IGxldmVsKQogICAgIGlmIChsZXZlbCA8IDAgIHx8IGxldmVsID49IHNpemVvZih6b29t TGV2ZWxzKSAvIHNpemVvZihmbG9hdCkpCiAgICAgICAgIHJldHVybiBFSU5BX0ZBTFNFOwogCi0g ICAgRXZhc19Db29yZCBveCwgb3ksIG14LCBteSwgY3gsIGN5OwotICAgIGV2YXNfcG9pbnRlcl9j YW52YXNfeHlfZ2V0KGV2YXNfb2JqZWN0X2V2YXNfZ2V0KHdlYnZpZXcpLCAmbXgsICZteSk7IC8v IEdldCBjdXJyZW50IG1vdXNlIHBvc2l0aW9uIG9uIHdpbmRvdy4KLSAgICBldmFzX29iamVjdF9n ZW9tZXRyeV9nZXQod2VidmlldywgJm94LCAmb3ksIE5VTEwsIE5VTEwpOyAvLyBHZXQgd2Vidmll dydzIHBvc2l0aW9uIG9uIHdpbmRvdy4KLSAgICBjeCA9IG14IC0gb3g7IC8vIGN1cnJlbnQgeCBw b3NpdGlvbiA9IG1vdXNlIHggcG9zaXRpb24gLSB3ZWJ2aWV3IHggcG9zaXRpb24KLSAgICBjeSA9 IG15IC0gb3k7IC8vIGN1cnJlbnQgeSBwb3NpdGlvbiA9IG1vdXNlIHkgcG9zaXRpb24gLSB3ZWJ2 aWV3IHkgcG9zaXRpb24KLQotICAgIEVpbmFfQm9vbCByZXN1bHQgPSBld2tfdmlld19zY2FsZV9z ZXQod2Vidmlldywgem9vbUxldmVsc1tsZXZlbF0sIGN4LCBjeSk7Ci0gICAgcmV0dXJuIHJlc3Vs dDsKKyAgICByZXR1cm4gZXdrX3ZpZXdfcGFnZV96b29tX2ZhY3Rvcl9zZXQod2Vidmlldywgem9v bUxldmVsc1tsZXZlbF0pOwogfQogCiBzdGF0aWMgRXdrX1ZpZXdfU21hcnRfQ2xhc3MgKm1pbmlC cm93c2VyVmlld1NtYXJ0Q2xhc3MoKQo= 228294 2014-04-01 09:30:37 -0700 2014-04-02 09:24:58 -0700 proposed patch 3 diff_org_130391_5.txt text/plain 5315 a.badowski ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkMmU3YzJhLi41ZmFkYzhmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTQtMDQtMDEgIEFuZHJ6ZWogQmFkb3dza2kgIDxhLmJhZG93c2tpQHNhbXN1bmcuY29t PgorCisgICAgICAgIFtFRkxdIFtXSzJdIFJlcGxhY2luZyB6b29tIGZ1bmN0aW9uYWxpdHkgb2Yg TWluaUJyb3dzZXIgZnJvbSBzY2FsZV9zZXQgdG8gcGFnZV96b29tX3NldC4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMDM5MQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX3ZpZXcuY3BwOgorICAgICAgICAoZXdrX3ZpZXdfcGFnZV96b29tX3NldCk6CisgICAgICAg IChld2tfdmlld19wYWdlX3pvb21fZ2V0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9l d2tfdmlldy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92 aWV3LmNwcDoKKyAgICAgICAgKFRFU1RfRik6CisKIDIwMTQtMDMtMzEgIFNpbW9uIEZyYXNlciAg PHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgW1VJLXNpZGUgY29tcG9zaXRpbmdd IEZpeCBhbmltYXRpb25zLCBhbmQgYWRkIGxvZ2dpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAppbmRleCBhYmUwMWFkLi5jYzFlYzhmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCkBAIC0yMzgsNiAr MjM4LDIxIEBAIGRvdWJsZSBld2tfdmlld19zY2FsZV9nZXQoY29uc3QgRXZhc19PYmplY3QqIGV3 a1ZpZXcpCiAgICAgcmV0dXJuIFdLUGFnZUdldFNjYWxlRmFjdG9yKGltcGwtPndrUGFnZSgpKTsK IH0KIAorRWluYV9Cb29sIGV3a192aWV3X3BhZ2Vfem9vbV9zZXQoRXZhc19PYmplY3QqIGV3a1Zp ZXcsIGRvdWJsZSB6b29tRmFjdG9yKQoreworICAgIEVXS19WSUVXX0lNUExfR0VUX09SX1JFVFVS Tihld2tWaWV3LCBpbXBsLCBmYWxzZSk7CisKKyAgICBXS1BhZ2VTZXRQYWdlWm9vbUZhY3Rvcihp bXBsLT53a1BhZ2UoKSwgem9vbUZhY3Rvcik7CisgICAgcmV0dXJuIHRydWU7Cit9CisKK2RvdWJs ZSBld2tfdmlld19wYWdlX3pvb21fZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3KQorewor ICAgIEVXS19WSUVXX0lNUExfR0VUX09SX1JFVFVSTihld2tWaWV3LCBpbXBsLCAtMSk7CisKKyAg ICByZXR1cm4gV0tQYWdlR2V0UGFnZVpvb21GYWN0b3IoaW1wbC0+d2tQYWdlKCkpOworfQorCiBF aW5hX0Jvb2wgZXdrX3ZpZXdfZGV2aWNlX3BpeGVsX3JhdGlvX3NldChFdmFzX09iamVjdCogZXdr VmlldywgZmxvYXQgcmF0aW8pCiB7CiAgICAgRVdLX1ZJRVdfSU1QTF9HRVRfT1JfUkVUVVJOKGV3 a1ZpZXcsIGltcGwsIGZhbHNlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZWZsL2V3a192aWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9l d2tfdmlldy5oCmluZGV4IDg1YzExMDkuLjVjZGFlOWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaApAQCAtNTczLDYgKzU3MywyOCBAQCBFQVBJIEVpbmFf Qm9vbCBld2tfdmlld19zY2FsZV9zZXQoRXZhc19PYmplY3QgKm8sIGRvdWJsZSBzY2FsZUZhY3Rv ciwgaW50IHgsIGludAogRUFQSSBkb3VibGUgZXdrX3ZpZXdfc2NhbGVfZ2V0KGNvbnN0IEV2YXNf T2JqZWN0ICpvKTsKIAogLyoqCisgKiBTZXRzIHpvb20gb2YgdGhlIGN1cnJlbnQgcGFnZS4KKyAq CisgKiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0byBzZXQgdGhlIHpvb20gbGV2ZWwKKyAqIEBwYXJh bSB6b29tX2ZhY3RvciBhIG5ldyBsZXZlbCB0byBzZXQKKyAqCisgKiBAcmV0dXJuIEBjIEVJTkFf VFJVRSBvbiBzdWNjZXNzIG9yIEBjIEVJTkFfRkFMU0Ugb3RoZXJ3aXNlCisgKi8KK0VBUEkgRWlu YV9Cb29sIGV3a192aWV3X3BhZ2Vfem9vbV9zZXQoRXZhc19PYmplY3QgKm8sIGRvdWJsZSB6b29t RmFjdG9yKTsKKworLyoqCisgKiBRdWVyaWVzIHRoZSBjdXJyZW50IHpvbSBmYWN0b3Igb2YgdGhl IHBhZ2UuCisgKgorICogSXQgcmV0dXJucyBwcmV2aW91cyB6b29tIGZhY3RvciBhZnRlciBld2tf dmlld19wYWdlX3pvb21fZmFjdG9yX3NldCBpcyBjYWxsZWQgaW1tZWRpYXRlbHkKKyAqIHVudGls IHpvb20gZmFjdG9yIG9mIHBhZ2UgaXMgcmVhbGx5IGNoYW5nZWQuCisgKgorICogQHBhcmFtIG8g dmlldyBvYmplY3QgdG8gZ2V0IHRoZSB6b29tIGZhY3RvcgorICoKKyAqIEByZXR1cm4gY3VycmVu dCB6b29tIGZhY3RvciBpbiB1c2Ugb24gc3VjY2VzcyBvciBAYyAtMS4wIG9uIGZhaWx1cmUKKyAq LworRUFQSSBkb3VibGUgZXdrX3ZpZXdfcGFnZV96b29tX2dldChjb25zdCBFdmFzX09iamVjdCAq byk7CisKKy8qKgogICogUXVlcmllcyB0aGUgcmF0aW8gYmV0d2VlbiB0aGUgQ1NTIHVuaXRzIGFu ZCBkZXZpY2UgcGl4ZWxzIHdoZW4gdGhlIGNvbnRlbnQgaXMgdW5zY2FsZWQuCiAgKgogICogV2hl biBkZXNpZ25pbmcgdG91Y2gtZnJpZW5kbHkgY29udGVudHMsIGtub3dpbmcgdGhlIGFwcHJveGlt YXRlZCB0YXJnZXQgc2l6ZSBvbiBhIGRldmljZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwCmluZGV4IGI1YTEw MTkuLjcwZWQ4NzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHAKQEAgLTEwOTksMyArMTA5OSwxNyBAQCBU RVNUX0YoRVdLMlZpZXdUZXN0LCBld2tfdmlld19iZ19jb2xvcikKICAgICBBU1NFUlRfRVEoMCwg Ymx1ZSk7CiAgICAgQVNTRVJUX0VRKDI1NSwgcmVkKTsKIH0KKysKK1RFU1RfRihFV0syVmlld1Rl c3QsIGV3a192aWV3X3BhZ2Vfem9vbV9zZXQpCit7CisgICAgQVNTRVJUX1RSVUUobG9hZFVybFN5 bmMoZW52aXJvbm1lbnQtPmRlZmF1bHRUZXN0UGFnZVVybCgpKSk7CisKKyAgICAvLyBEZWZhdWx0 IHpvb20gZmFjdG9yIGlzIDEuMAorICAgIEFTU0VSVF9GTE9BVF9FUSgxLCBld2tfdmlld19wYWdl X3pvb21fZ2V0KHdlYlZpZXcoKSkpOworCisgICAgQVNTRVJUX1RSVUUoZXdrX3ZpZXdfcGFnZV96 b29tX3NldCh3ZWJWaWV3KCksIDAuNjcpKTsKKyAgICBBU1NFUlRfRkxPQVRfRVEoMC42NywgZXdr X3ZpZXdfcGFnZV96b29tX2dldCh3ZWJWaWV3KCkpKTsKKworICAgIEFTU0VSVF9UUlVFKGV3a192 aWV3X3BhZ2Vfem9vbV9zZXQod2ViVmlldygpLCAxKSk7CisgICAgQVNTRVJUX0ZMT0FUX0VRKDEs IGV3a192aWV3X3BhZ2Vfem9vbV9nZXQod2ViVmlldygpKSk7Cit9CmRpZmYgLS1naXQgYS9Ub29s cy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYWJkMDAzMC4uODkxZTNjNiAxMDA2 NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsx LDEyIEBACisyMDE0LTA0LTAxICBBbmRyemVqIEJhZG93c2tpICA8YS5iYWRvd3NraUBzYW1zdW5n LmNvbT4KKworICAgICAgICBbRUZMXSBbV0syXSBSZXBsYWNpbmcgem9vbSBmdW5jdGlvbmFsaXR5 IG9mIE1pbmlCcm93c2VyIGZyb20gc2NhbGVfc2V0IHRvIHBhZ2Vfem9vbV9zZXQuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzAzOTEKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1pbmlCcm93c2VyL2Vm bC9tYWluLmM6CisKIDIwMTQtMDQtMDEgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2Fs aWEuY29tPgogCiAgICAgICAgIFtHVEtdIE5vIGxvbmdlciBidWlsZCBXZWJLaXQxIGd0a2RvYwpk aWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYyBiL1Rvb2xzL01pbmlCcm93 c2VyL2VmbC9tYWluLmMKaW5kZXggMTFhYjFlMS4uZWE5MDlkNzAgMTAwNjQ0Ci0tLSBhL1Rvb2xz L01pbmlCcm93c2VyL2VmbC9tYWluLmMKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4u YwpAQCAtNzIsMTQgKzcyLDcgQEAgem9vbV9sZXZlbF9zZXQoRXZhc19PYmplY3QgKndlYnZpZXcs IGludCBsZXZlbCkKICAgICBpZiAobGV2ZWwgPCAwICB8fCBsZXZlbCA+PSBzaXplb2Yoem9vbUxl dmVscykgLyBzaXplb2YoZmxvYXQpKQogICAgICAgICByZXR1cm4gRUlOQV9GQUxTRTsKIAotICAg IEV2YXNfQ29vcmQgb3gsIG95LCBteCwgbXksIGN4LCBjeTsKLSAgICBldmFzX3BvaW50ZXJfY2Fu dmFzX3h5X2dldChldmFzX29iamVjdF9ldmFzX2dldCh3ZWJ2aWV3KSwgJm14LCAmbXkpOyAvLyBH ZXQgY3VycmVudCBtb3VzZSBwb3NpdGlvbiBvbiB3aW5kb3cuCi0gICAgZXZhc19vYmplY3RfZ2Vv bWV0cnlfZ2V0KHdlYnZpZXcsICZveCwgJm95LCBOVUxMLCBOVUxMKTsgLy8gR2V0IHdlYnZpZXcn cyBwb3NpdGlvbiBvbiB3aW5kb3cuCi0gICAgY3ggPSBteCAtIG94OyAvLyBjdXJyZW50IHggcG9z aXRpb24gPSBtb3VzZSB4IHBvc2l0aW9uIC0gd2VidmlldyB4IHBvc2l0aW9uCi0gICAgY3kgPSBt eSAtIG95OyAvLyBjdXJyZW50IHkgcG9zaXRpb24gPSBtb3VzZSB5IHBvc2l0aW9uIC0gd2Vidmll dyB5IHBvc2l0aW9uCi0KLSAgICBFaW5hX0Jvb2wgcmVzdWx0ID0gZXdrX3ZpZXdfc2NhbGVfc2V0 KHdlYnZpZXcsIHpvb21MZXZlbHNbbGV2ZWxdLCBjeCwgY3kpOwotICAgIHJldHVybiByZXN1bHQ7 CisgICAgcmV0dXJuIGV3a192aWV3X3BhZ2Vfem9vbV9zZXQod2Vidmlldywgem9vbUxldmVsc1ts ZXZlbF0pOwogfQogCiBzdGF0aWMgRXdrX1ZpZXdfU21hcnRfQ2xhc3MgKm1pbmlCcm93c2VyVmll d1NtYXJ0Q2xhc3MoKQo= 228401 2014-04-02 09:24:58 -0700 2014-04-03 01:19:09 -0700 proposed patch 4 diff_org_130391_6.txt text/plain 5673 a.badowski ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkMmU3YzJhLi41MzIxMjkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTQtMDQtMDEgIEFuZHJ6ZWogQmFkb3dza2kgIDxhLmJhZG93c2tpQHNhbXN1bmcuY29t PgorCisgICAgICAgIFtFRkxdIFtXSzJdIFJlcGxhY2luZyB6b29tIGZ1bmN0aW9uYWxpdHkgb2Yg TWluaUJyb3dzZXIgZnJvbSBzY2FsZV9zZXQgdG8gcGFnZV96b29tX3NldC4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMDM5MQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENoYW5nZSB0aGUgaW1wbGVtZW50 YXRpb24gb2YgdGhlIHpvb20gZnVuY3Rpb25hbGl0eSBmcm9tIGV3a192aWV3X3NjYWxlX3NldAor ICAgICAgICB0byBld2tfdmlld19wYWdlX3pvb21fc2V0LiBBZGRpbmcgdG8gdGhlIEFQSSBmdW5j dGlvbnM6IGV3a192aWV3X3BhZ2Vfc2V0IGFuZAorICAgICAgICBld2tfdmlld19wYWdlX2dldCB0 byBjYWxsIGFwcHJvcHJpYXRlIFdLIGZ1bmN0aW9ucy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvZWZsL2V3a192aWV3LmNwcDoKKyAgICAgICAgKGV3a192aWV3X3BhZ2Vfem9vbV9zZXQpOgor ICAgICAgICAoZXdrX3ZpZXdfcGFnZV96b29tX2dldCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX3ZpZXcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0 X2V3azJfdmlldy5jcHA6CisgICAgICAgIChURVNUX0YpOgorCiAyMDE0LTAzLTMxICBTaW1vbiBG cmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFtVSS1zaWRlIGNvbXBv c2l0aW5nXSBGaXggYW5pbWF0aW9ucywgYW5kIGFkZCBsb2dnaW5nCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKaW5kZXggYWJlMDFhZC4uY2MxZWM4ZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcApAQCAt MjM4LDYgKzIzOCwyMSBAQCBkb3VibGUgZXdrX3ZpZXdfc2NhbGVfZ2V0KGNvbnN0IEV2YXNfT2Jq ZWN0KiBld2tWaWV3KQogICAgIHJldHVybiBXS1BhZ2VHZXRTY2FsZUZhY3RvcihpbXBsLT53a1Bh Z2UoKSk7CiB9CiAKK0VpbmFfQm9vbCBld2tfdmlld19wYWdlX3pvb21fc2V0KEV2YXNfT2JqZWN0 KiBld2tWaWV3LCBkb3VibGUgem9vbUZhY3RvcikKK3sKKyAgICBFV0tfVklFV19JTVBMX0dFVF9P Ul9SRVRVUk4oZXdrVmlldywgaW1wbCwgZmFsc2UpOworCisgICAgV0tQYWdlU2V0UGFnZVpvb21G YWN0b3IoaW1wbC0+d2tQYWdlKCksIHpvb21GYWN0b3IpOworICAgIHJldHVybiB0cnVlOworfQor Citkb3VibGUgZXdrX3ZpZXdfcGFnZV96b29tX2dldChjb25zdCBFdmFzX09iamVjdCogZXdrVmll dykKK3sKKyAgICBFV0tfVklFV19JTVBMX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgaW1wbCwgLTEp OworCisgICAgcmV0dXJuIFdLUGFnZUdldFBhZ2Vab29tRmFjdG9yKGltcGwtPndrUGFnZSgpKTsK K30KKwogRWluYV9Cb29sIGV3a192aWV3X2RldmljZV9waXhlbF9yYXRpb19zZXQoRXZhc19PYmpl Y3QqIGV3a1ZpZXcsIGZsb2F0IHJhdGlvKQogewogICAgIEVXS19WSUVXX0lNUExfR0VUX09SX1JF VFVSTihld2tWaWV3LCBpbXBsLCBmYWxzZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX3ZpZXcuaAppbmRleCA4NWMxMTA5Li5kODY2MDhjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKQEAgLTU3Myw2ICs1NzMsMjggQEAgRUFQ SSBFaW5hX0Jvb2wgZXdrX3ZpZXdfc2NhbGVfc2V0KEV2YXNfT2JqZWN0ICpvLCBkb3VibGUgc2Nh bGVGYWN0b3IsIGludCB4LCBpbnQKIEVBUEkgZG91YmxlIGV3a192aWV3X3NjYWxlX2dldChjb25z dCBFdmFzX09iamVjdCAqbyk7CiAKIC8qKgorICogU2V0cyB6b29tIG9mIHRoZSBjdXJyZW50IHBh Z2UuCisgKgorICogQHBhcmFtIG8gdmlldyBvYmplY3QgdG8gc2V0IHRoZSB6b29tIGxldmVsCisg KiBAcGFyYW0gem9vbV9mYWN0b3IgYSBuZXcgbGV2ZWwgdG8gc2V0CisgKgorICogQHJldHVybiBA YyBFSU5BX1RSVUUgb24gc3VjY2VzcyBvciBAYyBFSU5BX0ZBTFNFIG90aGVyd2lzZQorICovCitF QVBJIEVpbmFfQm9vbCBld2tfdmlld19wYWdlX3pvb21fc2V0KEV2YXNfT2JqZWN0ICpvLCBkb3Vi bGUgem9vbV9mYWN0b3IpOworCisvKioKKyAqIFF1ZXJpZXMgdGhlIGN1cnJlbnQgem9tIGZhY3Rv ciBvZiB0aGUgcGFnZS4KKyAqCisgKiBJdCByZXR1cm5zIHByZXZpb3VzIHpvb20gZmFjdG9yIGFm dGVyIGV3a192aWV3X3BhZ2Vfem9vbV9mYWN0b3Jfc2V0IGlzIGNhbGxlZCBpbW1lZGlhdGVseQor ICogdW50aWwgem9vbSBmYWN0b3Igb2YgcGFnZSBpcyByZWFsbHkgY2hhbmdlZC4KKyAqCisgKiBA cGFyYW0gbyB2aWV3IG9iamVjdCB0byBnZXQgdGhlIHpvb20gZmFjdG9yCisgKgorICogQHJldHVy biBjdXJyZW50IHpvb20gZmFjdG9yIGluIHVzZSBvbiBzdWNjZXNzIG9yIEBjIC0xLjAgb24gZmFp bHVyZQorICovCitFQVBJIGRvdWJsZSBld2tfdmlld19wYWdlX3pvb21fZ2V0KGNvbnN0IEV2YXNf T2JqZWN0ICpvKTsKKworLyoqCiAgKiBRdWVyaWVzIHRoZSByYXRpbyBiZXR3ZWVuIHRoZSBDU1Mg dW5pdHMgYW5kIGRldmljZSBwaXhlbHMgd2hlbiB0aGUgY29udGVudCBpcyB1bnNjYWxlZC4KICAq CiAgKiBXaGVuIGRlc2lnbmluZyB0b3VjaC1mcmllbmRseSBjb250ZW50cywga25vd2luZyB0aGUg YXBwcm94aW1hdGVkIHRhcmdldCBzaXplIG9uIGEgZGV2aWNlCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHAKaW5k ZXggYjVhMTAxOS4uZDIzNmM0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcApAQCAtMTA5OSwzICsxMDk5 LDE3IEBAIFRFU1RfRihFV0syVmlld1Rlc3QsIGV3a192aWV3X2JnX2NvbG9yKQogICAgIEFTU0VS VF9FUSgwLCBibHVlKTsKICAgICBBU1NFUlRfRVEoMjU1LCByZWQpOwogfQorCitURVNUX0YoRVdL MlZpZXdUZXN0LCBld2tfdmlld19wYWdlX3pvb21fc2V0KQoreworICAgIEFTU0VSVF9UUlVFKGxv YWRVcmxTeW5jKGVudmlyb25tZW50LT5kZWZhdWx0VGVzdFBhZ2VVcmwoKSkpOworCisgICAgLy8g RGVmYXVsdCB6b29tIGZhY3RvciBpcyAxLjAKKyAgICBBU1NFUlRfRkxPQVRfRVEoMSwgZXdrX3Zp ZXdfcGFnZV96b29tX2dldCh3ZWJWaWV3KCkpKTsKKworICAgIEFTU0VSVF9UUlVFKGV3a192aWV3 X3BhZ2Vfem9vbV9zZXQod2ViVmlldygpLCAwLjY3KSk7CisgICAgQVNTRVJUX0ZMT0FUX0VRKDAu NjcsIGV3a192aWV3X3BhZ2Vfem9vbV9nZXQod2ViVmlldygpKSk7CisKKyAgICBBU1NFUlRfVFJV RShld2tfdmlld19wYWdlX3pvb21fc2V0KHdlYlZpZXcoKSwgMSkpOworICAgIEFTU0VSVF9GTE9B VF9FUSgxLCBld2tfdmlld19wYWdlX3pvb21fZ2V0KHdlYlZpZXcoKSkpOworfQpkaWZmIC0tZ2l0 IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGFiZDAwMzAuLjNiNzIz ZWQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNSBAQAorMjAxNC0wNC0wMSAgQW5kcnplaiBCYWRvd3NraSAgPGEuYmFkb3dza2lA c2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gW1dLMl0gUmVwbGFjaW5nIHpvb20gZnVuY3Rp b25hbGl0eSBvZiBNaW5pQnJvd3NlciBmcm9tIHNjYWxlX3NldCB0byBwYWdlX3pvb21fc2V0Lgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwMzkxCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2hhbmdlIHRo ZSBpbXBsZW1lbnRhdGlvbiBvZiB0aGUgem9vbSBmdW5jdGlvbmFsaXR5IGZyb20gZXdrX3ZpZXdf c2NhbGVfc2V0CisgICAgICAgIHRvIGV3a192aWV3X3BhZ2Vfem9vbV9zZXQuCisKKyAgICAgICAg KiBNaW5pQnJvd3Nlci9lZmwvbWFpbi5jOgorCiAyMDE0LTA0LTAxICBNYXJ0aW4gUm9iaW5zb24g IDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBObyBsb25nZXIgYnVpbGQg V2ViS2l0MSBndGtkb2MKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMg Yi9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCmluZGV4IDExYWIxZTEuLmVhOTA5ZDcwIDEw MDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCisrKyBiL1Rvb2xzL01pbmlC cm93c2VyL2VmbC9tYWluLmMKQEAgLTcyLDE0ICs3Miw3IEBAIHpvb21fbGV2ZWxfc2V0KEV2YXNf T2JqZWN0ICp3ZWJ2aWV3LCBpbnQgbGV2ZWwpCiAgICAgaWYgKGxldmVsIDwgMCAgfHwgbGV2ZWwg Pj0gc2l6ZW9mKHpvb21MZXZlbHMpIC8gc2l6ZW9mKGZsb2F0KSkKICAgICAgICAgcmV0dXJuIEVJ TkFfRkFMU0U7CiAKLSAgICBFdmFzX0Nvb3JkIG94LCBveSwgbXgsIG15LCBjeCwgY3k7Ci0gICAg ZXZhc19wb2ludGVyX2NhbnZhc194eV9nZXQoZXZhc19vYmplY3RfZXZhc19nZXQod2Vidmlldyks ICZteCwgJm15KTsgLy8gR2V0IGN1cnJlbnQgbW91c2UgcG9zaXRpb24gb24gd2luZG93LgotICAg IGV2YXNfb2JqZWN0X2dlb21ldHJ5X2dldCh3ZWJ2aWV3LCAmb3gsICZveSwgTlVMTCwgTlVMTCk7 IC8vIEdldCB3ZWJ2aWV3J3MgcG9zaXRpb24gb24gd2luZG93LgotICAgIGN4ID0gbXggLSBveDsg Ly8gY3VycmVudCB4IHBvc2l0aW9uID0gbW91c2UgeCBwb3NpdGlvbiAtIHdlYnZpZXcgeCBwb3Np dGlvbgotICAgIGN5ID0gbXkgLSBveTsgLy8gY3VycmVudCB5IHBvc2l0aW9uID0gbW91c2UgeSBw b3NpdGlvbiAtIHdlYnZpZXcgeSBwb3NpdGlvbgotCi0gICAgRWluYV9Cb29sIHJlc3VsdCA9IGV3 a192aWV3X3NjYWxlX3NldCh3ZWJ2aWV3LCB6b29tTGV2ZWxzW2xldmVsXSwgY3gsIGN5KTsKLSAg ICByZXR1cm4gcmVzdWx0OworICAgIHJldHVybiBld2tfdmlld19wYWdlX3pvb21fc2V0KHdlYnZp ZXcsIHpvb21MZXZlbHNbbGV2ZWxdKTsKIH0KIAogc3RhdGljIEV3a19WaWV3X1NtYXJ0X0NsYXNz ICptaW5pQnJvd3NlclZpZXdTbWFydENsYXNzKCkK 228487 2014-04-03 01:19:09 -0700 2014-04-03 06:57:56 -0700 proposed patch 5 diff_org_130391_7.txt text/plain 5685 a.badowski ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkMmU3YzJhLi5mY2YyZjZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTQtMDQtMDMgIEFuZHJ6ZWogQmFkb3dza2kgIDxhLmJhZG93c2tpQHNhbXN1bmcuY29t PgorCisgICAgICAgIFtFRkxdW1dLMl0gUmVwbGFjaW5nIHpvb20gZnVuY3Rpb25hbGl0eSBvZiBN aW5pQnJvd3NlciBmcm9tIHNjYWxlX3NldCB0byBwYWdlX3pvb21fc2V0LgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwMzkxCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2hhbmdlIHRoZSBpbXBsZW1lbnRh dGlvbiBvZiB0aGUgem9vbSBmdW5jdGlvbmFsaXR5IGZyb20gZXdrX3ZpZXdfc2NhbGVfc2V0Cisg ICAgICAgIHRvIGV3a192aWV3X3BhZ2Vfem9vbV9zZXQuIEFkZGluZyB0byB0aGUgQVBJIGZ1bmN0 aW9uczogZXdrX3ZpZXdfcGFnZV96b29tX3NldCBhbmQKKyAgICAgICAgZXdrX3ZpZXdfcGFnZV96 b29tX2dldCB0byBjYWxsIGFwcHJvcHJpYXRlIFdLIGZ1bmN0aW9ucy4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcDoKKyAgICAgICAgKGV3a192aWV3X3BhZ2Vfem9v bV9zZXQpOgorICAgICAgICAoZXdrX3ZpZXdfcGFnZV96b29tX2dldCk6CisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC90 ZXN0cy90ZXN0X2V3azJfdmlldy5jcHA6CisgICAgICAgIChURVNUX0YpOgorCiAyMDE0LTAzLTMx ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFtVSS1z aWRlIGNvbXBvc2l0aW5nXSBGaXggYW5pbWF0aW9ucywgYW5kIGFkZCBsb2dnaW5nCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKaW5kZXggYWJlMDFhZC4u Y2M2NTg4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdr X3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3 LmNwcApAQCAtMjM4LDYgKzIzOCwyMiBAQCBkb3VibGUgZXdrX3ZpZXdfc2NhbGVfZ2V0KGNvbnN0 IEV2YXNfT2JqZWN0KiBld2tWaWV3KQogICAgIHJldHVybiBXS1BhZ2VHZXRTY2FsZUZhY3Rvcihp bXBsLT53a1BhZ2UoKSk7CiB9CiAKK0VpbmFfQm9vbCBld2tfdmlld19wYWdlX3pvb21fc2V0KEV2 YXNfT2JqZWN0KiBld2tWaWV3LCBkb3VibGUgem9vbUZhY3RvcikKK3sKKyAgICBFV0tfVklFV19J TVBMX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgaW1wbCwgZmFsc2UpOworCisgICAgV0tQYWdlU2V0 UGFnZVpvb21GYWN0b3IoaW1wbC0+d2tQYWdlKCksIHpvb21GYWN0b3IpOworCisgICAgcmV0dXJu IHRydWU7Cit9CisKK2RvdWJsZSBld2tfdmlld19wYWdlX3pvb21fZ2V0KGNvbnN0IEV2YXNfT2Jq ZWN0KiBld2tWaWV3KQoreworICAgIEVXS19WSUVXX0lNUExfR0VUX09SX1JFVFVSTihld2tWaWV3 LCBpbXBsLCAtMSk7CisKKyAgICByZXR1cm4gV0tQYWdlR2V0UGFnZVpvb21GYWN0b3IoaW1wbC0+ d2tQYWdlKCkpOworfQorCiBFaW5hX0Jvb2wgZXdrX3ZpZXdfZGV2aWNlX3BpeGVsX3JhdGlvX3Nl dChFdmFzX09iamVjdCogZXdrVmlldywgZmxvYXQgcmF0aW8pCiB7CiAgICAgRVdLX1ZJRVdfSU1Q TF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIGltcGwsIGZhbHNlKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCmluZGV4IDg1YzExMDkuLjMxNTA1ODggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaApAQCAtNTczLDYgKzU3 MywyOCBAQCBFQVBJIEVpbmFfQm9vbCBld2tfdmlld19zY2FsZV9zZXQoRXZhc19PYmplY3QgKm8s IGRvdWJsZSBzY2FsZUZhY3RvciwgaW50IHgsIGludAogRUFQSSBkb3VibGUgZXdrX3ZpZXdfc2Nh bGVfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0ICpvKTsKIAogLyoqCisgKiBTZXRzIHpvb20gb2YgdGhl IGN1cnJlbnQgcGFnZS4KKyAqCisgKiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0byBzZXQgdGhlIHpv b20gbGV2ZWwKKyAqIEBwYXJhbSB6b29tX2ZhY3RvciBhIG5ldyBsZXZlbCB0byBzZXQKKyAqCisg KiBAcmV0dXJuIEBjIEVJTkFfVFJVRSBvbiBzdWNjZXNzIG9yIEBjIEVJTkFfRkFMU0Ugb3RoZXJ3 aXNlCisgKi8KK0VBUEkgRWluYV9Cb29sIGV3a192aWV3X3BhZ2Vfem9vbV9zZXQoRXZhc19PYmpl Y3QgKm8sIGRvdWJsZSB6b29tX2ZhY3Rvcik7CisKKy8qKgorICogUXVlcmllcyB0aGUgY3VycmVu dCB6b29tIGZhY3RvciBvZiB0aGUgcGFnZS4KKyAqCisgKiBJdCByZXR1cm5zIHByZXZpb3VzIHpv b20gZmFjdG9yIGFmdGVyIGV3a192aWV3X3BhZ2Vfem9vbV9mYWN0b3Jfc2V0IGlzIGNhbGxlZCBp bW1lZGlhdGVseQorICogdW50aWwgem9vbSBmYWN0b3Igb2YgcGFnZSBpcyByZWFsbHkgY2hhbmdl ZC4KKyAqCisgKiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0byBnZXQgdGhlIHpvb20gZmFjdG9yCisg KgorICogQHJldHVybiBjdXJyZW50IHpvb20gZmFjdG9yIGluIHVzZSBvbiBzdWNjZXNzIG9yIEBj IC0xLjAgb24gZmFpbHVyZQorICovCitFQVBJIGRvdWJsZSBld2tfdmlld19wYWdlX3pvb21fZ2V0 KGNvbnN0IEV2YXNfT2JqZWN0ICpvKTsKKworLyoqCiAgKiBRdWVyaWVzIHRoZSByYXRpbyBiZXR3 ZWVuIHRoZSBDU1MgdW5pdHMgYW5kIGRldmljZSBwaXhlbHMgd2hlbiB0aGUgY29udGVudCBpcyB1 bnNjYWxlZC4KICAqCiAgKiBXaGVuIGRlc2lnbmluZyB0b3VjaC1mcmllbmRseSBjb250ZW50cywg a25vd2luZyB0aGUgYXBwcm94aW1hdGVkIHRhcmdldCBzaXplIG9uIGEgZGV2aWNlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmll dy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJf dmlldy5jcHAKaW5kZXggYjVhMTAxOS4uZDIzNmM0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcApAQCAt MTA5OSwzICsxMDk5LDE3IEBAIFRFU1RfRihFV0syVmlld1Rlc3QsIGV3a192aWV3X2JnX2NvbG9y KQogICAgIEFTU0VSVF9FUSgwLCBibHVlKTsKICAgICBBU1NFUlRfRVEoMjU1LCByZWQpOwogfQor CitURVNUX0YoRVdLMlZpZXdUZXN0LCBld2tfdmlld19wYWdlX3pvb21fc2V0KQoreworICAgIEFT U0VSVF9UUlVFKGxvYWRVcmxTeW5jKGVudmlyb25tZW50LT5kZWZhdWx0VGVzdFBhZ2VVcmwoKSkp OworCisgICAgLy8gRGVmYXVsdCB6b29tIGZhY3RvciBpcyAxLjAKKyAgICBBU1NFUlRfRkxPQVRf RVEoMSwgZXdrX3ZpZXdfcGFnZV96b29tX2dldCh3ZWJWaWV3KCkpKTsKKworICAgIEFTU0VSVF9U UlVFKGV3a192aWV3X3BhZ2Vfem9vbV9zZXQod2ViVmlldygpLCAwLjY3KSk7CisgICAgQVNTRVJU X0ZMT0FUX0VRKDAuNjcsIGV3a192aWV3X3BhZ2Vfem9vbV9nZXQod2ViVmlldygpKSk7CisKKyAg ICBBU1NFUlRfVFJVRShld2tfdmlld19wYWdlX3pvb21fc2V0KHdlYlZpZXcoKSwgMSkpOworICAg IEFTU0VSVF9GTE9BVF9FUSgxLCBld2tfdmlld19wYWdlX3pvb21fZ2V0KHdlYlZpZXcoKSkpOwor fQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGFi ZDAwMzAuLmVmNTBiM2QgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxNC0wNC0wMiAgQW5kcnplaiBCYWRvd3NraSAg PGEuYmFkb3dza2lAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gW1dLMl0gUmVwbGFjaW5n IHpvb20gZnVuY3Rpb25hbGl0eSBvZiBNaW5pQnJvd3NlciBmcm9tIHNjYWxlX3NldCB0byBwYWdl X3pvb21fc2V0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTMwMzkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQ2hhbmdlIHRoZSBpbXBsZW1lbnRhdGlvbiBvZiB0aGUgem9vbSBmdW5jdGlvbmFsaXR5IGZy b20gZXdrX3ZpZXdfc2NhbGVfc2V0CisgICAgICAgIHRvIGV3a192aWV3X3BhZ2Vfem9vbV9zZXQu CisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9lZmwvbWFpbi5jOgorCiAyMDE0LTA0LTAxICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBObyBs b25nZXIgYnVpbGQgV2ViS2l0MSBndGtkb2MKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2Vy L2VmbC9tYWluLmMgYi9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCmluZGV4IDExYWIxZTEu LmVhOTA5ZDcwIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCisrKyBi L1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKQEAgLTcyLDE0ICs3Miw3IEBAIHpvb21fbGV2 ZWxfc2V0KEV2YXNfT2JqZWN0ICp3ZWJ2aWV3LCBpbnQgbGV2ZWwpCiAgICAgaWYgKGxldmVsIDwg MCAgfHwgbGV2ZWwgPj0gc2l6ZW9mKHpvb21MZXZlbHMpIC8gc2l6ZW9mKGZsb2F0KSkKICAgICAg ICAgcmV0dXJuIEVJTkFfRkFMU0U7CiAKLSAgICBFdmFzX0Nvb3JkIG94LCBveSwgbXgsIG15LCBj eCwgY3k7Ci0gICAgZXZhc19wb2ludGVyX2NhbnZhc194eV9nZXQoZXZhc19vYmplY3RfZXZhc19n ZXQod2VidmlldyksICZteCwgJm15KTsgLy8gR2V0IGN1cnJlbnQgbW91c2UgcG9zaXRpb24gb24g d2luZG93LgotICAgIGV2YXNfb2JqZWN0X2dlb21ldHJ5X2dldCh3ZWJ2aWV3LCAmb3gsICZveSwg TlVMTCwgTlVMTCk7IC8vIEdldCB3ZWJ2aWV3J3MgcG9zaXRpb24gb24gd2luZG93LgotICAgIGN4 ID0gbXggLSBveDsgLy8gY3VycmVudCB4IHBvc2l0aW9uID0gbW91c2UgeCBwb3NpdGlvbiAtIHdl YnZpZXcgeCBwb3NpdGlvbgotICAgIGN5ID0gbXkgLSBveTsgLy8gY3VycmVudCB5IHBvc2l0aW9u ID0gbW91c2UgeSBwb3NpdGlvbiAtIHdlYnZpZXcgeSBwb3NpdGlvbgotCi0gICAgRWluYV9Cb29s IHJlc3VsdCA9IGV3a192aWV3X3NjYWxlX3NldCh3ZWJ2aWV3LCB6b29tTGV2ZWxzW2xldmVsXSwg Y3gsIGN5KTsKLSAgICByZXR1cm4gcmVzdWx0OworICAgIHJldHVybiBld2tfdmlld19wYWdlX3pv b21fc2V0KHdlYnZpZXcsIHpvb21MZXZlbHNbbGV2ZWxdKTsKIH0KIAogc3RhdGljIEV3a19WaWV3 X1NtYXJ0X0NsYXNzICptaW5pQnJvd3NlclZpZXdTbWFydENsYXNzKCkK 228505 2014-04-03 06:57:56 -0700 2014-04-03 08:33:37 -0700 proposed patch 6 diff_org_130391_8.txt text/plain 5680 a.badowski ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkMmU3YzJhLi5lNzg4N2UwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTQtMDQtMDMgIEFuZHJ6ZWogQmFkb3dza2kgIDxhLmJhZG93c2tpQHNhbXN1bmcuY29t PgorCisgICAgICAgIFtFRkxdW1dLMl0gUmVwbGFjaW5nIHpvb20gZnVuY3Rpb25hbGl0eSBvZiBN aW5pQnJvd3NlciBmcm9tIHNjYWxlX3NldCB0byBwYWdlX3pvb21fc2V0LgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwMzkxCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgR3l1eW91bmcgS2ltLgorCisgICAgICAgIENoYW5nZSB0aGUgaW1wbGVtZW50YXRp b24gb2YgdGhlIHpvb20gZnVuY3Rpb25hbGl0eSBmcm9tIGV3a192aWV3X3NjYWxlX3NldAorICAg ICAgICB0byBld2tfdmlld19wYWdlX3pvb21fc2V0LiBBZGRpbmcgdG8gdGhlIEFQSSBmdW5jdGlv bnM6IGV3a192aWV3X3BhZ2Vfem9vbV9zZXQgYW5kCisgICAgICAgIGV3a192aWV3X3BhZ2Vfem9v bV9nZXQgdG8gY2FsbCBhcHByb3ByaWF0ZSBXSyBmdW5jdGlvbnMuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHA6CisgICAgICAgIChld2tfdmlld19wYWdlX3pvb21f c2V0KToKKyAgICAgICAgKGV3a192aWV3X3BhZ2Vfem9vbV9nZXQpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZWZsL2V3a192aWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvdGVz dHMvdGVzdF9ld2syX3ZpZXcuY3BwOgorICAgICAgICAoVEVTVF9GKToKKwogMjAxNC0wMy0zMSAg U2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBbVUktc2lk ZSBjb21wb3NpdGluZ10gRml4IGFuaW1hdGlvbnMsIGFuZCBhZGQgbG9nZ2luZwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCmluZGV4IGFiZTAxYWQuLmNj NjU4ODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192 aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5j cHAKQEAgLTIzOCw2ICsyMzgsMjIgQEAgZG91YmxlIGV3a192aWV3X3NjYWxlX2dldChjb25zdCBF dmFzX09iamVjdCogZXdrVmlldykKICAgICByZXR1cm4gV0tQYWdlR2V0U2NhbGVGYWN0b3IoaW1w bC0+d2tQYWdlKCkpOwogfQogCitFaW5hX0Jvb2wgZXdrX3ZpZXdfcGFnZV96b29tX3NldChFdmFz X09iamVjdCogZXdrVmlldywgZG91YmxlIHpvb21GYWN0b3IpCit7CisgICAgRVdLX1ZJRVdfSU1Q TF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIGltcGwsIGZhbHNlKTsKKworICAgIFdLUGFnZVNldFBh Z2Vab29tRmFjdG9yKGltcGwtPndrUGFnZSgpLCB6b29tRmFjdG9yKTsKKworICAgIHJldHVybiB0 cnVlOworfQorCitkb3VibGUgZXdrX3ZpZXdfcGFnZV96b29tX2dldChjb25zdCBFdmFzX09iamVj dCogZXdrVmlldykKK3sKKyAgICBFV0tfVklFV19JTVBMX0dFVF9PUl9SRVRVUk4oZXdrVmlldywg aW1wbCwgLTEpOworCisgICAgcmV0dXJuIFdLUGFnZUdldFBhZ2Vab29tRmFjdG9yKGltcGwtPndr UGFnZSgpKTsKK30KKwogRWluYV9Cb29sIGV3a192aWV3X2RldmljZV9waXhlbF9yYXRpb19zZXQo RXZhc19PYmplY3QqIGV3a1ZpZXcsIGZsb2F0IHJhdGlvKQogewogICAgIEVXS19WSUVXX0lNUExf R0VUX09SX1JFVFVSTihld2tWaWV3LCBpbXBsLCBmYWxzZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaAppbmRleCA4NWMxMTA5Li4zMTUwNTg4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKQEAgLTU3Myw2ICs1NzMs MjggQEAgRUFQSSBFaW5hX0Jvb2wgZXdrX3ZpZXdfc2NhbGVfc2V0KEV2YXNfT2JqZWN0ICpvLCBk b3VibGUgc2NhbGVGYWN0b3IsIGludCB4LCBpbnQKIEVBUEkgZG91YmxlIGV3a192aWV3X3NjYWxl X2dldChjb25zdCBFdmFzX09iamVjdCAqbyk7CiAKIC8qKgorICogU2V0cyB6b29tIG9mIHRoZSBj dXJyZW50IHBhZ2UuCisgKgorICogQHBhcmFtIG8gdmlldyBvYmplY3QgdG8gc2V0IHRoZSB6b29t IGxldmVsCisgKiBAcGFyYW0gem9vbV9mYWN0b3IgYSBuZXcgbGV2ZWwgdG8gc2V0CisgKgorICog QHJldHVybiBAYyBFSU5BX1RSVUUgb24gc3VjY2VzcyBvciBAYyBFSU5BX0ZBTFNFIG90aGVyd2lz ZQorICovCitFQVBJIEVpbmFfQm9vbCBld2tfdmlld19wYWdlX3pvb21fc2V0KEV2YXNfT2JqZWN0 ICpvLCBkb3VibGUgem9vbV9mYWN0b3IpOworCisvKioKKyAqIFF1ZXJpZXMgdGhlIGN1cnJlbnQg em9vbSBmYWN0b3Igb2YgdGhlIHBhZ2UuCisgKgorICogSXQgcmV0dXJucyBwcmV2aW91cyB6b29t IGZhY3RvciBhZnRlciBld2tfdmlld19wYWdlX3pvb21fZmFjdG9yX3NldCBpcyBjYWxsZWQgaW1t ZWRpYXRlbHkKKyAqIHVudGlsIHpvb20gZmFjdG9yIG9mIHBhZ2UgaXMgcmVhbGx5IGNoYW5nZWQu CisgKgorICogQHBhcmFtIG8gdmlldyBvYmplY3QgdG8gZ2V0IHRoZSB6b29tIGZhY3RvcgorICoK KyAqIEByZXR1cm4gY3VycmVudCB6b29tIGZhY3RvciBpbiB1c2Ugb24gc3VjY2VzcyBvciBAYyAt MS4wIG9uIGZhaWx1cmUKKyAqLworRUFQSSBkb3VibGUgZXdrX3ZpZXdfcGFnZV96b29tX2dldChj b25zdCBFdmFzX09iamVjdCAqbyk7CisKKy8qKgogICogUXVlcmllcyB0aGUgcmF0aW8gYmV0d2Vl biB0aGUgQ1NTIHVuaXRzIGFuZCBkZXZpY2UgcGl4ZWxzIHdoZW4gdGhlIGNvbnRlbnQgaXMgdW5z Y2FsZWQuCiAgKgogICogV2hlbiBkZXNpZ25pbmcgdG91Y2gtZnJpZW5kbHkgY29udGVudHMsIGtu b3dpbmcgdGhlIGFwcHJveGltYXRlZCB0YXJnZXQgc2l6ZSBvbiBhIGRldmljZQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcu Y3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3Zp ZXcuY3BwCmluZGV4IGI1YTEwMTkuLmQyMzZjNGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHAKQEAgLTEw OTksMyArMTA5OSwxNyBAQCBURVNUX0YoRVdLMlZpZXdUZXN0LCBld2tfdmlld19iZ19jb2xvcikK ICAgICBBU1NFUlRfRVEoMCwgYmx1ZSk7CiAgICAgQVNTRVJUX0VRKDI1NSwgcmVkKTsKIH0KKwor VEVTVF9GKEVXSzJWaWV3VGVzdCwgZXdrX3ZpZXdfcGFnZV96b29tX3NldCkKK3sKKyAgICBBU1NF UlRfVFJVRShsb2FkVXJsU3luYyhlbnZpcm9ubWVudC0+ZGVmYXVsdFRlc3RQYWdlVXJsKCkpKTsK KworICAgIC8vIERlZmF1bHQgem9vbSBmYWN0b3IgaXMgMS4wCisgICAgQVNTRVJUX0ZMT0FUX0VR KDEsIGV3a192aWV3X3BhZ2Vfem9vbV9nZXQod2ViVmlldygpKSk7CisKKyAgICBBU1NFUlRfVFJV RShld2tfdmlld19wYWdlX3pvb21fc2V0KHdlYlZpZXcoKSwgMC42NykpOworICAgIEFTU0VSVF9G TE9BVF9FUSgwLjY3LCBld2tfdmlld19wYWdlX3pvb21fZ2V0KHdlYlZpZXcoKSkpOworCisgICAg QVNTRVJUX1RSVUUoZXdrX3ZpZXdfcGFnZV96b29tX3NldCh3ZWJWaWV3KCksIDEpKTsKKyAgICBB U1NFUlRfRkxPQVRfRVEoMSwgZXdrX3ZpZXdfcGFnZV96b29tX2dldCh3ZWJWaWV3KCkpKTsKK30K ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhYmQw MDMwLi5jNmE4M2EwIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTQtMDQtMDIgIEFuZHJ6ZWogQmFkb3dza2kgIDxh LmJhZG93c2tpQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtFRkxdW1dLMl0gUmVwbGFjaW5nIHpv b20gZnVuY3Rpb25hbGl0eSBvZiBNaW5pQnJvd3NlciBmcm9tIHNjYWxlX3NldCB0byBwYWdlX3pv b21fc2V0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTMwMzkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgR3l1eW91bmcgS2ltLgorCisgICAgICAgIENo YW5nZSB0aGUgaW1wbGVtZW50YXRpb24gb2YgdGhlIHpvb20gZnVuY3Rpb25hbGl0eSBmcm9tIGV3 a192aWV3X3NjYWxlX3NldAorICAgICAgICB0byBld2tfdmlld19wYWdlX3pvb21fc2V0LgorCisg ICAgICAgICogTWluaUJyb3dzZXIvZWZsL21haW4uYzoKKwogMjAxNC0wNC0wMSAgTWFydGluIFJv Ymluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gTm8gbG9uZ2Vy IGJ1aWxkIFdlYktpdDEgZ3RrZG9jCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9lZmwv bWFpbi5jIGIvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwppbmRleCAxMWFiMWUxLi5lYTkw OWQ3MCAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYworKysgYi9Ub29s cy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCkBAIC03MiwxNCArNzIsNyBAQCB6b29tX2xldmVsX3Nl dChFdmFzX09iamVjdCAqd2VidmlldywgaW50IGxldmVsKQogICAgIGlmIChsZXZlbCA8IDAgIHx8 IGxldmVsID49IHNpemVvZih6b29tTGV2ZWxzKSAvIHNpemVvZihmbG9hdCkpCiAgICAgICAgIHJl dHVybiBFSU5BX0ZBTFNFOwogCi0gICAgRXZhc19Db29yZCBveCwgb3ksIG14LCBteSwgY3gsIGN5 OwotICAgIGV2YXNfcG9pbnRlcl9jYW52YXNfeHlfZ2V0KGV2YXNfb2JqZWN0X2V2YXNfZ2V0KHdl YnZpZXcpLCAmbXgsICZteSk7IC8vIEdldCBjdXJyZW50IG1vdXNlIHBvc2l0aW9uIG9uIHdpbmRv dy4KLSAgICBldmFzX29iamVjdF9nZW9tZXRyeV9nZXQod2VidmlldywgJm94LCAmb3ksIE5VTEws IE5VTEwpOyAvLyBHZXQgd2VidmlldydzIHBvc2l0aW9uIG9uIHdpbmRvdy4KLSAgICBjeCA9IG14 IC0gb3g7IC8vIGN1cnJlbnQgeCBwb3NpdGlvbiA9IG1vdXNlIHggcG9zaXRpb24gLSB3ZWJ2aWV3 IHggcG9zaXRpb24KLSAgICBjeSA9IG15IC0gb3k7IC8vIGN1cnJlbnQgeSBwb3NpdGlvbiA9IG1v dXNlIHkgcG9zaXRpb24gLSB3ZWJ2aWV3IHkgcG9zaXRpb24KLQotICAgIEVpbmFfQm9vbCByZXN1 bHQgPSBld2tfdmlld19zY2FsZV9zZXQod2Vidmlldywgem9vbUxldmVsc1tsZXZlbF0sIGN4LCBj eSk7Ci0gICAgcmV0dXJuIHJlc3VsdDsKKyAgICByZXR1cm4gZXdrX3ZpZXdfcGFnZV96b29tX3Nl dCh3ZWJ2aWV3LCB6b29tTGV2ZWxzW2xldmVsXSk7CiB9CiAKIHN0YXRpYyBFd2tfVmlld19TbWFy dF9DbGFzcyAqbWluaUJyb3dzZXJWaWV3U21hcnRDbGFzcygpCg==