114299 2013-04-09 12:08:15 -0700 [GTK] --minimal build fails with error: class WebCore::EventHandler' has no member named 'dragSourceEndedAt 2013-04-30 08:57:46 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 113660 0 bartosh webkit-unassigned commit-queue dglazkov jpetsovits mrobinson pnormand oldest_to_newest 872006 0 bartosh 2013-04-09 12:08:15 -0700 Here is the error: Failed to run "['Tools/Scripts/build-webkit', '--release', '--gtk', '--update-gtk', '--no-webkit2', '--makeargs="-j2"']" exit_code: 2 orm/gtk/libPlatformGtk_la-ContextMenuItemGtk.lo In file included from ./autotoolsconfig.h:254:0, from ../../Source/WebCore/config.h:26, from ../../Source/WebKit/gtk/webkit/webkitwebview.cpp:31: ./WebKitFeatures.h:92:0: warning: "ENABLE_SPELLCHECK" redefined [enabled by default] In file included from ../../Source/WebCore/config.h:26:0, from ../../Source/WebKit/gtk/webkit/webkitwebview.cpp:31: ./autotoolsconfig.h:19:0: note: this is the location of the previous definition ../../Source/WebKit/gtk/webkit/webkitwebview.cpp: In function 'void webkit_web_view_drag_end(GtkWidget*, GdkDragContext*)': ../../Source/WebKit/gtk/webkit/webkitwebview.cpp:1524:28: error: 'class WebCore::EventHandler' has no member named 'dragSourceEndedAt' ../../Source/WebKit/gtk/webkit/webkitwebview.cpp: In function 'void dragExitedCallback(GtkWidget*, WebCore::DragData*, bool)': ../../Source/WebKit/gtk/webkit/webkitwebview.cpp:1537:128: error: 'class WebCore::Page' has no member named 'dragController' ../../Source/WebKit/gtk/webkit/webkitwebview.cpp:1538:124: error: 'class WebCore::Page' has no member named 'dragController' ../../Source/WebKit/gtk/webkit/webkitwebview.cpp: In function 'gboolean webkit_web_view_drag_motion(GtkWidget*, GdkDragContext*, gint, gint, guint)': ../../Source/WebKit/gtk/webkit/webkitwebview.cpp:1555:46: error: 'class WebCore::Page' has no member named 'dragController' ../../Source/WebKit/gtk/webkit/webkitwebview.cpp: In function 'void webkit_web_view_drag_data_received(GtkWidget*, GdkDragContext*, gint, gint, GtkSelectionData*, guint, guint)': ../../Source/WebKit/gtk/webkit/webkitwebview.cpp:1569:46: error: 'class WebCore::Page' has no member named 'dragController' ../../Source/WebKit/gtk/webkit/webkitwebview.cpp: In function 'gboolean webkit_web_view_drag_drop(GtkWidget*, GdkDragContext*, gint, gint, guint)': ../../Source/WebKit/gtk/webkit/webkitwebview.cpp:1582:20: error: 'class WebCore::Page' has no member named 'dragController' make[1]: *** [Source/WebKit/gtk/webkit/libwebkitgtk_3_0_la-webkitwebview.lo] Error 1 make[1]: *** Waiting for unfinished jobs.... In file included from ./autotoolsconfig.h:254:0, from ../../Source/JavaScriptCore/config.h:26, from ../../Source/WebCore/platform/gtk/ContextMenuItemGtk.cpp:21: ./WebKitFeatures.h:92:0: warning: "ENABLE_SPELLCHECK" redefined [enabled by default] In file included from ../../Source/JavaScriptCore/config.h:26:0, from ../../Source/WebCore/platform/gtk/ContextMenuItemGtk.cpp:21: ./autotoolsconfig.h:19:0: note: this is the location of the previous definition make[1]: Leaving directory `/srv/ews/WebKit/WebKitBuild/Release' make: *** [all] Error 2 874179 1 197674 bartosh 2013-04-11 14:44:04 -0700 Created attachment 197674 Patch 874914 2 197674 pnormand 2013-04-12 12:58:51 -0700 Comment on attachment 197674 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=197674&action=review > Source/WebKit/gtk/webkit/webkitwebview.cpp:3111 > +#endif I think you need an #else here to set the drag_* to NULL. 875142 3 197934 bartosh 2013-04-13 04:42:37 -0700 Created attachment 197934 Patch 875143 4 bartosh 2013-04-13 04:43:37 -0700 Updated according to reviewer's suggestions. 882677 5 200026 bartosh 2013-04-29 10:41:45 -0700 Created attachment 200026 Patch 883091 6 200026 commit-queue 2013-04-30 08:57:43 -0700 Comment on attachment 200026 Patch Clearing flags on attachment: 200026 Committed r149371: <http://trac.webkit.org/changeset/149371> 883092 7 commit-queue 2013-04-30 08:57:46 -0700 All reviewed patches have been landed. Closing bug. 197674 2013-04-11 14:44:04 -0700 2013-04-13 04:42:30 -0700 Patch bug-114299-20130412004343.patch text/plain 3824 bartosh U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4MjE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggOThhNTVhZGUy Njg5NjZmNDMxOWZlMTcxOTRiZTUwNzA3M2ZiZTFmNy4uZWFkYzg4M2MwODAwNjc0NDI2NjUzYjY0 Y2QwOGRkMzgyYjY0ZTA1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEz LTA0LTExICBFZCBCYXJ0b3NoICA8YmFydG9zaEBnbWFpbC5jb20+CisKKyAgICAgICAgW0dUS10g LS1taW5pbWFsIGJ1aWxkIGZhaWxzIHdpdGggZXJyb3I6IGNsYXNzIFdlYkNvcmU6OkV2ZW50SGFu ZGxlcicgaGFzIG5vIG1lbWJlciBuYW1lZCAnZHJhZ1NvdXJjZUVuZGVkQXQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNDI5OQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdyYXBwZWQgY29kZSwgcmVsYXRl ZCB0byBkcmFnJmRyb3AgaW4gI2lmIEVOQUJMRShEUkFHX1NVUFBPUlQpCisgICAgICAgICogd2Vi a2l0L3dlYmtpdHdlYnZpZXcuY3BwOgorICAgICAgICAod2Via2l0X3dlYl92aWV3X2NsYXNzX2lu aXQpOgorICAgICAgICAod2Via2l0X3dlYl92aWV3X2luaXQpOgorCiAyMDEzLTA0LTEwICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgogCiAgICAgICAgIE1hc3MgcmVtb3Zl IGFsbCB0aGUgZW1wdHkgZGlyZWN0b3JpZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3Rr L3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJr aXR3ZWJ2aWV3LmNwcAppbmRleCBiMjcxMjQ3MGVmODEyODE1ZTQzMjc1NThkZWEyOTdmM2VjMGJh OTcwLi5iYzU3MTMyN2FkMTIzZGRkNjAwM2Y4ZmJlZjQyYzRjNzU0MzgxYThhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKKysrIGIvU291cmNl L1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCkBAIC0xNDg4LDYgKzE0ODgsNyBA QCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfc2NyZWVuX2NoYW5nZWQoR3RrV2lkZ2V0KiB3 aWRnZXQsIEdka1NjcmVlbiogcHJldmlvdQogICAgIHNldHRpbmdzLT5zZXRNaW5pbXVtTG9naWNh bEZvbnRTaXplKHdlYlZpZXdDb252ZXJ0Rm9udFNpemVUb1BpeGVscyh3ZWJWaWV3LCBtaW5pbXVt TG9naWNhbEZvbnRTaXplKSk7CiB9CiAKKyNpZiBFTkFCTEUoRFJBR19TVVBQT1JUKQogc3RhdGlj IHZvaWQgd2Via2l0X3dlYl92aWV3X2RyYWdfZW5kKEd0a1dpZGdldCogd2lkZ2V0LCBHZGtEcmFn Q29udGV4dCogY29udGV4dCkKIHsKICAgICBXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3ID0gV0VCS0lU X1dFQl9WSUVXKHdpZGdldCk7CkBAIC0xNTgzLDYgKzE1ODQsNyBAQCBzdGF0aWMgZ2Jvb2xlYW4g d2Via2l0X3dlYl92aWV3X2RyYWdfZHJvcChHdGtXaWRnZXQqIHdpZGdldCwgR2RrRHJhZ0NvbnRl eHQqIGNvbgogICAgIGd0a19kcmFnX2ZpbmlzaChjb250ZXh0LCBUUlVFLCBGQUxTRSwgdGltZSk7 CiAgICAgcmV0dXJuIFRSVUU7CiB9CisjZW5kaWYgLy8gRU5BQkxFKERSQUdfU1VQUE9SVCkKIAog I2lmIEdUS19DSEVDS19WRVJTSU9OKDIsIDEyLCAwKQogc3RhdGljIGdib29sZWFuIHdlYmtpdF93 ZWJfdmlld19xdWVyeV90b29sdGlwKEd0a1dpZGdldCAqd2lkZ2V0LCBnaW50IHgsIGdpbnQgeSwg Z2Jvb2xlYW4ga2V5Ym9hcmRfbW9kZSwgR3RrVG9vbHRpcCAqdG9vbHRpcCkKQEAgLTMwOTksMTIg KzMxMDEsMTQgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2NsYXNzX2luaXQoV2ViS2l0 V2ViVmlld0NsYXNzKiB3ZWJWaWV3Q2xhc3MpCiAgICAgd2lkZ2V0Q2xhc3MtPmZvY3VzX291dF9l dmVudCA9IHdlYmtpdF93ZWJfdmlld19mb2N1c19vdXRfZXZlbnQ7CiAgICAgd2lkZ2V0Q2xhc3Mt PmdldF9hY2Nlc3NpYmxlID0gd2Via2l0X3dlYl92aWV3X2dldF9hY2Nlc3NpYmxlOwogICAgIHdp ZGdldENsYXNzLT5zY3JlZW5fY2hhbmdlZCA9IHdlYmtpdF93ZWJfdmlld19zY3JlZW5fY2hhbmdl ZDsKKyNpZiBFTkFCTEUoRFJBR19TVVBQT1JUKQogICAgIHdpZGdldENsYXNzLT5kcmFnX2VuZCA9 IHdlYmtpdF93ZWJfdmlld19kcmFnX2VuZDsKICAgICB3aWRnZXRDbGFzcy0+ZHJhZ19kYXRhX2dl dCA9IHdlYmtpdF93ZWJfdmlld19kcmFnX2RhdGFfZ2V0OwogICAgIHdpZGdldENsYXNzLT5kcmFn X21vdGlvbiA9IHdlYmtpdF93ZWJfdmlld19kcmFnX21vdGlvbjsKICAgICB3aWRnZXRDbGFzcy0+ ZHJhZ19sZWF2ZSA9IHdlYmtpdF93ZWJfdmlld19kcmFnX2xlYXZlOwogICAgIHdpZGdldENsYXNz LT5kcmFnX2Ryb3AgPSB3ZWJraXRfd2ViX3ZpZXdfZHJhZ19kcm9wOwogICAgIHdpZGdldENsYXNz LT5kcmFnX2RhdGFfcmVjZWl2ZWQgPSB3ZWJraXRfd2ViX3ZpZXdfZHJhZ19kYXRhX3JlY2VpdmVk OworI2VuZGlmCiAjaWYgR1RLX0NIRUNLX1ZFUlNJT04oMiwgMTIsIDApCiAgICAgd2lkZ2V0Q2xh c3MtPnF1ZXJ5X3Rvb2x0aXAgPSB3ZWJraXRfd2ViX3ZpZXdfcXVlcnlfdG9vbHRpcDsKICAgICB3 aWRnZXRDbGFzcy0+c2hvd19oZWxwID0gd2Via2l0X3dlYl92aWV3X3Nob3dfaGVscDsKQEAgLTM3 NTUsNyArMzc1OSw5IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19pbml0KFdlYktpdFdl YlZpZXcqIHdlYlZpZXcpCiAgICAgcGFnZUNsaWVudHMuY29udGV4dE1lbnVDbGllbnQgPSBuZXcg V2ViS2l0OjpDb250ZXh0TWVudUNsaWVudCh3ZWJWaWV3KTsKICNlbmRpZgogICAgIHBhZ2VDbGll bnRzLmVkaXRvckNsaWVudCA9IG5ldyBXZWJLaXQ6OkVkaXRvckNsaWVudCh3ZWJWaWV3KTsKKyNp ZiBFTkFCTEUoRFJBR19TVVBQT1JUKQogICAgIHBhZ2VDbGllbnRzLmRyYWdDbGllbnQgPSBuZXcg V2ViS2l0OjpEcmFnQ2xpZW50KHdlYlZpZXcpOworI2VuZGlmCiAgICAgcGFnZUNsaWVudHMuaW5z cGVjdG9yQ2xpZW50ID0gbmV3IFdlYktpdDo6SW5zcGVjdG9yQ2xpZW50KHdlYlZpZXcpOwogCiAg ICAgcHJpdi0+Y29yZVBhZ2UgPSBuZXcgUGFnZShwYWdlQ2xpZW50cyk7CkBAIC0zODIzLDkgKzM4 MjksMTEgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2luaXQoV2ViS2l0V2ViVmlldyog d2ViVmlldykKIAogICAgIHByaXYtPnN1YlJlc291cmNlcyA9IGFkb3B0R1JlZihnX2hhc2hfdGFi bGVfbmV3X2Z1bGwoZ19zdHJfaGFzaCwgZ19zdHJfZXF1YWwsIGdfZnJlZSwgZ19vYmplY3RfdW5y ZWYpKTsKIAorI2lmIEVOQUJMRShEUkFHX1NVUFBPUlQpCiAgICAgcHJpdi0+ZHJhZ0FuZERyb3BI ZWxwZXIuc2V0V2lkZ2V0KEdUS19XSURHRVQod2ViVmlldykpOwogICAgIGd0a19kcmFnX2Rlc3Rf c2V0KEdUS19XSURHRVQod2ViVmlldyksIHN0YXRpY19jYXN0PEd0a0Rlc3REZWZhdWx0cz4oMCks IDAsIDAsIHN0YXRpY19jYXN0PEdka0RyYWdBY3Rpb24+KEdES19BQ1RJT05fQ09QWSB8IEdES19B Q1RJT05fQ09QWSB8IEdES19BQ1RJT05fTU9WRSB8IEdES19BQ1RJT05fTElOSyB8IEdES19BQ1RJ T05fUFJJVkFURSkpOwogICAgIGd0a19kcmFnX2Rlc3Rfc2V0X3RhcmdldF9saXN0KEdUS19XSURH RVQod2ViVmlldyksIFBhc3RlYm9hcmRIZWxwZXI6OmRlZmF1bHRQYXN0ZWJvYXJkSGVscGVyKCkt PnRhcmdldExpc3QoKSk7CisjZW5kaWYKIAogICAgIHByaXYtPnNlbGZTY3JvbGxpbmcgPSBmYWxz ZTsKIAo= 197934 2013-04-13 04:42:37 -0700 2013-04-29 10:41:39 -0700 Patch bug-114299-20130413144214.patch text/plain 4081 bartosh U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4MzU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggZTY2NWFiNmNm ZGQzOTY2NzYwY2I4MGI3N2YyOGU0NDViZTM2MTgxMC4uNmIzYzZhNWY4MTM0YzY2NTJhMDZkN2Iy MDkyYTU5NTRlYmZmZDNkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEz LTA0LTExICBFZCBCYXJ0b3NoICA8YmFydG9zaEBnbWFpbC5jb20+CisKKyAgICAgICAgW0dUS10g LS1taW5pbWFsIGJ1aWxkIGZhaWxzIHdpdGggZXJyb3I6IGNsYXNzIFdlYkNvcmU6OkV2ZW50SGFu ZGxlcicgaGFzIG5vIG1lbWJlciBuYW1lZCAnZHJhZ1NvdXJjZUVuZGVkQXQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNDI5OQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdyYXBwZWQgY29kZSwgcmVsYXRl ZCB0byBkcmFnJmRyb3AgaW4gI2lmIEVOQUJMRShEUkFHX1NVUFBPUlQpCisKKyAgICAgICAgKiB3 ZWJraXQvd2Via2l0d2Vidmlldy5jcHA6CisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfY2xhc3Nf aW5pdCk6CisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfaW5pdCk6CisKIDIwMTMtMDQtMTIgIENh cmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtd IFNwbGl0IEd0a0F1dGhlbnRpY2F0aW9uRGlhbG9nIGluIHR3byB3aWRnZXRzCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAgYi9Tb3VyY2UvV2Vi S2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKaW5kZXggYjI3MTI0NzBlZjgxMjgxNWU0 MzI3NTU4ZGVhMjk3ZjNlYzBiYTk3MC4uNzllYjAyOTUwNzg2Y2IzOTU4MGM5MzU4ZDQ1MGQ5MmE3 YmIyYmJjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZp ZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcApA QCAtMTQ4OCw2ICsxNDg4LDcgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X3NjcmVlbl9j aGFuZ2VkKEd0a1dpZGdldCogd2lkZ2V0LCBHZGtTY3JlZW4qIHByZXZpb3UKICAgICBzZXR0aW5n cy0+c2V0TWluaW11bUxvZ2ljYWxGb250U2l6ZSh3ZWJWaWV3Q29udmVydEZvbnRTaXplVG9QaXhl bHMod2ViVmlldywgbWluaW11bUxvZ2ljYWxGb250U2l6ZSkpOwogfQogCisjaWYgRU5BQkxFKERS QUdfU1VQUE9SVCkKIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19kcmFnX2VuZChHdGtXaWRn ZXQqIHdpZGdldCwgR2RrRHJhZ0NvbnRleHQqIGNvbnRleHQpCiB7CiAgICAgV2ViS2l0V2ViVmll dyogd2ViVmlldyA9IFdFQktJVF9XRUJfVklFVyh3aWRnZXQpOwpAQCAtMTU4Myw2ICsxNTg0LDcg QEAgc3RhdGljIGdib29sZWFuIHdlYmtpdF93ZWJfdmlld19kcmFnX2Ryb3AoR3RrV2lkZ2V0KiB3 aWRnZXQsIEdka0RyYWdDb250ZXh0KiBjb24KICAgICBndGtfZHJhZ19maW5pc2goY29udGV4dCwg VFJVRSwgRkFMU0UsIHRpbWUpOwogICAgIHJldHVybiBUUlVFOwogfQorI2VuZGlmIC8vIEVOQUJM RShEUkFHX1NVUFBPUlQpCiAKICNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigyLCAxMiwgMCkKIHN0YXRp YyBnYm9vbGVhbiB3ZWJraXRfd2ViX3ZpZXdfcXVlcnlfdG9vbHRpcChHdGtXaWRnZXQgKndpZGdl dCwgZ2ludCB4LCBnaW50IHksIGdib29sZWFuIGtleWJvYXJkX21vZGUsIEd0a1Rvb2x0aXAgKnRv b2x0aXApCkBAIC0zMDk5LDEyICszMTAxLDIxIEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmll d19jbGFzc19pbml0KFdlYktpdFdlYlZpZXdDbGFzcyogd2ViVmlld0NsYXNzKQogICAgIHdpZGdl dENsYXNzLT5mb2N1c19vdXRfZXZlbnQgPSB3ZWJraXRfd2ViX3ZpZXdfZm9jdXNfb3V0X2V2ZW50 OwogICAgIHdpZGdldENsYXNzLT5nZXRfYWNjZXNzaWJsZSA9IHdlYmtpdF93ZWJfdmlld19nZXRf YWNjZXNzaWJsZTsKICAgICB3aWRnZXRDbGFzcy0+c2NyZWVuX2NoYW5nZWQgPSB3ZWJraXRfd2Vi X3ZpZXdfc2NyZWVuX2NoYW5nZWQ7CisjaWYgRU5BQkxFKERSQUdfU1VQUE9SVCkKICAgICB3aWRn ZXRDbGFzcy0+ZHJhZ19lbmQgPSB3ZWJraXRfd2ViX3ZpZXdfZHJhZ19lbmQ7CiAgICAgd2lkZ2V0 Q2xhc3MtPmRyYWdfZGF0YV9nZXQgPSB3ZWJraXRfd2ViX3ZpZXdfZHJhZ19kYXRhX2dldDsKICAg ICB3aWRnZXRDbGFzcy0+ZHJhZ19tb3Rpb24gPSB3ZWJraXRfd2ViX3ZpZXdfZHJhZ19tb3Rpb247 CiAgICAgd2lkZ2V0Q2xhc3MtPmRyYWdfbGVhdmUgPSB3ZWJraXRfd2ViX3ZpZXdfZHJhZ19sZWF2 ZTsKICAgICB3aWRnZXRDbGFzcy0+ZHJhZ19kcm9wID0gd2Via2l0X3dlYl92aWV3X2RyYWdfZHJv cDsKICAgICB3aWRnZXRDbGFzcy0+ZHJhZ19kYXRhX3JlY2VpdmVkID0gd2Via2l0X3dlYl92aWV3 X2RyYWdfZGF0YV9yZWNlaXZlZDsKKyNlbHNlCisgICAgd2lkZ2V0Q2xhc3MtPmRyYWdfZW5kID0g TlVMTDsKKyAgICB3aWRnZXRDbGFzcy0+ZHJhZ19kYXRhX2dldCA9IE5VTEw7CisgICAgd2lkZ2V0 Q2xhc3MtPmRyYWdfbW90aW9uID0gTlVMTDsKKyAgICB3aWRnZXRDbGFzcy0+ZHJhZ19sZWF2ZSA9 IE5VTEw7CisgICAgd2lkZ2V0Q2xhc3MtPmRyYWdfZHJvcCA9IE5VTEw7CisgICAgd2lkZ2V0Q2xh c3MtPmRyYWdfZGF0YV9yZWNlaXZlZCA9IE5VTEw7CisjZW5kaWYKICNpZiBHVEtfQ0hFQ0tfVkVS U0lPTigyLCAxMiwgMCkKICAgICB3aWRnZXRDbGFzcy0+cXVlcnlfdG9vbHRpcCA9IHdlYmtpdF93 ZWJfdmlld19xdWVyeV90b29sdGlwOwogICAgIHdpZGdldENsYXNzLT5zaG93X2hlbHAgPSB3ZWJr aXRfd2ViX3ZpZXdfc2hvd19oZWxwOwpAQCAtMzc1NSw3ICszNzY2LDkgQEAgc3RhdGljIHZvaWQg d2Via2l0X3dlYl92aWV3X2luaXQoV2ViS2l0V2ViVmlldyogd2ViVmlldykKICAgICBwYWdlQ2xp ZW50cy5jb250ZXh0TWVudUNsaWVudCA9IG5ldyBXZWJLaXQ6OkNvbnRleHRNZW51Q2xpZW50KHdl YlZpZXcpOwogI2VuZGlmCiAgICAgcGFnZUNsaWVudHMuZWRpdG9yQ2xpZW50ID0gbmV3IFdlYktp dDo6RWRpdG9yQ2xpZW50KHdlYlZpZXcpOworI2lmIEVOQUJMRShEUkFHX1NVUFBPUlQpCiAgICAg cGFnZUNsaWVudHMuZHJhZ0NsaWVudCA9IG5ldyBXZWJLaXQ6OkRyYWdDbGllbnQod2ViVmlldyk7 CisjZW5kaWYKICAgICBwYWdlQ2xpZW50cy5pbnNwZWN0b3JDbGllbnQgPSBuZXcgV2ViS2l0OjpJ bnNwZWN0b3JDbGllbnQod2ViVmlldyk7CiAKICAgICBwcml2LT5jb3JlUGFnZSA9IG5ldyBQYWdl KHBhZ2VDbGllbnRzKTsKQEAgLTM4MjMsOSArMzgzNiwxMSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRf d2ViX3ZpZXdfaW5pdChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQogCiAgICAgcHJpdi0+c3ViUmVz b3VyY2VzID0gYWRvcHRHUmVmKGdfaGFzaF90YWJsZV9uZXdfZnVsbChnX3N0cl9oYXNoLCBnX3N0 cl9lcXVhbCwgZ19mcmVlLCBnX29iamVjdF91bnJlZikpOwogCisjaWYgRU5BQkxFKERSQUdfU1VQ UE9SVCkKICAgICBwcml2LT5kcmFnQW5kRHJvcEhlbHBlci5zZXRXaWRnZXQoR1RLX1dJREdFVCh3 ZWJWaWV3KSk7CiAgICAgZ3RrX2RyYWdfZGVzdF9zZXQoR1RLX1dJREdFVCh3ZWJWaWV3KSwgc3Rh dGljX2Nhc3Q8R3RrRGVzdERlZmF1bHRzPigwKSwgMCwgMCwgc3RhdGljX2Nhc3Q8R2RrRHJhZ0Fj dGlvbj4oR0RLX0FDVElPTl9DT1BZIHwgR0RLX0FDVElPTl9DT1BZIHwgR0RLX0FDVElPTl9NT1ZF IHwgR0RLX0FDVElPTl9MSU5LIHwgR0RLX0FDVElPTl9QUklWQVRFKSk7CiAgICAgZ3RrX2RyYWdf ZGVzdF9zZXRfdGFyZ2V0X2xpc3QoR1RLX1dJREdFVCh3ZWJWaWV3KSwgUGFzdGVib2FyZEhlbHBl cjo6ZGVmYXVsdFBhc3RlYm9hcmRIZWxwZXIoKS0+dGFyZ2V0TGlzdCgpKTsKKyNlbmRpZgogCiAg ICAgcHJpdi0+c2VsZlNjcm9sbGluZyA9IGZhbHNlOwogCg== 200026 2013-04-29 10:41:45 -0700 2013-04-30 08:57:43 -0700 Patch bug-114299-20130429204101.patch text/plain 4108 bartosh U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5MjkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggZTdlYmFiNTJh MTcxYWI1OTlmNjU1MzIyOGJjNjgwN2IxODE0MTJhNS4uZjFiNTVhNjgxMWFiZTIxYmQ2NzVhZmY4 MTM1MzZmOWFkNTM2MzBjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEz LTA0LTExICBFZCBCYXJ0b3NoICA8YmFydG9zaEBnbWFpbC5jb20+CisKKyAgICAgICAgW0dUS10g LS1taW5pbWFsIGJ1aWxkIGZhaWxzIHdpdGggZXJyb3I6IGNsYXNzIFdlYkNvcmU6OkV2ZW50SGFu ZGxlcicgaGFzIG5vIG1lbWJlciBuYW1lZCAnZHJhZ1NvdXJjZUVuZGVkQXQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNDI5OQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdyYXBwZWQgY29kZSwgcmVsYXRl ZCB0byBkcmFnJmRyb3AgaW4gI2lmIEVOQUJMRShEUkFHX1NVUFBPUlQpCisKKyAgICAgICAgKiB3 ZWJraXQvd2Via2l0d2Vidmlldy5jcHA6CisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfY2xhc3Nf aW5pdCk6CisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfaW5pdCk6CisKIDIwMTMtMDQtMjUgIEpv c2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVj dG9yOiBDb25zb2xlTWVzc2FnZSBzaG91bGQgaW5jbHVkZSBsaW5lIGFuZCBjb2x1bW4gbnVtYmVy IHdoZXJlIHBvc3NpYmxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Vi a2l0d2Vidmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5j cHAKaW5kZXggNzc4MTcwMGI3NGIxOWI0ZTU4NjQ3MmZlMjMyMjJiZWI2MzFkNTIwYS4uYzBiNzcx YzNhMmYxNDg5YTFlNmQ5MzA5MTFkZDZlMmI2OTExOTc5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZ3Rr L3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcApAQCAtMTQ4OSw2ICsxNDg5LDcgQEAgc3RhdGljIHZv aWQgd2Via2l0X3dlYl92aWV3X3NjcmVlbl9jaGFuZ2VkKEd0a1dpZGdldCogd2lkZ2V0LCBHZGtT Y3JlZW4qIHByZXZpb3UKICAgICBzZXR0aW5ncy0+c2V0TWluaW11bUxvZ2ljYWxGb250U2l6ZSh3 ZWJWaWV3Q29udmVydEZvbnRTaXplVG9QaXhlbHMod2ViVmlldywgbWluaW11bUxvZ2ljYWxGb250 U2l6ZSkpOwogfQogCisjaWYgRU5BQkxFKERSQUdfU1VQUE9SVCkKIHN0YXRpYyB2b2lkIHdlYmtp dF93ZWJfdmlld19kcmFnX2VuZChHdGtXaWRnZXQqIHdpZGdldCwgR2RrRHJhZ0NvbnRleHQqIGNv bnRleHQpCiB7CiAgICAgV2ViS2l0V2ViVmlldyogd2ViVmlldyA9IFdFQktJVF9XRUJfVklFVyh3 aWRnZXQpOwpAQCAtMTU4NCw2ICsxNTg1LDcgQEAgc3RhdGljIGdib29sZWFuIHdlYmtpdF93ZWJf dmlld19kcmFnX2Ryb3AoR3RrV2lkZ2V0KiB3aWRnZXQsIEdka0RyYWdDb250ZXh0KiBjb24KICAg ICBndGtfZHJhZ19maW5pc2goY29udGV4dCwgVFJVRSwgRkFMU0UsIHRpbWUpOwogICAgIHJldHVy biBUUlVFOwogfQorI2VuZGlmIC8vIEVOQUJMRShEUkFHX1NVUFBPUlQpCiAKICNpZiBHVEtfQ0hF Q0tfVkVSU0lPTigyLCAxMiwgMCkKIHN0YXRpYyBnYm9vbGVhbiB3ZWJraXRfd2ViX3ZpZXdfcXVl cnlfdG9vbHRpcChHdGtXaWRnZXQgKndpZGdldCwgZ2ludCB4LCBnaW50IHksIGdib29sZWFuIGtl eWJvYXJkX21vZGUsIEd0a1Rvb2x0aXAgKnRvb2x0aXApCkBAIC0zMTAwLDEyICszMTAyLDIxIEBA IHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19jbGFzc19pbml0KFdlYktpdFdlYlZpZXdDbGFz cyogd2ViVmlld0NsYXNzKQogICAgIHdpZGdldENsYXNzLT5mb2N1c19vdXRfZXZlbnQgPSB3ZWJr aXRfd2ViX3ZpZXdfZm9jdXNfb3V0X2V2ZW50OwogICAgIHdpZGdldENsYXNzLT5nZXRfYWNjZXNz aWJsZSA9IHdlYmtpdF93ZWJfdmlld19nZXRfYWNjZXNzaWJsZTsKICAgICB3aWRnZXRDbGFzcy0+ c2NyZWVuX2NoYW5nZWQgPSB3ZWJraXRfd2ViX3ZpZXdfc2NyZWVuX2NoYW5nZWQ7CisjaWYgRU5B QkxFKERSQUdfU1VQUE9SVCkKICAgICB3aWRnZXRDbGFzcy0+ZHJhZ19lbmQgPSB3ZWJraXRfd2Vi X3ZpZXdfZHJhZ19lbmQ7CiAgICAgd2lkZ2V0Q2xhc3MtPmRyYWdfZGF0YV9nZXQgPSB3ZWJraXRf d2ViX3ZpZXdfZHJhZ19kYXRhX2dldDsKICAgICB3aWRnZXRDbGFzcy0+ZHJhZ19tb3Rpb24gPSB3 ZWJraXRfd2ViX3ZpZXdfZHJhZ19tb3Rpb247CiAgICAgd2lkZ2V0Q2xhc3MtPmRyYWdfbGVhdmUg PSB3ZWJraXRfd2ViX3ZpZXdfZHJhZ19sZWF2ZTsKICAgICB3aWRnZXRDbGFzcy0+ZHJhZ19kcm9w ID0gd2Via2l0X3dlYl92aWV3X2RyYWdfZHJvcDsKICAgICB3aWRnZXRDbGFzcy0+ZHJhZ19kYXRh X3JlY2VpdmVkID0gd2Via2l0X3dlYl92aWV3X2RyYWdfZGF0YV9yZWNlaXZlZDsKKyNlbHNlCisg ICAgd2lkZ2V0Q2xhc3MtPmRyYWdfZW5kID0gTlVMTDsKKyAgICB3aWRnZXRDbGFzcy0+ZHJhZ19k YXRhX2dldCA9IE5VTEw7CisgICAgd2lkZ2V0Q2xhc3MtPmRyYWdfbW90aW9uID0gTlVMTDsKKyAg ICB3aWRnZXRDbGFzcy0+ZHJhZ19sZWF2ZSA9IE5VTEw7CisgICAgd2lkZ2V0Q2xhc3MtPmRyYWdf ZHJvcCA9IE5VTEw7CisgICAgd2lkZ2V0Q2xhc3MtPmRyYWdfZGF0YV9yZWNlaXZlZCA9IE5VTEw7 CisjZW5kaWYKICNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigyLCAxMiwgMCkKICAgICB3aWRnZXRDbGFz cy0+cXVlcnlfdG9vbHRpcCA9IHdlYmtpdF93ZWJfdmlld19xdWVyeV90b29sdGlwOwogICAgIHdp ZGdldENsYXNzLT5zaG93X2hlbHAgPSB3ZWJraXRfd2ViX3ZpZXdfc2hvd19oZWxwOwpAQCAtMzc1 Niw3ICszNzY3LDkgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2luaXQoV2ViS2l0V2Vi Vmlldyogd2ViVmlldykKICAgICBwYWdlQ2xpZW50cy5jb250ZXh0TWVudUNsaWVudCA9IG5ldyBX ZWJLaXQ6OkNvbnRleHRNZW51Q2xpZW50KHdlYlZpZXcpOwogI2VuZGlmCiAgICAgcGFnZUNsaWVu dHMuZWRpdG9yQ2xpZW50ID0gbmV3IFdlYktpdDo6RWRpdG9yQ2xpZW50KHdlYlZpZXcpOworI2lm IEVOQUJMRShEUkFHX1NVUFBPUlQpCiAgICAgcGFnZUNsaWVudHMuZHJhZ0NsaWVudCA9IG5ldyBX ZWJLaXQ6OkRyYWdDbGllbnQod2ViVmlldyk7CisjZW5kaWYKICAgICBwYWdlQ2xpZW50cy5pbnNw ZWN0b3JDbGllbnQgPSBuZXcgV2ViS2l0OjpJbnNwZWN0b3JDbGllbnQod2ViVmlldyk7CiAKICAg ICBwcml2LT5jb3JlUGFnZSA9IG5ldyBQYWdlKHBhZ2VDbGllbnRzKTsKQEAgLTM4MjQsOSArMzgz NywxMSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfaW5pdChXZWJLaXRXZWJWaWV3KiB3 ZWJWaWV3KQogCiAgICAgcHJpdi0+c3ViUmVzb3VyY2VzID0gYWRvcHRHUmVmKGdfaGFzaF90YWJs ZV9uZXdfZnVsbChnX3N0cl9oYXNoLCBnX3N0cl9lcXVhbCwgZ19mcmVlLCBnX29iamVjdF91bnJl ZikpOwogCisjaWYgRU5BQkxFKERSQUdfU1VQUE9SVCkKICAgICBwcml2LT5kcmFnQW5kRHJvcEhl bHBlci5zZXRXaWRnZXQoR1RLX1dJREdFVCh3ZWJWaWV3KSk7CiAgICAgZ3RrX2RyYWdfZGVzdF9z ZXQoR1RLX1dJREdFVCh3ZWJWaWV3KSwgc3RhdGljX2Nhc3Q8R3RrRGVzdERlZmF1bHRzPigwKSwg MCwgMCwgc3RhdGljX2Nhc3Q8R2RrRHJhZ0FjdGlvbj4oR0RLX0FDVElPTl9DT1BZIHwgR0RLX0FD VElPTl9DT1BZIHwgR0RLX0FDVElPTl9NT1ZFIHwgR0RLX0FDVElPTl9MSU5LIHwgR0RLX0FDVElP Tl9QUklWQVRFKSk7CiAgICAgZ3RrX2RyYWdfZGVzdF9zZXRfdGFyZ2V0X2xpc3QoR1RLX1dJREdF VCh3ZWJWaWV3KSwgUGFzdGVib2FyZEhlbHBlcjo6ZGVmYXVsdFBhc3RlYm9hcmRIZWxwZXIoKS0+ dGFyZ2V0TGlzdCgpKTsKKyNlbmRpZgogCiAgICAgcHJpdi0+c2VsZlNjcm9sbGluZyA9IGZhbHNl OwogCg==