46772 2010-09-28 18:54:58 -0700 [EFL] Viewport data change notification by Bug 46755 2010-10-04 20:44:00 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 46755 47084 0 gyuyoung.kim webkit-unassigned abarth antognolli+webkit kenneth leandro lucas.de.marchi tonikitoo oldest_to_newest 286695 0 gyuyoung.kim 2010-09-28 18:54:58 -0700 Bug 46755 (Viewport data change notification) will change viewport header function. So, I think that EFL port need to support the change. 288905 1 69628 gyuyoung.kim 2010-10-04 06:33:36 -0700 Created attachment 69628 Patch 288911 2 gyuyoung.kim 2010-10-04 06:43:30 -0700 I modify viewport functions in efl port according to Bug 46755. Rafael removed xxxinitLayoutComplete() in Bug 46722. Because, he said the feature is not needed anymore. I remember that the functions are to prevent re-layouting. Does Qt port still use this ? For the time being, I remove the function definitions related to initial layout complete. 288912 3 69628 kenneth 2010-10-04 06:44:41 -0700 Comment on attachment 69628 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=69628&action=review > WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp:520 > ewk_view_viewport_set(m_view, arguments.width, arguments.height, arguments.initialScale, arguments.minimumScale, arguments.maximumScale, arguments.userScalable); don't you guys want the DPI adjustment? > WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h:-59 > - bool getInitLayoutCompleted() { return m_initLayoutCompleted; } don't you need to remove the m_initLayoutCompleted variable as well? 288914 4 kenneth 2010-10-04 06:45:48 -0700 (In reply to comment #3) > (From update of attachment 69628 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=69628&action=review > > > WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp:520 > > ewk_view_viewport_set(m_view, arguments.width, arguments.height, arguments.initialScale, arguments.minimumScale, arguments.maximumScale, arguments.userScalable); > > don't you guys want the DPI adjustment? > > > WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h:-59 > > - bool getInitLayoutCompleted() { return m_initLayoutCompleted; } > > don't you need to remove the m_initLayoutCompleted variable as well? The new method is now called at the right time so this is not needed anymore. 288915 5 gyuyoung.kim 2010-10-04 06:52:16 -0700 (In reply to comment #3) > (From update of attachment 69628 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=69628&action=review > > don't you guys want the DPI adjustment? Ah, I just made a new bug(Bug 47084) for DPI. Because, in order to use DPI, EWebLauncher needs to modify as well. I need time. >> The new method is now called at the right time so this is not needed anymore. I understand that the functions related to initLayoutcomplte are not needed anymore. right? 288916 6 kenneth 2010-10-04 06:57:43 -0700 > I understand that the functions related to initLayoutcomplte are not needed anymore. right? right 288917 7 gyuyoung.kim 2010-10-04 07:00:05 -0700 Do you want the targetDensityDpi is supported in this bug ? I should modify both ewk_view.cpp and EWebLauncher/main.cpp. I need to consider the targetDensityDpi arguments further. 288925 8 69632 gyuyoung.kim 2010-10-04 07:20:43 -0700 Created attachment 69632 Patch I didn't remove member variable(m_iniLAyoutcompleted). I make a new patch for it. 288926 9 kenneth 2010-10-04 07:22:18 -0700 You really want to change your code to call the new WebCore::findConfigurationForViewportData to compute the right data for you, instead of just exposing what the web author set. 289371 10 abarth 2010-10-04 20:44:00 -0700 Committed r69061: <http://trac.webkit.org/changeset/69061> 69628 2010-10-04 06:33:36 -0700 2010-10-04 07:20:43 -0700 Patch patch-viewport.txt text/plain 3307 gyuyoung.kim ZGlmZiAtLWdpdCBhL1dlYktpdC9lZmwvQ2hhbmdlTG9nIGIvV2ViS2l0L2VmbC9DaGFuZ2VMb2cK aW5kZXggNjI4MzI0Ni4uYmFhZTBkNSAxMDA2NDQKLS0tIGEvV2ViS2l0L2VmbC9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0xMC0wNCAg R3l1eW91bmcgS2ltICA8Z3l1eW91bmcua2ltQHNhbXN1bmcuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtFRkxdIFZpZXdwb3J0IGRhdGEgY2hh bmdlIG5vdGlmaWNhdGlvbiBieSBCdWcgNDY3NTUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2NzcyCisKKyAgICAgICAgQnVnIDQ2NzU1IGNoYW5nZXMg dmlydHVhbCBmdW5jdGlvbiByZWdhcmRpbmcgdG8gdmlld3BvcnQgbWV0YXRhZy4gVGh1cywgRUZM IHBvcnQgCisgICAgICAgIHNob3VsZCBjaGFuZ2UgdGhlIGZ1bmN0aW9uIGFzIHdlbGwgaW4gb3Jk ZXIgdG8gZ2V0IHZpZXdwb3J0IGFyZ3VtZW50cy4KKworICAgICAgICBBbmQsIHNldEluaXRMYXlv dXRDb21wbGV0ZWQgLyBnZXRJbml0TGF5b3V0Q29tcGxldGVkKCkgYXJlIHJlbW92ZWQgYmVjYXVz ZSB0aGVzZSBmdW5jdGlvbnMKKyAgICAgICAgYXJlbid0IG5lZWRlZCBhbnltb3JlLgorCisgICAg ICAgICogV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50RWZsLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkNocm9tZUNsaWVudEVmbDo6ZGlzcGF0Y2hWaWV3cG9ydERhdGFEaWRDaGFuZ2UpOgorICAg ICAgICAqIFdlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEVmbC5oOgorICAgICAgICAqIFdlYkNv cmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50RWZsLmg6CisKIDIwMTAtMTAtMDEgIFJhZmFlbCBB bnRvZ25vbGxpICA8YW50b2dub2xsaUBwcm9mdXNpb24ubW9iaT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KZGlmZiAtLWdpdCBhL1dlYktpdC9lZmwv V2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50RWZsLmNwcCBiL1dlYktpdC9lZmwvV2ViQ29yZVN1 cHBvcnQvQ2hyb21lQ2xpZW50RWZsLmNwcAppbmRleCBiZDllMDU1Li4xZjFjMWVjIDEwMDY0NAot LS0gYS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEVmbC5jcHAKKysrIGIv V2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRFZmwuY3BwCkBAIC01MTUsMTIg KzUxNSw4IEBAIHZvaWQgQ2hyb21lQ2xpZW50RWZsOjpjaG9vc2VJY29uRm9yRmlsZXMoY29uc3Qg VmVjdG9yPFN0cmluZz4mLCBGaWxlQ2hvb3NlciopCiAgICAgbm90SW1wbGVtZW50ZWQoKTsKIH0K IAotdm9pZCBDaHJvbWVDbGllbnRFZmw6OmRpZFJlY2VpdmVWaWV3cG9ydEFyZ3VtZW50cyhGcmFt ZSogZnJhbWUsIGNvbnN0IFZpZXdwb3J0QXJndW1lbnRzJiBhcmd1bWVudHMpIGNvbnN0Cit2b2lk IENocm9tZUNsaWVudEVmbDo6ZGlzcGF0Y2hWaWV3cG9ydERhdGFEaWRDaGFuZ2UoY29uc3QgVmll d3BvcnRBcmd1bWVudHMmIGFyZ3VtZW50cykgY29uc3QKIHsKLSAgICBGcmFtZUxvYWRlckNsaWVu dEVmbCogY2xpZW50ID0gc3RhdGljX2Nhc3Q8RnJhbWVMb2FkZXJDbGllbnRFZmwqPihmcmFtZS0+ bG9hZGVyKCktPmNsaWVudCgpKTsKLSAgICBpZiAoY2xpZW50LT5nZXRJbml0TGF5b3V0Q29tcGxl dGVkKCkpCi0gICAgICAgIHJldHVybjsKLQogICAgIGV3a192aWV3X3ZpZXdwb3J0X3NldChtX3Zp ZXcsIGFyZ3VtZW50cy53aWR0aCwgYXJndW1lbnRzLmhlaWdodCwgYXJndW1lbnRzLmluaXRpYWxT Y2FsZSwgYXJndW1lbnRzLm1pbmltdW1TY2FsZSwgYXJndW1lbnRzLm1heGltdW1TY2FsZSwgYXJn dW1lbnRzLnVzZXJTY2FsYWJsZSk7CiB9CiAKZGlmZiAtLWdpdCBhL1dlYktpdC9lZmwvV2ViQ29y ZVN1cHBvcnQvQ2hyb21lQ2xpZW50RWZsLmggYi9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0No cm9tZUNsaWVudEVmbC5oCmluZGV4IGQ5MzlhZTYuLjQzMzliOWEgMTAwNjQ0Ci0tLSBhL1dlYktp dC9lZmwvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50RWZsLmgKKysrIGIvV2ViS2l0L2VmbC9X ZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRFZmwuaApAQCAtMTM3LDcgKzEzNyw3IEBAIHB1Ymxp YzoKICAgICB2aXJ0dWFsIHZvaWQgY2FuY2VsR2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdEZv ckZyYW1lKEZyYW1lKik7CiAgICAgdmlydHVhbCB2b2lkIGljb25Gb3JGaWxlcyhjb25zdCBWZWN0 b3I8U3RyaW5nLCAwdT4mLCBQYXNzUmVmUHRyPEZpbGVDaG9vc2VyPik7CiAKLSAgICB2aXJ0dWFs IHZvaWQgZGlkUmVjZWl2ZVZpZXdwb3J0QXJndW1lbnRzKEZyYW1lKiBmcmFtZSwgY29uc3QgVmll d3BvcnRBcmd1bWVudHMmIGFyZ3VtZW50cykgY29uc3Q7CisgICAgdmlydHVhbCB2b2lkIGRpc3Bh dGNoVmlld3BvcnREYXRhRGlkQ2hhbmdlKGNvbnN0IFZpZXdwb3J0QXJndW1lbnRzJikgY29uc3Q7 CiAKICAgICB2aXJ0dWFsIGJvb2wgc2VsZWN0SXRlbVdyaXRpbmdEaXJlY3Rpb25Jc05hdHVyYWwo KTsKICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8UG9wdXBNZW51PiBjcmVhdGVQb3B1cE1lbnUoUG9w dXBNZW51Q2xpZW50KikgY29uc3Q7CmRpZmYgLS1naXQgYS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBw b3J0L0ZyYW1lTG9hZGVyQ2xpZW50RWZsLmggYi9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50RWZsLmgKaW5kZXggMmI0NDE0YS4uYjA5M2U5OCAxMDA2NDQKLS0tIGEv V2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEVmbC5oCisrKyBiL1dl YktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRFZmwuaApAQCAtNTUsOSAr NTUsNiBAQCBjbGFzcyBGcmFtZUxvYWRlckNsaWVudEVmbCA6IHB1YmxpYyBGcmFtZUxvYWRlckNs aWVudCB7CiAgICAgdm9pZCBzZXRDdXN0b21Vc2VyQWdlbnQoY29uc3QgU3RyaW5nICZhZ2VudCk7 CiAgICAgY29uc3QgU3RyaW5nJiBjdXN0b21Vc2VyQWdlbnQoKSBjb25zdDsKIAotICAgIHZvaWQg c2V0SW5pdExheW91dENvbXBsZXRlZChib29sIGNvbXBsZXRlZCkgeyBtX2luaXRMYXlvdXRDb21w bGV0ZWQgPSBjb21wbGV0ZWQ7IH0KLSAgICBib29sIGdldEluaXRMYXlvdXRDb21wbGV0ZWQoKSB7 IHJldHVybiBtX2luaXRMYXlvdXRDb21wbGV0ZWQ7IH0KLQogICAgIHZpcnR1YWwgYm9vbCBoYXNX ZWJWaWV3KCkgY29uc3Q7CiAgICAgdmlydHVhbCBib29sIGhhc0ZyYW1lVmlldygpIGNvbnN0Owog Cg== 69632 2010-10-04 07:20:43 -0700 2010-10-04 07:21:19 -0700 Patch patch-viewport.txt text/plain 4763 gyuyoung.kim ZGlmZiAtLWdpdCBhL1dlYktpdC9lZmwvQ2hhbmdlTG9nIGIvV2ViS2l0L2VmbC9DaGFuZ2VMb2cK aW5kZXggNjI4MzI0Ni4uODVkYTFhZCAxMDA2NDQKLS0tIGEvV2ViS2l0L2VmbC9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAorCisyMDEwLTEwLTA0 ICBHeXV5b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0VGTF0gVmlld3BvcnQgZGF0YSBj aGFuZ2Ugbm90aWZpY2F0aW9uIGJ5IEJ1ZyA0Njc1NQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDY3NzIKKworICAgICAgICBCdWcgNDY3NTUgY2hhbmdl cyB2aXJ0dWFsIGZ1bmN0aW9uIHJlZ2FyZGluZyB0byB2aWV3cG9ydCBtZXRhdGFnLiBUaHVzLCBF RkwgcG9ydCAKKyAgICAgICAgc2hvdWxkIGNoYW5nZSB0aGUgZnVuY3Rpb24gYXMgd2VsbCBpbiBv cmRlciB0byBnZXQgdmlld3BvcnQgYXJndW1lbnRzLgorCisgICAgICAgIEFuZCwgc2V0SW5pdExh eW91dENvbXBsZXRlZCAvIGdldEluaXRMYXlvdXRDb21wbGV0ZWQoKSBhcmUgcmVtb3ZlZCBiZWNh dXNlIHRoZXNlIGZ1bmN0aW9ucworICAgICAgICBhcmVuJ3QgbmVlZGVkIGFueW1vcmUuCisKKyAg ICAgICAgKiBXZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRFZmwuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Q2hyb21lQ2xpZW50RWZsOjpkaXNwYXRjaFZpZXdwb3J0RGF0YURpZENoYW5nZSk6Cisg ICAgICAgICogV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50RWZsLmg6CisgICAgICAgICogV2Vi Q29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRFZmwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RnJhbWVMb2FkZXJDbGllbnRFZmw6OkZyYW1lTG9hZGVyQ2xpZW50RWZsKToKKyAgICAgICAgKFdl YkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50RWZsOjpkaXNwYXRjaERpZENvbW1pdExvYWQpOgorICAg ICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRFZmw6OmRpc3BhdGNoRGlkRmlyc3RMYXlv dXQpOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50RWZsLmg6CisK IDIwMTAtMTAtMDEgIFJhZmFlbCBBbnRvZ25vbGxpICA8YW50b2dub2xsaUBwcm9mdXNpb24ubW9i aT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KZGlm ZiAtLWdpdCBhL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50RWZsLmNwcCBi L1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50RWZsLmNwcAppbmRleCBiZDll MDU1Li4xZjFjMWVjIDEwMDY0NAotLS0gYS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0Nocm9t ZUNsaWVudEVmbC5jcHAKKysrIGIvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGll bnRFZmwuY3BwCkBAIC01MTUsMTIgKzUxNSw4IEBAIHZvaWQgQ2hyb21lQ2xpZW50RWZsOjpjaG9v c2VJY29uRm9yRmlsZXMoY29uc3QgVmVjdG9yPFN0cmluZz4mLCBGaWxlQ2hvb3NlciopCiAgICAg bm90SW1wbGVtZW50ZWQoKTsKIH0KIAotdm9pZCBDaHJvbWVDbGllbnRFZmw6OmRpZFJlY2VpdmVW aWV3cG9ydEFyZ3VtZW50cyhGcmFtZSogZnJhbWUsIGNvbnN0IFZpZXdwb3J0QXJndW1lbnRzJiBh cmd1bWVudHMpIGNvbnN0Cit2b2lkIENocm9tZUNsaWVudEVmbDo6ZGlzcGF0Y2hWaWV3cG9ydERh dGFEaWRDaGFuZ2UoY29uc3QgVmlld3BvcnRBcmd1bWVudHMmIGFyZ3VtZW50cykgY29uc3QKIHsK LSAgICBGcmFtZUxvYWRlckNsaWVudEVmbCogY2xpZW50ID0gc3RhdGljX2Nhc3Q8RnJhbWVMb2Fk ZXJDbGllbnRFZmwqPihmcmFtZS0+bG9hZGVyKCktPmNsaWVudCgpKTsKLSAgICBpZiAoY2xpZW50 LT5nZXRJbml0TGF5b3V0Q29tcGxldGVkKCkpCi0gICAgICAgIHJldHVybjsKLQogICAgIGV3a192 aWV3X3ZpZXdwb3J0X3NldChtX3ZpZXcsIGFyZ3VtZW50cy53aWR0aCwgYXJndW1lbnRzLmhlaWdo dCwgYXJndW1lbnRzLmluaXRpYWxTY2FsZSwgYXJndW1lbnRzLm1pbmltdW1TY2FsZSwgYXJndW1l bnRzLm1heGltdW1TY2FsZSwgYXJndW1lbnRzLnVzZXJTY2FsYWJsZSk7CiB9CiAKZGlmZiAtLWdp dCBhL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50RWZsLmggYi9XZWJLaXQv ZWZsL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEVmbC5oCmluZGV4IGQ5MzlhZTYuLjQzMzli OWEgMTAwNjQ0Ci0tLSBhL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50RWZs LmgKKysrIGIvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRFZmwuaApAQCAt MTM3LDcgKzEzNyw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgY2FuY2VsR2VvbG9jYXRp b25QZXJtaXNzaW9uUmVxdWVzdEZvckZyYW1lKEZyYW1lKik7CiAgICAgdmlydHVhbCB2b2lkIGlj b25Gb3JGaWxlcyhjb25zdCBWZWN0b3I8U3RyaW5nLCAwdT4mLCBQYXNzUmVmUHRyPEZpbGVDaG9v c2VyPik7CiAKLSAgICB2aXJ0dWFsIHZvaWQgZGlkUmVjZWl2ZVZpZXdwb3J0QXJndW1lbnRzKEZy YW1lKiBmcmFtZSwgY29uc3QgVmlld3BvcnRBcmd1bWVudHMmIGFyZ3VtZW50cykgY29uc3Q7Cisg ICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoVmlld3BvcnREYXRhRGlkQ2hhbmdlKGNvbnN0IFZpZXdw b3J0QXJndW1lbnRzJikgY29uc3Q7CiAKICAgICB2aXJ0dWFsIGJvb2wgc2VsZWN0SXRlbVdyaXRp bmdEaXJlY3Rpb25Jc05hdHVyYWwoKTsKICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8UG9wdXBNZW51 PiBjcmVhdGVQb3B1cE1lbnUoUG9wdXBNZW51Q2xpZW50KikgY29uc3Q7CmRpZmYgLS1naXQgYS9X ZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50RWZsLmNwcCBiL1dlYktp dC9lZmwvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRFZmwuY3BwCmluZGV4IDJkNDUy ZDguLjYxYTc4OTQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRnJhbWVM b2FkZXJDbGllbnRFZmwuY3BwCisrKyBiL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRnJhbWVM b2FkZXJDbGllbnRFZmwuY3BwCkBAIC03Miw3ICs3Miw2IEBAIEZyYW1lTG9hZGVyQ2xpZW50RWZs OjpGcmFtZUxvYWRlckNsaWVudEVmbChFdmFzX09iamVjdCAqdmlldykKICAgICAsIG1fY3VzdG9t VXNlckFnZW50KCIiKQogICAgICwgbV9wbHVnaW5WaWV3KDApCiAgICAgLCBtX2hhc1NlbnRSZXNw b25zZVRvUGx1Z2luKGZhbHNlKQotICAgICwgbV9pbml0TGF5b3V0Q29tcGxldGVkKGZhbHNlKQog ewogfQogCkBAIC02MTUsOCArNjE0LDYgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudEVmbDo6ZGlz cGF0Y2hEaWRDaGFuZ2VJY29ucygpCiAKIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRFZmw6OmRpc3Bh dGNoRGlkQ29tbWl0TG9hZCgpCiB7Ci0gICAgbV9pbml0TGF5b3V0Q29tcGxldGVkID0gZmFsc2U7 Ci0KICAgICBld2tfZnJhbWVfdXJpX2NoYW5nZWQobV9mcmFtZSk7CiAgICAgaWYgKGV3a192aWV3 X2ZyYW1lX21haW5fZ2V0KG1fdmlldykgIT0gbV9mcmFtZSkKICAgICAgICAgcmV0dXJuOwpAQCAt NjM0LDcgKzYzMSw2IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRFZmw6OmRpc3BhdGNoRGlkRmlu aXNoRG9jdW1lbnRMb2FkKCkKIAogdm9pZCBGcmFtZUxvYWRlckNsaWVudEVmbDo6ZGlzcGF0Y2hE aWRGaXJzdExheW91dCgpCiB7Ci0gICAgbV9pbml0TGF5b3V0Q29tcGxldGVkID0gdHJ1ZTsKICAg ICBld2tfZnJhbWVfbG9hZF9maXJzdGxheW91dF9maW5pc2hlZChtX2ZyYW1lKTsKIH0KIApkaWZm IC0tZ2l0IGEvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEVmbC5o IGIvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEVmbC5oCmluZGV4 IDJiNDQxNGEuLmQyNTBiNzYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQv RnJhbWVMb2FkZXJDbGllbnRFZmwuaAorKysgYi9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50RWZsLmgKQEAgLTU1LDkgKzU1LDYgQEAgY2xhc3MgRnJhbWVMb2FkZXJD bGllbnRFZmwgOiBwdWJsaWMgRnJhbWVMb2FkZXJDbGllbnQgewogICAgIHZvaWQgc2V0Q3VzdG9t VXNlckFnZW50KGNvbnN0IFN0cmluZyAmYWdlbnQpOwogICAgIGNvbnN0IFN0cmluZyYgY3VzdG9t VXNlckFnZW50KCkgY29uc3Q7CiAKLSAgICB2b2lkIHNldEluaXRMYXlvdXRDb21wbGV0ZWQoYm9v bCBjb21wbGV0ZWQpIHsgbV9pbml0TGF5b3V0Q29tcGxldGVkID0gY29tcGxldGVkOyB9Ci0gICAg Ym9vbCBnZXRJbml0TGF5b3V0Q29tcGxldGVkKCkgeyByZXR1cm4gbV9pbml0TGF5b3V0Q29tcGxl dGVkOyB9Ci0KICAgICB2aXJ0dWFsIGJvb2wgaGFzV2ViVmlldygpIGNvbnN0OwogICAgIHZpcnR1 YWwgYm9vbCBoYXNGcmFtZVZpZXcoKSBjb25zdDsKIApAQCAtMjE4LDggKzIxNSw2IEBAIGNsYXNz IEZyYW1lTG9hZGVyQ2xpZW50RWZsIDogcHVibGljIEZyYW1lTG9hZGVyQ2xpZW50IHsKICAgICAv LyBQbHVnaW4gdmlldyB0byByZWRpcmVjdCBkYXRhIHRvCiAgICAgUGx1Z2luVmlldyogbV9wbHVn aW5WaWV3OwogICAgIGJvb2wgbV9oYXNTZW50UmVzcG9uc2VUb1BsdWdpbjsKLQotICAgIGJvb2wg bV9pbml0TGF5b3V0Q29tcGxldGVkOwogfTsKIAogfQo=