87874 2012-05-30 10:42:29 -0700 [chromium] Expose device scale factor in WebPluginContainer 2012-06-28 10:00:31 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED LATER P2 Normal --- 1 jhorwich jhorwich abarth danakj dglazkov fishd jamesr rbyers rjkroege thakis tkent+wkapi webkit.review.bot oldest_to_newest 637409 0 jhorwich 2012-05-30 10:42:29 -0700 [chromium] Expose device scale factor in WebPluginContainer 637441 1 144872 jhorwich 2012-05-30 11:10:49 -0700 Created attachment 144872 Patch 637444 2 webkit.review.bot 2012-05-30 11:12:06 -0700 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 637450 3 jamesr 2012-05-30 11:13:05 -0700 What's this for? 637503 4 144872 danakj 2012-05-30 11:52:40 -0700 Comment on attachment 144872 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=144872&action=review > Source/WebKit/chromium/public/WebPluginContainer.h:115 > + virtual float getDeviceScaleFactor() = 0; If we're returning the defaultDeviceScaleFactor, let's call this function getDefaultDeviceScaleFactor? That said I'm not exactly positive which (default?)deviceScaleFactor should be given out here. Josh maybe you can explain how its being used, James will know what's right. 637531 5 jhorwich 2012-05-30 12:25:22 -0700 (In reply to comment #3) > What's this for? Context is allowing Pepper to expose the scale factor (between pixels on the display device and "DIPs" aka Density-Independent 'Pixels') to Pepper plugins that wish to render at display device resolution in cases where 1 DIP != 1 physical pixel. Pepper today sends information to plugins in DIPs so existing plugins, or plugins that don't wish to render in device native resolution for whatever reason, will continue to have their output scaled to the correct size in cases where the scale factor between device pixels and DIPs is not 1. http://code.google.com/p/chromium/issues/detail?id=114673 is the issue on the chromium tracker that this patch will help in addressing. (In reply to comment #4) As for calling it "defaultDeviceScaleFactor" vs "deviceScaleFactor" - I had named it without the 'default' qualifier because I believe Pepper plugins care about the actual scale factor, not whether it is the default or not. I suppose it gets a bit confusing since, at least in the current implementation, "page zoom" does not result in a change to scale factor in any way, but rather an expansion of the number of pixels (DIPs) a plugin is given - for example if I have a plugin with "width=400" and I zoom the page to "125%" the plugin sees a DidChangeView with a width of 500. This is great for plugins that reasonably handle scaling (e.g. render things in terms of percentages of their view area) as it results in still-crisp output and actually zoomed content. It is less ideal for plugins that use fixed-size (in terms of pixels) assets or fixed locations for rendering as it results in a user-initiated page zoom not generating larger (easier-to-read) plugin contents. This patch or my planned chromium-side patch would not change this behavior - I'm just pointing it out for completeness - e.g. that I want Pepper to have access to the scale factor between device pixels and DIPs, not the page zoom. 637603 6 144872 abarth 2012-05-30 13:23:15 -0700 Comment on attachment 144872 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=144872&action=review > Source/WebKit/chromium/src/WebPluginContainerImpl.cpp:255 > +float WebPluginContainerImpl::getDeviceScaleFactor() > +{ > + Page* page = m_element->document()->page(); > + if (!page) > + return 1.0; > + Settings* settings = page->settings(); > + if (!settings) > + return 1.0; > + return settings->defaultDeviceScaleFactor(); > +} Can we hold off on this API until http://lists.webkit.org/pipermail/webkit-dev/2012-May/020847.html gets resolved? It's likely that this will need to change or at least be renamed. 637604 7 144872 abarth 2012-05-30 13:24:04 -0700 Comment on attachment 144872 Patch Marking r- for now. Please feel free to renominate once WebKit gets it's scale factors sorted out into something sane. 637755 8 jhorwich 2012-05-30 15:27:23 -0700 (In reply to comment #6) > (From update of attachment 144872 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=144872&action=review > > > Source/WebKit/chromium/src/WebPluginContainerImpl.cpp:255 > > +float WebPluginContainerImpl::getDeviceScaleFactor() > > +{ > > + Page* page = m_element->document()->page(); > > + if (!page) > > + return 1.0; > > + Settings* settings = page->settings(); > > + if (!settings) > > + return 1.0; > > + return settings->defaultDeviceScaleFactor(); > > +} > > Can we hold off on this API until http://lists.webkit.org/pipermail/webkit-dev/2012-May/020847.html gets resolved? It's likely that this will need to change or at least be renamed. Yes, I think holding off until the dust settles from that discussion would be wise. Thank you for pointing it out to me. 642745 9 146096 jhorwich 2012-06-06 13:24:15 -0700 Created attachment 146096 Simpler patch that uses page->deviceScaleFactor instead 642747 10 146096 jamesr 2012-06-06 13:27:55 -0700 Comment on attachment 146096 Simpler patch that uses page->deviceScaleFactor instead What's the notification path for when this value changes? Should be be push (from WebKit to the plugin), instead of pull (the plugin asks WebKit) ? 649329 11 rbyers 2012-06-14 11:24:16 -0700 Any update on this? The "dust has settled" for abarth@'s has happened now, right? +rjkroege/thakis who are working on dynamically changing the scale factor. We may want to land this without support for dynamic changing first (if it's not ready), and then update. 649331 12 jamesr 2012-06-14 11:27:11 -0700 I think we should design an API that supports dynamic switching from the start. To me the most obvious way to do that is to have the model be push (from embedder to plugin) rather than pull. 649333 13 thakis 2012-06-14 11:28:56 -0700 rbyers: Dynamic switching for mac is done & checked in (except for composited pages), dynamic switching for aura is done and in review (again except for composited pages). Might make sense to be similar to the npapi model here https://wiki.mozilla.org/NPAPI:ContentsScaleFactor which is both push and pull. 649346 14 jhorwich 2012-06-14 11:47:18 -0700 (In reply to comment #12) > I think we should design an API that supports dynamic switching from the start. To me the most obvious way to do that is to have the model be push (from embedder to plugin) rather than pull. Typical usage in Pepper for a change in a plugin's view size/clip/origin is for the embedder to push - via calling the plugin instance's DidChangeView with a view resource that has all the new metrics. I believe we would want such a push to happen if the device_scale_factor changes dynamically - I'm not familiar enough yet with dynamic switching to know if this (PluginInstance::ViewChanged, which pushes to the plugin) already happens or not. Semi-related question, I'm looking to also expose to the plugin the mapping between logical pixels and CSS pixels in the view resource, so a plugin could accurately scale contents/event locations/etc. for cases where page zoom or page scale is not 100% in chromium. Initial testing by using page->pageScaleFactor() showed it stay at 1.0 when zooming. Is there some easy way to get the current logical pixel (DIP) :: CSS pixel mapping from WebPluginContainer? 649367 15 abarth 2012-06-14 12:19:14 -0700 > Any update on this? The "dust has settled" for abarth@'s has happened now, right? Yep. This wiki page was the outcome: http://trac.webkit.org/wiki/ScalesAndZooms @jamesr: Do you think we should post a link to that wiki page to webkit-dev? 649379 16 jamesr 2012-06-14 12:29:43 -0700 (In reply to comment #14) > Semi-related question, I'm looking to also expose to the plugin the mapping between logical pixels and CSS pixels in the view resource, so a plugin could accurately scale contents/event locations/etc. for cases where page zoom or page scale is not 100% in chromium. Initial testing by using page->pageScaleFactor() showed it stay at 1.0 when zooming. Is there some easy way to get the current logical pixel (DIP) :: CSS pixel mapping from WebPluginContainer? Page zoom does not change the pageScaleFactor, see https://trac.webkit.org/wiki/ScalesAndZooms. There's a pageZoomFactor() - try that. 649680 17 jhorwich 2012-06-14 17:41:29 -0700 (In reply to comment #16) > (In reply to comment #14) > > Semi-related question, I'm looking to also expose to the plugin the mapping between logical pixels and CSS pixels in the view resource, so a plugin could accurately scale contents/event locations/etc. for cases where page zoom or page scale is not 100% in chromium. Initial testing by using page->pageScaleFactor() showed it stay at 1.0 when zooming. Is there some easy way to get the current logical pixel (DIP) :: CSS pixel mapping from WebPluginContainer? > > Page zoom does not change the pageScaleFactor, see https://trac.webkit.org/wiki/ScalesAndZooms. There's a pageZoomFactor() - try that. Thank you - pageZoomFactor is in fact letting me understand the mapping between logical & CSS pixels. 654104 18 148701 jhorwich 2012-06-20 18:26:55 -0700 Created attachment 148701 Similar patch, with additional getPageZoomFactor 654120 19 jhorwich 2012-06-20 18:41:59 -0700 (In reply to comment #11) > Any update on this? The "dust has settled" for abarth@'s has happened now, right? > > +rjkroege/thakis who are working on dynamically changing the scale factor. We may want to land this without support for dynamic changing first (if it's not ready), and then update. FYI, I've been testing this with dynamic switching (along with the related patch in chromium, https://chromiumcodereview.appspot.com/10544168/ and a HiDPI-aware test plugin), and I've confirmed that when I toggle monitor scale (under ash, using ctrl-shift-home which sends ash::AcceleratorAction::MONITOR_TOGGLE_SCALE), the plugin does get a DidChangeView call, so a HiDPI-aware plugin can in fact react to dynamic changing - assuming other methods of dynamic changing are similar to that. 655003 20 148701 jhorwich 2012-06-21 16:26:22 -0700 Comment on attachment 148701 Similar patch, with additional getPageZoomFactor Please take a look 655013 21 148701 jamesr 2012-06-21 16:34:15 -0700 Comment on attachment 148701 Similar patch, with additional getPageZoomFactor View in context: https://bugs.webkit.org/attachment.cgi?id=148701&action=review > Source/WebKit/chromium/src/WebPluginContainerImpl.h:118 > + virtual float getDeviceScaleFactor(); > + virtual float getPageZoomFactor(); style note: in WebKit, getters do not have the "get" prefix, they are just named after the thing they are getting. > Source/WebKit/chromium/public/WebPluginContainer.h:37 > +#define WEBPLUGINCONTAINER_HAS_GETDEVICESCALEFACTOR 1 > +#define WEBPLUGINCONTAINER_HAS_GETPAGEZOOMFACTOR 1 personally I'd fold these into one #define although I'm not sure you need an #define here at all - unless there are implementations of the WebPluginContainer implementation outside of the WebKit repository? > Source/WebKit/chromium/public/WebPluginContainer.h:117 > + virtual float getDeviceScaleFactor() = 0; > + virtual float getPageZoomFactor() = 0; same note here re: naming how does this interact with zoomLevelChanged() ? is the idea with this API that somebody is supposed to call zoomLevelChanged() when the page / device scale change, and if so how does the zoomLevel parameter on zoomLevelChanged() interact with these? or is that call talking about a different concept? 655060 22 148701 jhorwich 2012-06-21 17:23:43 -0700 Comment on attachment 148701 Similar patch, with additional getPageZoomFactor View in context: https://bugs.webkit.org/attachment.cgi?id=148701&action=review >> Source/WebKit/chromium/src/WebPluginContainerImpl.h:118 >> + virtual float getPageZoomFactor(); > > style note: in WebKit, getters do not have the "get" prefix, they are just named after the thing they are getting. Will fix >> Source/WebKit/chromium/public/WebPluginContainer.h:37 >> +#define WEBPLUGINCONTAINER_HAS_GETPAGEZOOMFACTOR 1 > > personally I'd fold these into one #define > > although I'm not sure you need an #define here at all - unless there are implementations of the WebPluginContainer implementation outside of the WebKit repository? The goal was to remove patch order dependency between WebKit and chromium - e.g. chromium would have calls to the new methods bracketed in #ifdef WEBPLUGINCONTAINHER_HAS_xxx and assume 1.0 otherwise. Similar to some defines like WEBWIDGET_HAS_SETCOMPOSITORSURFACEREADY in chromium/public/WebWidget.h I could remove them altogether and just sequence the patches if you wish (WebKit first, then chromium), please let me know. >> Source/WebKit/chromium/public/WebPluginContainer.h:117 >> + virtual float getPageZoomFactor() = 0; > > same note here re: naming > > how does this interact with zoomLevelChanged() ? is the idea with this API that somebody is supposed to call zoomLevelChanged() when the page / device scale change, and if so how does the zoomLevel parameter on zoomLevelChanged() interact with these? or is that call talking about a different concept? naming: will fix My intent with adding [get]pageZoomFactor was to make the data available from a PPB_View resource along with the device scale factor. There is no strict need for this now, I thought it simpler to add both at once rather than one-at-a-time in Pepper. Existing plugins can continue to implement PP_ZoomDev to query and control page zoom - or for those that don't want to implement PP_ZoomDev, but do wish to respect the current page zoom, they can fetch it from PPB_View. http://codereview.chromium.org/10544168/ has the chromium side of this patch, to provide more context. Note that I don't have a specific immediate need for this, so I can easily drop it from the patches (and rely on PP_ZoomDev) 655066 23 jamesr 2012-06-21 17:28:26 -0700 We normally only put #defines in if there's no way to resolve the compile issues just by patch ordering, so if there's an ordering that can avoid the need please do that. I don't have any idea what PP_ZoomDev is or how it applies. Can you please answer the question just in terms of the WebPluginContainer interface (which doesn't know anything about pepper)? I can't tell from your answer whether the zoomLevelChanged() is related to the page zoom level or not, or if so how. 655126 24 jhorwich 2012-06-21 18:32:24 -0700 (In reply to comment #23) > We normally only put #defines in if there's no way to resolve the compile issues just by patch ordering, so if there's an ordering that can avoid the need please do that. Will do - I'll just remove these, and wait on this patch from WebKit before applying my chromium one. > > I don't have any idea what PP_ZoomDev is or how it applies. Can you please answer the question just in terms of the WebPluginContainer interface (which doesn't know anything about pepper)? I can't tell from your answer whether the zoomLevelChanged() is related to the page zoom level or not, or if so how. Sorry, the zoomLevel / zoomFactor stuff is a bit confusing to follow at times. To answer your original questions: - this doesn't interact with WebPluginContainer::zoomLevelChanged - that method's reason for being is AFAICT to allow a full-frame plugin to control the indicated zoom level, allowing such plugins to surface their own "zoom" UI and keep other (browser) zoom UI in sync. the zoomLevel parameter does not affect the value returned by my API - the idea of this (pageScaleFactor) API is to allow the plugin to know the page scale factor in order to map between logical pixels and CSS pixels. This API does not require that anyone calls zoomLevelChanged when the page/device scale change Please let me know if that helps clarify things, and/or if this just makes things more confusing than it already is ... and/or if I should just leave the pageScaleFactor part out of this patch. 655133 25 jhorwich 2012-06-21 18:36:47 -0700 > - the idea of this (pageScaleFactor) API is to allow the plugin to know the page scale factor in order to map between logical pixels and CSS pixels. This API does not require that anyone calls zoomLevelChanged when the page/device scale change sorry, meant to say "pageZoomFactor" not "pageScaleFactor". > > Please let me know if that helps clarify things, and/or if this just makes things more confusing than it already is ... and/or if I should just leave the pageScaleFactor part out of this patch. Same here - meant to say "pageZoomFactor" not "pageScaleFactor" 655138 26 jamesr 2012-06-21 18:45:24 -0700 OK. Is there a particular reason you are routing pageZoomFactor through and not pageScaleFactor? They both change the mapping of CSS to logical pixels. 655706 27 149089 jhorwich 2012-06-22 13:03:39 -0700 Created attachment 149089 Patch to address feedback, add pageScaleFactor 655707 28 jhorwich 2012-06-22 13:05:53 -0700 (In reply to comment #26) > OK. Is there a particular reason you are routing pageZoomFactor through and not pageScaleFactor? They both change the mapping of CSS to logical pixels. I am now also routing pageScaleFactor as well. (Updated latest patch, addressing earlier review feedback as well) 655800 29 149089 jamesr 2012-06-22 14:49:31 -0700 Comment on attachment 149089 Patch to address feedback, add pageScaleFactor View in context: https://bugs.webkit.org/attachment.cgi?id=149089&action=review > Source/WebKit/chromium/src/WebPluginContainerImpl.cpp:269 > + return frame->pageZoomFactor(); do you know why the pageScale is on the Page, but the pageZoom is on a Frame? What is this value when inside an iframe? 655820 30 149089 jhorwich 2012-06-22 15:11:22 -0700 Comment on attachment 149089 Patch to address feedback, add pageScaleFactor View in context: https://bugs.webkit.org/attachment.cgi?id=149089&action=review >> Source/WebKit/chromium/src/WebPluginContainerImpl.cpp:269 >> + return frame->pageZoomFactor(); > > do you know why the pageScale is on the Page, but the pageZoom is on a Frame? What is this value when inside an iframe? I'm not familiar with the history as to why the pageZoom isn't available from the Page (just the Frame). I did choose to pull pageScaleFactor from the page rather than frame->frameScaleFactor since frameScaleFactor appears to return the scale factor between I ran a test where a plugin was inside an iframe, and when I invoked pageZoom, the value provided for pageZoomFactor (using the frame) accurately reflected the overall page zoom, which I believe is the desired behavior. I do not have a convenient method of testing pageScale however. 656011 31 jhorwich 2012-06-22 20:32:53 -0700 (In reply to comment #30) > (From update of attachment 149089 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=149089&action=review > > >> Source/WebKit/chromium/src/WebPluginContainerImpl.cpp:269 > >> + return frame->pageZoomFactor(); > > > > do you know why the pageScale is on the Page, but the pageZoom is on a Frame? What is this value when inside an iframe? > > I'm not familiar with the history as to why the pageZoom isn't available from the Page (just the Frame). I did choose to pull pageScaleFactor from the page rather than frame->frameScaleFactor since frameScaleFactor appears to return the scale factor between (sorry for the copy-and-paste error) ... between logical and CSS only for the main frame, otherwise it merely returns 1. See Source/WebCore/page/Frame.cpp) 658142 32 jhorwich 2012-06-26 17:20:23 -0700 Ping :) I'd like to get this patch (or equivalent) landed soon so I can land the dependent chromium change. I'm also new to webkit so I believe someone else will need to land it for me. Is there anything else that needs addressing on this? Thank you! 658178 33 149089 abarth 2012-06-26 17:58:17 -0700 Comment on attachment 149089 Patch to address feedback, add pageScaleFactor View in context: https://bugs.webkit.org/attachment.cgi?id=149089&action=review This looks fine. One silly nit below. Please feel encouraged to upload a new patch with the nit fixed an to set the commit-queue flag to ?. That requests a committer to mark your patch for commit via the bot. > Source/WebKit/chromium/src/WebPluginContainerImpl.cpp:268 > + return 1.0; Bad indent, should be four spaces. 658183 34 danakj 2012-06-26 18:01:27 -0700 (In reply to comment #33) > (From update of attachment 149089 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=149089&action=review > > This looks fine. One silly nit below. Please feel encouraged to upload a new patch with the nit fixed an to set the commit-queue flag to ?. That requests a committer to mark your patch for commit via the bot. Also include Adam's name in the Changelog as reviewer, or you'll need a reviewer to land it. :) 658750 35 149777 jhorwich 2012-06-27 11:48:49 -0700 Created attachment 149777 Patch for landing Fixed style nit (indentation), added reviewer to ChangeLog 658852 36 149777 webkit.review.bot 2012-06-27 14:01:15 -0700 Comment on attachment 149777 Patch for landing Clearing flags on attachment: 149777 Committed r121364: <http://trac.webkit.org/changeset/121364> 659573 37 danakj 2012-06-28 10:00:31 -0700 This is landed no? Should be marked fixed then? 144872 2012-05-30 11:10:49 -0700 2012-06-06 13:19:13 -0700 Patch bug-87874-20120530111048.patch text/plain 3067 jhorwich SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiAxMTg5NDApCisrKyBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4 IEBACisyMDEyLTA1LTMwICBKb3NoIEhvcndpY2ggIDxqaG9yd2ljaEBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgW2Nocm9taXVtXSBFeHBvc2UgZGV2aWNlIHNjYWxlIGZhY3RvciBpbiBXZWJQbHVn aW5Db250YWluZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTg3ODc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBwdWJsaWMvV2ViUGx1Z2luQ29udGFpbmVyLmg6CisgICAgICAgIChXZWJQbHVnaW5Db250 YWluZXIpOgorICAgICAgICAqIHNyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViUGx1Z2luQ29udGFpbmVySW1wbDo6Z2V0RGV2aWNlU2NhbGVGYWN0b3Ip OgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKiBzcmMvV2ViUGx1Z2luQ29udGFpbmVySW1w bC5oOgorICAgICAgICAoV2ViUGx1Z2luQ29udGFpbmVySW1wbCk6CisKIDIwMTItMDUtMzAgIEpv Y2hlbiBFaXNpbmdlciAgPGpvY2hlbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgTWF0Y2ggRmly ZWZveCByZXN0cmljdGlvbnMgdG8gd2luZG93LmJsdXIgYW5kIHdpbmRvdy5mb2N1cwpJbmRleDog U291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGx1Z2luQ29udGFpbmVyLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGx1Z2luQ29udGFpbmVy LmgJKHJldmlzaW9uIDExODkzMikKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dl YlBsdWdpbkNvbnRhaW5lci5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw2ICszMyw4IEBACiAKIHN0 cnVjdCBOUE9iamVjdDsKIAorI2RlZmluZSBXRUJQTFVHSU5DT05UQUlORVJfSEFTX0dFVERFVklD RVNDQUxFRkFDVE9SIDEKKwogbmFtZXNwYWNlIFdlYktpdCB7CiAKIGNsYXNzIFdlYkVsZW1lbnQ7 CkBAIC0xMTAsNiArMTEyLDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgV2ViUGx1Z2luKiBwbHVn aW4oKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIHNldFBsdWdpbihXZWJQbHVnaW4qKSA9IDA7CiAK KyAgICB2aXJ0dWFsIGZsb2F0IGdldERldmljZVNjYWxlRmFjdG9yKCkgPSAwOworCiBwcm90ZWN0 ZWQ6CiAgICAgfldlYlBsdWdpbkNvbnRhaW5lcigpIHsgfQogfTsKSW5kZXg6IFNvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuY3BwCShy ZXZpc2lvbiAxMTg5MzIpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5D b250YWluZXJJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzEsNiArNzEsNyBAQAogI2luY2x1 ZGUgIlNjcm9sbEFuaW1hdG9yLmgiCiAjaW5jbHVkZSAiU2Nyb2xsVmlldy5oIgogI2luY2x1ZGUg IlNjcm9sbGJhclRoZW1lLmgiCisjaW5jbHVkZSAiU2V0dGluZ3MuaCIKICNpbmNsdWRlICJVc2Vy R2VzdHVyZUluZGljYXRvci5oIgogI2luY2x1ZGUgIldlYlByaW50UGFyYW1zLmgiCiAjaW5jbHVk ZSAiV2hlZWxFdmVudC5oIgpAQCAtMjQyLDYgKzI0MywxNyBAQCB2b2lkIFdlYlBsdWdpbkNvbnRh aW5lckltcGw6OnNldFBsdWdpbihXCiAgICAgfQogfQogCitmbG9hdCBXZWJQbHVnaW5Db250YWlu ZXJJbXBsOjpnZXREZXZpY2VTY2FsZUZhY3RvcigpCit7CisgICAgUGFnZSogcGFnZSA9IG1fZWxl bWVudC0+ZG9jdW1lbnQoKS0+cGFnZSgpOworICAgIGlmICghcGFnZSkKKyAgICAgICAgcmV0dXJu IDEuMDsKKyAgICBTZXR0aW5ncyogc2V0dGluZ3MgPSBwYWdlLT5zZXR0aW5ncygpOworICAgIGlm ICghc2V0dGluZ3MpCisgICAgICAgIHJldHVybiAxLjA7CisgICAgcmV0dXJuIHNldHRpbmdzLT5k ZWZhdWx0RGV2aWNlU2NhbGVGYWN0b3IoKTsKK30KKwogYm9vbCBXZWJQbHVnaW5Db250YWluZXJJ bXBsOjpzdXBwb3J0c1BhZ2luYXRlZFByaW50KCkgY29uc3QKIHsKICAgICByZXR1cm4gbV93ZWJQ bHVnaW4tPnN1cHBvcnRzUGFnaW5hdGVkUHJpbnQoKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmgJKHJldmlzaW9uIDEx ODkzMikKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lcklt cGwuaAkod29ya2luZyBjb3B5KQpAQCAtMTE0LDYgKzExNCw4IEBAIHB1YmxpYzoKICAgICBXZWJQ bHVnaW4qIHBsdWdpbigpIHsgcmV0dXJuIG1fd2ViUGx1Z2luOyB9CiAgICAgdm9pZCBzZXRQbHVn aW4oV2ViUGx1Z2luKik7CiAKKyAgICB2aXJ0dWFsIGZsb2F0IGdldERldmljZVNjYWxlRmFjdG9y KCk7CisKICAgICAvLyBQcmludGluZyBpbnRlcmZhY2UuIFRoZSBwbHVnaW4gY2FuIHN1cHBvcnQg Y3VzdG9tIHByaW50aW5nCiAgICAgLy8gKHdoaWNoIG1lYW5zIGl0IGNvbnRyb2xzIHRoZSBsYXlv dXQsIG51bWJlciBvZiBwYWdlcyBldGMpLgogICAgIC8vIFdoZXRoZXIgdGhlIHBsdWdpbiBzdXBw b3J0cyBpdHMgb3duIHBhZ2luYXRlZCBwcmludC4gVGhlIG90aGVyIHByaW50Cg== 146096 2012-06-06 13:24:15 -0700 2012-06-20 15:37:37 -0700 Simpler patch that uses page->deviceScaleFactor instead wk_87874.diff text/plain 3206 jhorwich SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiAxMTk2MDUpCisrKyBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMz IEBACisyMDEyLTA2LTA2ICBKb3NoIEhvcndpY2ggIDxqaG9yd2ljaEBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgW2Nocm9taXVtXSBFeHBvc2UgZGV2aWNlIHNjYWxlIGZhY3RvciBpbiBXZWJQbHVn aW5Db250YWluZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTg3ODc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBwdWJsaWMvV2ViUGx1Z2luQ29udGFpbmVyLmg6CisgICAgICAgIChXZWJQbHVnaW5Db250 YWluZXIpOgorICAgICAgICAqIHNyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViUGx1Z2luQ29udGFpbmVySW1wbDo6Z2V0RGV2aWNlU2NhbGVGYWN0b3Ip OgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKiBzcmMvV2ViUGx1Z2luQ29udGFpbmVySW1w bC5oOgorICAgICAgICAoV2ViUGx1Z2luQ29udGFpbmVySW1wbCk6CisKKzIwMTItMDYtMDYgIEpv c2ggSG9yd2ljaCAgPGpob3J3aWNoQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1d IEV4cG9zZSBkZXZpY2Ugc2NhbGUgZmFjdG9yIGluIFdlYlBsdWdpbkNvbnRhaW5lcgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODc4NzQKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHB1YmxpYy9XZWJQbHVn aW5Db250YWluZXIuaDoKKyAgICAgICAgKFdlYlBsdWdpbkNvbnRhaW5lcik6CisgICAgICAgICog c3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQbHVn aW5Db250YWluZXJJbXBsOjpnZXREZXZpY2VTY2FsZUZhY3Rvcik6CisgICAgICAgIChXZWJLaXQp OgorICAgICAgICAqIHNyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmg6CisgICAgICAgIChXZWJQ bHVnaW5Db250YWluZXJJbXBsKToKKwogMjAxMi0wNi0wNiAgTmljbyBXZWJlciAgPHRoYWtpc0Bj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBFeHBvc2Ugc2V0UGljdG9ncmFwaEZv bnRGYW1pbHkgdGhyb3VnaCB0aGUgY2hyb21pdW0gd2Via2l0IGFwaS4KSW5kZXg6IFNvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuY3Bw CShyZXZpc2lvbiAxMTk2MDMpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVn aW5Db250YWluZXJJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjQyLDYgKzI0MiwxNCBAQAog ICAgIH0KIH0KIAorZmxvYXQgV2ViUGx1Z2luQ29udGFpbmVySW1wbDo6Z2V0RGV2aWNlU2NhbGVG YWN0b3IoKQoreworICAgIFBhZ2UqIHBhZ2UgPSBtX2VsZW1lbnQtPmRvY3VtZW50KCktPnBhZ2Uo KTsKKyAgICBpZiAoIXBhZ2UpCisgICAgICAgIHJldHVybiAxLjA7CisgICAgcmV0dXJuIHBhZ2Ut PmRldmljZVNjYWxlRmFjdG9yKCk7Cit9CisKIGJvb2wgV2ViUGx1Z2luQ29udGFpbmVySW1wbDo6 c3VwcG9ydHNQYWdpbmF0ZWRQcmludCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1fd2ViUGx1Z2lu LT5zdXBwb3J0c1BhZ2luYXRlZFByaW50KCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5oCShyZXZpc2lvbiAxMTk2MDMp CisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmgJ KHdvcmtpbmcgY29weSkKQEAgLTExNCw2ICsxMTQsOCBAQAogICAgIFdlYlBsdWdpbiogcGx1Z2lu KCkgeyByZXR1cm4gbV93ZWJQbHVnaW47IH0KICAgICB2b2lkIHNldFBsdWdpbihXZWJQbHVnaW4q KTsKIAorICAgIHZpcnR1YWwgZmxvYXQgZ2V0RGV2aWNlU2NhbGVGYWN0b3IoKTsKKwogICAgIC8v IFByaW50aW5nIGludGVyZmFjZS4gVGhlIHBsdWdpbiBjYW4gc3VwcG9ydCBjdXN0b20gcHJpbnRp bmcKICAgICAvLyAod2hpY2ggbWVhbnMgaXQgY29udHJvbHMgdGhlIGxheW91dCwgbnVtYmVyIG9m IHBhZ2VzIGV0YykuCiAgICAgLy8gV2hldGhlciB0aGUgcGx1Z2luIHN1cHBvcnRzIGl0cyBvd24g cGFnaW5hdGVkIHByaW50LiBUaGUgb3RoZXIgcHJpbnQKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hy b21pdW0vcHVibGljL1dlYlBsdWdpbkNvbnRhaW5lci5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlBsdWdpbkNvbnRhaW5lci5oCShyZXZpc2lvbiAxMTk2 MDMpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJQbHVnaW5Db250YWluZXIu aAkod29ya2luZyBjb3B5KQpAQCAtMzMsNiArMzMsOCBAQAogCiBzdHJ1Y3QgTlBPYmplY3Q7CiAK KyNkZWZpbmUgV0VCUExVR0lOQ09OVEFJTkVSX0hBU19HRVRERVZJQ0VTQ0FMRUZBQ1RPUiAxCisK IG5hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBXZWJFbGVtZW50OwpAQCAtMTEwLDYgKzExMiw4 IEBACiAgICAgdmlydHVhbCBXZWJQbHVnaW4qIHBsdWdpbigpID0gMDsKICAgICB2aXJ0dWFsIHZv aWQgc2V0UGx1Z2luKFdlYlBsdWdpbiopID0gMDsKIAorICAgIHZpcnR1YWwgZmxvYXQgZ2V0RGV2 aWNlU2NhbGVGYWN0b3IoKSA9IDA7CisKIHByb3RlY3RlZDoKICAgICB+V2ViUGx1Z2luQ29udGFp bmVyKCkgeyB9CiB9Owo= 148701 2012-06-20 18:26:55 -0700 2012-06-22 13:04:44 -0700 Similar patch, with additional getPageZoomFactor wk.patch text/plain 3090 jhorwich SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiAxMjA4NzQpCisrKyBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5 IEBACisyMDEyLTA2LTIwICBKb3NoIEhvcndpY2ggIDxqaG9yd2ljaEBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgW2Nocm9taXVtXSBFeHBvc2UgZGV2aWNlIHNjYWxlIGZhY3RvciBpbiBXZWJQbHVn aW5Db250YWluZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTg3ODc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBwdWJsaWMvV2ViUGx1Z2luQ29udGFpbmVyLmg6CisgICAgICAgIChXZWJQbHVnaW5Db250 YWluZXIpOgorICAgICAgICAqIHNyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViUGx1Z2luQ29udGFpbmVySW1wbDo6Z2V0RGV2aWNlU2NhbGVGYWN0b3Ip OgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGx1Z2luQ29udGFpbmVy SW1wbDo6Z2V0UGFnZVpvb21GYWN0b3IpOgorICAgICAgICAqIHNyYy9XZWJQbHVnaW5Db250YWlu ZXJJbXBsLmg6CisgICAgICAgIChXZWJQbHVnaW5Db250YWluZXJJbXBsKToKKwogMjAxMi0wNi0x OSAgSmFtZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJv bWl1bV0gU2VwYXJhdGUgTGF5ZXJSZW5kZXJlciBpbml0aWFsaXphdGlvbiBmcm9tIHVwZGF0ZUxh eWVycwpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVy SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1 Z2luQ29udGFpbmVySW1wbC5jcHAJKHJldmlzaW9uIDEyMDg2NSkKKysrIFNvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0yNDIsNiArMjQyLDIyIEBACiAgICAgfQogfQogCitmbG9hdCBXZWJQbHVnaW5Db250YWluZXJJ bXBsOjpnZXREZXZpY2VTY2FsZUZhY3RvcigpCit7CisgICAgUGFnZSogcGFnZSA9IG1fZWxlbWVu dC0+ZG9jdW1lbnQoKS0+cGFnZSgpOworICAgIGlmICghcGFnZSkKKyAgICAgICAgcmV0dXJuIDEu MDsKKyAgICByZXR1cm4gcGFnZS0+ZGV2aWNlU2NhbGVGYWN0b3IoKTsKK30KKworZmxvYXQgV2Vi UGx1Z2luQ29udGFpbmVySW1wbDo6Z2V0UGFnZVpvb21GYWN0b3IoKQoreworICAgIEZyYW1lKiBm cmFtZSA9IG1fZWxlbWVudC0+ZG9jdW1lbnQoKS0+ZnJhbWUoKTsKKyAgICBpZiAoIWZyYW1lKQor ICAgICAgcmV0dXJuIDEuMDsKKyAgICByZXR1cm4gZnJhbWUtPnBhZ2Vab29tRmFjdG9yKCk7Cit9 CisKIGJvb2wgV2ViUGx1Z2luQ29udGFpbmVySW1wbDo6c3VwcG9ydHNQYWdpbmF0ZWRQcmludCgp IGNvbnN0CiB7CiAgICAgcmV0dXJuIG1fd2ViUGx1Z2luLT5zdXBwb3J0c1BhZ2luYXRlZFByaW50 KCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJ bXBsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2lu Q29udGFpbmVySW1wbC5oCShyZXZpc2lvbiAxMjA4NjUpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmgJKHdvcmtpbmcgY29weSkKQEAgLTExNCw2 ICsxMTQsOSBAQAogICAgIFdlYlBsdWdpbiogcGx1Z2luKCkgeyByZXR1cm4gbV93ZWJQbHVnaW47 IH0KICAgICB2b2lkIHNldFBsdWdpbihXZWJQbHVnaW4qKTsKIAorICAgIHZpcnR1YWwgZmxvYXQg Z2V0RGV2aWNlU2NhbGVGYWN0b3IoKTsKKyAgICB2aXJ0dWFsIGZsb2F0IGdldFBhZ2Vab29tRmFj dG9yKCk7CisKICAgICAvLyBQcmludGluZyBpbnRlcmZhY2UuIFRoZSBwbHVnaW4gY2FuIHN1cHBv cnQgY3VzdG9tIHByaW50aW5nCiAgICAgLy8gKHdoaWNoIG1lYW5zIGl0IGNvbnRyb2xzIHRoZSBs YXlvdXQsIG51bWJlciBvZiBwYWdlcyBldGMpLgogICAgIC8vIFdoZXRoZXIgdGhlIHBsdWdpbiBz dXBwb3J0cyBpdHMgb3duIHBhZ2luYXRlZCBwcmludC4gVGhlIG90aGVyIHByaW50CkluZGV4OiBT b3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJQbHVnaW5Db250YWluZXIuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJQbHVnaW5Db250YWluZXIu aAkocmV2aXNpb24gMTIwODY1KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi UGx1Z2luQ29udGFpbmVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTMzLDYgKzMzLDkgQEAKIAogc3Ry dWN0IE5QT2JqZWN0OwogCisjZGVmaW5lIFdFQlBMVUdJTkNPTlRBSU5FUl9IQVNfR0VUREVWSUNF U0NBTEVGQUNUT1IgMQorI2RlZmluZSBXRUJQTFVHSU5DT05UQUlORVJfSEFTX0dFVFBBR0VaT09N RkFDVE9SIDEKKwogbmFtZXNwYWNlIFdlYktpdCB7CiAKIGNsYXNzIFdlYkVsZW1lbnQ7CkBAIC0x MTAsNiArMTEzLDkgQEAKICAgICB2aXJ0dWFsIFdlYlBsdWdpbiogcGx1Z2luKCkgPSAwOwogICAg IHZpcnR1YWwgdm9pZCBzZXRQbHVnaW4oV2ViUGx1Z2luKikgPSAwOwogCisgICAgdmlydHVhbCBm bG9hdCBnZXREZXZpY2VTY2FsZUZhY3RvcigpID0gMDsKKyAgICB2aXJ0dWFsIGZsb2F0IGdldFBh Z2Vab29tRmFjdG9yKCkgPSAwOworCiBwcm90ZWN0ZWQ6CiAgICAgfldlYlBsdWdpbkNvbnRhaW5l cigpIHsgfQogfTsK 149089 2012-06-22 13:03:39 -0700 2012-06-26 17:58:17 -0700 Patch to address feedback, add pageScaleFactor Patch text/plain 3554 jhorwich SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiAxMjA5ODkpCisrKyBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIw IEBACisyMDEyLTA2LTIxICBKb3NoIEhvcndpY2ggIDxqaG9yd2ljaEBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgW2Nocm9taXVtXSBFeHBvc2UgZGV2aWNlIHNjYWxlIGZhY3RvciBpbiBXZWJQbHVn aW5Db250YWluZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTg3ODc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBwdWJsaWMvV2ViUGx1Z2luQ29udGFpbmVyLmg6CisgICAgICAgIChXZWJQbHVnaW5Db250 YWluZXIpOgorICAgICAgICAqIHNyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViUGx1Z2luQ29udGFpbmVySW1wbDo6ZGV2aWNlU2NhbGVGYWN0b3IpOgor ICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGx1Z2luQ29udGFpbmVySW1w bDo6cGFnZVNjYWxlRmFjdG9yKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGx1Z2luQ29udGFpbmVy SW1wbDo6cGFnZVpvb21GYWN0b3IpOgorICAgICAgICAqIHNyYy9XZWJQbHVnaW5Db250YWluZXJJ bXBsLmg6CisgICAgICAgIChXZWJQbHVnaW5Db250YWluZXJJbXBsKToKKwogMjAxMi0wNi0yMSAg T2xpIExhbiAgPG9saWxhbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQWRkIG1ldGhvZHMgdG8g c2VsZWN0IGJldHdlZW4gb2Zmc2V0cyBpbiBhbiBlZGl0YWJsZSBmaWVsZC4KSW5kZXg6IFNvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwu Y3BwCShyZXZpc2lvbiAxMjEwNDYpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQ bHVnaW5Db250YWluZXJJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjQ1LDYgKzI0NSwzMCBA QAogICAgIH0KIH0KIAorZmxvYXQgV2ViUGx1Z2luQ29udGFpbmVySW1wbDo6ZGV2aWNlU2NhbGVG YWN0b3IoKQoreworICAgIFBhZ2UqIHBhZ2UgPSBtX2VsZW1lbnQtPmRvY3VtZW50KCktPnBhZ2Uo KTsKKyAgICBpZiAoIXBhZ2UpCisgICAgICAgIHJldHVybiAxLjA7CisgICAgcmV0dXJuIHBhZ2Ut PmRldmljZVNjYWxlRmFjdG9yKCk7Cit9CisKK2Zsb2F0IFdlYlBsdWdpbkNvbnRhaW5lckltcGw6 OnBhZ2VTY2FsZUZhY3RvcigpCit7CisgICAgUGFnZSogcGFnZSA9IG1fZWxlbWVudC0+ZG9jdW1l bnQoKS0+cGFnZSgpOworICAgIGlmICghcGFnZSkKKyAgICAgICAgcmV0dXJuIDEuMDsKKyAgICBy ZXR1cm4gcGFnZS0+cGFnZVNjYWxlRmFjdG9yKCk7Cit9CisKK2Zsb2F0IFdlYlBsdWdpbkNvbnRh aW5lckltcGw6OnBhZ2Vab29tRmFjdG9yKCkKK3sKKyAgICBGcmFtZSogZnJhbWUgPSBtX2VsZW1l bnQtPmRvY3VtZW50KCktPmZyYW1lKCk7CisgICAgaWYgKCFmcmFtZSkKKyAgICAgIHJldHVybiAx LjA7CisgICAgcmV0dXJuIGZyYW1lLT5wYWdlWm9vbUZhY3RvcigpOworfQorCiBib29sIFdlYlBs dWdpbkNvbnRhaW5lckltcGw6OnN1cHBvcnRzUGFnaW5hdGVkUHJpbnQoKSBjb25zdAogewogICAg IHJldHVybiBtX3dlYlBsdWdpbi0+c3VwcG9ydHNQYWdpbmF0ZWRQcmludCgpOwpJbmRleDogU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwu aAkocmV2aXNpb24gMTIxMDQ2KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1 Z2luQ29udGFpbmVySW1wbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMTUsNiArMTE1LDEwIEBACiAg ICAgV2ViUGx1Z2luKiBwbHVnaW4oKSB7IHJldHVybiBtX3dlYlBsdWdpbjsgfQogICAgIHZvaWQg c2V0UGx1Z2luKFdlYlBsdWdpbiopOwogCisgICAgdmlydHVhbCBmbG9hdCBkZXZpY2VTY2FsZUZh Y3RvcigpOworICAgIHZpcnR1YWwgZmxvYXQgcGFnZVNjYWxlRmFjdG9yKCk7CisgICAgdmlydHVh bCBmbG9hdCBwYWdlWm9vbUZhY3RvcigpOworCiAgICAgLy8gUHJpbnRpbmcgaW50ZXJmYWNlLiBU aGUgcGx1Z2luIGNhbiBzdXBwb3J0IGN1c3RvbSBwcmludGluZwogICAgIC8vICh3aGljaCBtZWFu cyBpdCBjb250cm9scyB0aGUgbGF5b3V0LCBudW1iZXIgb2YgcGFnZXMgZXRjKS4KICAgICAvLyBX aGV0aGVyIHRoZSBwbHVnaW4gc3VwcG9ydHMgaXRzIG93biBwYWdpbmF0ZWQgcHJpbnQuIFRoZSBv dGhlciBwcmludApJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGx1Z2lu Q29udGFpbmVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv V2ViUGx1Z2luQ29udGFpbmVyLmgJKHJldmlzaW9uIDEyMTA0NikKKysrIFNvdXJjZS9XZWJLaXQv Y2hyb21pdW0vcHVibGljL1dlYlBsdWdpbkNvbnRhaW5lci5oCSh3b3JraW5nIGNvcHkpCkBAIC05 OCw2ICs5OCw3IEBACiAgICAgICAgIGNvbnN0IFdlYlVSTFJlcXVlc3QmLCBjb25zdCBXZWJTdHJp bmcmIHRhcmdldCwgYm9vbCBub3RpZnlOZWVkZWQsIHZvaWQqIG5vdGlmeURhdGEpID0gMDsKIAog ICAgIC8vIE5vdGlmaWVzIHRoYXQgdGhlIHpvb20gbGV2ZWwgaGFzIGNoYW5nZWQuCisgICAgLy8g Tm90ZSwgdGhpcyBkb2VzIE5PVCBhZmZlY3QgcGFnZVNjYWxlRmFjdG9yIG9yIHBhZ2Vab29tRmFj dG9yCiAgICAgdmlydHVhbCB2b2lkIHpvb21MZXZlbENoYW5nZWQoZG91YmxlIHpvb21MZXZlbCkg PSAwOwogCiAgICAgLy8gTm90aWZpZXMgd2hldGhlciB0aGUgY29udGVudHMgb2YgdGhlIHBsdWdp biBhcmUgZW50aXJlbHkgb3BhcXVlLgpAQCAtMTEwLDYgKzExMSwxMCBAQAogICAgIHZpcnR1YWwg V2ViUGx1Z2luKiBwbHVnaW4oKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIHNldFBsdWdpbihXZWJQ bHVnaW4qKSA9IDA7CiAKKyAgICB2aXJ0dWFsIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yKCkgPSAw OworICAgIHZpcnR1YWwgZmxvYXQgcGFnZVNjYWxlRmFjdG9yKCkgPSAwOworICAgIHZpcnR1YWwg ZmxvYXQgcGFnZVpvb21GYWN0b3IoKSA9IDA7CisKIHByb3RlY3RlZDoKICAgICB+V2ViUGx1Z2lu Q29udGFpbmVyKCkgeyB9CiB9Owo= 149777 2012-06-27 11:48:49 -0700 2012-06-27 14:01:15 -0700 Patch for landing patch_for_landing.patch text/plain 3552 jhorwich SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiAxMjA5ODkpCisrKyBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIw IEBACisyMDEyLTA2LTI3ICBKb3NoIEhvcndpY2ggIDxqaG9yd2ljaEBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgW2Nocm9taXVtXSBFeHBvc2UgZGV2aWNlIHNjYWxlIGZhY3RvciBpbiBXZWJQbHVn aW5Db250YWluZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTg3ODc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KKworICAgICAgICAq IHB1YmxpYy9XZWJQbHVnaW5Db250YWluZXIuaDoKKyAgICAgICAgKFdlYlBsdWdpbkNvbnRhaW5l cik6CisgICAgICAgICogc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJQbHVnaW5Db250YWluZXJJbXBsOjpkZXZpY2VTY2FsZUZhY3Rvcik6CisgICAg ICAgIChXZWJLaXQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQbHVnaW5Db250YWluZXJJbXBsOjpw YWdlU2NhbGVGYWN0b3IpOgorICAgICAgICAoV2ViS2l0OjpXZWJQbHVnaW5Db250YWluZXJJbXBs OjpwYWdlWm9vbUZhY3Rvcik6CisgICAgICAgICogc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwu aDoKKyAgICAgICAgKFdlYlBsdWdpbkNvbnRhaW5lckltcGwpOgorCiAyMDEyLTA2LTIxICBPbGkg TGFuICA8b2xpbGFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBBZGQgbWV0aG9kcyB0byBzZWxl Y3QgYmV0d2VlbiBvZmZzZXRzIGluIGFuIGVkaXRhYmxlIGZpZWxkLgpJbmRleDogU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5jcHAJ KHJldmlzaW9uIDEyMTM1MCkKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBsdWdp bkNvbnRhaW5lckltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNDUsNiArMjQ1LDMwIEBACiAg ICAgfQogfQogCitmbG9hdCBXZWJQbHVnaW5Db250YWluZXJJbXBsOjpkZXZpY2VTY2FsZUZhY3Rv cigpCit7CisgICAgUGFnZSogcGFnZSA9IG1fZWxlbWVudC0+ZG9jdW1lbnQoKS0+cGFnZSgpOwor ICAgIGlmICghcGFnZSkKKyAgICAgICAgcmV0dXJuIDEuMDsKKyAgICByZXR1cm4gcGFnZS0+ZGV2 aWNlU2NhbGVGYWN0b3IoKTsKK30KKworZmxvYXQgV2ViUGx1Z2luQ29udGFpbmVySW1wbDo6cGFn ZVNjYWxlRmFjdG9yKCkKK3sKKyAgICBQYWdlKiBwYWdlID0gbV9lbGVtZW50LT5kb2N1bWVudCgp LT5wYWdlKCk7CisgICAgaWYgKCFwYWdlKQorICAgICAgICByZXR1cm4gMS4wOworICAgIHJldHVy biBwYWdlLT5wYWdlU2NhbGVGYWN0b3IoKTsKK30KKworZmxvYXQgV2ViUGx1Z2luQ29udGFpbmVy SW1wbDo6cGFnZVpvb21GYWN0b3IoKQoreworICAgIEZyYW1lKiBmcmFtZSA9IG1fZWxlbWVudC0+ ZG9jdW1lbnQoKS0+ZnJhbWUoKTsKKyAgICBpZiAoIWZyYW1lKQorICAgICAgICByZXR1cm4gMS4w OworICAgIHJldHVybiBmcmFtZS0+cGFnZVpvb21GYWN0b3IoKTsKK30KKwogYm9vbCBXZWJQbHVn aW5Db250YWluZXJJbXBsOjpzdXBwb3J0c1BhZ2luYXRlZFByaW50KCkgY29uc3QKIHsKICAgICBy ZXR1cm4gbV93ZWJQbHVnaW4tPnN1cHBvcnRzUGFnaW5hdGVkUHJpbnQoKTsKSW5kZXg6IFNvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmgJ KHJldmlzaW9uIDEyMTM1MCkKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBsdWdp bkNvbnRhaW5lckltcGwuaAkod29ya2luZyBjb3B5KQpAQCAtMTE2LDYgKzExNiwxMCBAQAogICAg IFdlYlBsdWdpbiogcGx1Z2luKCkgeyByZXR1cm4gbV93ZWJQbHVnaW47IH0KICAgICB2b2lkIHNl dFBsdWdpbihXZWJQbHVnaW4qKTsKIAorICAgIHZpcnR1YWwgZmxvYXQgZGV2aWNlU2NhbGVGYWN0 b3IoKTsKKyAgICB2aXJ0dWFsIGZsb2F0IHBhZ2VTY2FsZUZhY3RvcigpOworICAgIHZpcnR1YWwg ZmxvYXQgcGFnZVpvb21GYWN0b3IoKTsKKwogICAgIC8vIFByaW50aW5nIGludGVyZmFjZS4gVGhl IHBsdWdpbiBjYW4gc3VwcG9ydCBjdXN0b20gcHJpbnRpbmcKICAgICAvLyAod2hpY2ggbWVhbnMg aXQgY29udHJvbHMgdGhlIGxheW91dCwgbnVtYmVyIG9mIHBhZ2VzIGV0YykuCiAgICAgLy8gV2hl dGhlciB0aGUgcGx1Z2luIHN1cHBvcnRzIGl0cyBvd24gcGFnaW5hdGVkIHByaW50LiBUaGUgb3Ro ZXIgcHJpbnQKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlBsdWdpbkNv bnRhaW5lci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dl YlBsdWdpbkNvbnRhaW5lci5oCShyZXZpc2lvbiAxMjEzNTApCisrKyBTb3VyY2UvV2ViS2l0L2No cm9taXVtL3B1YmxpYy9XZWJQbHVnaW5Db250YWluZXIuaAkod29ya2luZyBjb3B5KQpAQCAtOTgs NiArOTgsNyBAQAogICAgICAgICBjb25zdCBXZWJVUkxSZXF1ZXN0JiwgY29uc3QgV2ViU3RyaW5n JiB0YXJnZXQsIGJvb2wgbm90aWZ5TmVlZGVkLCB2b2lkKiBub3RpZnlEYXRhKSA9IDA7CiAKICAg ICAvLyBOb3RpZmllcyB0aGF0IHRoZSB6b29tIGxldmVsIGhhcyBjaGFuZ2VkLgorICAgIC8vIE5v dGUsIHRoaXMgZG9lcyBOT1QgYWZmZWN0IHBhZ2VTY2FsZUZhY3RvciBvciBwYWdlWm9vbUZhY3Rv cgogICAgIHZpcnR1YWwgdm9pZCB6b29tTGV2ZWxDaGFuZ2VkKGRvdWJsZSB6b29tTGV2ZWwpID0g MDsKIAogICAgIC8vIE5vdGlmaWVzIHdoZXRoZXIgdGhlIGNvbnRlbnRzIG9mIHRoZSBwbHVnaW4g YXJlIGVudGlyZWx5IG9wYXF1ZS4KQEAgLTExMyw2ICsxMTQsMTAgQEAKICAgICB2aXJ0dWFsIFdl YlBsdWdpbiogcGx1Z2luKCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBzZXRQbHVnaW4oV2ViUGx1 Z2luKikgPSAwOwogCisgICAgdmlydHVhbCBmbG9hdCBkZXZpY2VTY2FsZUZhY3RvcigpID0gMDsK KyAgICB2aXJ0dWFsIGZsb2F0IHBhZ2VTY2FsZUZhY3RvcigpID0gMDsKKyAgICB2aXJ0dWFsIGZs b2F0IHBhZ2Vab29tRmFjdG9yKCkgPSAwOworCiBwcm90ZWN0ZWQ6CiAgICAgfldlYlBsdWdpbkNv bnRhaW5lcigpIHsgfQogfTsK