138090 2014-10-27 04:09:56 -0700 [GTK] Minibrowser: Add support for zoom using Control Key + Mouse scroll 2014-11-25 05:47:57 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tanay.c webkit-unassigned buildbot cgarcia commit-queue gyuyoung.kim mrobinson pnormand rniwa oldest_to_newest 1044226 0 tanay.c 2014-10-27 04:09:56 -0700 Supporting the following behaviour in GTK Minibrowser 1) Control key + Mouse scroll up -- Zoom in 2) Control key + Mouse scroll down -- Zoom out 1044227 1 240474 tanay.c 2014-10-27 04:14:30 -0700 Created attachment 240474 Patch 1048296 2 gyuyoung.kim 2014-11-12 16:23:32 -0800 CC'ing Martin 1048299 3 mrobinson 2014-11-12 16:30:07 -0800 Is there already a way to zoom in MiniBrowser? I don't think we should be adding features just for the sake of adding features. It should be "mini." 1048343 4 tanay.c 2014-11-12 21:54:29 -0800 (In reply to comment #3) > Is there already a way to zoom in MiniBrowser? I don't think we should be > adding features just for the sake of adding features. It should be "mini." Yes, there is zoom support in the Minibrowser via keyboard & softkeys. However, scroll with mouse to zoom seems more intuitive way to zoom and is a functionality present in all major browsers, hence it would be a good addition to GTK. Also it gives a good way to use/test gdk event API's for scroll direction and state. 1048366 5 pnormand 2014-11-13 00:08:38 -0800 If you want to test GTK features in a full blown WebKitGTK browser I suggest one called Epiphany. MiniBrowser doesn't need new features, it should remain... minimal. 1048371 6 240474 cgarcia 2014-11-13 00:40:11 -0800 Comment on attachment 240474 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=240474&action=review I don't see the problem of having this in MiniBrowser, I have some comments about the patch, though. > Tools/MiniBrowser/gtk/BrowserWindow.c:447 > +static void mouseZoomCallback(BrowserWindow *window, const GdkEvent *event) This is actually the scroll-event callback, that is used to implement zoom, I would call this scrollEventCallback instead. The function is boolean not void. > Tools/MiniBrowser/gtk/BrowserWindow.c:454 > + gdk_event_get_scroll_direction(event, &direction); > + gdk_event_get_state(event, &state); You could simply cast to GdkEventScroll or event change the function parameter to receive a GdkEventScroll directly, and then you can use event->state and event->direction directly. > Tools/MiniBrowser/gtk/BrowserWindow.c:456 > + if (direction == GDK_SCROLL_UP && state == GDK_CONTROL_MASK) { Instead of checking the state all the time, we can just return early when the state != GDK_CONTROL_MASK. > Tools/MiniBrowser/gtk/BrowserWindow.c:459 > + zoomLevel = webkit_web_view_get_zoom_level(window->webView) * zoomStep; > + webkit_web_view_set_zoom_level(window->webView, zoomLevel); This is duplicated in zoomInCallback, we could move this to a function browser_window_zoom_in() for example and call it from here and zoomInCallback() > Tools/MiniBrowser/gtk/BrowserWindow.c:466 > + zoomLevel = webkit_web_view_get_zoom_level(window->webView) / zoomStep; > + webkit_web_view_set_zoom_level(window->webView, zoomLevel); And the same here. > Tools/MiniBrowser/gtk/BrowserWindow.c:468 > + } You should probably handle the other direction, including GDK_SCROLL_SMOOTH, a switch would look much better than ifs, I think > Tools/MiniBrowser/gtk/BrowserWindow.c:469 > +} You should return TRUE when you have handled the event and FALSE otherwise to propagate the event. > Tools/MiniBrowser/gtk/BrowserWindow.c:790 > + g_signal_connect(window, "scroll_event", G_CALLBACK(mouseZoomCallback), window); scroll_event -> scroll-event. It doesn't make sense to pass the instance pointer as user data and you are not even handling the user data in the callback. I think it would be better if you implement the scroll_event vmethod of GtkWidgetClass instead of connecting to the signal. 1048382 7 240474 cgarcia 2014-11-13 02:55:56 -0800 Comment on attachment 240474 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=240474&action=review >> Tools/MiniBrowser/gtk/BrowserWindow.c:790 >> + g_signal_connect(window, "scroll_event", G_CALLBACK(mouseZoomCallback), window); > > scroll_event -> scroll-event. It doesn't make sense to pass the instance pointer as user data and you are not even handling the user data in the callback. I think it would be better if you implement the scroll_event vmethod of GtkWidgetClass instead of connecting to the signal. hmm, but we don't want to connect to the window scroll event, but to the web view scroll event instead. 1048383 8 tanay.c 2014-11-13 03:10:53 -0800 (In reply to comment #7) > Comment on attachment 240474 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=240474&action=review > > >> Tools/MiniBrowser/gtk/BrowserWindow.c:790 > >> + g_signal_connect(window, "scroll_event", G_CALLBACK(mouseZoomCallback), window); > > > > scroll_event -> scroll-event. It doesn't make sense to pass the instance pointer as user data and you are not even handling the user data in the callback. I think it would be better if you implement the scroll_event vmethod of GtkWidgetClass instead of connecting to the signal. > > hmm, but we don't want to connect to the window scroll event, but to the web > view scroll event instead. We are connecting to the scroll event for the window. The zoom API webkit_webview_set_zoom_level() acts on the window->webview. As per your review comment I am using the GDKEventScroll so I do not need to pass window as user data and will pass NULL instead. I will incorporate the other review comments and upload a patch. 1048384 9 cgarcia 2014-11-13 03:14:24 -0800 (In reply to comment #8) > (In reply to comment #7) > > Comment on attachment 240474 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=240474&action=review > > > > >> Tools/MiniBrowser/gtk/BrowserWindow.c:790 > > >> + g_signal_connect(window, "scroll_event", G_CALLBACK(mouseZoomCallback), window); > > > > > > scroll_event -> scroll-event. It doesn't make sense to pass the instance pointer as user data and you are not even handling the user data in the callback. I think it would be better if you implement the scroll_event vmethod of GtkWidgetClass instead of connecting to the signal. > > > > hmm, but we don't want to connect to the window scroll event, but to the web > > view scroll event instead. > > We are connecting to the scroll event for the window. The zoom API > webkit_webview_set_zoom_level() acts on the window->webview. > As per your review comment I am using the GDKEventScroll so I do not need to > pass window as user data and will pass NULL instead. I will incorporate the > other review comments and upload a patch. But you don't want to zoom the view when scrolling in the toolbar for example 1048387 10 tanay.c 2014-11-13 03:50:20 -0800 (In reply to comment #9) > (In reply to comment #8) > > (In reply to comment #7) > > > Comment on attachment 240474 [details] > > > Patch > > > > > > View in context: > > > https://bugs.webkit.org/attachment.cgi?id=240474&action=review > > > > > > >> Tools/MiniBrowser/gtk/BrowserWindow.c:790 > > > >> + g_signal_connect(window, "scroll_event", G_CALLBACK(mouseZoomCallback), window); > > > > > > > > scroll_event -> scroll-event. It doesn't make sense to pass the instance pointer as user data and you are not even handling the user data in the callback. I think it would be better if you implement the scroll_event vmethod of GtkWidgetClass instead of connecting to the signal. > > > > > > hmm, but we don't want to connect to the window scroll event, but to the web > > > view scroll event instead. > > > > We are connecting to the scroll event for the window. The zoom API > > webkit_webview_set_zoom_level() acts on the window->webview. > > As per your review comment I am using the GDKEventScroll so I do not need to > > pass window as user data and will pass NULL instead. I will incorporate the > > other review comments and upload a patch. > > But you don't want to zoom the view when scrolling in the toolbar for example I just tried to connect to the WebKitWebView 'scroll-event' signal and I am only getting a event->direction value of '4' for up and down scroll. This is corresponding to GDK_SMOOTH_SCROLL. 1048388 11 tanay.c 2014-11-13 04:04:06 -0800 Since I recieve only one scroll direction value in this case (WebKitWebView) it is not possible to differentiate between the events. Connecting to window scroll events does not cause any issues as per my testing. Please do let me know your inputs. 1048395 12 cgarcia 2014-11-13 05:04:44 -0800 (In reply to comment #10) > (In reply to comment #9) > > (In reply to comment #8) > > > (In reply to comment #7) > > > > Comment on attachment 240474 [details] > > > > Patch > > > > > > > > View in context: > > > > https://bugs.webkit.org/attachment.cgi?id=240474&action=review > > > > > > > > >> Tools/MiniBrowser/gtk/BrowserWindow.c:790 > > > > >> + g_signal_connect(window, "scroll_event", G_CALLBACK(mouseZoomCallback), window); > > > > > > > > > > scroll_event -> scroll-event. It doesn't make sense to pass the instance pointer as user data and you are not even handling the user data in the callback. I think it would be better if you implement the scroll_event vmethod of GtkWidgetClass instead of connecting to the signal. > > > > > > > > hmm, but we don't want to connect to the window scroll event, but to the web > > > > view scroll event instead. > > > > > > We are connecting to the scroll event for the window. The zoom API > > > webkit_webview_set_zoom_level() acts on the window->webview. > > > As per your review comment I am using the GDKEventScroll so I do not need to > > > pass window as user data and will pass NULL instead. I will incorporate the > > > other review comments and upload a patch. > > > > But you don't want to zoom the view when scrolling in the toolbar for example > > I just tried to connect to the WebKitWebView 'scroll-event' signal and I am > only getting a event->direction value of '4' for up and down scroll. This is > corresponding to GDK_SMOOTH_SCROLL. Yes, that's because the web view has the GDK_SMOOTH_SCROLL_MASK in its event mask. You should handle GDK_SMOOTH_SCROLL as I suggested previously. 1048396 13 cgarcia 2014-11-13 05:05:25 -0800 (In reply to comment #11) > Since I recieve only one scroll direction value in this case (WebKitWebView) > it is not possible to differentiate between the events. Connecting to window > scroll events does not cause any issues as per my testing. Please do let me > know your inputs. Does not cause any issues doesn't mean it's correct. 1048397 14 240474 cgarcia 2014-11-13 05:09:21 -0800 Comment on attachment 240474 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=240474&action=review >> Tools/MiniBrowser/gtk/BrowserWindow.c:456 >> + if (direction == GDK_SCROLL_UP && state == GDK_CONTROL_MASK) { > > Instead of checking the state all the time, we can just return early when the state != GDK_CONTROL_MASK. The state comparison is also wrong, since state is a bitmask you have to compare with the mask (gtk_accelerator_get_default_mod_mask()) if (state & mask == GDK_CONTROL_MASK) 1048654 15 241552 tanay.c 2014-11-13 21:21:37 -0800 Created attachment 241552 Patch 1048655 16 tanay.c 2014-11-13 21:26:42 -0800 Thanks for the inputs. Uploaded patch with review comments and changes for: 1) Connecting to WebView scroll event 2) Using the GdkEventScroll -> delta_y values to determine scroll direction 1050950 17 tanay.c 2014-11-24 22:59:21 -0800 Reminder to review 1050953 18 241552 cgarcia 2014-11-24 23:38:55 -0800 Comment on attachment 241552 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=241552&action=review > Tools/MiniBrowser/gtk/BrowserWindow.c:448 > +static void browser_window_zoom_in(BrowserWindow *window) Private methods should follow the WebKit coding style, this should be browserWindowZoomIn > Tools/MiniBrowser/gtk/BrowserWindow.c:456 > +static void browser_window_zoom_out(BrowserWindow *window) Ditto. > Tools/MiniBrowser/gtk/BrowserWindow.c:470 > + return isEventHandled; This is the only place where we return FALSE, so I think we don't need the local variable, simply return FALSE here directly and TRUE after the if > Tools/MiniBrowser/gtk/BrowserWindow.c:480 > + return isEventHandled; This is always TRUE at this point due to the early return. But the event was actually handled only if the zoom happened. You could make zoom in/out functions bool and return False when the view can't zoom, and return that value directly here. 1050974 19 242191 tanay.c 2014-11-25 02:27:32 -0800 Created attachment 242191 Patch 1050980 20 242191 cgarcia 2014-11-25 03:47:13 -0800 Comment on attachment 242191 Patch Ok, thanks. 1050984 21 242191 commit-queue 2014-11-25 05:47:52 -0800 Comment on attachment 242191 Patch Clearing flags on attachment: 242191 Committed r176539: <http://trac.webkit.org/changeset/176539> 1050985 22 commit-queue 2014-11-25 05:47:57 -0800 All reviewed patches have been landed. Closing bug. 240474 2014-10-27 04:14:30 -0700 2014-11-13 21:21:23 -0800 Patch bug-138090-20141027164504.patch text/plain 2627 tanay.c SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3NTIxNikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDE0LTEwLTI3ICBUYW5heSBDICA8dGFuYXkuY0BzYW1zdW5nLmNvbT4KKwor ICAgICAgICBbR1RLXSBNaW5pYnJvd3NlcjogQWRkIHN1cHBvcnQgZm9yIHpvb20gdXNpbmcgQ29u dHJvbCBLZXkgKyBNb3VzZSBzY3JvbGwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzODA5MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYzogQWRkZWQg aW1wbGVtZW50YXRpb24gZm9yIHpvb20gdXNpbmcgbW91c2Ugc2Nyb2xsICsgY29udHJvbCBrZXkK KyAgICAgICAgKG1vdXNlWm9vbUNhbGxiYWNrKTogQWRkZWQuCisgICAgICAgIChicm93c2VyV2lu ZG93Q29uc3RydWN0ZWQpOiBNb2RpZmllZC4gCisKIDIwMTQtMTAtMjUgIFJhbmllcmUgU2lsdmEg IDxyYW5pZXJlQGltZS51bmljYW1wLmJyPgogCiAgICAgICAgIEZpeCBsaW5rIHRvIEFyY2ggTGlu dXggV2lraQpJbmRleDogVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jCShyZXZpc2lv biAxNzQ5MjMpCisrKyBUb29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jCSh3b3Jr aW5nIGNvcHkpCkBAIC00NDQsNiArNDQ0LDMwIEBAIHN0YXRpYyBnYm9vbGVhbiBicm93c2VyV2lu ZG93Q2FuWm9vbU91dCgKICAgICByZXR1cm4gem9vbUxldmVsID4gbWluaW11bVpvb21MZXZlbDsK IH0KIAorc3RhdGljIHZvaWQgbW91c2Vab29tQ2FsbGJhY2soQnJvd3NlcldpbmRvdyAqd2luZG93 LCBjb25zdCBHZGtFdmVudCAqZXZlbnQpCit7CisgICAgR2RrU2Nyb2xsRGlyZWN0aW9uIGRpcmVj dGlvbjsKKyAgICBHZGtNb2RpZmllclR5cGUgc3RhdGU7CisgICAgZ2RvdWJsZSB6b29tTGV2ZWw7 CisgICAgCisgICAgZ2RrX2V2ZW50X2dldF9zY3JvbGxfZGlyZWN0aW9uKGV2ZW50LCAmZGlyZWN0 aW9uKTsKKyAgICBnZGtfZXZlbnRfZ2V0X3N0YXRlKGV2ZW50LCAmc3RhdGUpOworICAgIAorICAg IGlmIChkaXJlY3Rpb24gPT0gR0RLX1NDUk9MTF9VUCAmJiBzdGF0ZSA9PSBHREtfQ09OVFJPTF9N QVNLKSB7CisgICAgICAgIGlmIChicm93c2VyV2luZG93Q2FuWm9vbUluKHdpbmRvdykpIHsKKyAg ICAgICAgICAgIHpvb21MZXZlbCA9IHdlYmtpdF93ZWJfdmlld19nZXRfem9vbV9sZXZlbCh3aW5k b3ctPndlYlZpZXcpICogem9vbVN0ZXA7CisgICAgICAgICAgICB3ZWJraXRfd2ViX3ZpZXdfc2V0 X3pvb21fbGV2ZWwod2luZG93LT53ZWJWaWV3LCB6b29tTGV2ZWwpOworICAgICAgICB9IAorICAg IH0KKworICAgIGlmIChkaXJlY3Rpb24gPT0gR0RLX1NDUk9MTF9ET1dOICYmIHN0YXRlID09IEdE S19DT05UUk9MX01BU0spIHsKKyAgICAgICAgaWYgKGJyb3dzZXJXaW5kb3dDYW5ab29tT3V0KHdp bmRvdykpIHsKKyAgICAgICAgICAgIHpvb21MZXZlbCA9IHdlYmtpdF93ZWJfdmlld19nZXRfem9v bV9sZXZlbCh3aW5kb3ctPndlYlZpZXcpIC8gem9vbVN0ZXA7CisgICAgICAgICAgICB3ZWJraXRf d2ViX3ZpZXdfc2V0X3pvb21fbGV2ZWwod2luZG93LT53ZWJWaWV3LCB6b29tTGV2ZWwpOworICAg ICAgICB9CisgICAgfQorfQorCiBzdGF0aWMgdm9pZCBicm93c2VyV2luZG93VXBkYXRlWm9vbUFj dGlvbnMoQnJvd3NlcldpbmRvdyAqd2luZG93KQogewogICAgIGd0a193aWRnZXRfc2V0X3NlbnNp dGl2ZSh3aW5kb3ctPnpvb21Jbkl0ZW0sIGJyb3dzZXJXaW5kb3dDYW5ab29tSW4od2luZG93KSk7 CkBAIC03NjMsNiArNzg3LDcgQEAgc3RhdGljIHZvaWQgYnJvd3NlcldpbmRvd0NvbnN0cnVjdGVk KEdPYgogICAgIGdfc2lnbmFsX2Nvbm5lY3Qod2luZG93LT53ZWJWaWV3LCAibGVhdmUtZnVsbHNj cmVlbiIsIEdfQ0FMTEJBQ0sod2ViVmlld0xlYXZlRnVsbFNjcmVlbiksIHdpbmRvdyk7CiAgICAg Z19zaWduYWxfY29ubmVjdCh3aW5kb3ctPndlYlZpZXcsICJub3RpZnk6OmlzLWxvYWRpbmciLCBH X0NBTExCQUNLKHdlYlZpZXdJc0xvYWRpbmdDaGFuZ2VkKSwgd2luZG93KTsKIAorICAgIGdfc2ln bmFsX2Nvbm5lY3Qod2luZG93LCAic2Nyb2xsX2V2ZW50IiwgR19DQUxMQkFDSyhtb3VzZVpvb21D YWxsYmFjayksIHdpbmRvdyk7CiAgICAgZ19zaWduYWxfY29ubmVjdCh3ZWJraXRfd2ViX3ZpZXdf Z2V0X2NvbnRleHQod2luZG93LT53ZWJWaWV3KSwgImRvd25sb2FkLXN0YXJ0ZWQiLCBHX0NBTExC QUNLKGRvd25sb2FkU3RhcnRlZCksIHdpbmRvdyk7CiAKICAgICB3aW5kb3ctPnNlYXJjaEJhciA9 IEJST1dTRVJfU0VBUkNIX0JBUihicm93c2VyX3NlYXJjaF9iYXJfbmV3KHdpbmRvdy0+d2ViVmll dykpOwo= 241552 2014-11-13 21:21:37 -0800 2014-11-25 02:27:17 -0800 Patch bug-138090-20141114105209.patch text/plain 3775 tanay.c SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3NjExNSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE4IEBACisyMDE0LTExLTEzICBUYW5heSBDICA8dGFuYXkuY0BzYW1zdW5nLmNvbT4KKwor ICAgICAgICBbR1RLXSBNaW5pYnJvd3NlcjogQWRkIHN1cHBvcnQgZm9yIHpvb20gdXNpbmcgQ29u dHJvbCBLZXkgKyBNb3VzZSBzY3JvbGwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzODA5MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYzogSW1wbGVt ZW50aW5nIHpvb20gdXNpbmcgQ250cmwgKyBNb3VzZSBzY3JvbGwKKyAgICAgICAgKGJyb3dzZXJf d2luZG93X3pvb21faW4pOiBBZGRlZC4KKyAgICAgICAgKGJyb3dzZXJfd2luZG93X3pvb21fb3V0 KTogQWRkZWQuCisgICAgICAgIChzY3JvbGxFdmVudENhbGxiYWNrKTogQWRkZWQuCisgICAgICAg ICh6b29tSW5DYWxsYmFjayk6IE1vZGlmaWVkLgorICAgICAgICAoem9vbU91dENhbGxiYWNrKTog TW9kaWZpZWQuCisgICAgICAgIChicm93c2VyV2luZG93Q29uc3RydWN0ZWQpOiBNb2RpZmllZC4K KwogMjAxNC0xMS0xMyAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM4NjI4CkluZGV4 OiBUb29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMJKHJldmlzaW9uIDE3NTQ2NikKKysr IFRvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMJKHdvcmtpbmcgY29weSkKQEAg LTQ0NSw2ICs0NDUsNDEgQEAgc3RhdGljIGdib29sZWFuIGJyb3dzZXJXaW5kb3dDYW5ab29tT3V0 KAogICAgIHJldHVybiB6b29tTGV2ZWwgPiBtaW5pbXVtWm9vbUxldmVsOwogfQogCitzdGF0aWMg dm9pZCBicm93c2VyX3dpbmRvd196b29tX2luKEJyb3dzZXJXaW5kb3cgKndpbmRvdykKK3sKKyAg ICBpZiAoYnJvd3NlcldpbmRvd0Nhblpvb21Jbih3aW5kb3cpKSB7CisgICAgICAgIGdkb3VibGUg em9vbUxldmVsID0gd2Via2l0X3dlYl92aWV3X2dldF96b29tX2xldmVsKHdpbmRvdy0+d2ViVmll dykgKiB6b29tU3RlcDsKKyAgICAgICAgd2Via2l0X3dlYl92aWV3X3NldF96b29tX2xldmVsKHdp bmRvdy0+d2ViVmlldywgem9vbUxldmVsKTsKKyAgICB9Cit9CisKK3N0YXRpYyB2b2lkIGJyb3dz ZXJfd2luZG93X3pvb21fb3V0KEJyb3dzZXJXaW5kb3cgKndpbmRvdykKK3sKKyAgICBpZiAoYnJv d3NlcldpbmRvd0Nhblpvb21PdXQod2luZG93KSkgeworICAgICAgICBnZG91YmxlIHpvb21MZXZl bCA9IHdlYmtpdF93ZWJfdmlld19nZXRfem9vbV9sZXZlbCh3aW5kb3ctPndlYlZpZXcpIC8gem9v bVN0ZXA7CisgICAgICAgIHdlYmtpdF93ZWJfdmlld19zZXRfem9vbV9sZXZlbCh3aW5kb3ctPndl YlZpZXcsIHpvb21MZXZlbCk7CisgICAgfQorfQorCitzdGF0aWMgZ2Jvb2xlYW4gc2Nyb2xsRXZl bnRDYWxsYmFjayhXZWJLaXRXZWJWaWV3ICp3ZWJWaWV3LCBjb25zdCBHZGtFdmVudFNjcm9sbCAq ZXZlbnQsIEJyb3dzZXJXaW5kb3cgKndpbmRvdykKK3sKKyAgICBnYm9vbGVhbiBpc0V2ZW50SGFu ZGxlZCA9IEZBTFNFOworICAgIEdka01vZGlmaWVyVHlwZSBtb2QgPSBndGtfYWNjZWxlcmF0b3Jf Z2V0X2RlZmF1bHRfbW9kX21hc2soKTsKKworICAgIGlmICgoZXZlbnQtPnN0YXRlICYgbW9kKSAh PSBHREtfQ09OVFJPTF9NQVNLKQorICAgICAgICByZXR1cm4gaXNFdmVudEhhbmRsZWQ7CisgICAg CisgICAgaWYgKGV2ZW50LT5kZWx0YV95IDwgMCkgeworICAgICAgICBicm93c2VyX3dpbmRvd196 b29tX2luKHdpbmRvdyk7CisgICAgICAgIGlzRXZlbnRIYW5kbGVkID0gVFJVRTsKKyAgICB9IGVs c2UgeworICAgICAgICBicm93c2VyX3dpbmRvd196b29tX291dCh3aW5kb3cpOworICAgICAgICBp c0V2ZW50SGFuZGxlZCA9IFRSVUU7CisgICAgfQorCisgICAgcmV0dXJuIGlzRXZlbnRIYW5kbGVk OworfQorCiBzdGF0aWMgdm9pZCBicm93c2VyV2luZG93VXBkYXRlWm9vbUFjdGlvbnMoQnJvd3Nl cldpbmRvdyAqd2luZG93KQogewogICAgIGd0a193aWRnZXRfc2V0X3NlbnNpdGl2ZSh3aW5kb3ct Pnpvb21Jbkl0ZW0sIGJyb3dzZXJXaW5kb3dDYW5ab29tSW4od2luZG93KSk7CkBAIC01MDMsMTgg KzUzOCwxMiBAQCBzdGF0aWMgZ2Jvb2xlYW4gaW5zcGVjdG9yV2FzQ2xvc2VkKFdlYktpCiAKIHN0 YXRpYyB2b2lkIHpvb21JbkNhbGxiYWNrKEJyb3dzZXJXaW5kb3cgKndpbmRvdykKIHsKLSAgICBp ZiAoYnJvd3NlcldpbmRvd0Nhblpvb21Jbih3aW5kb3cpKSB7Ci0gICAgICAgIGdkb3VibGUgem9v bUxldmVsID0gd2Via2l0X3dlYl92aWV3X2dldF96b29tX2xldmVsKHdpbmRvdy0+d2ViVmlldykg KiB6b29tU3RlcDsKLSAgICAgICAgd2Via2l0X3dlYl92aWV3X3NldF96b29tX2xldmVsKHdpbmRv dy0+d2ViVmlldywgem9vbUxldmVsKTsKLSAgICB9CisgICAgYnJvd3Nlcl93aW5kb3dfem9vbV9p bih3aW5kb3cpOwogfQogCiBzdGF0aWMgdm9pZCB6b29tT3V0Q2FsbGJhY2soQnJvd3NlcldpbmRv dyAqd2luZG93KQogewotICAgIGlmIChicm93c2VyV2luZG93Q2FuWm9vbU91dCh3aW5kb3cpKSB7 Ci0gICAgICAgIGdkb3VibGUgem9vbUxldmVsID0gd2Via2l0X3dlYl92aWV3X2dldF96b29tX2xl dmVsKHdpbmRvdy0+d2ViVmlldykgLyB6b29tU3RlcDsKLSAgICAgICAgd2Via2l0X3dlYl92aWV3 X3NldF96b29tX2xldmVsKHdpbmRvdy0+d2ViVmlldywgem9vbUxldmVsKTsKLSAgICB9CisgICAg YnJvd3Nlcl93aW5kb3dfem9vbV9vdXQod2luZG93KTsKIH0KIAogc3RhdGljIHZvaWQgZGVmYXVs dFpvb21DYWxsYmFjayhCcm93c2VyV2luZG93ICp3aW5kb3cpCkBAIC03ODEsNiArODEwLDcgQEAg c3RhdGljIHZvaWQgYnJvd3NlcldpbmRvd0NvbnN0cnVjdGVkKEdPYgogICAgIGdfc2lnbmFsX2Nv bm5lY3Qod2luZG93LT53ZWJWaWV3LCAiZW50ZXItZnVsbHNjcmVlbiIsIEdfQ0FMTEJBQ0sod2Vi Vmlld0VudGVyRnVsbFNjcmVlbiksIHdpbmRvdyk7CiAgICAgZ19zaWduYWxfY29ubmVjdCh3aW5k b3ctPndlYlZpZXcsICJsZWF2ZS1mdWxsc2NyZWVuIiwgR19DQUxMQkFDSyh3ZWJWaWV3TGVhdmVG dWxsU2NyZWVuKSwgd2luZG93KTsKICAgICBnX3NpZ25hbF9jb25uZWN0KHdpbmRvdy0+d2ViVmll dywgIm5vdGlmeTo6aXMtbG9hZGluZyIsIEdfQ0FMTEJBQ0sod2ViVmlld0lzTG9hZGluZ0NoYW5n ZWQpLCB3aW5kb3cpOworICAgIGdfc2lnbmFsX2Nvbm5lY3Qod2luZG93LT53ZWJWaWV3LCAic2Ny b2xsLWV2ZW50IiwgR19DQUxMQkFDSyhzY3JvbGxFdmVudENhbGxiYWNrKSwgd2luZG93KTsKIAog ICAgIGdfc2lnbmFsX2Nvbm5lY3Qod2Via2l0X3dlYl92aWV3X2dldF9jb250ZXh0KHdpbmRvdy0+ d2ViVmlldyksICJkb3dubG9hZC1zdGFydGVkIiwgR19DQUxMQkFDSyhkb3dubG9hZFN0YXJ0ZWQp LCB3aW5kb3cpOwogCg== 242191 2014-11-25 02:27:32 -0800 2014-11-25 05:47:52 -0800 Patch bug-138090-20141125155817.patch text/plain 3706 tanay.c SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3NjUzOCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE4IEBACisyMDE0LTExLTI1ICBUYW5heSBDICA8dGFuYXkuY0BzYW1zdW5nLmNvbT4KKwor ICAgICAgICBbR1RLXSBNaW5pYnJvd3NlcjogQWRkIHN1cHBvcnQgZm9yIHpvb20gdXNpbmcgQ29u dHJvbCBLZXkgKyBNb3VzZSBzY3JvbGwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzODA5MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYzogSW1wbGVt ZW50aW5nIHpvb20gdXNpbmcgQ250cmwgKyBNb3VzZSBzY3JvbGwKKyAgICAgICAgKGJyb3dzZXJX aW5kb3dab29tSW4pOiBBZGRlZC4KKyAgICAgICAgKGJyb3dzZXJXaW5kb3dab29tT3V0KTogQWRk ZWQuCisgICAgICAgIChzY3JvbGxFdmVudENhbGxiYWNrKTogQWRkZWQuCisgICAgICAgICh6b29t SW5DYWxsYmFjayk6IE1vZGlmaWVkLgorICAgICAgICAoem9vbU91dENhbGxiYWNrKTogTW9kaWZp ZWQuCisgICAgICAgIChicm93c2VyV2luZG93Q29uc3RydWN0ZWQpOiBNb2RpZmllZC4KKwogMjAx NC0xMS0yNSAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAg IFtFRkxdIFJFR1JFU1NJT04ocjE3NjUxNCk6IEl0IG1hZGUgcGVyZm9ybWFuY2UgdGVzdHMgZmFp bApJbmRleDogVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jCShyZXZpc2lvbiAxNzY1 MzcpCisrKyBUb29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jCSh3b3JraW5nIGNv cHkpCkBAIC00NDUsNiArNDQ1LDM5IEBAIHN0YXRpYyBnYm9vbGVhbiBicm93c2VyV2luZG93Q2Fu Wm9vbU91dCgKICAgICByZXR1cm4gem9vbUxldmVsID4gbWluaW11bVpvb21MZXZlbDsKIH0KIAor c3RhdGljIGdib29sZWFuIGJyb3dzZXJXaW5kb3dab29tSW4oQnJvd3NlcldpbmRvdyAqd2luZG93 KQoreworICAgIGlmIChicm93c2VyV2luZG93Q2FuWm9vbUluKHdpbmRvdykpIHsKKyAgICAgICAg Z2RvdWJsZSB6b29tTGV2ZWwgPSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3pvb21fbGV2ZWwod2luZG93 LT53ZWJWaWV3KSAqIHpvb21TdGVwOworICAgICAgICB3ZWJraXRfd2ViX3ZpZXdfc2V0X3pvb21f bGV2ZWwod2luZG93LT53ZWJWaWV3LCB6b29tTGV2ZWwpOworICAgICAgICByZXR1cm4gVFJVRTsK KyAgICB9CisgICAgcmV0dXJuIEZBTFNFOworfQorCitzdGF0aWMgZ2Jvb2xlYW4gYnJvd3Nlcldp bmRvd1pvb21PdXQoQnJvd3NlcldpbmRvdyAqd2luZG93KQoreworICAgIGlmIChicm93c2VyV2lu ZG93Q2FuWm9vbU91dCh3aW5kb3cpKSB7CisgICAgICAgIGdkb3VibGUgem9vbUxldmVsID0gd2Vi a2l0X3dlYl92aWV3X2dldF96b29tX2xldmVsKHdpbmRvdy0+d2ViVmlldykgLyB6b29tU3RlcDsK KyAgICAgICAgd2Via2l0X3dlYl92aWV3X3NldF96b29tX2xldmVsKHdpbmRvdy0+d2ViVmlldywg em9vbUxldmVsKTsKKyAgICAgICAgcmV0dXJuIFRSVUU7CisgICAgfQorICAgIHJldHVybiBGQUxT RTsKK30KKworc3RhdGljIGdib29sZWFuIHNjcm9sbEV2ZW50Q2FsbGJhY2soV2ViS2l0V2ViVmll dyAqd2ViVmlldywgY29uc3QgR2RrRXZlbnRTY3JvbGwgKmV2ZW50LCBCcm93c2VyV2luZG93ICp3 aW5kb3cpCit7CisgICAgR2RrTW9kaWZpZXJUeXBlIG1vZCA9IGd0a19hY2NlbGVyYXRvcl9nZXRf ZGVmYXVsdF9tb2RfbWFzaygpOworCisgICAgaWYgKChldmVudC0+c3RhdGUgJiBtb2QpICE9IEdE S19DT05UUk9MX01BU0spCisgICAgICAgIHJldHVybiBGQUxTRTsKKyAgICAKKyAgICBpZiAoZXZl bnQtPmRlbHRhX3kgPCAwKQorICAgICAgICByZXR1cm4gYnJvd3NlcldpbmRvd1pvb21Jbih3aW5k b3cpOworICAgIAorICAgIHJldHVybiBicm93c2VyV2luZG93Wm9vbU91dCh3aW5kb3cpOworfQor CiBzdGF0aWMgdm9pZCBicm93c2VyV2luZG93VXBkYXRlWm9vbUFjdGlvbnMoQnJvd3NlcldpbmRv dyAqd2luZG93KQogewogICAgIGd0a193aWRnZXRfc2V0X3NlbnNpdGl2ZSh3aW5kb3ctPnpvb21J bkl0ZW0sIGJyb3dzZXJXaW5kb3dDYW5ab29tSW4od2luZG93KSk7CkBAIC01MDMsMTggKzUzNiwx MiBAQCBzdGF0aWMgZ2Jvb2xlYW4gaW5zcGVjdG9yV2FzQ2xvc2VkKFdlYktpCiAKIHN0YXRpYyB2 b2lkIHpvb21JbkNhbGxiYWNrKEJyb3dzZXJXaW5kb3cgKndpbmRvdykKIHsKLSAgICBpZiAoYnJv d3NlcldpbmRvd0Nhblpvb21Jbih3aW5kb3cpKSB7Ci0gICAgICAgIGdkb3VibGUgem9vbUxldmVs ID0gd2Via2l0X3dlYl92aWV3X2dldF96b29tX2xldmVsKHdpbmRvdy0+d2ViVmlldykgKiB6b29t U3RlcDsKLSAgICAgICAgd2Via2l0X3dlYl92aWV3X3NldF96b29tX2xldmVsKHdpbmRvdy0+d2Vi Vmlldywgem9vbUxldmVsKTsKLSAgICB9CisgICAgYnJvd3NlcldpbmRvd1pvb21Jbih3aW5kb3cp OwogfQogCiBzdGF0aWMgdm9pZCB6b29tT3V0Q2FsbGJhY2soQnJvd3NlcldpbmRvdyAqd2luZG93 KQogewotICAgIGlmIChicm93c2VyV2luZG93Q2FuWm9vbU91dCh3aW5kb3cpKSB7Ci0gICAgICAg IGdkb3VibGUgem9vbUxldmVsID0gd2Via2l0X3dlYl92aWV3X2dldF96b29tX2xldmVsKHdpbmRv dy0+d2ViVmlldykgLyB6b29tU3RlcDsKLSAgICAgICAgd2Via2l0X3dlYl92aWV3X3NldF96b29t X2xldmVsKHdpbmRvdy0+d2ViVmlldywgem9vbUxldmVsKTsKLSAgICB9CisgICAgYnJvd3Nlcldp bmRvd1pvb21PdXQod2luZG93KTsKIH0KIAogc3RhdGljIHZvaWQgZGVmYXVsdFpvb21DYWxsYmFj ayhCcm93c2VyV2luZG93ICp3aW5kb3cpCkBAIC03ODEsNiArODA4LDcgQEAgc3RhdGljIHZvaWQg YnJvd3NlcldpbmRvd0NvbnN0cnVjdGVkKEdPYgogICAgIGdfc2lnbmFsX2Nvbm5lY3Qod2luZG93 LT53ZWJWaWV3LCAiZW50ZXItZnVsbHNjcmVlbiIsIEdfQ0FMTEJBQ0sod2ViVmlld0VudGVyRnVs bFNjcmVlbiksIHdpbmRvdyk7CiAgICAgZ19zaWduYWxfY29ubmVjdCh3aW5kb3ctPndlYlZpZXcs ICJsZWF2ZS1mdWxsc2NyZWVuIiwgR19DQUxMQkFDSyh3ZWJWaWV3TGVhdmVGdWxsU2NyZWVuKSwg d2luZG93KTsKICAgICBnX3NpZ25hbF9jb25uZWN0KHdpbmRvdy0+d2ViVmlldywgIm5vdGlmeTo6 aXMtbG9hZGluZyIsIEdfQ0FMTEJBQ0sod2ViVmlld0lzTG9hZGluZ0NoYW5nZWQpLCB3aW5kb3cp OworICAgIGdfc2lnbmFsX2Nvbm5lY3Qod2luZG93LT53ZWJWaWV3LCAic2Nyb2xsLWV2ZW50Iiwg R19DQUxMQkFDSyhzY3JvbGxFdmVudENhbGxiYWNrKSwgd2luZG93KTsKIAogICAgIGdfc2lnbmFs X2Nvbm5lY3Qod2Via2l0X3dlYl92aWV3X2dldF9jb250ZXh0KHdpbmRvdy0+d2ViVmlldyksICJk b3dubG9hZC1zdGFydGVkIiwgR19DQUxMQkFDSyhkb3dubG9hZFN0YXJ0ZWQpLCB3aW5kb3cpOwog Cg==