57644 2011-04-01 11:01:00 -0700 [GTK] Flash in divs with overflow: auto is not positioned and clipped properly 2011-04-26 17:23:52 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P3 Normal --- 1 mrobinson webkit-unassigned abarth cgarcia eric webkit.review.bot xan.lopez oldest_to_newest 377919 0 mrobinson 2011-04-01 11:01:00 -0700 It appears that Flash in divs that have scrollbars is not positioned or clipped properly. This can be seen by scrolling the div itself. You'll notice that the Flash window does not move and isn't clipped to the size of the div. 377927 1 87882 mrobinson 2011-04-01 11:14:45 -0700 Created attachment 87882 Patch 378668 2 87882 cgarcia 2011-04-03 23:31:20 -0700 Comment on attachment 87882 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=87882&action=review > Source/WebCore/plugins/gtk/PluginViewGtk.cpp:553 > + GdkRectangle clipRect = m_clipRect; > + GdkRegion* clipRegion = gdk_region_rectangle(&clipRect); > + gdk_window_shape_combine_region(gtk_widget_get_window(widget), clipRegion, 0, 0); > + gdk_region_destroy(clipRegion); you need a #ifdef here since there's no GdkRegion in GTK+3 379051 3 88121 mrobinson 2011-04-04 14:01:02 -0700 Created attachment 88121 Patch with fixes for GTK+ 3.x 379351 4 88121 cgarcia 2011-04-04 23:41:50 -0700 Comment on attachment 88121 Patch with fixes for GTK+ 3.x View in context: https://bugs.webkit.org/attachment.cgi?id=88121&action=review > Source/WebCore/plugins/gtk/PluginViewGtk.cpp:497 > + if (!m_clipRect.width() || !m_clipRect.height()) { maybe if (m_clipRect.isEmpty()) is more clear here. > Source/WebCore/plugins/gtk/PluginViewGtk.cpp:556 > + cairo_rectangle_int_t clipRect = m_clipRect; GdkRectangle is cairo_rectangle_int_t, so you can move GdkRectangle clipRect = m_clipRect; out of the #ifdef block and use it for both gtk2 and gtk3 379719 5 88273 mrobinson 2011-04-05 10:34:19 -0700 Created attachment 88273 Patch with Carlos' suggestions 393011 6 88273 krit 2011-04-26 16:30:20 -0700 Comment on attachment 88273 Patch with Carlos' suggestions View in context: https://bugs.webkit.org/attachment.cgi?id=88273&action=review LGTM. r=me > Source/WebCore/plugins/gtk/PluginViewGtk.cpp:495 > + // If the width or height are null, set the clipRect to null, indicating that s/the width/width/ 393028 7 mrobinson 2011-04-26 16:35:37 -0700 Committed r84979: <http://trac.webkit.org/changeset/84979> 393173 8 webkit.review.bot 2011-04-26 17:23:52 -0700 http://trac.webkit.org/changeset/84979 might have broken SnowLeopard Intel Release (Tests) The following tests are not passing: accessibility/anchor-linked-anonymous-block-crash.html accessibility/aria-activedescendant-crash.html accessibility/aria-checkbox-checked.html accessibility/aria-checkbox-text.html accessibility/aria-combobox.html accessibility/aria-controls-with-tabs.html accessibility/aria-describedby-on-input.html accessibility/aria-disabled.html accessibility/aria-help.html accessibility/aria-hidden-update.html accessibility/aria-hidden-with-elements.html accessibility/aria-hidden.html accessibility/aria-label.html accessibility/aria-labelledby-on-input.html accessibility/aria-labelledby-overrides-label.html accessibility/aria-labelledby-stay-within.html accessibility/aria-link-supports-press.html accessibility/aria-list-and-listitem.html accessibility/aria-option-role.html accessibility/aria-presentational-role.html 87882 2011-04-01 11:14:45 -0700 2011-04-04 14:00:51 -0700 Patch bug-57644-20110401111443.patch text/plain 7977 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogODI2MDMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0MjdmNTkzMjgwMjk2OGJk MjA5ZGQ5YTEzYWJmNzM0YWE0ZjNmZDAxLi5lMTJlMzYzNTljMTE1MDMzMmNmODlmYmRhMjIyMjNj ZTllZmExZDcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDQtMDEgIE1hcnRp biBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIEZsYXNoIGluIGRpdnMgd2l0aCBvdmVy ZmxvdzogYXV0byBpcyBub3QgcG9zaXRpb25lZCBhbmQgY2xpcHBlZCBwcm9wZXJseQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTc2NDQKKworICAgICAg ICBNYW51YWwgdGVzdDogcGx1Z2lucy93aW5kb3dlZC1pbi1pZnJhbWUtMi5odG1sCisKKyAgICAg ICAgKiBtYW51YWwtdGVzdHMvcGx1Z2lucy93aW5kb3dlZC1pbi1pZnJhbWUtMi5odG1sOiBBZGRl ZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvV2lkZ2V0R3RrLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OldpZGdldDo6c2V0RnJhbWVSZWN0KTogTGlrZSB0aGUgUXQgcG9ydCwgd2Ugbm90aWZ5IHRo ZSB3aWRnZXQgdmlhIGZyYW1lUmVjdHNDaGFuZ2VkLgorICAgICAgICAqIHBsdWdpbnMvUGx1Z2lu Vmlldy5oOiBBZGRlZCBoZWxwZXIgbWV0aG9kIHRvIHNldCB0aGUgYWxsb2NhdGlvbiBhbmQgY2xp cC4KKyAgICAgICAgKiBwbHVnaW5zL2d0ay9QbHVnaW5WaWV3R3RrLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlBsdWdpblZpZXc6OnNldE5QV2luZG93SWZOZWVkZWQpOkNhbGwgdGhlIGhlbHBlciBt ZXRob2QgaW5zdGVhZCBvZiBzZXR0aW5nCisgICAgICAgIHRoZSBhbGxvY2F0aW9uIGltbWVkaWF0 ZWx5LiBCcmluZyB0aGlzIG1ldGhvZCBpbnRvIHN5bmMgd2l0aCB0aGUgaW1wbGVtZW50YXRpb24g aW4KKyAgICAgICAgdGhlIFF0IHBvcnQuCisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3Ojp1 cGRhdGVXaWRnZXRBbGxvY2F0aW9uQW5kQ2xpcCk6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6 UGx1Z2luVmlldzo6cGx1Z0FkZGVkQ2FsbGJhY2spOiBDYWxsIHRoZSBuZXcgaGVscGVyIG1ldGhv ZC4KKwogMjAxMS0wMy0zMSAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5j b20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjgyNTg5LgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbWFudWFsLXRlc3RzL3BsdWdpbnMvd2luZG93ZWQtaW4taWZyYW1l LTIuaHRtbCBiL1NvdXJjZS9XZWJDb3JlL21hbnVhbC10ZXN0cy9wbHVnaW5zL3dpbmRvd2VkLWlu LWlmcmFtZS0yLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYjExODhlMDRjNWZhMjA5YjcyNTM2ODNmMzJlNzlk N2I3Y2Y0ODMyMQotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJDb3JlL21hbnVhbC10ZXN0 cy9wbHVnaW5zL3dpbmRvd2VkLWluLWlmcmFtZS0yLmh0bWwKQEAgLTAsMCArMSwyNiBAQAorPGh0 bWwgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGh0bWwiPgorCis8aGVhZD4KKzxtZXRh IGh0dHAtZXF1aXY9IkNvbnRlbnQtVHlwZSIgY29udGVudD0idGV4dC9odG1sOyBjaGFyc2V0PVVU Ri04IiAvPgorPHRpdGxlPkZsYXNoIEluIElGcmFtZSBUZXN0IEZpbGU8L3RpdGxlPgorPC9oZWFk PgorCis8Ym9keT4KKworICAgIDxiPiBUaGlzIG1hbnVhbCB0ZXN0cyBjbGlwcGluZyBhbmQgdHJh bnNsYXRpb24gb2YgcGx1Z2luIGxvYWRlZCBhcyB0aGUgc3JjIG9mIGFuIGlmcmFtZQorICAgICAg ICBpbnNpZGUgYSBkaXYgd2l0aCBhdXRvIG92ZXJmbG93LiBUaGUgZmxhc2ggaW4gdGhlIG1pZGRs ZSBvZiB0aGlzIHBhZ2Ugc2hvdWxkIGJlIGNsaXBwZWQKKyAgICAgICAgdG8gdGhlIHNpemUgb2Yg dGhlIGRpdiBhbmQgc2hvdWxkIHNjcm9sbCBwcm9wZXJseSB3aGVuIHNjcm9sbGluZyB0aGUgbWFp biBmcmFtZSBhcyB3ZWxsCisgICAgICAgIGFzIHRoZSBkaXYgaXRzZWxmLiBUaGlzIHdhcyBhIHBy b2JsZW0gZm9yIEdUSysgaW4KKyAgICAgICAgPGEgaHJlZj0iaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTU3NjQ0Ij5idWcgNTc2NDQ8L2E+LgorICAgIDwvYj4KKyAgICA8 ZGl2IHN0eWxlPSJoZWlnaHQ6MzAwcHg7Ij4mbmJzcDs8L2Rpdj4KKyAgICA8ZGl2IHN0eWxlPSJ3 aWR0aDogNTAwcHg7IGhlaWdodDogMzAwcHg7IG92ZXJmbG93OiBhdXRvOyI+CisgICAgICAgIDxk aXYgc3R5bGU9ImhlaWdodDoxMDBweDsiPiZuYnNwOzwvZGl2PgorICAgICAgICA8aWZyYW1lIHdp ZHRoPSI2MDAiIGhlaWdodD0iMzY4IiBzcmM9InRlc3Quc3dmIiBmcmFtZWJvcmRlcj0iMCIgYWxs b3dmdWxsc2NyZWVuPjwvaWZyYW1lPgorICAgICAgICA8ZGl2IHN0eWxlPSJoZWlnaHQ6MTAwcHg7 Ij4mbmJzcDs8L2Rpdj4KKyAgICA8L2Rpdj4KKyAgICA8ZGl2IHN0eWxlPSJoZWlnaHQ6MzAwcHg7 Ij4mbmJzcDs8L2Rpdj4KKzxiciBjbGVhcj0iYWxsIj4KKzwvYm9keT4KKworPC9odG1sPgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1dpZGdldEd0ay5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvV2lkZ2V0R3RrLmNwcAppbmRleCAwYWIzOTQwODhhZDM0 MWQzYzMwZWIyOGRjMWI3OTA2MjQ2MmI1N2QyLi45YmNhNTA2MThhOWExYmIyMDU0ZjViNjVlYWY3 NjEwNDhhYTEwOGM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvV2lk Z2V0R3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvV2lkZ2V0R3RrLmNw cApAQCAtMTA5LDYgKzEwOSw3IEBAIEludFJlY3QgV2lkZ2V0OjpmcmFtZVJlY3QoKSBjb25zdAog dm9pZCBXaWRnZXQ6OnNldEZyYW1lUmVjdChjb25zdCBJbnRSZWN0JiByZWN0KQogewogICAgIG1f ZnJhbWUgPSByZWN0OworICAgIGZyYW1lUmVjdHNDaGFuZ2VkKCk7CiB9CiAKIHZvaWQgV2lkZ2V0 OjpyZWxlYXNlUGxhdGZvcm1XaWRnZXQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGx1 Z2lucy9QbHVnaW5WaWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL1BsdWdpblZpZXcuaApp bmRleCA4OTY1MDhkNGZiNjM4YjExZGJlNWU4N2ZjOGViMzkwMDI0M2JiMTg3Li42NjZhMDU4OGNi MGY1ODY1ODJlZTA1YThmNWI0YzY4YzdhZTE3MjRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbHVnaW5zL1BsdWdpblZpZXcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL1BsdWdp blZpZXcuaApAQCAtNDM4LDYgKzQzOCw3IEBAIHByaXZhdGU6CiAjaWYgUExBVEZPUk0oR1RLKQog ICAgICAgICBzdGF0aWMgZ2Jvb2xlYW4gcGx1Z1JlbW92ZWRDYWxsYmFjayhHdGtTb2NrZXQqLCBQ bHVnaW5WaWV3Kik7CiAgICAgICAgIHN0YXRpYyB2b2lkIHBsdWdBZGRlZENhbGxiYWNrKEd0a1Nv Y2tldCosIFBsdWdpblZpZXcqKTsKKyAgICAgICAgdm9pZCB1cGRhdGVXaWRnZXRBbGxvY2F0aW9u QW5kQ2xpcCgpOwogICAgICAgICBib29sIG1fcGx1Z0FkZGVkOwogICAgICAgICBJbnRSZWN0IG1f ZGVsYXllZEFsbG9jYXRpb247CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs dWdpbnMvZ3RrL1BsdWdpblZpZXdHdGsuY3BwIGIvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9ndGsv UGx1Z2luVmlld0d0ay5jcHAKaW5kZXggNzVhNTFjNTY0OGI3NGFmOTc5NjUyZDJkZTUwYjIwNjM2 N2VhMzc4YS4uMThlM2M4YmY5NzgzNjdhY2U4Y2UzYTdiMjc0NzNkY2I3MGRhMDhkNCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9ndGsvUGx1Z2luVmlld0d0ay5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGx1Z2lucy9ndGsvUGx1Z2luVmlld0d0ay5jcHAKQEAgLTQ5MiwyNiAr NDkyLDI3IEBAIHZvaWQgUGx1Z2luVmlldzo6c2V0TlBXaW5kb3dJZk5lZWRlZCgpCiAgICAgaWYg KG1faXNXaW5kb3dlZCAmJiAhcGxhdGZvcm1QbHVnaW5XaWRnZXQoKSkKICAgICAgICAgcmV0dXJu OwogCi0gICAgaWYgKG1faXNXaW5kb3dlZCkgewotICAgICAgICBtX25wV2luZG93LnggPSBtX3dp bmRvd1JlY3QueCgpOwotICAgICAgICBtX25wV2luZG93LnkgPSBtX3dpbmRvd1JlY3QueSgpOwot ICAgICAgICBtX25wV2luZG93LndpZHRoID0gbV93aW5kb3dSZWN0LndpZHRoKCk7Ci0gICAgICAg IG1fbnBXaW5kb3cuaGVpZ2h0ID0gbV93aW5kb3dSZWN0LmhlaWdodCgpOwotCi0gICAgICAgIG1f bnBXaW5kb3cuY2xpcFJlY3QubGVmdCA9IG1heCgwLCBtX2NsaXBSZWN0LngoKSk7Ci0gICAgICAg IG1fbnBXaW5kb3cuY2xpcFJlY3QudG9wID0gbWF4KDAsIG1fY2xpcFJlY3QueSgpKTsKLSAgICAg ICAgbV9ucFdpbmRvdy5jbGlwUmVjdC5yaWdodCA9IG1fY2xpcFJlY3QueCgpICsgbV9jbGlwUmVj dC53aWR0aCgpOwotICAgICAgICBtX25wV2luZG93LmNsaXBSZWN0LmJvdHRvbSA9IG1fY2xpcFJl Y3QueSgpICsgbV9jbGlwUmVjdC5oZWlnaHQoKTsKLSAgICB9IGVsc2UgewotICAgICAgICBtX25w V2luZG93LnggPSAwOwotICAgICAgICBtX25wV2luZG93LnkgPSAwOwotICAgICAgICBtX25wV2lu ZG93LndpZHRoID0gbV93aW5kb3dSZWN0LndpZHRoKCk7Ci0gICAgICAgIG1fbnBXaW5kb3cuaGVp Z2h0ID0gbV93aW5kb3dSZWN0LmhlaWdodCgpOwotCisgICAgLy8gSWYgdGhlIHdpZHRoIG9yIGhl aWdodCBhcmUgbnVsbCwgc2V0IHRoZSBjbGlwUmVjdCB0byBudWxsLCBpbmRpY2F0aW5nIHRoYXQK KyAgICAvLyB0aGUgcGx1Z2luIGlzIG5vdCB2aXNpYmxlL3Njcm9sbGVkIG91dC4KKyAgICBpZiAo IW1fY2xpcFJlY3Qud2lkdGgoKSB8fCAhbV9jbGlwUmVjdC5oZWlnaHQoKSkgewogICAgICAgICBt X25wV2luZG93LmNsaXBSZWN0LmxlZnQgPSAwOwotICAgICAgICBtX25wV2luZG93LmNsaXBSZWN0 LnRvcCA9IDA7CiAgICAgICAgIG1fbnBXaW5kb3cuY2xpcFJlY3QucmlnaHQgPSAwOworICAgICAg ICBtX25wV2luZG93LmNsaXBSZWN0LnRvcCA9IDA7CiAgICAgICAgIG1fbnBXaW5kb3cuY2xpcFJl Y3QuYm90dG9tID0gMDsKKyAgICB9IGVsc2UgeworICAgICAgICAvLyBDbGlwcGluZyByZWN0YW5n bGUgb2YgdGhlIHBsdWctaW47IHRoZSBvcmlnaW4gaXMgdGhlIHRvcCBsZWZ0IGNvcm5lciBvZiB0 aGUgZHJhd2FibGUgb3Igd2luZG93LiAKKyAgICAgICAgbV9ucFdpbmRvdy5jbGlwUmVjdC5sZWZ0 ID0gbV9ucFdpbmRvdy54ICsgbV9jbGlwUmVjdC54KCk7CisgICAgICAgIG1fbnBXaW5kb3cuY2xp cFJlY3QudG9wID0gbV9ucFdpbmRvdy55ICsgbV9jbGlwUmVjdC55KCk7CisgICAgICAgIG1fbnBX aW5kb3cuY2xpcFJlY3QucmlnaHQgPSBtX25wV2luZG93LnggKyBtX2NsaXBSZWN0LngoKSArIG1f Y2xpcFJlY3Qud2lkdGgoKTsKKyAgICAgICAgbV9ucFdpbmRvdy5jbGlwUmVjdC5ib3R0b20gPSBt X25wV2luZG93LnkgKyBtX2NsaXBSZWN0LnkoKSArIG1fY2xpcFJlY3QuaGVpZ2h0KCk7CisgICAg fQorCisgICAgLy8gRkxBU0ggV09SS0FST1VORDogT25seSBzZXQgaW5pdGlhbGx5LiBNdWx0aXBs ZSBjYWxscyB0bworICAgIC8vIHNldE5QV2luZG93KCkgY2F1c2UgdGhlIHBsdWdpbiB0byBjcmFz aCBpbiB3aW5kb3dlZCBtb2RlLgorICAgIGlmICghbV9wbHVnaW4tPnF1aXJrcygpLmNvbnRhaW5z KFBsdWdpblF1aXJrRG9udENhbGxTZXRXaW5kb3dNb3JlVGhhbk9uY2UpIHx8ICFtX2lzV2luZG93 ZWQKKyAgICAgICAgfHwgbV9ucFdpbmRvdy53aWR0aCA9PSBzdGF0aWNfY2FzdDx1aW50MzJfdD4o LTEpIHx8IG1fbnBXaW5kb3cuaGVpZ2h0ID09IHN0YXRpY19jYXN0PHVpbnQzMl90PigtMSkpIHsK KyAgICAgICAgbV9ucFdpbmRvdy53aWR0aCA9IG1fd2luZG93UmVjdC53aWR0aCgpOworICAgICAg ICBtX25wV2luZG93LmhlaWdodCA9IG1fd2luZG93UmVjdC5oZWlnaHQoKTsKICAgICB9CiAKICAg ICBQbHVnaW5WaWV3OjpzZXRDdXJyZW50UGx1Z2luVmlldyh0aGlzKTsKQEAgLTUzMywxNSArNTM0 LDI4IEBAIHZvaWQgUGx1Z2luVmlldzo6c2V0TlBXaW5kb3dJZk5lZWRlZCgpCiAgICAgfQogI2Vu ZGlmCiAKLSAgICBHdGtBbGxvY2F0aW9uIGFsbG9jYXRpb24gPSB7IG1fd2luZG93UmVjdC54KCks IG1fd2luZG93UmVjdC55KCksIG1fd2luZG93UmVjdC53aWR0aCgpLCBtX3dpbmRvd1JlY3QuaGVp Z2h0KCkgfTsKKyAgICBtX2RlbGF5ZWRBbGxvY2F0aW9uID0gbV93aW5kb3dSZWN0OworICAgIHVw ZGF0ZVdpZGdldEFsbG9jYXRpb25BbmRDbGlwKCk7Cit9CiAKK3ZvaWQgUGx1Z2luVmlldzo6dXBk YXRlV2lkZ2V0QWxsb2NhdGlvbkFuZENsaXAoKQorewogICAgIC8vIElmIHRoZSB3aW5kb3cgaGFz IG5vdCBiZWVuIGVtYmVkZGVkIHlldCAodGhlIHBsdWcgYWRkZWQpLCB3ZSBkZWxheSBzZXR0aW5n IGl0cyBhbGxvY2F0aW9uIHVudGlsIAogICAgIC8vIHRoYXQgcG9pbnQuIFRoaXMgZml4ZXMgaXNz dWVzIHdpdGggc29tZSBKYXZhIHBsdWdpbiBpbnN0YW5jZXMgbm90IHJlbmRlcmluZyBpbW1lZGlh dGVseS4KLSAgICBpZiAoIW1fcGx1Z0FkZGVkKSB7Ci0gICAgICAgIG1fZGVsYXllZEFsbG9jYXRp b24gPSBhbGxvY2F0aW9uOworICAgIGlmICghbV9wbHVnQWRkZWQgfHwgbV9kZWxheWVkQWxsb2Nh dGlvbi5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKKworICAgIEd0a1dpZGdldCogd2lkZ2V0 ID0gcGxhdGZvcm1QbHVnaW5XaWRnZXQoKTsKKyAgICBpZiAoZ3RrX3dpZGdldF9nZXRfcmVhbGl6 ZWQod2lkZ2V0KSkgeworICAgICAgICBHZGtSZWN0YW5nbGUgY2xpcFJlY3QgPSBtX2NsaXBSZWN0 OworICAgICAgICBHZGtSZWdpb24qIGNsaXBSZWdpb24gPSBnZGtfcmVnaW9uX3JlY3RhbmdsZSgm Y2xpcFJlY3QpOworICAgICAgICBnZGtfd2luZG93X3NoYXBlX2NvbWJpbmVfcmVnaW9uKGd0a193 aWRnZXRfZ2V0X3dpbmRvdyh3aWRnZXQpLCBjbGlwUmVnaW9uLCAwLCAwKTsKKyAgICAgICAgZ2Rr X3JlZ2lvbl9kZXN0cm95KGNsaXBSZWdpb24pOwogICAgIH0KLSAgICBndGtfd2lkZ2V0X3NpemVf YWxsb2NhdGUocGxhdGZvcm1QbHVnaW5XaWRnZXQoKSwgJmFsbG9jYXRpb24pOworCisgICAgR3Rr QWxsb2NhdGlvbiBhbGxvY2F0aW9uKG1fZGVsYXllZEFsbG9jYXRpb24pOworICAgIGd0a193aWRn ZXRfc2l6ZV9hbGxvY2F0ZSh3aWRnZXQsICZhbGxvY2F0aW9uKTsKKyAgICBtX2RlbGF5ZWRBbGxv Y2F0aW9uID0gSW50UmVjdCgpOwogfQogCiB2b2lkIFBsdWdpblZpZXc6OnNldFBhcmVudFZpc2li bGUoYm9vbCB2aXNpYmxlKQpAQCAtNzY4LDEzICs3ODIsOCBAQCB2b2lkIFBsdWdpblZpZXc6OnBs dWdBZGRlZENhbGxiYWNrKEd0a1NvY2tldCogc29ja2V0LCBQbHVnaW5WaWV3KiB2aWV3KQogewog ICAgIEFTU0VSVChzb2NrZXQpOwogICAgIEFTU0VSVCh2aWV3KTsKLQogICAgIHZpZXctPm1fcGx1 Z0FkZGVkID0gdHJ1ZTsKLSAgICBpZiAoIXZpZXctPm1fZGVsYXllZEFsbG9jYXRpb24uaXNFbXB0 eSgpKSB7Ci0gICAgICAgIEd0a0FsbG9jYXRpb24gYWxsb2NhdGlvbih2aWV3LT5tX2RlbGF5ZWRB bGxvY2F0aW9uKTsKLSAgICAgICAgZ3RrX3dpZGdldF9zaXplX2FsbG9jYXRlKEdUS19XSURHRVQo c29ja2V0KSwgJmFsbG9jYXRpb24pOwotICAgICAgICB2aWV3LT5tX2RlbGF5ZWRBbGxvY2F0aW9u LnNldFNpemUoSW50U2l6ZSgpKTsKLSAgICB9CisgICAgdmlldy0+dXBkYXRlV2lkZ2V0QWxsb2Nh dGlvbkFuZENsaXAoKTsKIH0KIAogYm9vbCBQbHVnaW5WaWV3OjpwbGF0Zm9ybVN0YXJ0KCkK 88121 2011-04-04 14:01:02 -0700 2011-04-05 10:34:11 -0700 Patch with fixes for GTK+ 3.x bug-57644-20110404140056.patch text/plain 8281 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogODI4NTYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjZmEwYzgzNjFhMzVmZTUx NzAxNjBmYWMzZjNiZWE3MmM2ZjE5YTZmLi40ZTM4NDJiNDE3ODAxMWE2N2JkOTEwY2M1ODYyNjhh OTgwZGU3NWQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDQtMDEgIE1hcnRp biBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIEZsYXNoIGluIGRpdnMgd2l0aCBvdmVy ZmxvdzogYXV0byBpcyBub3QgcG9zaXRpb25lZCBhbmQgY2xpcHBlZCBwcm9wZXJseQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTc2NDQKKworICAgICAg ICBNYW51YWwgdGVzdDogcGx1Z2lucy93aW5kb3dlZC1pbi1pZnJhbWUtMi5odG1sCisKKyAgICAg ICAgKiBtYW51YWwtdGVzdHMvcGx1Z2lucy93aW5kb3dlZC1pbi1pZnJhbWUtMi5odG1sOiBBZGRl ZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvV2lkZ2V0R3RrLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OldpZGdldDo6c2V0RnJhbWVSZWN0KTogTGlrZSB0aGUgUXQgcG9ydCwgd2Ugbm90aWZ5IHRo ZSB3aWRnZXQgdmlhIGZyYW1lUmVjdHNDaGFuZ2VkLgorICAgICAgICAqIHBsdWdpbnMvUGx1Z2lu Vmlldy5oOiBBZGRlZCBoZWxwZXIgbWV0aG9kIHRvIHNldCB0aGUgYWxsb2NhdGlvbiBhbmQgY2xp cC4KKyAgICAgICAgKiBwbHVnaW5zL2d0ay9QbHVnaW5WaWV3R3RrLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlBsdWdpblZpZXc6OnNldE5QV2luZG93SWZOZWVkZWQpOkNhbGwgdGhlIGhlbHBlciBt ZXRob2QgaW5zdGVhZCBvZiBzZXR0aW5nCisgICAgICAgIHRoZSBhbGxvY2F0aW9uIGltbWVkaWF0 ZWx5LiBCcmluZyB0aGlzIG1ldGhvZCBpbnRvIHN5bmMgd2l0aCB0aGUgaW1wbGVtZW50YXRpb24g aW4KKyAgICAgICAgdGhlIFF0IHBvcnQuCisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3Ojp1 cGRhdGVXaWRnZXRBbGxvY2F0aW9uQW5kQ2xpcCk6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6 UGx1Z2luVmlldzo6cGx1Z0FkZGVkQ2FsbGJhY2spOiBDYWxsIHRoZSBuZXcgaGVscGVyIG1ldGhv ZC4KKwogMjAxMS0wNC0wNCAgTWFsY29sbSBNYWNMZW9kICA8bW1hY2xlb2RAd2VibWFpbC5jby56 YT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZXZpbiBPbGxpdmllci4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL21hbnVhbC10ZXN0cy9wbHVnaW5zL3dpbmRvd2VkLWluLWlmcmFtZS0yLmh0 bWwgYi9Tb3VyY2UvV2ViQ29yZS9tYW51YWwtdGVzdHMvcGx1Z2lucy93aW5kb3dlZC1pbi1pZnJh bWUtMi5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLmIxMTg4ZTA0YzVmYTIwOWI3MjUzNjgzZjMyZTc5ZDdiN2Nm NDgzMjEKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9tYW51YWwtdGVzdHMvcGx1 Z2lucy93aW5kb3dlZC1pbi1pZnJhbWUtMi5odG1sCkBAIC0wLDAgKzEsMjYgQEAKKzxodG1sIHht bG5zPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hodG1sIj4KKworPGhlYWQ+Cis8bWV0YSBodHRw LWVxdWl2PSJDb250ZW50LVR5cGUiIGNvbnRlbnQ9InRleHQvaHRtbDsgY2hhcnNldD1VVEYtOCIg Lz4KKzx0aXRsZT5GbGFzaCBJbiBJRnJhbWUgVGVzdCBGaWxlPC90aXRsZT4KKzwvaGVhZD4KKwor PGJvZHk+CisKKyAgICA8Yj4gVGhpcyBtYW51YWwgdGVzdHMgY2xpcHBpbmcgYW5kIHRyYW5zbGF0 aW9uIG9mIHBsdWdpbiBsb2FkZWQgYXMgdGhlIHNyYyBvZiBhbiBpZnJhbWUKKyAgICAgICAgaW5z aWRlIGEgZGl2IHdpdGggYXV0byBvdmVyZmxvdy4gVGhlIGZsYXNoIGluIHRoZSBtaWRkbGUgb2Yg dGhpcyBwYWdlIHNob3VsZCBiZSBjbGlwcGVkCisgICAgICAgIHRvIHRoZSBzaXplIG9mIHRoZSBk aXYgYW5kIHNob3VsZCBzY3JvbGwgcHJvcGVybHkgd2hlbiBzY3JvbGxpbmcgdGhlIG1haW4gZnJh bWUgYXMgd2VsbAorICAgICAgICBhcyB0aGUgZGl2IGl0c2VsZi4gVGhpcyB3YXMgYSBwcm9ibGVt IGZvciBHVEsrIGluCisgICAgICAgIDxhIGhyZWY9Imh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD01NzY0NCI+YnVnIDU3NjQ0PC9hPi4KKyAgICA8L2I+CisgICAgPGRpdiBz dHlsZT0iaGVpZ2h0OjMwMHB4OyI+Jm5ic3A7PC9kaXY+CisgICAgPGRpdiBzdHlsZT0id2lkdGg6 IDUwMHB4OyBoZWlnaHQ6IDMwMHB4OyBvdmVyZmxvdzogYXV0bzsiPgorICAgICAgICA8ZGl2IHN0 eWxlPSJoZWlnaHQ6MTAwcHg7Ij4mbmJzcDs8L2Rpdj4KKyAgICAgICAgPGlmcmFtZSB3aWR0aD0i NjAwIiBoZWlnaHQ9IjM2OCIgc3JjPSJ0ZXN0LnN3ZiIgZnJhbWVib3JkZXI9IjAiIGFsbG93ZnVs bHNjcmVlbj48L2lmcmFtZT4KKyAgICAgICAgPGRpdiBzdHlsZT0iaGVpZ2h0OjEwMHB4OyI+Jm5i c3A7PC9kaXY+CisgICAgPC9kaXY+CisgICAgPGRpdiBzdHlsZT0iaGVpZ2h0OjMwMHB4OyI+Jm5i c3A7PC9kaXY+Cis8YnIgY2xlYXI9ImFsbCI+Cis8L2JvZHk+CisKKzwvaHRtbD4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9XaWRnZXRHdGsuY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3RrL1dpZGdldEd0ay5jcHAKaW5kZXggMGFiMzk0MDg4YWQzNDFkM2Mz MGViMjhkYzFiNzkwNjI0NjJiNTdkMi4uOWJjYTUwNjE4YTlhMWJiMjA1NGY1YjY1ZWFmNzYxMDQ4 YWExMDhjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1dpZGdldEd0 ay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1dpZGdldEd0ay5jcHAKQEAg LTEwOSw2ICsxMDksNyBAQCBJbnRSZWN0IFdpZGdldDo6ZnJhbWVSZWN0KCkgY29uc3QKIHZvaWQg V2lkZ2V0OjpzZXRGcmFtZVJlY3QoY29uc3QgSW50UmVjdCYgcmVjdCkKIHsKICAgICBtX2ZyYW1l ID0gcmVjdDsKKyAgICBmcmFtZVJlY3RzQ2hhbmdlZCgpOwogfQogCiB2b2lkIFdpZGdldDo6cmVs ZWFzZVBsYXRmb3JtV2lkZ2V0KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMv UGx1Z2luVmlldy5oIGIvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3LmgKaW5kZXgg ODk2NTA4ZDRmYjYzOGIxMWRiZTVlODdmYzhlYjM5MDAyNDNiYjE4Ny4uNjY2YTA1ODhjYjBmNTg2 NTgyZWUwNWE4ZjViNGM2OGM3YWUxNzI0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGx1 Z2lucy9QbHVnaW5WaWV3LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3 LmgKQEAgLTQzOCw2ICs0MzgsNyBAQCBwcml2YXRlOgogI2lmIFBMQVRGT1JNKEdUSykKICAgICAg ICAgc3RhdGljIGdib29sZWFuIHBsdWdSZW1vdmVkQ2FsbGJhY2soR3RrU29ja2V0KiwgUGx1Z2lu VmlldyopOwogICAgICAgICBzdGF0aWMgdm9pZCBwbHVnQWRkZWRDYWxsYmFjayhHdGtTb2NrZXQq LCBQbHVnaW5WaWV3Kik7CisgICAgICAgIHZvaWQgdXBkYXRlV2lkZ2V0QWxsb2NhdGlvbkFuZENs aXAoKTsKICAgICAgICAgYm9vbCBtX3BsdWdBZGRlZDsKICAgICAgICAgSW50UmVjdCBtX2RlbGF5 ZWRBbGxvY2F0aW9uOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5z L2d0ay9QbHVnaW5WaWV3R3RrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvZ3RrL1BsdWdp blZpZXdHdGsuY3BwCmluZGV4IDM2ODk5OWUyMmYwZWYzZTNjNjJlMjFlMzcyMTdlYjM0Y2Y5Mjdl NmMuLmFmNDhmNmVlN2ViMTMwZTYwOGM5ZDUwOWRhYWVmZjJkN2NhZjA1YzMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvZ3RrL1BsdWdpblZpZXdHdGsuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsdWdpbnMvZ3RrL1BsdWdpblZpZXdHdGsuY3BwCkBAIC00OTIsMjYgKzQ5Miwy NyBAQCB2b2lkIFBsdWdpblZpZXc6OnNldE5QV2luZG93SWZOZWVkZWQoKQogICAgIGlmIChtX2lz V2luZG93ZWQgJiYgIXBsYXRmb3JtUGx1Z2luV2lkZ2V0KCkpCiAgICAgICAgIHJldHVybjsKIAot ICAgIGlmIChtX2lzV2luZG93ZWQpIHsKLSAgICAgICAgbV9ucFdpbmRvdy54ID0gbV93aW5kb3dS ZWN0LngoKTsKLSAgICAgICAgbV9ucFdpbmRvdy55ID0gbV93aW5kb3dSZWN0LnkoKTsKLSAgICAg ICAgbV9ucFdpbmRvdy53aWR0aCA9IG1fd2luZG93UmVjdC53aWR0aCgpOwotICAgICAgICBtX25w V2luZG93LmhlaWdodCA9IG1fd2luZG93UmVjdC5oZWlnaHQoKTsKLQotICAgICAgICBtX25wV2lu ZG93LmNsaXBSZWN0LmxlZnQgPSBtYXgoMCwgbV9jbGlwUmVjdC54KCkpOwotICAgICAgICBtX25w V2luZG93LmNsaXBSZWN0LnRvcCA9IG1heCgwLCBtX2NsaXBSZWN0LnkoKSk7Ci0gICAgICAgIG1f bnBXaW5kb3cuY2xpcFJlY3QucmlnaHQgPSBtX2NsaXBSZWN0LngoKSArIG1fY2xpcFJlY3Qud2lk dGgoKTsKLSAgICAgICAgbV9ucFdpbmRvdy5jbGlwUmVjdC5ib3R0b20gPSBtX2NsaXBSZWN0Lnko KSArIG1fY2xpcFJlY3QuaGVpZ2h0KCk7Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgbV9ucFdpbmRv dy54ID0gMDsKLSAgICAgICAgbV9ucFdpbmRvdy55ID0gMDsKLSAgICAgICAgbV9ucFdpbmRvdy53 aWR0aCA9IG1fd2luZG93UmVjdC53aWR0aCgpOwotICAgICAgICBtX25wV2luZG93LmhlaWdodCA9 IG1fd2luZG93UmVjdC5oZWlnaHQoKTsKLQorICAgIC8vIElmIHRoZSB3aWR0aCBvciBoZWlnaHQg YXJlIG51bGwsIHNldCB0aGUgY2xpcFJlY3QgdG8gbnVsbCwgaW5kaWNhdGluZyB0aGF0CisgICAg Ly8gdGhlIHBsdWdpbiBpcyBub3QgdmlzaWJsZS9zY3JvbGxlZCBvdXQuCisgICAgaWYgKCFtX2Ns aXBSZWN0LndpZHRoKCkgfHwgIW1fY2xpcFJlY3QuaGVpZ2h0KCkpIHsKICAgICAgICAgbV9ucFdp bmRvdy5jbGlwUmVjdC5sZWZ0ID0gMDsKLSAgICAgICAgbV9ucFdpbmRvdy5jbGlwUmVjdC50b3Ag PSAwOwogICAgICAgICBtX25wV2luZG93LmNsaXBSZWN0LnJpZ2h0ID0gMDsKKyAgICAgICAgbV9u cFdpbmRvdy5jbGlwUmVjdC50b3AgPSAwOwogICAgICAgICBtX25wV2luZG93LmNsaXBSZWN0LmJv dHRvbSA9IDA7CisgICAgfSBlbHNlIHsKKyAgICAgICAgLy8gQ2xpcHBpbmcgcmVjdGFuZ2xlIG9m IHRoZSBwbHVnLWluOyB0aGUgb3JpZ2luIGlzIHRoZSB0b3AgbGVmdCBjb3JuZXIgb2YgdGhlIGRy YXdhYmxlIG9yIHdpbmRvdy4gCisgICAgICAgIG1fbnBXaW5kb3cuY2xpcFJlY3QubGVmdCA9IG1f bnBXaW5kb3cueCArIG1fY2xpcFJlY3QueCgpOworICAgICAgICBtX25wV2luZG93LmNsaXBSZWN0 LnRvcCA9IG1fbnBXaW5kb3cueSArIG1fY2xpcFJlY3QueSgpOworICAgICAgICBtX25wV2luZG93 LmNsaXBSZWN0LnJpZ2h0ID0gbV9ucFdpbmRvdy54ICsgbV9jbGlwUmVjdC54KCkgKyBtX2NsaXBS ZWN0LndpZHRoKCk7CisgICAgICAgIG1fbnBXaW5kb3cuY2xpcFJlY3QuYm90dG9tID0gbV9ucFdp bmRvdy55ICsgbV9jbGlwUmVjdC55KCkgKyBtX2NsaXBSZWN0LmhlaWdodCgpOworICAgIH0KKwor ICAgIC8vIEZMQVNIIFdPUktBUk9VTkQ6IE9ubHkgc2V0IGluaXRpYWxseS4gTXVsdGlwbGUgY2Fs bHMgdG8KKyAgICAvLyBzZXROUFdpbmRvdygpIGNhdXNlIHRoZSBwbHVnaW4gdG8gY3Jhc2ggaW4g d2luZG93ZWQgbW9kZS4KKyAgICBpZiAoIW1fcGx1Z2luLT5xdWlya3MoKS5jb250YWlucyhQbHVn aW5RdWlya0RvbnRDYWxsU2V0V2luZG93TW9yZVRoYW5PbmNlKSB8fCAhbV9pc1dpbmRvd2VkCisg ICAgICAgIHx8IG1fbnBXaW5kb3cud2lkdGggPT0gc3RhdGljX2Nhc3Q8dWludDMyX3Q+KC0xKSB8 fCBtX25wV2luZG93LmhlaWdodCA9PSBzdGF0aWNfY2FzdDx1aW50MzJfdD4oLTEpKSB7CisgICAg ICAgIG1fbnBXaW5kb3cud2lkdGggPSBtX3dpbmRvd1JlY3Qud2lkdGgoKTsKKyAgICAgICAgbV9u cFdpbmRvdy5oZWlnaHQgPSBtX3dpbmRvd1JlY3QuaGVpZ2h0KCk7CiAgICAgfQogCiAgICAgUGx1 Z2luVmlldzo6c2V0Q3VycmVudFBsdWdpblZpZXcodGhpcyk7CkBAIC01MzMsMTUgKzUzNCwzNSBA QCB2b2lkIFBsdWdpblZpZXc6OnNldE5QV2luZG93SWZOZWVkZWQoKQogICAgIH0KICNlbmRpZgog Ci0gICAgR3RrQWxsb2NhdGlvbiBhbGxvY2F0aW9uID0geyBtX3dpbmRvd1JlY3QueCgpLCBtX3dp bmRvd1JlY3QueSgpLCBtX3dpbmRvd1JlY3Qud2lkdGgoKSwgbV93aW5kb3dSZWN0LmhlaWdodCgp IH07CisgICAgbV9kZWxheWVkQWxsb2NhdGlvbiA9IG1fd2luZG93UmVjdDsKKyAgICB1cGRhdGVX aWRnZXRBbGxvY2F0aW9uQW5kQ2xpcCgpOworfQogCit2b2lkIFBsdWdpblZpZXc6OnVwZGF0ZVdp ZGdldEFsbG9jYXRpb25BbmRDbGlwKCkKK3sKICAgICAvLyBJZiB0aGUgd2luZG93IGhhcyBub3Qg YmVlbiBlbWJlZGRlZCB5ZXQgKHRoZSBwbHVnIGFkZGVkKSwgd2UgZGVsYXkgc2V0dGluZyBpdHMg YWxsb2NhdGlvbiB1bnRpbCAKICAgICAvLyB0aGF0IHBvaW50LiBUaGlzIGZpeGVzIGlzc3VlcyB3 aXRoIHNvbWUgSmF2YSBwbHVnaW4gaW5zdGFuY2VzIG5vdCByZW5kZXJpbmcgaW1tZWRpYXRlbHku Ci0gICAgaWYgKCFtX3BsdWdBZGRlZCkgewotICAgICAgICBtX2RlbGF5ZWRBbGxvY2F0aW9uID0g YWxsb2NhdGlvbjsKKyAgICBpZiAoIW1fcGx1Z0FkZGVkIHx8IG1fZGVsYXllZEFsbG9jYXRpb24u aXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CisKKyAgICBHdGtXaWRnZXQqIHdpZGdldCA9IHBs YXRmb3JtUGx1Z2luV2lkZ2V0KCk7CisgICAgaWYgKGd0a193aWRnZXRfZ2V0X3JlYWxpemVkKHdp ZGdldCkpIHsKKyNpZmRlZiBHVEtfQVBJX1ZFUlNJT05fMgorICAgICAgICBHZGtSZWN0YW5nbGUg Y2xpcFJlY3QgPSBtX2NsaXBSZWN0OworICAgICAgICBHZGtSZWdpb24qIGNsaXBSZWdpb24gPSBn ZGtfcmVnaW9uX3JlY3RhbmdsZSgmY2xpcFJlY3QpOworICAgICAgICBnZGtfd2luZG93X3NoYXBl X2NvbWJpbmVfcmVnaW9uKGd0a193aWRnZXRfZ2V0X3dpbmRvdyh3aWRnZXQpLCBjbGlwUmVnaW9u LCAwLCAwKTsKKyAgICAgICAgZ2RrX3JlZ2lvbl9kZXN0cm95KGNsaXBSZWdpb24pOworI2Vsc2UK KyAgICAgICAgY2Fpcm9fcmVjdGFuZ2xlX2ludF90IGNsaXBSZWN0ID0gbV9jbGlwUmVjdDsKKyAg ICAgICAgY2Fpcm9fcmVnaW9uX3QqIGNsaXBSZWdpb24gPSBjYWlyb19yZWdpb25fY3JlYXRlX3Jl Y3RhbmdsZSgmY2xpcFJlY3QpOworICAgICAgICBnZGtfd2luZG93X3NoYXBlX2NvbWJpbmVfcmVn aW9uKGd0a193aWRnZXRfZ2V0X3dpbmRvdyh3aWRnZXQpLCBjbGlwUmVnaW9uLCAwLCAwKTsKKyAg ICAgICAgY2Fpcm9fcmVnaW9uX2Rlc3Ryb3koY2xpcFJlZ2lvbik7CisjZW5kaWYKICAgICB9Ci0g ICAgZ3RrX3dpZGdldF9zaXplX2FsbG9jYXRlKHBsYXRmb3JtUGx1Z2luV2lkZ2V0KCksICZhbGxv Y2F0aW9uKTsKKworICAgIEd0a0FsbG9jYXRpb24gYWxsb2NhdGlvbihtX2RlbGF5ZWRBbGxvY2F0 aW9uKTsKKyAgICBndGtfd2lkZ2V0X3NpemVfYWxsb2NhdGUod2lkZ2V0LCAmYWxsb2NhdGlvbik7 CisgICAgbV9kZWxheWVkQWxsb2NhdGlvbiA9IEludFJlY3QoKTsKIH0KIAogdm9pZCBQbHVnaW5W aWV3OjpzZXRQYXJlbnRWaXNpYmxlKGJvb2wgdmlzaWJsZSkKQEAgLTc3MCwxMyArNzkxLDggQEAg dm9pZCBQbHVnaW5WaWV3OjpwbHVnQWRkZWRDYWxsYmFjayhHdGtTb2NrZXQqIHNvY2tldCwgUGx1 Z2luVmlldyogdmlldykKIHsKICAgICBBU1NFUlQoc29ja2V0KTsKICAgICBBU1NFUlQodmlldyk7 Ci0KICAgICB2aWV3LT5tX3BsdWdBZGRlZCA9IHRydWU7Ci0gICAgaWYgKCF2aWV3LT5tX2RlbGF5 ZWRBbGxvY2F0aW9uLmlzRW1wdHkoKSkgewotICAgICAgICBHdGtBbGxvY2F0aW9uIGFsbG9jYXRp b24odmlldy0+bV9kZWxheWVkQWxsb2NhdGlvbik7Ci0gICAgICAgIGd0a193aWRnZXRfc2l6ZV9h bGxvY2F0ZShHVEtfV0lER0VUKHNvY2tldCksICZhbGxvY2F0aW9uKTsKLSAgICAgICAgdmlldy0+ bV9kZWxheWVkQWxsb2NhdGlvbi5zZXRTaXplKEludFNpemUoKSk7Ci0gICAgfQorICAgIHZpZXct PnVwZGF0ZVdpZGdldEFsbG9jYXRpb25BbmRDbGlwKCk7CiB9CiAKIGJvb2wgUGx1Z2luVmlldzo6 cGxhdGZvcm1TdGFydCgpCg== 88273 2011-04-05 10:34:19 -0700 2011-04-26 16:35:42 -0700 Patch with Carlos' suggestions bug-57644-20110405103420.patch text/plain 8200 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogODI5NDgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBiMGFhMTg4YzNmYThkNWRh NTE0NzExYzZlNmM0MGJmOTZlY2M3MThiLi43N2NkMWJlNTAyNTM3MzM0YjBhNTRkYTMyZmI3YmEx Zjg0N2FhMDIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDQtMDEgIE1hcnRp biBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIEZsYXNoIGluIGRpdnMgd2l0aCBvdmVy ZmxvdzogYXV0byBpcyBub3QgcG9zaXRpb25lZCBhbmQgY2xpcHBlZCBwcm9wZXJseQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTc2NDQKKworICAgICAg ICBNYW51YWwgdGVzdDogcGx1Z2lucy93aW5kb3dlZC1pbi1pZnJhbWUtMi5odG1sCisKKyAgICAg ICAgKiBtYW51YWwtdGVzdHMvcGx1Z2lucy93aW5kb3dlZC1pbi1pZnJhbWUtMi5odG1sOiBBZGRl ZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvV2lkZ2V0R3RrLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OldpZGdldDo6c2V0RnJhbWVSZWN0KTogTGlrZSB0aGUgUXQgcG9ydCwgd2Ugbm90aWZ5IHRo ZSB3aWRnZXQgdmlhIGZyYW1lUmVjdHNDaGFuZ2VkLgorICAgICAgICAqIHBsdWdpbnMvUGx1Z2lu Vmlldy5oOiBBZGRlZCBoZWxwZXIgbWV0aG9kIHRvIHNldCB0aGUgYWxsb2NhdGlvbiBhbmQgY2xp cC4KKyAgICAgICAgKiBwbHVnaW5zL2d0ay9QbHVnaW5WaWV3R3RrLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlBsdWdpblZpZXc6OnNldE5QV2luZG93SWZOZWVkZWQpOkNhbGwgdGhlIGhlbHBlciBt ZXRob2QgaW5zdGVhZCBvZiBzZXR0aW5nCisgICAgICAgIHRoZSBhbGxvY2F0aW9uIGltbWVkaWF0 ZWx5LiBCcmluZyB0aGlzIG1ldGhvZCBpbnRvIHN5bmMgd2l0aCB0aGUgaW1wbGVtZW50YXRpb24g aW4KKyAgICAgICAgdGhlIFF0IHBvcnQuCisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3Ojp1 cGRhdGVXaWRnZXRBbGxvY2F0aW9uQW5kQ2xpcCk6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6 UGx1Z2luVmlldzo6cGx1Z0FkZGVkQ2FsbGJhY2spOiBDYWxsIHRoZSBuZXcgaGVscGVyIG1ldGhv ZC4KKwogMjAxMS0wNC0wNSAgRGltaXRyaSBHbGF6a292ICA8ZGdsYXprb3ZAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9tYW51YWwtdGVzdHMvcGx1Z2lucy93aW5kb3dlZC1pbi1pZnJhbWUtMi5odG1sIGIv U291cmNlL1dlYkNvcmUvbWFudWFsLXRlc3RzL3BsdWdpbnMvd2luZG93ZWQtaW4taWZyYW1lLTIu aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwLi5iMTE4OGUwNGM1ZmEyMDliNzI1MzY4M2YzMmU3OWQ3YjdjZjQ4MzIx Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkNvcmUvbWFudWFsLXRlc3RzL3BsdWdpbnMv d2luZG93ZWQtaW4taWZyYW1lLTIuaHRtbApAQCAtMCwwICsxLDI2IEBACis8aHRtbCB4bWxucz0i aHR0cDovL3d3dy53My5vcmcvMTk5OS94aHRtbCI+CisKKzxoZWFkPgorPG1ldGEgaHR0cC1lcXVp dj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9VVRGLTgiIC8+Cis8 dGl0bGU+Rmxhc2ggSW4gSUZyYW1lIFRlc3QgRmlsZTwvdGl0bGU+Cis8L2hlYWQ+CisKKzxib2R5 PgorCisgICAgPGI+IFRoaXMgbWFudWFsIHRlc3RzIGNsaXBwaW5nIGFuZCB0cmFuc2xhdGlvbiBv ZiBwbHVnaW4gbG9hZGVkIGFzIHRoZSBzcmMgb2YgYW4gaWZyYW1lCisgICAgICAgIGluc2lkZSBh IGRpdiB3aXRoIGF1dG8gb3ZlcmZsb3cuIFRoZSBmbGFzaCBpbiB0aGUgbWlkZGxlIG9mIHRoaXMg cGFnZSBzaG91bGQgYmUgY2xpcHBlZAorICAgICAgICB0byB0aGUgc2l6ZSBvZiB0aGUgZGl2IGFu ZCBzaG91bGQgc2Nyb2xsIHByb3Blcmx5IHdoZW4gc2Nyb2xsaW5nIHRoZSBtYWluIGZyYW1lIGFz IHdlbGwKKyAgICAgICAgYXMgdGhlIGRpdiBpdHNlbGYuIFRoaXMgd2FzIGEgcHJvYmxlbSBmb3Ig R1RLKyBpbgorICAgICAgICA8YSBocmVmPSJodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NTc2NDQiPmJ1ZyA1NzY0NDwvYT4uCisgICAgPC9iPgorICAgIDxkaXYgc3R5bGU9 ImhlaWdodDozMDBweDsiPiZuYnNwOzwvZGl2PgorICAgIDxkaXYgc3R5bGU9IndpZHRoOiA1MDBw eDsgaGVpZ2h0OiAzMDBweDsgb3ZlcmZsb3c6IGF1dG87Ij4KKyAgICAgICAgPGRpdiBzdHlsZT0i aGVpZ2h0OjEwMHB4OyI+Jm5ic3A7PC9kaXY+CisgICAgICAgIDxpZnJhbWUgd2lkdGg9IjYwMCIg aGVpZ2h0PSIzNjgiIHNyYz0idGVzdC5zd2YiIGZyYW1lYm9yZGVyPSIwIiBhbGxvd2Z1bGxzY3Jl ZW4+PC9pZnJhbWU+CisgICAgICAgIDxkaXYgc3R5bGU9ImhlaWdodDoxMDBweDsiPiZuYnNwOzwv ZGl2PgorICAgIDwvZGl2PgorICAgIDxkaXYgc3R5bGU9ImhlaWdodDozMDBweDsiPiZuYnNwOzwv ZGl2PgorPGJyIGNsZWFyPSJhbGwiPgorPC9ib2R5PgorCis8L2h0bWw+CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvV2lkZ2V0R3RrLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2d0ay9XaWRnZXRHdGsuY3BwCmluZGV4IDBhYjM5NDA4OGFkMzQxZDNjMzBlYjI4 ZGMxYjc5MDYyNDYyYjU3ZDIuLjliY2E1MDYxOGE5YTFiYjIwNTRmNWI2NWVhZjc2MTA0OGFhMTA4 YzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9XaWRnZXRHdGsuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9XaWRnZXRHdGsuY3BwCkBAIC0xMDks NiArMTA5LDcgQEAgSW50UmVjdCBXaWRnZXQ6OmZyYW1lUmVjdCgpIGNvbnN0CiB2b2lkIFdpZGdl dDo6c2V0RnJhbWVSZWN0KGNvbnN0IEludFJlY3QmIHJlY3QpCiB7CiAgICAgbV9mcmFtZSA9IHJl Y3Q7CisgICAgZnJhbWVSZWN0c0NoYW5nZWQoKTsKIH0KIAogdm9pZCBXaWRnZXQ6OnJlbGVhc2VQ bGF0Zm9ybVdpZGdldCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL1BsdWdp blZpZXcuaCBiL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlldy5oCmluZGV4IDg5NjUw OGQ0ZmI2MzhiMTFkYmU1ZTg3ZmM4ZWIzOTAwMjQzYmIxODcuLjY2NmEwNTg4Y2IwZjU4NjU4MmVl MDVhOGY1YjRjNjhjN2FlMTcyNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMv UGx1Z2luVmlldy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlldy5oCkBA IC00MzgsNiArNDM4LDcgQEAgcHJpdmF0ZToKICNpZiBQTEFURk9STShHVEspCiAgICAgICAgIHN0 YXRpYyBnYm9vbGVhbiBwbHVnUmVtb3ZlZENhbGxiYWNrKEd0a1NvY2tldCosIFBsdWdpblZpZXcq KTsKICAgICAgICAgc3RhdGljIHZvaWQgcGx1Z0FkZGVkQ2FsbGJhY2soR3RrU29ja2V0KiwgUGx1 Z2luVmlldyopOworICAgICAgICB2b2lkIHVwZGF0ZVdpZGdldEFsbG9jYXRpb25BbmRDbGlwKCk7 CiAgICAgICAgIGJvb2wgbV9wbHVnQWRkZWQ7CiAgICAgICAgIEludFJlY3QgbV9kZWxheWVkQWxs b2NhdGlvbjsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9ndGsv UGx1Z2luVmlld0d0ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL2d0ay9QbHVnaW5WaWV3 R3RrLmNwcAppbmRleCAzNjg5OTllMjJmMGVmM2UzYzYyZTIxZTM3MjE3ZWIzNGNmOTI3ZTZjLi4w Y2RkMzkxOTE2YjcyMTJlYTk1MDYwNGFhYTQ3ZGU0NDE5NTQ3YzEzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbHVnaW5zL2d0ay9QbHVnaW5WaWV3R3RrLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbHVnaW5zL2d0ay9QbHVnaW5WaWV3R3RrLmNwcApAQCAtNDkyLDI2ICs0OTIsMjcgQEAg dm9pZCBQbHVnaW5WaWV3OjpzZXROUFdpbmRvd0lmTmVlZGVkKCkKICAgICBpZiAobV9pc1dpbmRv d2VkICYmICFwbGF0Zm9ybVBsdWdpbldpZGdldCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBp ZiAobV9pc1dpbmRvd2VkKSB7Ci0gICAgICAgIG1fbnBXaW5kb3cueCA9IG1fd2luZG93UmVjdC54 KCk7Ci0gICAgICAgIG1fbnBXaW5kb3cueSA9IG1fd2luZG93UmVjdC55KCk7Ci0gICAgICAgIG1f bnBXaW5kb3cud2lkdGggPSBtX3dpbmRvd1JlY3Qud2lkdGgoKTsKLSAgICAgICAgbV9ucFdpbmRv dy5oZWlnaHQgPSBtX3dpbmRvd1JlY3QuaGVpZ2h0KCk7Ci0KLSAgICAgICAgbV9ucFdpbmRvdy5j bGlwUmVjdC5sZWZ0ID0gbWF4KDAsIG1fY2xpcFJlY3QueCgpKTsKLSAgICAgICAgbV9ucFdpbmRv dy5jbGlwUmVjdC50b3AgPSBtYXgoMCwgbV9jbGlwUmVjdC55KCkpOwotICAgICAgICBtX25wV2lu ZG93LmNsaXBSZWN0LnJpZ2h0ID0gbV9jbGlwUmVjdC54KCkgKyBtX2NsaXBSZWN0LndpZHRoKCk7 Ci0gICAgICAgIG1fbnBXaW5kb3cuY2xpcFJlY3QuYm90dG9tID0gbV9jbGlwUmVjdC55KCkgKyBt X2NsaXBSZWN0LmhlaWdodCgpOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIG1fbnBXaW5kb3cueCA9 IDA7Ci0gICAgICAgIG1fbnBXaW5kb3cueSA9IDA7Ci0gICAgICAgIG1fbnBXaW5kb3cud2lkdGgg PSBtX3dpbmRvd1JlY3Qud2lkdGgoKTsKLSAgICAgICAgbV9ucFdpbmRvdy5oZWlnaHQgPSBtX3dp bmRvd1JlY3QuaGVpZ2h0KCk7Ci0KKyAgICAvLyBJZiB0aGUgd2lkdGggb3IgaGVpZ2h0IGFyZSBu dWxsLCBzZXQgdGhlIGNsaXBSZWN0IHRvIG51bGwsIGluZGljYXRpbmcgdGhhdAorICAgIC8vIHRo ZSBwbHVnaW4gaXMgbm90IHZpc2libGUvc2Nyb2xsZWQgb3V0LgorICAgIGlmICghbV9jbGlwUmVj dC5pc0VtcHR5KCkpIHsKICAgICAgICAgbV9ucFdpbmRvdy5jbGlwUmVjdC5sZWZ0ID0gMDsKLSAg ICAgICAgbV9ucFdpbmRvdy5jbGlwUmVjdC50b3AgPSAwOwogICAgICAgICBtX25wV2luZG93LmNs aXBSZWN0LnJpZ2h0ID0gMDsKKyAgICAgICAgbV9ucFdpbmRvdy5jbGlwUmVjdC50b3AgPSAwOwog ICAgICAgICBtX25wV2luZG93LmNsaXBSZWN0LmJvdHRvbSA9IDA7CisgICAgfSBlbHNlIHsKKyAg ICAgICAgLy8gQ2xpcHBpbmcgcmVjdGFuZ2xlIG9mIHRoZSBwbHVnLWluOyB0aGUgb3JpZ2luIGlz IHRoZSB0b3AgbGVmdCBjb3JuZXIgb2YgdGhlIGRyYXdhYmxlIG9yIHdpbmRvdy4gCisgICAgICAg IG1fbnBXaW5kb3cuY2xpcFJlY3QubGVmdCA9IG1fbnBXaW5kb3cueCArIG1fY2xpcFJlY3QueCgp OworICAgICAgICBtX25wV2luZG93LmNsaXBSZWN0LnRvcCA9IG1fbnBXaW5kb3cueSArIG1fY2xp cFJlY3QueSgpOworICAgICAgICBtX25wV2luZG93LmNsaXBSZWN0LnJpZ2h0ID0gbV9ucFdpbmRv dy54ICsgbV9jbGlwUmVjdC54KCkgKyBtX2NsaXBSZWN0LndpZHRoKCk7CisgICAgICAgIG1fbnBX aW5kb3cuY2xpcFJlY3QuYm90dG9tID0gbV9ucFdpbmRvdy55ICsgbV9jbGlwUmVjdC55KCkgKyBt X2NsaXBSZWN0LmhlaWdodCgpOworICAgIH0KKworICAgIC8vIEZMQVNIIFdPUktBUk9VTkQ6IE9u bHkgc2V0IGluaXRpYWxseS4gTXVsdGlwbGUgY2FsbHMgdG8KKyAgICAvLyBzZXROUFdpbmRvdygp IGNhdXNlIHRoZSBwbHVnaW4gdG8gY3Jhc2ggaW4gd2luZG93ZWQgbW9kZS4KKyAgICBpZiAoIW1f cGx1Z2luLT5xdWlya3MoKS5jb250YWlucyhQbHVnaW5RdWlya0RvbnRDYWxsU2V0V2luZG93TW9y ZVRoYW5PbmNlKSB8fCAhbV9pc1dpbmRvd2VkCisgICAgICAgIHx8IG1fbnBXaW5kb3cud2lkdGgg PT0gc3RhdGljX2Nhc3Q8dWludDMyX3Q+KC0xKSB8fCBtX25wV2luZG93LmhlaWdodCA9PSBzdGF0 aWNfY2FzdDx1aW50MzJfdD4oLTEpKSB7CisgICAgICAgIG1fbnBXaW5kb3cud2lkdGggPSBtX3dp bmRvd1JlY3Qud2lkdGgoKTsKKyAgICAgICAgbV9ucFdpbmRvdy5oZWlnaHQgPSBtX3dpbmRvd1Jl Y3QuaGVpZ2h0KCk7CiAgICAgfQogCiAgICAgUGx1Z2luVmlldzo6c2V0Q3VycmVudFBsdWdpblZp ZXcodGhpcyk7CkBAIC01MzMsMTUgKzUzNCwzNCBAQCB2b2lkIFBsdWdpblZpZXc6OnNldE5QV2lu ZG93SWZOZWVkZWQoKQogICAgIH0KICNlbmRpZgogCi0gICAgR3RrQWxsb2NhdGlvbiBhbGxvY2F0 aW9uID0geyBtX3dpbmRvd1JlY3QueCgpLCBtX3dpbmRvd1JlY3QueSgpLCBtX3dpbmRvd1JlY3Qu d2lkdGgoKSwgbV93aW5kb3dSZWN0LmhlaWdodCgpIH07CisgICAgbV9kZWxheWVkQWxsb2NhdGlv biA9IG1fd2luZG93UmVjdDsKKyAgICB1cGRhdGVXaWRnZXRBbGxvY2F0aW9uQW5kQ2xpcCgpOwor fQogCit2b2lkIFBsdWdpblZpZXc6OnVwZGF0ZVdpZGdldEFsbG9jYXRpb25BbmRDbGlwKCkKK3sK ICAgICAvLyBJZiB0aGUgd2luZG93IGhhcyBub3QgYmVlbiBlbWJlZGRlZCB5ZXQgKHRoZSBwbHVn IGFkZGVkKSwgd2UgZGVsYXkgc2V0dGluZyBpdHMgYWxsb2NhdGlvbiB1bnRpbCAKICAgICAvLyB0 aGF0IHBvaW50LiBUaGlzIGZpeGVzIGlzc3VlcyB3aXRoIHNvbWUgSmF2YSBwbHVnaW4gaW5zdGFu Y2VzIG5vdCByZW5kZXJpbmcgaW1tZWRpYXRlbHkuCi0gICAgaWYgKCFtX3BsdWdBZGRlZCkgewot ICAgICAgICBtX2RlbGF5ZWRBbGxvY2F0aW9uID0gYWxsb2NhdGlvbjsKKyAgICBpZiAoIW1fcGx1 Z0FkZGVkIHx8IG1fZGVsYXllZEFsbG9jYXRpb24uaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47 CisKKyAgICBHdGtXaWRnZXQqIHdpZGdldCA9IHBsYXRmb3JtUGx1Z2luV2lkZ2V0KCk7CisgICAg aWYgKGd0a193aWRnZXRfZ2V0X3JlYWxpemVkKHdpZGdldCkpIHsKKyAgICAgICAgR2RrUmVjdGFu Z2xlIGNsaXBSZWN0ID0gbV9jbGlwUmVjdDsKKyNpZmRlZiBHVEtfQVBJX1ZFUlNJT05fMgorICAg ICAgICBHZGtSZWdpb24qIGNsaXBSZWdpb24gPSBnZGtfcmVnaW9uX3JlY3RhbmdsZSgmY2xpcFJl Y3QpOworICAgICAgICBnZGtfd2luZG93X3NoYXBlX2NvbWJpbmVfcmVnaW9uKGd0a193aWRnZXRf Z2V0X3dpbmRvdyh3aWRnZXQpLCBjbGlwUmVnaW9uLCAwLCAwKTsKKyAgICAgICAgZ2RrX3JlZ2lv bl9kZXN0cm95KGNsaXBSZWdpb24pOworI2Vsc2UKKyAgICAgICAgY2Fpcm9fcmVnaW9uX3QqIGNs aXBSZWdpb24gPSBjYWlyb19yZWdpb25fY3JlYXRlX3JlY3RhbmdsZSgmY2xpcFJlY3QpOworICAg ICAgICBnZGtfd2luZG93X3NoYXBlX2NvbWJpbmVfcmVnaW9uKGd0a193aWRnZXRfZ2V0X3dpbmRv dyh3aWRnZXQpLCBjbGlwUmVnaW9uLCAwLCAwKTsKKyAgICAgICAgY2Fpcm9fcmVnaW9uX2Rlc3Ry b3koY2xpcFJlZ2lvbik7CisjZW5kaWYKICAgICB9Ci0gICAgZ3RrX3dpZGdldF9zaXplX2FsbG9j YXRlKHBsYXRmb3JtUGx1Z2luV2lkZ2V0KCksICZhbGxvY2F0aW9uKTsKKworICAgIEd0a0FsbG9j YXRpb24gYWxsb2NhdGlvbihtX2RlbGF5ZWRBbGxvY2F0aW9uKTsKKyAgICBndGtfd2lkZ2V0X3Np emVfYWxsb2NhdGUod2lkZ2V0LCAmYWxsb2NhdGlvbik7CisgICAgbV9kZWxheWVkQWxsb2NhdGlv biA9IEludFJlY3QoKTsKIH0KIAogdm9pZCBQbHVnaW5WaWV3OjpzZXRQYXJlbnRWaXNpYmxlKGJv b2wgdmlzaWJsZSkKQEAgLTc3MCwxMyArNzkwLDggQEAgdm9pZCBQbHVnaW5WaWV3OjpwbHVnQWRk ZWRDYWxsYmFjayhHdGtTb2NrZXQqIHNvY2tldCwgUGx1Z2luVmlldyogdmlldykKIHsKICAgICBB U1NFUlQoc29ja2V0KTsKICAgICBBU1NFUlQodmlldyk7Ci0KICAgICB2aWV3LT5tX3BsdWdBZGRl ZCA9IHRydWU7Ci0gICAgaWYgKCF2aWV3LT5tX2RlbGF5ZWRBbGxvY2F0aW9uLmlzRW1wdHkoKSkg ewotICAgICAgICBHdGtBbGxvY2F0aW9uIGFsbG9jYXRpb24odmlldy0+bV9kZWxheWVkQWxsb2Nh dGlvbik7Ci0gICAgICAgIGd0a193aWRnZXRfc2l6ZV9hbGxvY2F0ZShHVEtfV0lER0VUKHNvY2tl dCksICZhbGxvY2F0aW9uKTsKLSAgICAgICAgdmlldy0+bV9kZWxheWVkQWxsb2NhdGlvbi5zZXRT aXplKEludFNpemUoKSk7Ci0gICAgfQorICAgIHZpZXctPnVwZGF0ZVdpZGdldEFsbG9jYXRpb25B bmRDbGlwKCk7CiB9CiAKIGJvb2wgUGx1Z2luVmlldzo6cGxhdGZvcm1TdGFydCgpCg==