139466 2014-12-09 17:24:53 -0800 [iOS] Add setting to ignore viewport scaling constraints 2014-12-10 15:42:11 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mhock mhock benjamin mhock oldest_to_newest 1054007 0 mhock 2014-12-09 17:24:53 -0800 [iOS] Add viewport override preference 1054008 1 242982 mhock 2014-12-09 17:39:16 -0800 Created attachment 242982 patch 1054010 2 242982 benjamin 2014-12-09 17:56:00 -0800 Comment on attachment 242982 patch View in context: https://bugs.webkit.org/attachment.cgi?id=242982&action=review The name "Override" is too generic. What do you think of "ignoreViewportScalingConstraints"? > Source/WebCore/page/ViewportConfiguration.cpp:241 > - applyViewportArgument(m_configuration.minimumScale, m_viewportArguments.minZoom, minimumViewportArgumentsScaleFactor, maximumViewportArgumentsScaleFactor); > + applyViewportArgument(m_configuration.minimumScale, m_override ? minimumViewportArgumentsScaleFactor : m_viewportArguments.minZoom, minimumViewportArgumentsScaleFactor, maximumViewportArgumentsScaleFactor); I think I would leave the configuration unchanged, and modify minimumScale() instead. That will make it easier to reason about the viewport configuration. The state of m_configuration would still be correct, but we would report different values to the API. > Source/WebCore/page/ViewportConfiguration.cpp:260 > + if (m_override) > + m_configuration.allowsUserScaling = true; ditto 1054028 3 242985 mhock 2014-12-09 20:21:03 -0800 Created attachment 242985 address comments 1054029 4 242985 benjamin 2014-12-09 20:27:19 -0800 Comment on attachment 242985 address comments View in context: https://bugs.webkit.org/attachment.cgi?id=242985&action=review > Source/WebCore/page/ViewportConfiguration.h:80 > + void setIgnoreViewportScalingConstraints(bool ignoreViewportScalingConstraints) {m_ignoreViewportScalingConstraints = ignoreViewportScalingConstraints; } I wonder if for Viewport Configuration, this should be named "IgnoreScalingConstraints" since the Viewport is implied by the object. I let you decide the name. > Source/WebCore/page/ViewportConfiguration.h:111 > + bool m_ignoreViewportScalingConstraints; You should initialize this in the constructor. 1054329 5 mhock 2014-12-10 15:42:11 -0800 Committed r177110: <http://trac.webkit.org/changeset/177110> 242982 2014-12-09 17:39:16 -0800 2014-12-09 20:21:03 -0800 patch viewportoverride.01.diff text/plain 8253 mhock ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxNmNkZWJhLi43ZTFkODI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTQtMTItMDkgIE1hcnRpbiBIb2NrICA8bWhvY2tAYXBwbGUuY29tPgorCisgICAgICAg IFtpT1NdIEFkZCB2aWV3cG9ydCBvdmVycmlkZSBzZXR0aW5nCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk0NjYKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBhZ2UvU2V0dGluZ3MuaW46IEFkZCB2aWV3 cG9ydCBvdmVycmlkZSBzZXR0aW5nLgorICAgICAgICAqIHBhZ2UvVmlld3BvcnRDb25maWd1cmF0 aW9uLmNwcDogT3ZlcnJpZGUgdmlld3BvcnQgYmVoYXZpb3IgYmFzZWQgb24gcHJlZmVyZW5jZS4K KyAgICAgICAgKFdlYkNvcmU6OlZpZXdwb3J0Q29uZmlndXJhdGlvbjo6aW5pdGlhbFNjYWxlKToK KyAgICAgICAgKFdlYkNvcmU6OlZpZXdwb3J0Q29uZmlndXJhdGlvbjo6bWluaW11bVNjYWxlKToK KyAgICAgICAgKFdlYkNvcmU6OlZpZXdwb3J0Q29uZmlndXJhdGlvbjo6dXBkYXRlQ29uZmlndXJh dGlvbik6CisgICAgICAgICogcGFnZS9WaWV3cG9ydENvbmZpZ3VyYXRpb24uaDoKKyAgICAgICAg KFdlYkNvcmU6OlZpZXdwb3J0Q29uZmlndXJhdGlvbjo6c2V0T3ZlcnJpZGUpOgorCiAyMDE0LTEy LTA5ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAg U2Nyb2xsaW5nIHRvIGFuY2hvciB0YWdzIGRvZXMgbm90aGluZyBpbiB2ZXJ0aWNhbC1ybCB3cml0 aW5nIG1vZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaW4gYi9T b3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmluCmluZGV4IDZhZDk3YmMuLjJjOTMyOWUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaW4KKysrIGIvU291cmNlL1dl YkNvcmUvcGFnZS9TZXR0aW5ncy5pbgpAQCAtMjM2LDMgKzIzNiw1IEBAIG1heGltdW1Tb3VyY2VC dWZmZXJTaXplIHR5cGU9aW50LCBpbml0aWFsPTMxODc2NzEwNCwgY29uZGl0aW9uYWw9TUVESUFf U09VUkNFCiBsb25nTW91c2VQcmVzc0VuYWJsZWQgaW5pdGlhbD1mYWxzZQogCiBzZXJ2aWNlQ29u dHJvbHNFbmFibGVkIGluaXRpYWw9ZmFsc2UsIGNvbmRpdGlvbmFsPVNFUlZJQ0VfQ09OVFJPTFMK Kwordmlld3BvcnRPdmVycmlkZUVuYWJsZWQgaW5pdGlhbD1mYWxzZQpcIE5vIG5ld2xpbmUgYXQg ZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVmlld3BvcnRDb25m aWd1cmF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVmlld3BvcnRDb25maWd1cmF0aW9u LmNwcAppbmRleCA5MTQwYTA3Li43MDM0MTZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL1ZpZXdwb3J0Q29uZmlndXJhdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9W aWV3cG9ydENvbmZpZ3VyYXRpb24uY3BwCkBAIC0xMDIsNyArMTAyLDcgQEAgZG91YmxlIFZpZXdw b3J0Q29uZmlndXJhdGlvbjo6aW5pdGlhbFNjYWxlKCkgY29uc3QKIAogICAgIC8vIElmIHRoZSBk b2N1bWVudCBoYXMgc3BlY2lmaWVkIGl0cyBvd24gaW5pdGlhbCBzY2FsZSwgdXNlIGl0IHJlZ2Fy ZGxlc3MuCiAgICAgLy8gVGhpcyBpcyBndWFyYW50ZWVkIHRvIGJlIHNhbml0eSBjaGVja2VkIGFs cmVhZHksIHNvIG5vIG5lZWQgZm9yIE1JTi9NQVguCi0gICAgaWYgKG1fY29uZmlndXJhdGlvbi5p bml0aWFsU2NhbGVJc1NldCkKKyAgICBpZiAobV9jb25maWd1cmF0aW9uLmluaXRpYWxTY2FsZUlz U2V0ICYmICFtX292ZXJyaWRlKQogICAgICAgICByZXR1cm4gbV9jb25maWd1cmF0aW9uLmluaXRp YWxTY2FsZTsKIAogICAgIC8vIElmIG5vdCwgaXQgaXMgdXAgdG8gdXMgdG8gZGV0ZXJtaW5lIHRo ZSBpbml0aWFsIHNjYWxlLgpAQCAtMTIzLDcgKzEyMyw3IEBAIGRvdWJsZSBWaWV3cG9ydENvbmZp Z3VyYXRpb246OmluaXRpYWxTY2FsZSgpIGNvbnN0CiBkb3VibGUgVmlld3BvcnRDb25maWd1cmF0 aW9uOjptaW5pbXVtU2NhbGUoKSBjb25zdAogewogICAgIC8vIElmIHdlIHNjYWxlIHRvIGZpdCwg dGhlbiB0aGlzIGlzIG91ciBtaW5pbXVtIHNjYWxlIGFzIHdlbGwuCi0gICAgaWYgKCFtX2NvbmZp Z3VyYXRpb24uaW5pdGlhbFNjYWxlSXNTZXQpCisgICAgaWYgKCFtX2NvbmZpZ3VyYXRpb24uaW5p dGlhbFNjYWxlSXNTZXQgfHwgbV9vdmVycmlkZSkKICAgICAgICAgcmV0dXJuIGluaXRpYWxTY2Fs ZSgpOwogCiAgICAgLy8gSWYgbm90LCB3ZSBzdGlsbCBuZWVkIHRvIHNhbml0eSBjaGVjayBvdXIg dmFsdWUuCkBAIC0yMzgsNyArMjM4LDcgQEAgdm9pZCBWaWV3cG9ydENvbmZpZ3VyYXRpb246OnVw ZGF0ZUNvbmZpZ3VyYXRpb24oKQogICAgIGJvb2wgdmlld3BvcnRBcmd1bWVudHNPdmVycmlkZXNX aWR0aDsKICAgICBib29sIHZpZXdwb3J0QXJndW1lbnRzT3ZlcnJpZGVzSGVpZ2h0OwogCi0gICAg YXBwbHlWaWV3cG9ydEFyZ3VtZW50KG1fY29uZmlndXJhdGlvbi5taW5pbXVtU2NhbGUsIG1fdmll d3BvcnRBcmd1bWVudHMubWluWm9vbSwgbWluaW11bVZpZXdwb3J0QXJndW1lbnRzU2NhbGVGYWN0 b3IsIG1heGltdW1WaWV3cG9ydEFyZ3VtZW50c1NjYWxlRmFjdG9yKTsKKyAgICBhcHBseVZpZXdw b3J0QXJndW1lbnQobV9jb25maWd1cmF0aW9uLm1pbmltdW1TY2FsZSwgbV9vdmVycmlkZSA/IG1p bmltdW1WaWV3cG9ydEFyZ3VtZW50c1NjYWxlRmFjdG9yIDogbV92aWV3cG9ydEFyZ3VtZW50cy5t aW5ab29tLCBtaW5pbXVtVmlld3BvcnRBcmd1bWVudHNTY2FsZUZhY3RvciwgbWF4aW11bVZpZXdw b3J0QXJndW1lbnRzU2NhbGVGYWN0b3IpOwogICAgIGFwcGx5Vmlld3BvcnRBcmd1bWVudChtX2Nv bmZpZ3VyYXRpb24ubWF4aW11bVNjYWxlLCBtX3ZpZXdwb3J0QXJndW1lbnRzLm1heFpvb20sIG1f Y29uZmlndXJhdGlvbi5taW5pbXVtU2NhbGUsIG1heGltdW1WaWV3cG9ydEFyZ3VtZW50c1NjYWxl RmFjdG9yKTsKICAgICBhcHBseVZpZXdwb3J0QXJndW1lbnQobV9jb25maWd1cmF0aW9uLmluaXRp YWxTY2FsZSwgdmlld3BvcnRBcmd1bWVudHNPdmVycmlkZXNJbml0aWFsU2NhbGUsIG1fdmlld3Bv cnRBcmd1bWVudHMuem9vbSwgbV9jb25maWd1cmF0aW9uLm1pbmltdW1TY2FsZSwgbV9jb25maWd1 cmF0aW9uLm1heGltdW1TY2FsZSk7CiAKQEAgLTI1NSw2ICsyNTUsOSBAQCB2b2lkIFZpZXdwb3J0 Q29uZmlndXJhdGlvbjo6dXBkYXRlQ29uZmlndXJhdGlvbigpCiAKICAgICBpZiAodmlld3BvcnRB cmd1bWVudFVzZXJab29tSXNTZXQobV92aWV3cG9ydEFyZ3VtZW50cy51c2VyWm9vbSkpCiAgICAg ICAgIG1fY29uZmlndXJhdGlvbi5hbGxvd3NVc2VyU2NhbGluZyA9IG1fdmlld3BvcnRBcmd1bWVu dHMudXNlclpvb20gIT0gMC47CisKKyAgICBpZiAobV9vdmVycmlkZSkKKyAgICAgICAgbV9jb25m aWd1cmF0aW9uLmFsbG93c1VzZXJTY2FsaW5nID0gdHJ1ZTsKIH0KIAogZG91YmxlIFZpZXdwb3J0 Q29uZmlndXJhdGlvbjo6dmlld3BvcnRBcmd1bWVudHNMZW5ndGgoZG91YmxlIGxlbmd0aCkgY29u c3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVmlld3BvcnRDb25maWd1cmF0aW9u LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1ZpZXdwb3J0Q29uZmlndXJhdGlvbi5oCmluZGV4IDg5 Y2Y5ZDIuLjJhMjYxM2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVmlld3BvcnRD b25maWd1cmF0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9WaWV3cG9ydENvbmZpZ3Vy YXRpb24uaApAQCAtNzcsNiArNzcsOCBAQCBwdWJsaWM6CiAgICAgY29uc3QgVmlld3BvcnRBcmd1 bWVudHMmIHZpZXdwb3J0QXJndW1lbnRzKCkgY29uc3QgeyByZXR1cm4gbV92aWV3cG9ydEFyZ3Vt ZW50czsgfQogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2V0Vmlld3BvcnRBcmd1bWVudHMoY29u c3QgVmlld3BvcnRBcmd1bWVudHMmKTsKIAorICAgIHZvaWQgc2V0T3ZlcnJpZGUoYm9vbCBvdmVy cmlkZSkge21fb3ZlcnJpZGUgPSBvdmVycmlkZTsgfQorCiAgICAgV0VCQ09SRV9FWFBPUlQgSW50 U2l6ZSBsYXlvdXRTaXplKCkgY29uc3Q7CiAgICAgV0VCQ09SRV9FWFBPUlQgZG91YmxlIGluaXRp YWxTY2FsZSgpIGNvbnN0OwogICAgIFdFQkNPUkVfRVhQT1JUIGRvdWJsZSBtaW5pbXVtU2NhbGUo KSBjb25zdDsKQEAgLTEwNSw2ICsxMDcsOCBAQCBwcml2YXRlOgogICAgIEludFNpemUgbV9jb250 ZW50U2l6ZTsKICAgICBGbG9hdFNpemUgbV9taW5pbXVtTGF5b3V0U2l6ZTsKICAgICBWaWV3cG9y dEFyZ3VtZW50cyBtX3ZpZXdwb3J0QXJndW1lbnRzOworCisgICAgYm9vbCBtX292ZXJyaWRlOwog fTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDM2ZTE5NDQuLjk0YjJi MWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxNC0xMi0wOSAgTWFydGluIEhvY2sg IDxtaG9ja0BhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gQWRkIHZpZXdwb3J0IG92ZXJyaWRl IHNldHRpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEzOTQ2NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogU2hhcmVkL1dlYlByZWZlcmVuY2VzRGVmaW5pdGlvbnMuaDogQWRkIHZpZXdwb3J0IG92ZXJy aWRlIHByZWZlcmVuY2UuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMu Y3BwOgorICAgICAgICAoV0tQcmVmZXJlbmNlc1NldFZpZXdwb3J0T3ZlcnJpZGVFbmFibGVkKToK KyAgICAgICAgKFdLUHJlZmVyZW5jZXNHZXRWaWV3cG9ydE92ZXJyaWRlRW5hYmxlZCk6CisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNSZWYuaDoKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnVw ZGF0ZVByZWZlcmVuY2VzKToKKwogMjAxNC0xMi0wOSAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3Nz eUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVSVEJGIGFmdGVyIHIxNzcwMzIuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNEZWZpbml0aW9ucy5oIGIvU291 cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzRGVmaW5pdGlvbnMuaAppbmRleCBmNGUw ZDYzLi41MWVkOWQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVy ZW5jZXNEZWZpbml0aW9ucy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJl bmNlc0RlZmluaXRpb25zLmgKQEAgLTIzNiw2ICsyMzYsNyBAQAogICAgIG1hY3JvKFRpbGVkU2Ny b2xsaW5nSW5kaWNhdG9yVmlzaWJsZSwgdGlsZWRTY3JvbGxpbmdJbmRpY2F0b3JWaXNpYmxlLCBC b29sLCBib29sLCBmYWxzZSkgXAogICAgIG1hY3JvKFNpbXBsZUxpbmVMYXlvdXREZWJ1Z0JvcmRl cnNFbmFibGVkLCBzaW1wbGVMaW5lTGF5b3V0RGVidWdCb3JkZXJzRW5hYmxlZCwgQm9vbCwgYm9v bCwgZmFsc2UpIFwKICAgICBtYWNybyhMb2dzUGFnZU1lc3NhZ2VzVG9TeXN0ZW1Db25zb2xlRW5h YmxlZCwgbG9nc1BhZ2VNZXNzYWdlc1RvU3lzdGVtQ29uc29sZUVuYWJsZWQsIEJvb2wsIGJvb2ws IGZhbHNlKSBcCisgICAgbWFjcm8oVmlld3BvcnRPdmVycmlkZUVuYWJsZWQsIHZpZXdwb3J0T3Zl cnJpZGVFbmFibGVkLCBCb29sLCBib29sLCBmYWxzZSkgXAogICAgIFwKIAogI2RlZmluZSBGT1Jf RUFDSF9XRUJLSVRfREVCVUdfVUlOVDMyX1BSRUZFUkVOQ0UobWFjcm8pIFwKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcAppbmRleCAyMjEyMDMx Li5hZjg2MGY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQ cmVmZXJlbmNlcy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJl ZmVyZW5jZXMuY3BwCkBAIC0xMzI2LDMgKzEzMjYsMTIgQEAgV0tEZWJ1Z092ZXJsYXlSZWdpb25z IFdLUHJlZmVyZW5jZXNHZXRWaXNpYmxlRGVidWdPdmVybGF5UmVnaW9ucyhXS1ByZWZlcmVuY2Vz UmUKICAgICByZXR1cm4gdG9JbXBsKHByZWZlcmVuY2VzUmVmKS0+dmlzaWJsZURlYnVnT3Zlcmxh eVJlZ2lvbnMoKTsKIH0KIAordm9pZCBXS1ByZWZlcmVuY2VzU2V0Vmlld3BvcnRPdmVycmlkZUVu YWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZiwgYm9vbCBlbmFibGVkKQorewor ICAgIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnNldFZpZXdwb3J0T3ZlcnJpZGVFbmFibGVkKGVu YWJsZWQpOworfQorCitib29sIFdLUHJlZmVyZW5jZXNHZXRWaWV3cG9ydE92ZXJyaWRlRW5hYmxl ZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmKQoreworICAgIHJldHVybiB0b0ltcGwo cHJlZmVyZW5jZXNSZWYpLT52aWV3cG9ydE92ZXJyaWRlRW5hYmxlZCgpOworfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNSZWYuaCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzUmVmLmgKaW5kZXggZmJm NDFiOS4uMDQ2NWI2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D L1dLUHJlZmVyZW5jZXNSZWYuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Mv V0tQcmVmZXJlbmNlc1JlZi5oCkBAIC0yNTgsNiArMjU4LDEwIEBAIFdLX0VYUE9SVCBib29sIFdL UHJlZmVyZW5jZXNHZXRTcGF0aWFsTmF2aWdhdGlvbkVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBw cmVmZXJlCiBXS19FWFBPUlQgdm9pZCBXS1ByZWZlcmVuY2VzU2V0VmlzaWJsZURlYnVnT3Zlcmxh eVJlZ2lvbnMoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZiwgV0tEZWJ1Z092ZXJsYXlS ZWdpb25zIGVuYWJsZWQpOwogV0tfRVhQT1JUIFdLRGVidWdPdmVybGF5UmVnaW9ucyBXS1ByZWZl cmVuY2VzR2V0VmlzaWJsZURlYnVnT3ZlcmxheVJlZ2lvbnMoV0tQcmVmZXJlbmNlc1JlZiBwcmVm ZXJlbmNlc1JlZik7CiAKKy8vIERlZmF1bHRzIHRvIGZhbHNlLgorV0tfRVhQT1JUIHZvaWQgV0tQ cmVmZXJlbmNlc1NldFZpZXdwb3J0T3ZlcnJpZGVFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJl ZmVyZW5jZXNSZWYsIGJvb2wgZW5hYmxlZCk7CitXS19FWFBPUlQgYm9vbCBXS1ByZWZlcmVuY2Vz R2V0Vmlld3BvcnRPdmVycmlkZUVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1Jl Zik7CisKICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggOTBhMjQxNS4uNzBhYTM4ZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtMjg4 NSw2ICsyODg1LDEwIEBAIHZvaWQgV2ViUGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMoY29uc3QgV2Vi UHJlZmVyZW5jZXNTdG9yZSYgc3RvcmUpCiAKICAgICBpZiAobV9kcmF3aW5nQXJlYSkKICAgICAg ICAgbV9kcmF3aW5nQXJlYS0+dXBkYXRlUHJlZmVyZW5jZXMoc3RvcmUpOworCisjaWYgUExBVEZP Uk0oSU9TKQorICAgIG1fdmlld3BvcnRDb25maWd1cmF0aW9uLnNldE92ZXJyaWRlKHN0b3JlLmdl dEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6dmlld3BvcnRPdmVycmlkZUVuYWJs ZWRLZXkoKSkpOworI2VuZGlmCiB9CiAKICNpZiBQTEFURk9STShDT0NPQSkK 242985 2014-12-09 20:21:03 -0800 2014-12-09 20:27:19 -0800 address comments viewportoverride.02.diff text/plain 8946 mhock ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxNmNkZWJhLi41MjJhOGU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTQtMTItMDkgIE1hcnRpbiBIb2NrICA8bWhvY2tAYXBwbGUuY29tPgorCisgICAgICAg IFtpT1NdIEFkZCBzZXR0aW5nIHRvIGlnbm9yZSB2aWV3cG9ydCBzY2FsaW5nIGNvbnN0cmFpbnRz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk0NjYK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE5MjAwMzI4PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZS5leHAuaW46CisgICAgICAgICog cGFnZS9TZXR0aW5ncy5pbjogQWRkIHNldHRpbmcgdG8gaWdub3JlIHZpZXdwb3J0IHNjYWxpbmcg Y29uc3RyYWludHMuCisgICAgICAgICogcGFnZS9WaWV3cG9ydENvbmZpZ3VyYXRpb24uY3BwOiBJ Z25vcmUgdmlld3BvcnQgc2NhbGluZyBjb25zdHJhaW50cyBiYXNlZCBvbiBwcmVmZXJlbmNlLgor ICAgICAgICAoV2ViQ29yZTo6Vmlld3BvcnRDb25maWd1cmF0aW9uOjppbml0aWFsU2NhbGUpOgor ICAgICAgICAoV2ViQ29yZTo6Vmlld3BvcnRDb25maWd1cmF0aW9uOjptaW5pbXVtU2NhbGUpOgor ICAgICAgICAoV2ViQ29yZTo6Vmlld3BvcnRDb25maWd1cmF0aW9uOjphbGxvd3NVc2VyU2NhbGlu Zyk6CisgICAgICAgICogcGFnZS9WaWV3cG9ydENvbmZpZ3VyYXRpb24uaDoKKyAgICAgICAgKFdl YkNvcmU6OlZpZXdwb3J0Q29uZmlndXJhdGlvbjo6c2V0SWdub3JlVmlld3BvcnRTY2FsaW5nQ29u c3RyYWludHMpOgorICAgICAgICAoV2ViQ29yZTo6Vmlld3BvcnRDb25maWd1cmF0aW9uOjphbGxv d3NVc2VyU2NhbGluZyk6IE1vdmVkIHRvIGNwcC4KKwogMjAxNC0xMi0wOSAgTXlsZXMgQy4gTWF4 ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFNjcm9sbGluZyB0byBhbmNo b3IgdGFncyBkb2VzIG5vdGhpbmcgaW4gdmVydGljYWwtcmwgd3JpdGluZyBtb2RlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNv cmUuZXhwLmluCmluZGV4IDcxZTlmZDEuLmI3ODRkOTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL1dlYkNvcmUuZXhwLmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCkBA IC0xOTA4LDYgKzE5MDgsNyBAQCBfX1pOSzdXZWJDb3JlMjFVc2VyQ29udGVudFVSTFBhdHRlcm43 bWF0Y2hlc0VSS05TXzNVUkxFCiBfX1pOSzdXZWJDb3JlMjFWaWV3cG9ydENvbmZpZ3VyYXRpb24x MGxheW91dFNpemVFdgogX19aTks3V2ViQ29yZTIxVmlld3BvcnRDb25maWd1cmF0aW9uMTJpbml0 aWFsU2NhbGVFdgogX19aTks3V2ViQ29yZTIxVmlld3BvcnRDb25maWd1cmF0aW9uMTJtaW5pbXVt U2NhbGVFdgorX19aTks3V2ViQ29yZTIxVmlld3BvcnRDb25maWd1cmF0aW9uMTdhbGxvd3NVc2Vy U2NhbGluZ0V2CiBfX1pOSzdXZWJDb3JlMjJXaGVlbEV2ZW50RGVsdGFUcmFja2VyMzBkb21pbmFu dFNjcm9sbEdlc3R1cmVEaXJlY3Rpb25FdgogX19aTks3V2ViQ29yZTIzQXBwbGljYXRpb25DYWNo ZVN0b3JhZ2UxMW1heGltdW1TaXplRXYKIF9fWk5LN1dlYkNvcmUyM0F1dGhlbnRpY2F0aW9uQ2hh bGxlbmdlMjBhdXRoZW50aWNhdGlvbkNsaWVudEV2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1NldHRpbmdzLmluIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5pbgppbmRl eCA2YWQ5N2JjLi4xNDlkZDIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRp bmdzLmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaW4KQEAgLTIzNiwzICsy MzYsNSBAQCBtYXhpbXVtU291cmNlQnVmZmVyU2l6ZSB0eXBlPWludCwgaW5pdGlhbD0zMTg3Njcx MDQsIGNvbmRpdGlvbmFsPU1FRElBX1NPVVJDRQogbG9uZ01vdXNlUHJlc3NFbmFibGVkIGluaXRp YWw9ZmFsc2UKIAogc2VydmljZUNvbnRyb2xzRW5hYmxlZCBpbml0aWFsPWZhbHNlLCBjb25kaXRp b25hbD1TRVJWSUNFX0NPTlRST0xTCisKK2lnbm9yZVZpZXdwb3J0U2NhbGluZ0NvbnN0cmFpbnRz IGluaXRpYWw9ZmFsc2UKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wYWdlL1ZpZXdwb3J0Q29uZmlndXJhdGlvbi5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL1ZpZXdwb3J0Q29uZmlndXJhdGlvbi5jcHAKaW5kZXggOTE0MGEwNy4uOTc4NGJh NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9WaWV3cG9ydENvbmZpZ3VyYXRpb24u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVmlld3BvcnRDb25maWd1cmF0aW9uLmNwcApA QCAtMTAyLDcgKzEwMiw3IEBAIGRvdWJsZSBWaWV3cG9ydENvbmZpZ3VyYXRpb246OmluaXRpYWxT Y2FsZSgpIGNvbnN0CiAKICAgICAvLyBJZiB0aGUgZG9jdW1lbnQgaGFzIHNwZWNpZmllZCBpdHMg b3duIGluaXRpYWwgc2NhbGUsIHVzZSBpdCByZWdhcmRsZXNzLgogICAgIC8vIFRoaXMgaXMgZ3Vh cmFudGVlZCB0byBiZSBzYW5pdHkgY2hlY2tlZCBhbHJlYWR5LCBzbyBubyBuZWVkIGZvciBNSU4v TUFYLgotICAgIGlmIChtX2NvbmZpZ3VyYXRpb24uaW5pdGlhbFNjYWxlSXNTZXQpCisgICAgaWYg KG1fY29uZmlndXJhdGlvbi5pbml0aWFsU2NhbGVJc1NldCAmJiAhbV9pZ25vcmVWaWV3cG9ydFNj YWxpbmdDb25zdHJhaW50cykKICAgICAgICAgcmV0dXJuIG1fY29uZmlndXJhdGlvbi5pbml0aWFs U2NhbGU7CiAKICAgICAvLyBJZiBub3QsIGl0IGlzIHVwIHRvIHVzIHRvIGRldGVybWluZSB0aGUg aW5pdGlhbCBzY2FsZS4KQEAgLTEyMyw3ICsxMjMsNyBAQCBkb3VibGUgVmlld3BvcnRDb25maWd1 cmF0aW9uOjppbml0aWFsU2NhbGUoKSBjb25zdAogZG91YmxlIFZpZXdwb3J0Q29uZmlndXJhdGlv bjo6bWluaW11bVNjYWxlKCkgY29uc3QKIHsKICAgICAvLyBJZiB3ZSBzY2FsZSB0byBmaXQsIHRo ZW4gdGhpcyBpcyBvdXIgbWluaW11bSBzY2FsZSBhcyB3ZWxsLgotICAgIGlmICghbV9jb25maWd1 cmF0aW9uLmluaXRpYWxTY2FsZUlzU2V0KQorICAgIGlmICghbV9jb25maWd1cmF0aW9uLmluaXRp YWxTY2FsZUlzU2V0IHx8IG1faWdub3JlVmlld3BvcnRTY2FsaW5nQ29uc3RyYWludHMpCiAgICAg ICAgIHJldHVybiBpbml0aWFsU2NhbGUoKTsKIAogICAgIC8vIElmIG5vdCwgd2Ugc3RpbGwgbmVl ZCB0byBzYW5pdHkgY2hlY2sgb3VyIHZhbHVlLgpAQCAtMTQzLDYgKzE0MywxMSBAQCBkb3VibGUg Vmlld3BvcnRDb25maWd1cmF0aW9uOjptaW5pbXVtU2NhbGUoKSBjb25zdAogICAgIHJldHVybiBt aW5pbXVtU2NhbGU7CiB9CiAKK2Jvb2wgVmlld3BvcnRDb25maWd1cmF0aW9uOjphbGxvd3NVc2Vy U2NhbGluZygpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1faWdub3JlVmlld3BvcnRTY2FsaW5nQ29u c3RyYWludHMgfHwgbV9jb25maWd1cmF0aW9uLmFsbG93c1VzZXJTY2FsaW5nOworfQorCiBWaWV3 cG9ydENvbmZpZ3VyYXRpb246OlBhcmFtZXRlcnMgVmlld3BvcnRDb25maWd1cmF0aW9uOjp3ZWJw YWdlUGFyYW1ldGVycygpCiB7CiAgICAgUGFyYW1ldGVycyBwYXJhbWV0ZXJzOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9WaWV3cG9ydENvbmZpZ3VyYXRpb24uaCBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvVmlld3BvcnRDb25maWd1cmF0aW9uLmgKaW5kZXggODljZjlkMi4uMDY0ZTM4 MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9WaWV3cG9ydENvbmZpZ3VyYXRpb24u aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1ZpZXdwb3J0Q29uZmlndXJhdGlvbi5oCkBAIC03 NywxMSArNzcsMTMgQEAgcHVibGljOgogICAgIGNvbnN0IFZpZXdwb3J0QXJndW1lbnRzJiB2aWV3 cG9ydEFyZ3VtZW50cygpIGNvbnN0IHsgcmV0dXJuIG1fdmlld3BvcnRBcmd1bWVudHM7IH0KICAg ICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldFZpZXdwb3J0QXJndW1lbnRzKGNvbnN0IFZpZXdwb3J0 QXJndW1lbnRzJik7CiAKKyAgICB2b2lkIHNldElnbm9yZVZpZXdwb3J0U2NhbGluZ0NvbnN0cmFp bnRzKGJvb2wgaWdub3JlVmlld3BvcnRTY2FsaW5nQ29uc3RyYWludHMpIHttX2lnbm9yZVZpZXdw b3J0U2NhbGluZ0NvbnN0cmFpbnRzID0gaWdub3JlVmlld3BvcnRTY2FsaW5nQ29uc3RyYWludHM7 IH0KKwogICAgIFdFQkNPUkVfRVhQT1JUIEludFNpemUgbGF5b3V0U2l6ZSgpIGNvbnN0OwogICAg IFdFQkNPUkVfRVhQT1JUIGRvdWJsZSBpbml0aWFsU2NhbGUoKSBjb25zdDsKICAgICBXRUJDT1JF X0VYUE9SVCBkb3VibGUgbWluaW11bVNjYWxlKCkgY29uc3Q7CiAgICAgZG91YmxlIG1heGltdW1T Y2FsZSgpIGNvbnN0IHsgcmV0dXJuIG1fY29uZmlndXJhdGlvbi5tYXhpbXVtU2NhbGU7IH0KLSAg ICBib29sIGFsbG93c1VzZXJTY2FsaW5nKCkgY29uc3QgeyByZXR1cm4gbV9jb25maWd1cmF0aW9u LmFsbG93c1VzZXJTY2FsaW5nOyB9CisgICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBhbGxvd3NVc2Vy U2NhbGluZygpIGNvbnN0OwogCiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIFBhcmFtZXRlcnMg d2VicGFnZVBhcmFtZXRlcnMoKTsKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgUGFyYW1ldGVy cyB0ZXh0RG9jdW1lbnRQYXJhbWV0ZXJzKCk7CkBAIC0xMDUsNiArMTA3LDggQEAgcHJpdmF0ZToK ICAgICBJbnRTaXplIG1fY29udGVudFNpemU7CiAgICAgRmxvYXRTaXplIG1fbWluaW11bUxheW91 dFNpemU7CiAgICAgVmlld3BvcnRBcmd1bWVudHMgbV92aWV3cG9ydEFyZ3VtZW50czsKKworICAg IGJvb2wgbV9pZ25vcmVWaWV3cG9ydFNjYWxpbmdDb25zdHJhaW50czsKIH07CiAKIH0gLy8gbmFt ZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCAzNmUxOTQ0Li45M2VlMjNmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTkgQEAKKzIwMTQtMTItMDkgIE1hcnRpbiBIb2NrICA8bWhvY2tAYXBwbGUu Y29tPgorCisgICAgICAgIFtpT1NdIEFkZCBzZXR0aW5nIHRvIGlnbm9yZSB2aWV3cG9ydCBzY2Fs aW5nIGNvbnN0cmFpbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMzk0NjYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE5MjAwMzI4PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2hhcmVkL1dlYlBy ZWZlcmVuY2VzRGVmaW5pdGlvbnMuaDogQWRkIGlnbm9yZVZpZXdwb3J0U2NhbGluZ0NvbnN0cmFp bnRzIHByZWZlcmVuY2UuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMu Y3BwOgorICAgICAgICAoV0tQcmVmZXJlbmNlc1NldElnbm9yZVZpZXdwb3J0U2NhbGluZ0NvbnN0 cmFpbnRzKToKKyAgICAgICAgKFdLUHJlZmVyZW5jZXNHZXRJZ25vcmVWaWV3cG9ydFNjYWxpbmdD b25zdHJhaW50cyk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNSZWYu aDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2U6OnVwZGF0ZVByZWZlcmVuY2VzKToKKwogMjAxNC0xMi0wOSAgQ3NhYmEg T3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVSVEJGIGFmdGVyIHIx NzcwMzIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNE ZWZpbml0aW9ucy5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzRGVmaW5p dGlvbnMuaAppbmRleCBmNGUwZDYzLi5iMWRjNzU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNEZWZpbml0aW9ucy5oCisrKyBiL1NvdXJjZS9XZWJLaXQy L1NoYXJlZC9XZWJQcmVmZXJlbmNlc0RlZmluaXRpb25zLmgKQEAgLTIzNiw2ICsyMzYsNyBAQAog ICAgIG1hY3JvKFRpbGVkU2Nyb2xsaW5nSW5kaWNhdG9yVmlzaWJsZSwgdGlsZWRTY3JvbGxpbmdJ bmRpY2F0b3JWaXNpYmxlLCBCb29sLCBib29sLCBmYWxzZSkgXAogICAgIG1hY3JvKFNpbXBsZUxp bmVMYXlvdXREZWJ1Z0JvcmRlcnNFbmFibGVkLCBzaW1wbGVMaW5lTGF5b3V0RGVidWdCb3JkZXJz RW5hYmxlZCwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKICAgICBtYWNybyhMb2dzUGFnZU1lc3NhZ2Vz VG9TeXN0ZW1Db25zb2xlRW5hYmxlZCwgbG9nc1BhZ2VNZXNzYWdlc1RvU3lzdGVtQ29uc29sZUVu YWJsZWQsIEJvb2wsIGJvb2wsIGZhbHNlKSBcCisgICAgbWFjcm8oSWdub3JlVmlld3BvcnRTY2Fs aW5nQ29uc3RyYWludHMsIGlnbm9yZVZpZXdwb3J0U2NhbGluZ0NvbnN0cmFpbnRzLCBCb29sLCBi b29sLCBmYWxzZSkgXAogICAgIFwKIAogI2RlZmluZSBGT1JfRUFDSF9XRUJLSVRfREVCVUdfVUlO VDMyX1BSRUZFUkVOQ0UobWFjcm8pIFwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvQy9XS1ByZWZlcmVuY2VzLmNwcAppbmRleCAyMjEyMDMxLi5hZmIzZjYzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwCkBAIC0xMzI2 LDMgKzEzMjYsMTIgQEAgV0tEZWJ1Z092ZXJsYXlSZWdpb25zIFdLUHJlZmVyZW5jZXNHZXRWaXNp YmxlRGVidWdPdmVybGF5UmVnaW9ucyhXS1ByZWZlcmVuY2VzUmUKICAgICByZXR1cm4gdG9JbXBs KHByZWZlcmVuY2VzUmVmKS0+dmlzaWJsZURlYnVnT3ZlcmxheVJlZ2lvbnMoKTsKIH0KIAordm9p ZCBXS1ByZWZlcmVuY2VzU2V0SWdub3JlVmlld3BvcnRTY2FsaW5nQ29uc3RyYWludHMoV0tQcmVm ZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZiwgYm9vbCBlbmFibGVkKQoreworICAgIHRvSW1wbChw cmVmZXJlbmNlc1JlZiktPnNldElnbm9yZVZpZXdwb3J0U2NhbGluZ0NvbnN0cmFpbnRzKGVuYWJs ZWQpOworfQorCitib29sIFdLUHJlZmVyZW5jZXNHZXRJZ25vcmVWaWV3cG9ydFNjYWxpbmdDb25z dHJhaW50cyhXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmKQoreworICAgIHJldHVybiB0 b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5pZ25vcmVWaWV3cG9ydFNjYWxpbmdDb25zdHJhaW50cygp OworfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVy ZW5jZXNSZWYuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2Vz UmVmLmgKaW5kZXggZmJmNDFiOS4uZDVlNzQ2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNSZWYuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1JlZi5oCkBAIC0yNTgsNiArMjU4LDEwIEBAIFdL X0VYUE9SVCBib29sIFdLUHJlZmVyZW5jZXNHZXRTcGF0aWFsTmF2aWdhdGlvbkVuYWJsZWQoV0tQ cmVmZXJlbmNlc1JlZiBwcmVmZXJlCiBXS19FWFBPUlQgdm9pZCBXS1ByZWZlcmVuY2VzU2V0Vmlz aWJsZURlYnVnT3ZlcmxheVJlZ2lvbnMoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZiwg V0tEZWJ1Z092ZXJsYXlSZWdpb25zIGVuYWJsZWQpOwogV0tfRVhQT1JUIFdLRGVidWdPdmVybGF5 UmVnaW9ucyBXS1ByZWZlcmVuY2VzR2V0VmlzaWJsZURlYnVnT3ZlcmxheVJlZ2lvbnMoV0tQcmVm ZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZik7CiAKKy8vIERlZmF1bHRzIHRvIGZhbHNlLgorV0tf RVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1NldElnbm9yZVZpZXdwb3J0U2NhbGluZ0NvbnN0cmFp bnRzKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYsIGJvb2wgZW5hYmxlZCk7CitXS19F WFBPUlQgYm9vbCBXS1ByZWZlcmVuY2VzR2V0SWdub3JlVmlld3BvcnRTY2FsaW5nQ29uc3RyYWlu dHMoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZik7CisKICNpZmRlZiBfX2NwbHVzcGx1 cwogfQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5jcHAKaW5kZXggOTBhMjQxNS4uNjE3YjExYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtMjg4NSw2ICsyODg1LDEwIEBAIHZvaWQgV2Vi UGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMoY29uc3QgV2ViUHJlZmVyZW5jZXNTdG9yZSYgc3RvcmUp CiAKICAgICBpZiAobV9kcmF3aW5nQXJlYSkKICAgICAgICAgbV9kcmF3aW5nQXJlYS0+dXBkYXRl UHJlZmVyZW5jZXMoc3RvcmUpOworCisjaWYgUExBVEZPUk0oSU9TKQorICAgIG1fdmlld3BvcnRD b25maWd1cmF0aW9uLnNldElnbm9yZVZpZXdwb3J0U2NhbGluZ0NvbnN0cmFpbnRzKHN0b3JlLmdl dEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6aWdub3JlVmlld3BvcnRTY2FsaW5n Q29uc3RyYWludHNLZXkoKSkpOworI2VuZGlmCiB9CiAKICNpZiBQTEFURk9STShDT0NPQSkK