91592 2012-07-18 00:06:16 -0700 [EFL] Highlight the element under mouse on web inspector 2012-10-24 16:44:59 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Other Linux RESOLVED FIXED P2 Normal --- 100303 0 seokju.kwon webkit-unassigned cdumez gyuyoung.kim gyuyoung.kim haraken lucas.de.marchi rakuco sw0524.lee webkit.review.bot oldest_to_newest 672058 0 seokju.kwon 2012-07-18 00:06:16 -0700 Implement highlighting the nodes when using the inspector 672063 1 152947 seokju.kwon 2012-07-18 00:13:23 -0700 Created attachment 152947 Patch 676653 2 152947 cdumez 2012-07-24 04:38:28 -0700 Comment on attachment 152947 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=152947&action=review > Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp:110 > + hideHighlight(); This looks a bit odd this way. Maybe we should move the code in hideHighlight() to a new invalidateView(inspectedView) method and call this new function is both highlight() and hideHighlight()? This would be more understandable for me. > Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp:118 > + WebCore::IntRect rect(0, 0, width, height); I would create this as late as possible, that is to say: after the NULL page check. > Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp:122 > + page->mainFrame()->view()->invalidateRect(rect); page->mainFrame()->view()->invalidateRect(WebCore::IntRect(0, 0, width, height)); ? > Source/WebKit/efl/ewk/ewk_paint_context.cpp:181 > + if (controller && controller->highlightedNode()) page->inspectorController() cannot return NULL so the first check is not needed. Use an ASSERT() instead if you want to be safe. 677542 3 seokju.kwon 2012-07-24 19:52:43 -0700 (In reply to comment #2) > (From update of attachment 152947 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=152947&action=review > > > Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp:110 > > + hideHighlight(); > > This looks a bit odd this way. Maybe we should move the code in hideHighlight() to a new invalidateView(inspectedView) method and call this new function is both highlight() and hideHighlight()? This would be more understandable for me. > > > Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp:118 > > + WebCore::IntRect rect(0, 0, width, height); > > I would create this as late as possible, that is to say: after the NULL page check. > > > Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp:122 > > + page->mainFrame()->view()->invalidateRect(rect); > > page->mainFrame()->view()->invalidateRect(WebCore::IntRect(0, 0, width, height)); ? > > > Source/WebKit/efl/ewk/ewk_paint_context.cpp:181 > > + if (controller && controller->highlightedNode()) > > page->inspectorController() cannot return NULL so the first check is not needed. Use an ASSERT() instead if you want to be safe. I will fix all things you mentioned. Thanks for reviewing. 677544 4 154224 seokju.kwon 2012-07-24 19:55:14 -0700 Created attachment 154224 Patch 677642 5 154224 cdumez 2012-07-24 22:39:48 -0700 Comment on attachment 154224 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=154224&action=review > Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.h:65 > + void invalidateView(Evas_Object*); I don't think invalidateView() needs to be public. I would have just used a static function in the cpp file. 677660 6 154224 gyuyoung.kim 2012-07-24 22:59:42 -0700 Comment on attachment 154224 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=154224&action=review > Source/WebKit/efl/ewk/ewk_paint_context.cpp:23 > +#if ENABLE(INSPECTOR) EFL port has used ENABLE(...) below regular include list. Please see ewk_view.cpp. http://trac.webkit.org/browser/trunk/Source/WebKit/efl/ewk/ewk_view.cpp#L81 678592 7 seokju.kwon 2012-07-25 16:30:13 -0700 (In reply to comment #6) > (From update of attachment 154224 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=154224&action=review > > > Source/WebKit/efl/ewk/ewk_paint_context.cpp:23 > > +#if ENABLE(INSPECTOR) > > EFL port has used ENABLE(...) below regular include list. > > Please see ewk_view.cpp. > http://trac.webkit.org/browser/trunk/Source/WebKit/efl/ewk/ewk_view.cpp#L81 you're right. I will move it. 678594 8 seokju.kwon 2012-07-25 16:31:31 -0700 (In reply to comment #5) > (From update of attachment 154224 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=154224&action=review > > > Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.h:65 > > + void invalidateView(Evas_Object*); > > I don't think invalidateView() needs to be public. I would have just used a static function in the cpp file. It makes sense. 678595 9 154473 seokju.kwon 2012-07-25 16:31:44 -0700 Created attachment 154473 Patch 678697 10 154473 gyuyoung.kim 2012-07-25 18:10:50 -0700 Comment on attachment 154473 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=154473&action=review The rest looks good. > Source/WebKit/efl/ewk/ewk_paint_context.cpp:181 > + WebCore::InspectorController* controller = page->inspectorController(); I wonder if page always has inspector controller. If not, I think below condition is good to avoid crash. if (WebCore::InspectorController* controller = page->inspectorController()) if (controller->highlightedNode()) controller->drawHighlight(*context->graphicContext); 678753 11 seokju.kwon 2012-07-25 19:11:19 -0700 (In reply to comment #10) > (From update of attachment 154473 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=154473&action=review > > The rest looks good. > > > Source/WebKit/efl/ewk/ewk_paint_context.cpp:181 > > + WebCore::InspectorController* controller = page->inspectorController(); > > I wonder if page always has inspector controller. If not, I think below condition is good to avoid crash. > > if (WebCore::InspectorController* controller = page->inspectorController()) > if (controller->highlightedNode()) > controller->drawHighlight(*context->graphicContext); It seems to me that page always has inspectorController. 678763 12 154473 gyuyoung.kim 2012-07-25 19:18:14 -0700 Comment on attachment 154473 Patch LGTM now. 678858 13 154473 cdumez 2012-07-25 22:31:12 -0700 Comment on attachment 154473 Patch LGTM. 679980 14 154473 haraken 2012-07-26 18:21:12 -0700 Comment on attachment 154473 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=154473&action=review Looks OK. rs=me >>> Source/WebKit/efl/ewk/ewk_paint_context.cpp:181 >>> + WebCore::InspectorController* controller = page->inspectorController(); >> >> I wonder if page always has inspector controller. If not, I think below condition is good to avoid crash. >> >> if (WebCore::InspectorController* controller = page->inspectorController()) >> if (controller->highlightedNode()) >> controller->drawHighlight(*context->graphicContext); > > It seems to me that page always has inspectorController. Looks so to me too. 680034 15 154473 webkit.review.bot 2012-07-26 19:41:53 -0700 Comment on attachment 154473 Patch Clearing flags on attachment: 154473 Committed r123831: <http://trac.webkit.org/changeset/123831> 680035 16 webkit.review.bot 2012-07-26 19:41:59 -0700 All reviewed patches have been landed. Closing bug. 152947 2012-07-18 00:13:23 -0700 2012-07-24 19:55:08 -0700 Patch bug-91592-20120718161326.patch text/plain 3053 seokju.kwon U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyOTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Vm bC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKaW5kZXggN2QzMTNlMzQ4 YjU0YmIyNWRhYjc1Zjg3NmVjYjI4ZGQwY2MwYmU2NS4uOGEyOGQ5OTJlMzJmNzc4ZmY2OTllZGI5 ZGY4ZTM0Y2I4YmVlNDAwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEy LTA3LTE4ICBTZW9ranUgS3dvbiAgPHNlb2tqdS5rd29uQHNhbXN1bmcuY29tPgorCisgICAgICAg IFtFRkxdIEhpZ2hsaWdodCB0aGUgZWxlbWVudCB1bmRlciBtb3VzZSBvbiB3ZWIgaW5zcGVjdG9y CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTU5Mgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVu dCBoaWdobGlnaHRpbmcgdGhlIG5vZGVzIHdoZW4gdXNpbmcgdGhlIGluc3BlY3Rvci4KKworICAg ICAgICAqIFdlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVudEVmbC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpJbnNwZWN0b3JDbGllbnRFZmw6OmhpZ2hsaWdodCk6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JDbGllbnRFZmw6OmhpZGVIaWdobGlnaHQpOgorICAgICAgICAqIGV3ay9ld2tf cGFpbnRfY29udGV4dC5jcHA6CisgICAgICAgIChld2tfcGFpbnRfY29udGV4dF9wYWludF9jb250 ZW50cyk6CisKIDIwMTItMDctMTcgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6 QGludGVsLmNvbT4KIAogICAgICAgICBbRUZMXSBSZXBsYWNlIDAgYnkgTlVMTCBpbiBwdWJsaWMg aGVhZGVycyBkb2N1bWVudGF0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJD b3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRFZmwuY3BwIGIvU291cmNlL1dlYktpdC9lZmwvV2Vi Q29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50RWZsLmNwcAppbmRleCBiZGM5NmUxOGQyZThmNjJl NDk0YTk3ZTM0MmY3ZGZiNGE0NjI4MzhjLi45MzU5NjY0NTdlOWQ4YjY1ZjAyZjdkNWI4NGZmMjJh OWZkOGZkODFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9J bnNwZWN0b3JDbGllbnRFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBw b3J0L0luc3BlY3RvckNsaWVudEVmbC5jcHAKQEAgLTEwNywxMiArMTA3LDIwIEBAIHZvaWQgSW5z cGVjdG9yQ2xpZW50RWZsOjpicmluZ0Zyb250ZW5kVG9Gcm9udCgpCiAKIHZvaWQgSW5zcGVjdG9y Q2xpZW50RWZsOjpoaWdobGlnaHQoKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgaGlk ZUhpZ2hsaWdodCgpOwogfQogCiB2b2lkIEluc3BlY3RvckNsaWVudEVmbDo6aGlkZUhpZ2hsaWdo dCgpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICBFdmFzX0Nvb3JkIHdpZHRoLCBoZWln aHQ7CisgICAgRXZhc19PYmplY3QqIG1haW5GcmFtZSA9IGV3a192aWV3X2ZyYW1lX21haW5fZ2V0 KG1faW5zcGVjdGVkVmlldyk7CisgICAgaWYgKG1haW5GcmFtZSAmJiBld2tfZnJhbWVfY29udGVu dHNfc2l6ZV9nZXQobWFpbkZyYW1lLCAmd2lkdGgsICZoZWlnaHQpKSB7CisgICAgICAgIFdlYkNv cmU6OkludFJlY3QgcmVjdCgwLCAwLCB3aWR0aCwgaGVpZ2h0KTsKKworICAgICAgICBXZWJDb3Jl OjpQYWdlKiBwYWdlID0gRVdLUHJpdmF0ZTo6Y29yZVBhZ2UobV9pbnNwZWN0ZWRWaWV3KTsKKyAg ICAgICAgaWYgKHBhZ2UpCisgICAgICAgICAgICBwYWdlLT5tYWluRnJhbWUoKS0+dmlldygpLT5p bnZhbGlkYXRlUmVjdChyZWN0KTsKKyAgICB9CiB9CiAKIGJvb2wgSW5zcGVjdG9yQ2xpZW50RWZs OjpzZW5kTWVzc2FnZVRvRnJvbnRlbmQoY29uc3QgU3RyaW5nJiBtZXNzYWdlKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19wYWludF9jb250ZXh0LmNwcCBiL1NvdXJjZS9X ZWJLaXQvZWZsL2V3ay9ld2tfcGFpbnRfY29udGV4dC5jcHAKaW5kZXggOTU1N2YwMzIzYTVhMmFj Zjk0MGQxNWE5MjJhZGJhN2IzMmYyMjUxZC4uNWMxMjgxNzBkMDBmMzM5NDdkMzIyYjQ5NjQxOTVi ODJmZDM4ZTJkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19wYWludF9j b250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3BhaW50X2NvbnRleHQu Y3BwCkBAIC0yMCw2ICsyMCwxMCBAQAogCiAjaW5jbHVkZSAiY29uZmlnLmgiCiAKKyNpZiBFTkFC TEUoSU5TUEVDVE9SKQorI2luY2x1ZGUgIkluc3BlY3RvckNvbnRyb2xsZXIuaCIKKyNpbmNsdWRl ICJQYWdlLmgiCisjZW5kaWYKICNpbmNsdWRlICJld2tfcGFpbnRfY29udGV4dF9wcml2YXRlLmgi CiAjaW5jbHVkZSAiZXdrX3ByaXZhdGUuaCIKIApAQCAtMTY5LDQgKzE3MywxMyBAQCB2b2lkIGV3 a19wYWludF9jb250ZXh0X3BhaW50X2NvbnRlbnRzKEV3a19QYWludF9Db250ZXh0KiBjb250ZXh0 LCBXZWJDb3JlOjpGcmFtZQogICAgIGlmICh2aWV3LT5pc1RyYW5zcGFyZW50KCkpCiAgICAgICAg IGNvbnRleHQtPmdyYXBoaWNDb250ZXh0LT5jbGVhclJlY3QocGFpbnRBcmVhKTsKICAgICB2aWV3 LT5wYWludENvbnRlbnRzKGNvbnRleHQtPmdyYXBoaWNDb250ZXh0LmdldCgpLCBwYWludEFyZWEp OworCisjaWYgRU5BQkxFKElOU1BFQ1RPUikKKyAgICBXZWJDb3JlOjpQYWdlKiBwYWdlID0gdmll dy0+ZnJhbWUoKS0+cGFnZSgpOworICAgIGlmIChwYWdlKSB7CisgICAgICAgIFdlYkNvcmU6Oklu c3BlY3RvckNvbnRyb2xsZXIqIGNvbnRyb2xsZXIgPSBwYWdlLT5pbnNwZWN0b3JDb250cm9sbGVy KCk7CisgICAgICAgIGlmIChjb250cm9sbGVyICYmIGNvbnRyb2xsZXItPmhpZ2hsaWdodGVkTm9k ZSgpKQorICAgICAgICAgICAgY29udHJvbGxlci0+ZHJhd0hpZ2hsaWdodCgqY29udGV4dC0+Z3Jh cGhpY0NvbnRleHQpOworICAgIH0KKyNlbmRpZgogfQo= 154224 2012-07-24 19:55:14 -0700 2012-07-25 16:31:37 -0700 Patch bug-91592-20120725115515.patch text/plain 4286 seokju.kwon U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzNTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Vm bC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKaW5kZXggZmUyZTZjNTZl M2VhMTBhNjgyZTdiZGY1Y2M2ODY0Yjg3ODA1ZWJhOS4uYjI1ZDA2ODk0NWI4NDEyMWJjN2I3MTgz MmUyMmUwN2QzN2NiNjEwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEy LTA3LTI0ICBTZW9ranUgS3dvbiAgPHNlb2tqdS5rd29uQHNhbXN1bmcuY29tPgorCisgICAgICAg IFtFRkxdIEhpZ2hsaWdodCB0aGUgZWxlbWVudCB1bmRlciBtb3VzZSBvbiB3ZWIgaW5zcGVjdG9y CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTU5Mgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVu dCBoaWdobGlnaHRpbmcgdGhlIG5vZGVzIHdoZW4gdXNpbmcgdGhlIGluc3BlY3Rvci4KKworICAg ICAgICAqIFdlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVudEVmbC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpJbnNwZWN0b3JDbGllbnRFZmw6OmhpZ2hsaWdodCk6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JDbGllbnRFZmw6OmhpZGVIaWdobGlnaHQpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yQ2xpZW50RWZsOjppbnZhbGlkYXRlVmlldyk6CisgICAgICAgIChXZWJDb3JlKToK KyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRFZmwuaDoKKyAgICAgICAg KEluc3BlY3RvckNsaWVudEVmbCk6CisgICAgICAgICogZXdrL2V3a19wYWludF9jb250ZXh0LmNw cDoKKyAgICAgICAgKGV3a19wYWludF9jb250ZXh0X3BhaW50X2NvbnRlbnRzKToKKwogMjAxMi0w Ny0yMyAgUGllcnJlIFJvc3NpICA8cGllcnJlLnJvc3NpQGdtYWlsLmNvbT4KIAogICAgICAgICBV bmlmeSBudW1Ub3VjaEV2ZW50SGFuZGxlcnNDaGFuZ2VkIGFuZCBuZWVkVG91Y2hFdmVudHMgaW4g dGhlIGNocm9tZSBjbGllbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVT dXBwb3J0L0luc3BlY3RvckNsaWVudEVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3Jl U3VwcG9ydC9JbnNwZWN0b3JDbGllbnRFZmwuY3BwCmluZGV4IGJkYzk2ZTE4ZDJlOGY2MmU0OTRh OTdlMzQyZjdkZmI0YTQ2MjgzOGMuLjQ5NTgxY2Q1M2QyMTA3YmEzZjc4YzBjN2YzZjcyMzFiNjFm YmJhMWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0luc3Bl Y3RvckNsaWVudEVmbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQv SW5zcGVjdG9yQ2xpZW50RWZsLmNwcApAQCAtMTA3LDEyICsxMDcsMTIgQEAgdm9pZCBJbnNwZWN0 b3JDbGllbnRFZmw6OmJyaW5nRnJvbnRlbmRUb0Zyb250KCkKIAogdm9pZCBJbnNwZWN0b3JDbGll bnRFZmw6OmhpZ2hsaWdodCgpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICBpbnZhbGlk YXRlVmlldyhtX2luc3BlY3RlZFZpZXcpOwogfQogCiB2b2lkIEluc3BlY3RvckNsaWVudEVmbDo6 aGlkZUhpZ2hsaWdodCgpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICBpbnZhbGlkYXRl VmlldyhtX2luc3BlY3RlZFZpZXcpOwogfQogCiBib29sIEluc3BlY3RvckNsaWVudEVmbDo6c2Vu ZE1lc3NhZ2VUb0Zyb250ZW5kKGNvbnN0IFN0cmluZyYgbWVzc2FnZSkKQEAgLTEzNiw2ICsxMzYs MTcgQEAgU3RyaW5nIEluc3BlY3RvckNsaWVudEVmbDo6aW5zcGVjdG9yRmlsZXNQYXRoKCkKICAg ICByZXR1cm4gaW5zcGVjdG9yRmlsZXNQYXRoOwogfQogCit2b2lkIEluc3BlY3RvckNsaWVudEVm bDo6aW52YWxpZGF0ZVZpZXcoRXZhc19PYmplY3QqIHdlYlZpZXcpCit7CisgICAgRXZhc19Db29y ZCB3aWR0aCwgaGVpZ2h0OworICAgIEV2YXNfT2JqZWN0KiBtYWluRnJhbWUgPSBld2tfdmlld19m cmFtZV9tYWluX2dldCh3ZWJWaWV3KTsKKyAgICBpZiAobWFpbkZyYW1lICYmIGV3a19mcmFtZV9j b250ZW50c19zaXplX2dldChtYWluRnJhbWUsICZ3aWR0aCwgJmhlaWdodCkpIHsKKyAgICAgICAg V2ViQ29yZTo6UGFnZSogcGFnZSA9IEVXS1ByaXZhdGU6OmNvcmVQYWdlKHdlYlZpZXcpOworICAg ICAgICBpZiAocGFnZSkKKyAgICAgICAgICAgIHBhZ2UtPm1haW5GcmFtZSgpLT52aWV3KCktPmlu dmFsaWRhdGVSZWN0KFdlYkNvcmU6OkludFJlY3QoMCwgMCwgd2lkdGgsIGhlaWdodCkpOworICAg IH0KK30KKwogSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRFZmw6Okluc3BlY3RvckZyb250ZW5kQ2xp ZW50RWZsKEV2YXNfT2JqZWN0KiBpbnNwZWN0ZWRWaWV3LCBFdmFzX09iamVjdCogaW5zcGVjdG9y VmlldywgSW5zcGVjdG9yQ2xpZW50RWZsKiBpbnNwZWN0b3JDbGllbnQpCiAgICAgOiBJbnNwZWN0 b3JGcm9udGVuZENsaWVudExvY2FsKEVXS1ByaXZhdGU6OmNvcmVQYWdlKGluc3BlY3RlZFZpZXcp LT5pbnNwZWN0b3JDb250cm9sbGVyKCksIEVXS1ByaXZhdGU6OmNvcmVQYWdlKGluc3BlY3RvclZp ZXcpLCBhZG9wdFB0cihuZXcgSW5zcGVjdG9yRnJvbnRlbmRTZXR0aW5nc0VmbCgpKSkKICAgICAs IG1faW5zcGVjdGVkVmlldyhpbnNwZWN0ZWRWaWV3KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9lZmwvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50RWZsLmggYi9Tb3VyY2UvV2ViS2l0 L2VmbC9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRFZmwuaAppbmRleCAxODgyMGM1YTEy MWQ2ZmMxYWM5MDNiNzFkMmU0YjY2NzljNTRmNTdmLi4wNjZkMmVjM2VhZTk1MTQyODcxOGIwZGIw MTVlNzhmNmJmZjZhZGRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3Vw cG9ydC9JbnNwZWN0b3JDbGllbnRFZmwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3Jl U3VwcG9ydC9JbnNwZWN0b3JDbGllbnRFZmwuaApAQCAtNjIsNiArNjIsNyBAQCBwdWJsaWM6CiAK ICAgICB2b2lkIHJlbGVhc2VGcm9udGVuZFBhZ2UoKTsKICAgICBTdHJpbmcgaW5zcGVjdG9yRmls ZXNQYXRoKCk7CisgICAgdm9pZCBpbnZhbGlkYXRlVmlldyhFdmFzX09iamVjdCopOwogCiBwcml2 YXRlOgogICAgIEV2YXNfT2JqZWN0KiBtX2luc3BlY3RlZFZpZXc7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2VmbC9ld2svZXdrX3BhaW50X2NvbnRleHQuY3BwIGIvU291cmNlL1dlYktpdC9l ZmwvZXdrL2V3a19wYWludF9jb250ZXh0LmNwcAppbmRleCA5NTU3ZjAzMjNhNWEyYWNmOTQwZDE1 YTkyMmFkYmE3YjMyZjIyNTFkLi43M2RjMDg5Y2JkMmZkMzdmMzA0ZDIyNGE5MjVkODAzZmVmYTJl ODUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3BhaW50X2NvbnRleHQu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfcGFpbnRfY29udGV4dC5jcHAKQEAg LTIwLDYgKzIwLDEwIEBACiAKICNpbmNsdWRlICJjb25maWcuaCIKIAorI2lmIEVOQUJMRShJTlNQ RUNUT1IpCisjaW5jbHVkZSAiSW5zcGVjdG9yQ29udHJvbGxlci5oIgorI2luY2x1ZGUgIlBhZ2Uu aCIKKyNlbmRpZgogI2luY2x1ZGUgImV3a19wYWludF9jb250ZXh0X3ByaXZhdGUuaCIKICNpbmNs dWRlICJld2tfcHJpdmF0ZS5oIgogCkBAIC0xNjksNCArMTczLDEzIEBAIHZvaWQgZXdrX3BhaW50 X2NvbnRleHRfcGFpbnRfY29udGVudHMoRXdrX1BhaW50X0NvbnRleHQqIGNvbnRleHQsIFdlYkNv cmU6OkZyYW1lCiAgICAgaWYgKHZpZXctPmlzVHJhbnNwYXJlbnQoKSkKICAgICAgICAgY29udGV4 dC0+Z3JhcGhpY0NvbnRleHQtPmNsZWFyUmVjdChwYWludEFyZWEpOwogICAgIHZpZXctPnBhaW50 Q29udGVudHMoY29udGV4dC0+Z3JhcGhpY0NvbnRleHQuZ2V0KCksIHBhaW50QXJlYSk7CisKKyNp ZiBFTkFCTEUoSU5TUEVDVE9SKQorICAgIFdlYkNvcmU6OlBhZ2UqIHBhZ2UgPSB2aWV3LT5mcmFt ZSgpLT5wYWdlKCk7CisgICAgaWYgKHBhZ2UpIHsKKyAgICAgICAgV2ViQ29yZTo6SW5zcGVjdG9y Q29udHJvbGxlciogY29udHJvbGxlciA9IHBhZ2UtPmluc3BlY3RvckNvbnRyb2xsZXIoKTsKKyAg ICAgICAgaWYgKGNvbnRyb2xsZXItPmhpZ2hsaWdodGVkTm9kZSgpKQorICAgICAgICAgICAgY29u dHJvbGxlci0+ZHJhd0hpZ2hsaWdodCgqY29udGV4dC0+Z3JhcGhpY0NvbnRleHQpOworICAgIH0K KyNlbmRpZgogfQo= 154473 2012-07-25 16:31:44 -0700 2012-07-26 19:41:53 -0700 Patch bug-91592-20120726083144.patch text/plain 3685 seokju.kwon U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzNTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Vm bC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKaW5kZXggZmUyZTZjNTZl M2VhMTBhNjgyZTdiZGY1Y2M2ODY0Yjg3ODA1ZWJhOS4uYjk2YWNjNTAyNDAxMTdiOTRlN2U2ZWNm ZWYxNDU4ZmExNjI3ZTNmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEy LTA3LTI0ICBTZW9ranUgS3dvbiAgPHNlb2tqdS5rd29uQHNhbXN1bmcuY29tPgorCisgICAgICAg IFtFRkxdIEhpZ2hsaWdodCB0aGUgZWxlbWVudCB1bmRlciBtb3VzZSBvbiB3ZWIgaW5zcGVjdG9y CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTU5Mgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVu dCBoaWdobGlnaHRpbmcgdGhlIG5vZGVzIHdoZW4gdXNpbmcgdGhlIHdlYiBpbnNwZWN0b3IuCisK KyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRFZmwuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yQ2xpZW50RWZsOjpoaWdobGlnaHQpOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yQ2xpZW50RWZsOjpoaWRlSGlnaGxpZ2h0KToKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvckNsaWVudEVmbDo6aW52YWxpZGF0ZVZpZXcpOgorICAgICAgICAoV2ViQ29y ZSk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50RWZsLmg6CisgICAg ICAgIChJbnNwZWN0b3JDbGllbnRFZmwpOgorICAgICAgICAqIGV3ay9ld2tfcGFpbnRfY29udGV4 dC5jcHA6CisgICAgICAgIChld2tfcGFpbnRfY29udGV4dF9wYWludF9jb250ZW50cyk6CisKIDIw MTItMDctMjMgIFBpZXJyZSBSb3NzaSAgPHBpZXJyZS5yb3NzaUBnbWFpbC5jb20+CiAKICAgICAg ICAgVW5pZnkgbnVtVG91Y2hFdmVudEhhbmRsZXJzQ2hhbmdlZCBhbmQgbmVlZFRvdWNoRXZlbnRz IGluIHRoZSBjaHJvbWUgY2xpZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJD b3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRFZmwuY3BwIGIvU291cmNlL1dlYktpdC9lZmwvV2Vi Q29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50RWZsLmNwcAppbmRleCBiZGM5NmUxOGQyZThmNjJl NDk0YTk3ZTM0MmY3ZGZiNGE0NjI4MzhjLi5iODIwMzk3NTY2NGQzY2RhNGUxZWI0YjU5YzA4ZTk2 NDRiMWE3NWM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9J bnNwZWN0b3JDbGllbnRFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBw b3J0L0luc3BlY3RvckNsaWVudEVmbC5jcHAKQEAgLTM3LDYgKzM3LDE3IEBAIHN0YXRpYyB2b2lk IG5vdGlmeVdlYkluc3BlY3RvckRlc3Ryb3kodm9pZCogdXNlckRhdGEsIEV2YXNfT2JqZWN0KiB3 ZWJ2aWV3LCB2b2lkCiAgICAgICAgIGluc3BlY3RvckZyb250ZW5kQ2xpZW50LT5kZXN0cm95SW5z cGVjdG9yV2luZG93KHRydWUpOwogfQogCitzdGF0aWMgdm9pZCBpbnZhbGlkYXRlVmlldyhFdmFz X09iamVjdCogd2ViVmlldykKK3sKKyAgICBFdmFzX0Nvb3JkIHdpZHRoLCBoZWlnaHQ7CisgICAg RXZhc19PYmplY3QqIG1haW5GcmFtZSA9IGV3a192aWV3X2ZyYW1lX21haW5fZ2V0KHdlYlZpZXcp OworICAgIGlmIChtYWluRnJhbWUgJiYgZXdrX2ZyYW1lX2NvbnRlbnRzX3NpemVfZ2V0KG1haW5G cmFtZSwgJndpZHRoLCAmaGVpZ2h0KSkgeworICAgICAgICBXZWJDb3JlOjpQYWdlKiBwYWdlID0g RVdLUHJpdmF0ZTo6Y29yZVBhZ2Uod2ViVmlldyk7CisgICAgICAgIGlmIChwYWdlKQorICAgICAg ICAgICAgcGFnZS0+bWFpbkZyYW1lKCktPnZpZXcoKS0+aW52YWxpZGF0ZVJlY3QoV2ViQ29yZTo6 SW50UmVjdCgwLCAwLCB3aWR0aCwgaGVpZ2h0KSk7CisgICAgfQorfQorCiBjbGFzcyBJbnNwZWN0 b3JGcm9udGVuZFNldHRpbmdzRWZsIDogcHVibGljIEluc3BlY3RvckZyb250ZW5kQ2xpZW50TG9j YWw6OlNldHRpbmdzIHsKIHB1YmxpYzoKICAgICB2aXJ0dWFsIFN0cmluZyBnZXRQcm9wZXJ0eShj b25zdCBTdHJpbmcmIG5hbWUpCkBAIC0xMDcsMTIgKzExOCwxMiBAQCB2b2lkIEluc3BlY3RvckNs aWVudEVmbDo6YnJpbmdGcm9udGVuZFRvRnJvbnQoKQogCiB2b2lkIEluc3BlY3RvckNsaWVudEVm bDo6aGlnaGxpZ2h0KCkKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIGludmFsaWRhdGVW aWV3KG1faW5zcGVjdGVkVmlldyk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yQ2xpZW50RWZsOjpoaWRl SGlnaGxpZ2h0KCkKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIGludmFsaWRhdGVWaWV3 KG1faW5zcGVjdGVkVmlldyk7CiB9CiAKIGJvb2wgSW5zcGVjdG9yQ2xpZW50RWZsOjpzZW5kTWVz c2FnZVRvRnJvbnRlbmQoY29uc3QgU3RyaW5nJiBtZXNzYWdlKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9lZmwvZXdrL2V3a19wYWludF9jb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZs L2V3ay9ld2tfcGFpbnRfY29udGV4dC5jcHAKaW5kZXggOTU1N2YwMzIzYTVhMmFjZjk0MGQxNWE5 MjJhZGJhN2IzMmYyMjUxZC4uYmRiZDg5OWJjYjEzMTZjMTZkOThiMDU1YWM3YzNhNGY2YmZjNmE1 ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19wYWludF9jb250ZXh0LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3BhaW50X2NvbnRleHQuY3BwCkBAIC0y Myw2ICsyMywxMSBAQAogI2luY2x1ZGUgImV3a19wYWludF9jb250ZXh0X3ByaXZhdGUuaCIKICNp bmNsdWRlICJld2tfcHJpdmF0ZS5oIgogCisjaWYgRU5BQkxFKElOU1BFQ1RPUikKKyNpbmNsdWRl ICJJbnNwZWN0b3JDb250cm9sbGVyLmgiCisjaW5jbHVkZSAiUGFnZS5oIgorI2VuZGlmCisKIEV3 a19QYWludF9Db250ZXh0KiBld2tfcGFpbnRfY29udGV4dF9uZXcoY2Fpcm9fdCogY2Fpcm8pCiB7 CiAgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKGNhaXJvLCAwKTsKQEAgLTE2OSw0 ICsxNzQsMTMgQEAgdm9pZCBld2tfcGFpbnRfY29udGV4dF9wYWludF9jb250ZW50cyhFd2tfUGFp bnRfQ29udGV4dCogY29udGV4dCwgV2ViQ29yZTo6RnJhbWUKICAgICBpZiAodmlldy0+aXNUcmFu c3BhcmVudCgpKQogICAgICAgICBjb250ZXh0LT5ncmFwaGljQ29udGV4dC0+Y2xlYXJSZWN0KHBh aW50QXJlYSk7CiAgICAgdmlldy0+cGFpbnRDb250ZW50cyhjb250ZXh0LT5ncmFwaGljQ29udGV4 dC5nZXQoKSwgcGFpbnRBcmVhKTsKKworI2lmIEVOQUJMRShJTlNQRUNUT1IpCisgICAgV2ViQ29y ZTo6UGFnZSogcGFnZSA9IHZpZXctPmZyYW1lKCktPnBhZ2UoKTsKKyAgICBpZiAocGFnZSkgewor ICAgICAgICBXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyKiBjb250cm9sbGVyID0gcGFnZS0+ aW5zcGVjdG9yQ29udHJvbGxlcigpOworICAgICAgICBpZiAoY29udHJvbGxlci0+aGlnaGxpZ2h0 ZWROb2RlKCkpCisgICAgICAgICAgICBjb250cm9sbGVyLT5kcmF3SGlnaGxpZ2h0KCpjb250ZXh0 LT5ncmFwaGljQ29udGV4dCk7CisgICAgfQorI2VuZGlmCiB9Cg==