44239 2010-08-19 04:01:19 -0700 [EFL] Enable offline pages cache (patch) 2010-08-30 02:14:18 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 0 m.malecki webkit-unassigned antognolli+webkit commit-queue kenneth tonikitoo webkit.review.bot oldest_to_newest 266623 0 m.malecki 2010-08-19 04:01:19 -0700 Enables offline pages cache and fixes the location of offline cache file (it was set dumbly to $HOME; the fix changes it to $HOME/.webkit with fallback to /tmp/.webkit if HOME not set). Please review. 266624 1 64826 m.malecki 2010-08-19 04:04:32 -0700 Created attachment 64826 Patch against r65660 with fixes as described in the ticket. 267189 2 64826 m.malecki 2010-08-20 03:31:18 -0700 Comment on attachment 64826 Patch against r65660 with fixes as described in the ticket. > Index: WebKit/efl/ChangeLog > =================================================================== > --- WebKit/efl/ChangeLog (revision 65660) > +++ WebKit/efl/ChangeLog (working copy) > @@ -1,3 +1,14 @@ > +2010-08-19 Mikołaj Małecki <m.malecki@samsung.com> > + > + Reviewed by NOBODY (OOPS!). > + > + [EFL] Enabled offline pages storage for WebKit EFL; fixed default location of offline cache files > + > + * ewk/ewk_main.cpp: > + (ewk_init): Fixed location of offline cache file > + * ewk/ewk_view.cpp: > + (_ewk_view_priv_new): Added setting to enable offline pages > + > 2010-08-15 Gyuyoung Kim <gyuyoung.kim@samsung.com> > > Reviewed by Antonio Gomes. > Index: WebKit/efl/ewk/ewk_main.cpp > =================================================================== > --- WebKit/efl/ewk/ewk_main.cpp (revision 65660) > +++ WebKit/efl/ewk/ewk_main.cpp (working copy) > @@ -21,10 +21,12 @@ > #include "config.h" > #include "ewk_main.h" > > +#include "ApplicationCacheStorage.h" > #include "EWebKit.h" > #include "Logging.h" > #include "PageCache.h" > #include "PageGroup.h" > +#include <string> > #include "ewk_private.h" > #include "ewk_settings.h" > #include "runtime/InitializeThreading.h" > @@ -118,7 +120,18 @@ int ewk_init(void) > WebCore::PageGroup::setShouldTrackVisitedLinks(true); > > // set default location of web database path > - ewk_settings_web_database_path_set(getenv("HOME")); > + { // this block is because of gotos > + using namespace std; > + // set default location of web database path > + const char* home = getenv("HOME"); > + if (!home) // don't forget about the homeless > + home = "/tmp"; // this directory must always exist > + string wkdir = string(home) + "/.webkit"; > + ewk_settings_web_database_path_set(wkdir.c_str()); > + > + // FIXME: It should be possible for client applications to override the default appcache location > + WebCore::cacheStorage().setCacheDirectory(wkdir.c_str()); > + } > > // TODO: this should move to WebCore, already reported to webkit-gtk folks: > #ifdef WTF_USE_SOUP > Index: WebKit/efl/ewk/ewk_view.cpp > =================================================================== > --- WebKit/efl/ewk/ewk_view.cpp (revision 65660) > +++ WebKit/efl/ewk/ewk_view.cpp (working copy) > @@ -559,6 +559,7 @@ static Ewk_View_Private_Data* _ewk_view_ > priv->page_settings->setJavaScriptEnabled(true); > priv->page_settings->setPluginsEnabled(true); > priv->page_settings->setLocalStorageEnabled(true); > + priv->page_settings->setOfflineWebApplicationCacheEnabled(true); > > url = priv->page_settings->userStyleSheetLocation(); > priv->settings.user_stylesheet = eina_stringshare_add(url.prettyURL().utf8().data()); 267253 3 64956 m.malecki 2010-08-20 08:09:24 -0700 Created attachment 64956 Patch against r65660 with fixes as described in the ticket. (updated) 267977 4 antognolli+webkit 2010-08-23 10:23:28 -0700 Some comments about the patch: > WebCore::PageGroup::setShouldTrackVisitedLinks(true); > > // set default location of web database path Maybe you should bring this comment together with the call ewk_settings_web_database_path_set? > - ewk_settings_web_database_path_set(getenv("HOME")); > + { // this block is because of gotos Do you really need this block? What's the difference if you don't have it? Considering my comments below of removing the std::string, you wouldn't need this anymore (and I didn't get the gotos idea). > + using namespace std; > + // set default location of web database path > + const char* home = getenv("HOME"); > + if (!home) // don't forget about the homeless > + home = "/tmp"; // this directory must always exist > + string wkdir = string(home) + "/.webkit"; We are not using "string" anywhere else in WebKit-EFL. So, could you use C functions for creating this string, like snprintf (since you are later converting to c_str() anyway). Or maybe using WebCore's ones? Then you wouldn't need to include <string>. > --- WebKit/efl/ewk/ewk_view.cpp (revision 65660) > +++ WebKit/efl/ewk/ewk_view.cpp (working copy) > @@ -559,6 +559,7 @@ static Ewk_View_Private_Data* _ewk_view_ > priv->page_settings->setJavaScriptEnabled(true); > priv->page_settings->setPluginsEnabled(true); > priv->page_settings->setLocalStorageEnabled(true); > + priv->page_settings->setOfflineWebApplicationCacheEnabled(true); Like the other page settings, you need to add a member of the struct priv->settings for it. 268000 5 antognolli+webkit 2010-08-23 11:01:34 -0700 And another comment: + // FIXME: It should be possible for client applications to override the default appcache location Maybe you could just add an api for this? It would be almost copy & paste of ewk_settings_web_database_path_set and get. Thank you, Rafael 269865 6 65559 m.malecki 2010-08-26 07:09:39 -0700 Created attachment 65559 Patch against r66096 with fixes as described in the ticket. Additional changes: offline_app_cache and cache_directory are now public properties of ewk. 269881 7 antognolli+webkit 2010-08-26 07:49:13 -0700 Patch looks nice now. I'm cc'ing some reviewers since they can give their votes. And I think you should also set r? and cq? flags. 270327 8 webkit.review.bot 2010-08-26 23:15:29 -0700 Attachment 65559 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit/efl/ewk/ewk_main.cpp:26: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 270395 9 65693 m.malecki 2010-08-27 02:30:29 -0700 Created attachment 65693 Patch against r66192 with fixes as described in the ticket. Fixed the checkstyle-reported problem. 270433 10 65693 kenneth 2010-08-27 05:19:59 -0700 Comment on attachment 65693 Patch against r66192 with fixes as described in the ticket. WebKit/efl/ewk/ewk_main.cpp:170 + // Exit now - otherwise you may have some crash later Remember that comments should start by capital letter and end with a dot. 270925 11 65693 commit-queue 2010-08-27 22:02:47 -0700 Comment on attachment 65693 Patch against r66192 with fixes as described in the ticket. Rejecting patch 65693 from commit-queue. Unexpected failure when processing patch! Please file a bug against webkit-patch. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', 'land-attachment', '--force-clean', '--build', '--non-interactive', '--ignore-builders', '--build-style=both', '--quiet', 65693, '--test', '--parent-command=commit-queue', '--no-update']" exit_code: 1 Last 500 characters of output: 693&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=44239&ctype=xml Processing 1 patch from 1 bug. Cleaning working directory Processing patch 65693 from bug 44239. Rafael Antognolli found in /Users/eseidel/Projects/CommitQueue/WebKit/efl/ChangeLog does not appear to be a valid reviewer according to committers.py. ERROR: /Users/eseidel/Projects/CommitQueue/WebKit/efl/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). 271006 12 antognolli+webkit 2010-08-28 09:55:18 -0700 Hi Mikołaj, Sorry, I didn't see that you had set the Reviewer entry in the ChangeLog with my name. This is not the correct way, since I'm not an official reviewer. You have to let it without changing (with the "Reviewed by NOBODY (OOPS!)." string), and then when Kenneth set your patch as r+ and cq+, the commit bot would automatically fill it with Kenneth's name. 271351 13 65891 m.malecki 2010-08-30 01:53:03 -0700 Created attachment 65891 Patch against r66371 with fixes as described in the ticket Removed the reviewer info from Changelog 271354 14 65891 commit-queue 2010-08-30 02:14:11 -0700 Comment on attachment 65891 Patch against r66371 with fixes as described in the ticket Clearing flags on attachment: 65891 Committed r66377: <http://trac.webkit.org/changeset/66377> 271355 15 commit-queue 2010-08-30 02:14:18 -0700 All reviewed patches have been landed. Closing bug. 64826 2010-08-19 04:04:32 -0700 2010-08-20 08:09:24 -0700 Patch against r65660 with fixes as described in the ticket. Webkit-patch-r65660+bug44239 text/plain 2725 m.malecki SW5kZXg6IFdlYktpdC9lZmwvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9lZmwvQ2hh bmdlTG9nCShyZXZpc2lvbiA2NTY2MCkKKysrIFdlYktpdC9lZmwvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDgtMTkgIE1pa2/FgmFqIE1hxYJlY2tpICA8 bS5tYWxlY2tpQHNhbXN1bmcuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFtFRkxdIEVuYWJsZWQgb2ZmbGluZSBwYWdlcyBzdG9yYWdlIGZvciBX ZWJLaXQgRUZMOyBmaXhlZCBkZWZhdWx0IGxvY2F0aW9uIG9mIG9mZmxpbmUgY2FjaGUgZmlsZXMK KworICAgICAgICAqIGV3ay9ld2tfbWFpbi5jcHA6CisgICAgICAgIChld2tfaW5pdCk6IEZpeGVk IGxvY2F0aW9uIG9mIG9mZmxpbmUgY2FjaGUgZmlsZQorICAgICAgICAqIGV3ay9ld2tfdmlldy5j cHA6CisgICAgICAgIChfZXdrX3ZpZXdfcHJpdl9uZXcpOiBBZGRlZCBzZXR0aW5nIHRvIGVuYWJs ZSBvZmZsaW5lIHBhZ2VzCisKIDIwMTAtMDgtMTUgIEd5dXlvdW5nIEtpbSAgPGd5dXlvdW5nLmtp bUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbnRvbmlvIEdvbWVzLgpJbmRl eDogV2ViS2l0L2VmbC9ld2svZXdrX21haW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9lZmwv ZXdrL2V3a19tYWluLmNwcAkocmV2aXNpb24gNjU2NjApCisrKyBXZWJLaXQvZWZsL2V3ay9ld2tf bWFpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxLDEwICsyMSwxMiBAQAogI2luY2x1ZGUgImNv bmZpZy5oIgogI2luY2x1ZGUgImV3a19tYWluLmgiCiAKKyNpbmNsdWRlICJBcHBsaWNhdGlvbkNh Y2hlU3RvcmFnZS5oIgogI2luY2x1ZGUgIkVXZWJLaXQuaCIKICNpbmNsdWRlICJMb2dnaW5nLmgi CiAjaW5jbHVkZSAiUGFnZUNhY2hlLmgiCiAjaW5jbHVkZSAiUGFnZUdyb3VwLmgiCisjaW5jbHVk ZSA8c3RyaW5nPgogI2luY2x1ZGUgImV3a19wcml2YXRlLmgiCiAjaW5jbHVkZSAiZXdrX3NldHRp bmdzLmgiCiAjaW5jbHVkZSAicnVudGltZS9Jbml0aWFsaXplVGhyZWFkaW5nLmgiCkBAIC0xMTgs NyArMTIwLDE4IEBAIGludCBld2tfaW5pdCh2b2lkKQogICAgIFdlYkNvcmU6OlBhZ2VHcm91cDo6 c2V0U2hvdWxkVHJhY2tWaXNpdGVkTGlua3ModHJ1ZSk7CiAKICAgICAvLyBzZXQgZGVmYXVsdCBs b2NhdGlvbiBvZiB3ZWIgZGF0YWJhc2UgcGF0aAotICAgIGV3a19zZXR0aW5nc193ZWJfZGF0YWJh c2VfcGF0aF9zZXQoZ2V0ZW52KCJIT01FIikpOworICAgIHsgLy8gdGhpcyBibG9jayBpcyBiZWNh dXNlIG9mIGdvdG9zCisgICAgICAgIHVzaW5nIG5hbWVzcGFjZSBzdGQ7CisgICAgICAgIC8vIHNl dCBkZWZhdWx0IGxvY2F0aW9uIG9mIHdlYiBkYXRhYmFzZSBwYXRoCisgICAgICAgIGNvbnN0IGNo YXIqIGhvbWUgPSBnZXRlbnYoIkhPTUUiKTsKKyAgICAgICAgaWYgKCFob21lKSAvLyBkb24ndCBm b3JnZXQgYWJvdXQgdGhlIGhvbWVsZXNzCisgICAgICAgICAgICBob21lID0gIi90bXAiOyAvLyB0 aGlzIGRpcmVjdG9yeSBtdXN0IGFsd2F5cyBleGlzdAorICAgICAgICBzdHJpbmcgd2tkaXIgPSBz dHJpbmcoaG9tZSkgKyAiLy53ZWJraXQiOworICAgICAgICBld2tfc2V0dGluZ3Nfd2ViX2RhdGFi YXNlX3BhdGhfc2V0KHdrZGlyLmNfc3RyKCkpOworCisgICAgICAgIC8vIEZJWE1FOiBJdCBzaG91 bGQgYmUgcG9zc2libGUgZm9yIGNsaWVudCBhcHBsaWNhdGlvbnMgdG8gb3ZlcnJpZGUgdGhlIGRl ZmF1bHQgYXBwY2FjaGUgbG9jYXRpb24KKyAgICAgICAgV2ViQ29yZTo6Y2FjaGVTdG9yYWdlKCku c2V0Q2FjaGVEaXJlY3Rvcnkod2tkaXIuY19zdHIoKSk7CisgICAgfQogCiAgICAgLy8gVE9ETzog dGhpcyBzaG91bGQgbW92ZSB0byBXZWJDb3JlLCBhbHJlYWR5IHJlcG9ydGVkIHRvIHdlYmtpdC1n dGsgZm9sa3M6CiAjaWZkZWYgV1RGX1VTRV9TT1VQCkluZGV4OiBXZWJLaXQvZWZsL2V3ay9ld2tf dmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCShyZXZp c2lvbiA2NTY2MCkKKysrIFdlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNTU5LDYgKzU1OSw3IEBAIHN0YXRpYyBFd2tfVmlld19Qcml2YXRlX0RhdGEqIF9ld2tf dmlld18KICAgICBwcml2LT5wYWdlX3NldHRpbmdzLT5zZXRKYXZhU2NyaXB0RW5hYmxlZCh0cnVl KTsKICAgICBwcml2LT5wYWdlX3NldHRpbmdzLT5zZXRQbHVnaW5zRW5hYmxlZCh0cnVlKTsKICAg ICBwcml2LT5wYWdlX3NldHRpbmdzLT5zZXRMb2NhbFN0b3JhZ2VFbmFibGVkKHRydWUpOworICAg IHByaXYtPnBhZ2Vfc2V0dGluZ3MtPnNldE9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxl ZCh0cnVlKTsKIAogICAgIHVybCA9IHByaXYtPnBhZ2Vfc2V0dGluZ3MtPnVzZXJTdHlsZVNoZWV0 TG9jYXRpb24oKTsKICAgICBwcml2LT5zZXR0aW5ncy51c2VyX3N0eWxlc2hlZXQgPSBlaW5hX3N0 cmluZ3NoYXJlX2FkZCh1cmwucHJldHR5VVJMKCkudXRmOCgpLmRhdGEoKSk7Cg== 64956 2010-08-20 08:09:24 -0700 2010-08-26 07:09:39 -0700 Patch against r65660 with fixes as described in the ticket. (updated) Webkit-patch-r65660+bug44239 text/plain 2734 m.malecki SW5kZXg6IFdlYktpdC9lZmwvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9lZmwvQ2hh bmdlTG9nCShyZXZpc2lvbiA2NTY2MCkKKysrIFdlYktpdC9lZmwvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDgtMTkgIE1pa2/FgmFqIE1hxYJlY2tpICA8 bS5tYWxlY2tpQHNhbXN1bmcuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFtFRkxdIEVuYWJsZWQgb2ZmbGluZSBwYWdlcyBzdG9yYWdlIGZvciBX ZWJLaXQgRUZMOyBmaXhlZCBkZWZhdWx0IGxvY2F0aW9uIG9mIG9mZmxpbmUgY2FjaGUgZmlsZXMK KworICAgICAgICAqIGV3ay9ld2tfbWFpbi5jcHA6CisgICAgICAgIChld2tfaW5pdCk6IEZpeGVk IGxvY2F0aW9uIG9mIG9mZmxpbmUgY2FjaGUgZmlsZQorICAgICAgICAqIGV3ay9ld2tfdmlldy5j cHA6CisgICAgICAgIChfZXdrX3ZpZXdfcHJpdl9uZXcpOiBBZGRlZCBzZXR0aW5nIHRvIGVuYWJs ZSBvZmZsaW5lIHBhZ2VzCisKIDIwMTAtMDgtMTUgIEd5dXlvdW5nIEtpbSAgPGd5dXlvdW5nLmtp bUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbnRvbmlvIEdvbWVzLgpJbmRl eDogV2ViS2l0L2VmbC9ld2svZXdrX21haW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9lZmwv ZXdrL2V3a19tYWluLmNwcAkocmV2aXNpb24gNjU2NjApCisrKyBXZWJLaXQvZWZsL2V3ay9ld2tf bWFpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxLDEwICsyMSwxMiBAQAogI2luY2x1ZGUgImNv bmZpZy5oIgogI2luY2x1ZGUgImV3a19tYWluLmgiCiAKKyNpbmNsdWRlICJhcHBjYWNoZS9BcHBs aWNhdGlvbkNhY2hlU3RvcmFnZS5oIgogI2luY2x1ZGUgIkVXZWJLaXQuaCIKICNpbmNsdWRlICJM b2dnaW5nLmgiCiAjaW5jbHVkZSAiUGFnZUNhY2hlLmgiCiAjaW5jbHVkZSAiUGFnZUdyb3VwLmgi CisjaW5jbHVkZSA8c3RyaW5nPgogI2luY2x1ZGUgImV3a19wcml2YXRlLmgiCiAjaW5jbHVkZSAi ZXdrX3NldHRpbmdzLmgiCiAjaW5jbHVkZSAicnVudGltZS9Jbml0aWFsaXplVGhyZWFkaW5nLmgi CkBAIC0xMTgsNyArMTIwLDE4IEBAIGludCBld2tfaW5pdCh2b2lkKQogICAgIFdlYkNvcmU6OlBh Z2VHcm91cDo6c2V0U2hvdWxkVHJhY2tWaXNpdGVkTGlua3ModHJ1ZSk7CiAKICAgICAvLyBzZXQg ZGVmYXVsdCBsb2NhdGlvbiBvZiB3ZWIgZGF0YWJhc2UgcGF0aAotICAgIGV3a19zZXR0aW5nc193 ZWJfZGF0YWJhc2VfcGF0aF9zZXQoZ2V0ZW52KCJIT01FIikpOworICAgIHsgLy8gdGhpcyBibG9j ayBpcyBiZWNhdXNlIG9mIGdvdG9zCisgICAgICAgIHVzaW5nIG5hbWVzcGFjZSBzdGQ7CisgICAg ICAgIC8vIHNldCBkZWZhdWx0IGxvY2F0aW9uIG9mIHdlYiBkYXRhYmFzZSBwYXRoCisgICAgICAg IGNvbnN0IGNoYXIqIGhvbWUgPSBnZXRlbnYoIkhPTUUiKTsKKyAgICAgICAgaWYgKCFob21lKSAv LyBkb24ndCBmb3JnZXQgYWJvdXQgdGhlIGhvbWVsZXNzCisgICAgICAgICAgICBob21lID0gIi90 bXAiOyAvLyB0aGlzIGRpcmVjdG9yeSBtdXN0IGFsd2F5cyBleGlzdAorICAgICAgICBzdHJpbmcg d2tkaXIgPSBzdHJpbmcoaG9tZSkgKyAiLy53ZWJraXQiOworICAgICAgICBld2tfc2V0dGluZ3Nf d2ViX2RhdGFiYXNlX3BhdGhfc2V0KHdrZGlyLmNfc3RyKCkpOworCisgICAgICAgIC8vIEZJWE1F OiBJdCBzaG91bGQgYmUgcG9zc2libGUgZm9yIGNsaWVudCBhcHBsaWNhdGlvbnMgdG8gb3ZlcnJp ZGUgdGhlIGRlZmF1bHQgYXBwY2FjaGUgbG9jYXRpb24KKyAgICAgICAgV2ViQ29yZTo6Y2FjaGVT dG9yYWdlKCkuc2V0Q2FjaGVEaXJlY3Rvcnkod2tkaXIuY19zdHIoKSk7CisgICAgfQogCiAgICAg Ly8gVE9ETzogdGhpcyBzaG91bGQgbW92ZSB0byBXZWJDb3JlLCBhbHJlYWR5IHJlcG9ydGVkIHRv IHdlYmtpdC1ndGsgZm9sa3M6CiAjaWZkZWYgV1RGX1VTRV9TT1VQCkluZGV4OiBXZWJLaXQvZWZs L2V3ay9ld2tfdmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcu Y3BwCShyZXZpc2lvbiA2NTY2MCkKKysrIFdlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAkod29y a2luZyBjb3B5KQpAQCAtNTU5LDYgKzU1OSw3IEBAIHN0YXRpYyBFd2tfVmlld19Qcml2YXRlX0Rh dGEqIF9ld2tfdmlld18KICAgICBwcml2LT5wYWdlX3NldHRpbmdzLT5zZXRKYXZhU2NyaXB0RW5h YmxlZCh0cnVlKTsKICAgICBwcml2LT5wYWdlX3NldHRpbmdzLT5zZXRQbHVnaW5zRW5hYmxlZCh0 cnVlKTsKICAgICBwcml2LT5wYWdlX3NldHRpbmdzLT5zZXRMb2NhbFN0b3JhZ2VFbmFibGVkKHRy dWUpOworICAgIHByaXYtPnBhZ2Vfc2V0dGluZ3MtPnNldE9mZmxpbmVXZWJBcHBsaWNhdGlvbkNh Y2hlRW5hYmxlZCh0cnVlKTsKIAogICAgIHVybCA9IHByaXYtPnBhZ2Vfc2V0dGluZ3MtPnVzZXJT dHlsZVNoZWV0TG9jYXRpb24oKTsKICAgICBwcml2LT5zZXR0aW5ncy51c2VyX3N0eWxlc2hlZXQg PSBlaW5hX3N0cmluZ3NoYXJlX2FkZCh1cmwucHJldHR5VVJMKCkudXRmOCgpLmRhdGEoKSk7Cg== 65559 2010-08-26 07:09:39 -0700 2010-08-27 02:30:29 -0700 Patch against r66096 with fixes as described in the ticket. Webkit-patch-r66096+bug44239 text/plain 10563 m.malecki SW5kZXg6IFdlYktpdC9lZmwvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9lZmwvQ2hh bmdlTG9nCShyZXZpc2lvbiA2NjEwMCkKKysrIFdlYktpdC9lZmwvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTAtMDgtMjYgIE1pa2/FgmFqIE1hxYJlY2tpICA8 bS5tYWxlY2tpQHNhbXN1bmcuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFtFRkxdIEFkZGVkIGluaXRpYWwgc2V0dGluZyB0byB0dXJuIG9uIG9m ZmxpbmUgcGFnZXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD00NDIzOQorCisgICAgICAgICogZXdrL2V3a19tYWluLmNwcDogVG9ybiBvZmYgbm9uLUVG TCBpbml0IHRvIF9ld2tfaW5pdF9ib2R5CisgICAgICAgIChld2tfaW5pdCk6IENoYW5nZWQgbm9u LUVGTCBpbml0IHRvIGNhbGwgX2V3a19pbml0X2JvZHkKKyAgICAgICAgKF9ld2tfaW5pdF9ib2R5 KTogTW92ZWQgaW50ZXJuYWwgaW5pdCBoZXJlIGFuZCBhZGRlZCBjYWNoZSBkaXJlY3RvcnkgcGF0 aCBzZXR0aW5nLgorICAgICAgICAqIGV3ay9ld2tfdmlldy5jcHA6IEFkZGVkIG5ldyBjb25maWcg aXRlbXM6IG9mZmxpbmVfYXBwX2NhY2hlIGFuZCBjYWNoZV9kaXJlY3RvcnkKKyAgICAgICAgKF9l d2tfdmlld19wcml2X25ldyk6IGNyZWF0aW5nIGNhY2hlX2RpcmVjdG9yeSBzdHJpbmcKKyAgICAg ICAgKF9ld2tfdmlld19wcml2X2RlbCk6IGRlbGV0aW5nIGNhY2hlX2RpcmVjdG9yeSBzdHJpbmcK KyAgICAgICAgKGV3a192aWV3X3NldHRpbmdfb2ZmbGluZV9hcHBfY2FjaGVfZ2V0KToKKyAgICAg ICAgKGV3a192aWV3X3NldHRpbmdfb2ZmbGluZV9hcHBfY2FjaGVfc2V0KToKKyAgICAgICAgKGV3 a192aWV3X3NldHRpbmdfY2FjaGVfZGlyZWN0b3J5X2dldCk6CisgICAgICAgIChld2tfdmlld19z ZXR0aW5nX2NhY2hlX2RpcmVjdG9yeV9zZXQpOgorICAgICAgICAqIGV3ay9ld2tfdmlldy5oOiBh ZGRlZCBvZmZsaW5lX2FwcF9jYWNoZSBhbmQgY2FjaGVfZGlyZWN0b3J5IHByb3BzIHRvIGV3ayBB UEkKKwogMjAxMC0wOC0yNSAgR3l1eW91bmcgS2ltICA8Z3l1eW91bmcua2ltQHNhbXN1bmcuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFudG9uaW8gR29tZXMuCkluZGV4OiBXZWJLaXQvZWZs L2V3ay9ld2tfbWFpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2VmbC9ld2svZXdrX21haW4u Y3BwCShyZXZpc2lvbiA2NjA5NikKKysrIFdlYktpdC9lZmwvZXdrL2V3a19tYWluLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMjEsNiArMjEsOSBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1 ZGUgImV3a19tYWluLmgiCiAKKyNpbmNsdWRlIDxzeXMvc3RhdC5oPgorCisjaW5jbHVkZSAiYXBw Y2FjaGUvQXBwbGljYXRpb25DYWNoZVN0b3JhZ2UuaCIKICNpbmNsdWRlICJFV2ViS2l0LmgiCiAj aW5jbHVkZSAiTG9nZ2luZy5oIgogI2luY2x1ZGUgIlBhZ2VDYWNoZS5oIgpAQCAtNTYsNiArNTks OCBAQAogc3RhdGljIGludCBfZXdrX2luaXRfY291bnQgPSAwOwogaW50IF9ld2tfbG9nX2RvbSA9 IC0xOwogCitzdGF0aWMgRWluYV9Cb29sIF9ld2tfaW5pdF9ib2R5KHZvaWQpOworCiBpbnQgZXdr X2luaXQodm9pZCkKIHsKICAgICBpZiAoX2V3a19pbml0X2NvdW50KQpAQCAtOTAsNiArOTUsNDQg QEAgaW50IGV3a19pbml0KHZvaWQpCiAgICAgICAgIGdvdG8gZXJyb3JfZWRqZTsKICAgICB9CiAK KyAgICBfZXdrX2luaXRfYm9keSgpOworCisgICAgcmV0dXJuICsrX2V3a19pbml0X2NvdW50Owor CitlcnJvcl9lZGplOgorICAgIGVjb3JlX2V2YXNfc2h1dGRvd24oKTsKK2Vycm9yX2Vjb3JlX2V2 YXM6CisgICAgZWNvcmVfc2h1dGRvd24oKTsKK2Vycm9yX2Vjb3JlOgorICAgIGV2YXNfc2h1dGRv d24oKTsKK2Vycm9yX2V2YXM6CisgICAgZWluYV9sb2dfZG9tYWluX3VucmVnaXN0ZXIoX2V3a19s b2dfZG9tKTsKKyAgICBfZXdrX2xvZ19kb20gPSAtMTsKK2Vycm9yX2xvZ19kb21haW46CisgICAg ZWluYV9zaHV0ZG93bigpOworZXJyb3JfZWluYToKKyAgICByZXR1cm4gMDsKK30KKworaW50IGV3 a19zaHV0ZG93bih2b2lkKQoreworICAgIF9ld2tfaW5pdF9jb3VudC0tOworICAgIGlmIChfZXdr X2luaXRfY291bnQpCisgICAgICAgIHJldHVybiBfZXdrX2luaXRfY291bnQ7CisKKyAgICBlY29y ZV9ldmFzX3NodXRkb3duKCk7CisgICAgZWNvcmVfc2h1dGRvd24oKTsKKyAgICBldmFzX3NodXRk b3duKCk7CisgICAgZWluYV9sb2dfZG9tYWluX3VucmVnaXN0ZXIoX2V3a19sb2dfZG9tKTsKKyAg ICBfZXdrX2xvZ19kb20gPSAtMTsKKyAgICBlaW5hX3NodXRkb3duKCk7CisKKyAgICByZXR1cm4g MDsKK30KKworRWluYV9Cb29sIF9ld2tfaW5pdF9ib2R5KHZvaWQpCit7CisKICNpZiBFTkFCTEUo R0xJQl9TVVBQT1JUKQogICAgIGdfdHlwZV9pbml0KCk7CiAKQEAgLTExNyw4ICsxNjAsMjQgQEAg aW50IGV3a19pbml0KHZvaWQpCiAgICAgV2ViQ29yZTo6cGFnZUNhY2hlKCktPnNldENhcGFjaXR5 KDMpOwogICAgIFdlYkNvcmU6OlBhZ2VHcm91cDo6c2V0U2hvdWxkVHJhY2tWaXNpdGVkTGlua3Mo dHJ1ZSk7CiAKLSAgICAvLyBzZXQgZGVmYXVsdCBsb2NhdGlvbiBvZiB3ZWIgZGF0YWJhc2UgcGF0 aAotICAgIGV3a19zZXR0aW5nc193ZWJfZGF0YWJhc2VfcGF0aF9zZXQoZ2V0ZW52KCJIT01FIikp OworICAgIC8vIHNldCBkZWZhdWx0IGxvY2F0aW9uIG9mIHdlYiBkYXRhYmFzZSBwYXRoIGFuZCBh cHBjYWNoZSBkaXIKKyAgICBjb25zdCBjaGFyKiBob21lID0gZ2V0ZW52KCJIT01FIik7CisgICAg aWYgKCFob21lKSAvLyBkb24ndCBmb3JnZXQgYWJvdXQgdGhlIGhvbWVsZXNzCisgICAgICAgIGhv bWUgPSAiL3RtcCI7IC8vIHRoaXMgZGlyZWN0b3J5IG11c3QgYWx3YXlzIGV4aXN0CisKKyAgICAv LyBhbnl3YXksIGNoZWNrIGl0IGZpcnN0CisgICAgc3RydWN0IHN0YXQgc3RhdGU7CisgICAgaWYg KHN0YXQoaG9tZSwgJnN0YXRlKSA9PSAtMSkgeworICAgICAgICAvLyBFeGl0IG5vdyAtIG90aGVy d2lzZSB5b3UgbWF5IGhhdmUgc29tZSBjcmFzaCBsYXRlcgorICAgICAgICBpbnQgZXJybm93YXMg PSBlcnJubzsKKyAgICAgICAgQ1JJVElDQUwoIkNhbid0IGFjY2VzcyBIT01FIGRpciAob3IgL3Rt cCkgLSBubyBwbGFjZSB0byBzYXZlIGRhdGFiYXNlczogJXMiLCBzdHJlcnJvcihlcnJub3dhcykp OworICAgICAgICByZXR1cm4gRUlOQV9GQUxTRTsKKyAgICB9CisKKyAgICBXVEY6OlN0cmluZyB3 a2RpciA9IFdURjo6U3RyaW5nKGhvbWUpICsgIi8ud2Via2l0IjsKKyAgICBld2tfc2V0dGluZ3Nf d2ViX2RhdGFiYXNlX3BhdGhfc2V0KHdrZGlyLnV0ZjgoKS5kYXRhKCkpOworCisgICAgV2ViQ29y ZTo6Y2FjaGVTdG9yYWdlKCkuc2V0Q2FjaGVEaXJlY3Rvcnkod2tkaXIpOwogCiAgICAgLy8gVE9E TzogdGhpcyBzaG91bGQgbW92ZSB0byBXZWJDb3JlLCBhbHJlYWR5IHJlcG9ydGVkIHRvIHdlYmtp dC1ndGsgZm9sa3M6CiAjaWZkZWYgV1RGX1VTRV9TT1VQCkBAIC0xMjksMzYgKzE4OCw2IEBAIGlu dCBld2tfaW5pdCh2b2lkKQogICAgIH0KICNlbmRpZgogCi0gICAgcmV0dXJuICsrX2V3a19pbml0 X2NvdW50OwotCi1lcnJvcl9lZGplOgotICAgIGVjb3JlX2V2YXNfc2h1dGRvd24oKTsKLWVycm9y X2Vjb3JlX2V2YXM6Ci0gICAgZWNvcmVfc2h1dGRvd24oKTsKLWVycm9yX2Vjb3JlOgotICAgIGV2 YXNfc2h1dGRvd24oKTsKLWVycm9yX2V2YXM6Ci0gICAgZWluYV9sb2dfZG9tYWluX3VucmVnaXN0 ZXIoX2V3a19sb2dfZG9tKTsKLSAgICBfZXdrX2xvZ19kb20gPSAtMTsKLWVycm9yX2xvZ19kb21h aW46Ci0gICAgZWluYV9zaHV0ZG93bigpOwotZXJyb3JfZWluYToKLSAgICByZXR1cm4gMDsKLX0K LQotaW50IGV3a19zaHV0ZG93bih2b2lkKQotewotICAgIF9ld2tfaW5pdF9jb3VudC0tOwotICAg IGlmIChfZXdrX2luaXRfY291bnQpCi0gICAgICAgIHJldHVybiBfZXdrX2luaXRfY291bnQ7Ci0K LSAgICBlY29yZV9ldmFzX3NodXRkb3duKCk7Ci0gICAgZWNvcmVfc2h1dGRvd24oKTsKLSAgICBl dmFzX3NodXRkb3duKCk7Ci0gICAgZWluYV9sb2dfZG9tYWluX3VucmVnaXN0ZXIoX2V3a19sb2df ZG9tKTsKLSAgICBfZXdrX2xvZ19kb20gPSAtMTsKLSAgICBlaW5hX3NodXRkb3duKCk7Ci0KLSAg ICByZXR1cm4gMDsKKyAgICByZXR1cm4gRUlOQV9UUlVFOwogfQogCkluZGV4OiBXZWJLaXQvZWZs L2V3ay9ld2tfdmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcu Y3BwCShyZXZpc2lvbiA2NjA5NikKKysrIFdlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAkod29y a2luZyBjb3B5KQpAQCAtMjIsNiArMjIsNyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1 ZGUgImV3a192aWV3LmgiCiAKKyNpbmNsdWRlICJhcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlU3Rv cmFnZS5oIgogI2luY2x1ZGUgIkNocm9tZUNsaWVudEVmbC5oIgogI2luY2x1ZGUgIkNvbnRleHRN ZW51Q2xpZW50RWZsLmgiCiAjaW5jbHVkZSAiQ29udGV4dE1lbnVDb250cm9sbGVyLmgiCkBAIC04 OCw2ICs4OSw3IEBAIHN0cnVjdCBfRXdrX1ZpZXdfUHJpdmF0ZV9EYXRhIHsKICAgICAgICAgY29u c3QgY2hhciogdXNlcl9zdHlsZXNoZWV0OwogICAgICAgICBjb25zdCBjaGFyKiBlbmNvZGluZ19k ZWZhdWx0OwogICAgICAgICBjb25zdCBjaGFyKiBlbmNvZGluZ19jdXN0b207CisgICAgICAgIGNv bnN0IGNoYXIqIGNhY2hlX2RpcmVjdG9yeTsKICAgICAgICAgaW50IGZvbnRfbWluaW11bV9zaXpl OwogICAgICAgICBpbnQgZm9udF9taW5pbXVtX2xvZ2ljYWxfc2l6ZTsKICAgICAgICAgaW50IGZv bnRfZGVmYXVsdF9zaXplOwpAQCAtMTA5LDYgKzExMSw3IEBAIHN0cnVjdCBfRXdrX1ZpZXdfUHJp dmF0ZV9EYXRhIHsKICAgICAgICAgRWluYV9Cb29sIGNhcmV0X2Jyb3dzaW5nOjE7CiAgICAgICAg IEVpbmFfQm9vbCBzcGF0aWFsX25hdmlnYXRpb246MTsKICAgICAgICAgRWluYV9Cb29sIGxvY2Fs X3N0b3JhZ2U6MTsKKyAgICAgICAgRWluYV9Cb29sIG9mZmxpbmVfYXBwX2NhY2hlOiAxOwogICAg ICAgICBzdHJ1Y3QgewogICAgICAgICAgICAgZmxvYXQgdzsKICAgICAgICAgICAgIGZsb2F0IGg7 CkBAIC01NjEsNiArNTY0LDcgQEAgc3RhdGljIEV3a19WaWV3X1ByaXZhdGVfRGF0YSogX2V3a192 aWV3XwogICAgIHByaXYtPnBhZ2Vfc2V0dGluZ3MtPnNldEphdmFTY3JpcHRFbmFibGVkKHRydWUp OwogICAgIHByaXYtPnBhZ2Vfc2V0dGluZ3MtPnNldFBsdWdpbnNFbmFibGVkKHRydWUpOwogICAg IHByaXYtPnBhZ2Vfc2V0dGluZ3MtPnNldExvY2FsU3RvcmFnZUVuYWJsZWQodHJ1ZSk7CisgICAg cHJpdi0+cGFnZV9zZXR0aW5ncy0+c2V0T2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVk KHRydWUpOwogCiAgICAgdXJsID0gcHJpdi0+cGFnZV9zZXR0aW5ncy0+dXNlclN0eWxlU2hlZXRM b2NhdGlvbigpOwogICAgIHByaXYtPnNldHRpbmdzLnVzZXJfc3R5bGVzaGVldCA9IGVpbmFfc3Ry aW5nc2hhcmVfYWRkKHVybC5wcmV0dHlVUkwoKS51dGY4KCkuZGF0YSgpKTsKQEAgLTU2OSw2ICs1 NzMsOSBAQCBzdGF0aWMgRXdrX1ZpZXdfUHJpdmF0ZV9EYXRhKiBfZXdrX3ZpZXdfCiAgICAgICAg IChwcml2LT5wYWdlX3NldHRpbmdzLT5kZWZhdWx0VGV4dEVuY29kaW5nTmFtZSgpLnV0ZjgoKS5k YXRhKCkpOwogICAgIHByaXYtPnNldHRpbmdzLmVuY29kaW5nX2N1c3RvbSA9IDA7CiAKKyAgICBw cml2LT5zZXR0aW5ncy5jYWNoZV9kaXJlY3RvcnkgPSBlaW5hX3N0cmluZ3NoYXJlX2FkZAorICAg ICAgICAoV2ViQ29yZTo6Y2FjaGVTdG9yYWdlKCkuY2FjaGVEaXJlY3RvcnkoKS51dGY4KCkuZGF0 YSgpKTsKKwogICAgIHByaXYtPnNldHRpbmdzLmZvbnRfbWluaW11bV9zaXplID0gcHJpdi0+cGFn ZV9zZXR0aW5ncy0+bWluaW11bUZvbnRTaXplKCk7CiAgICAgcHJpdi0+c2V0dGluZ3MuZm9udF9t aW5pbXVtX2xvZ2ljYWxfc2l6ZSA9IHByaXYtPnBhZ2Vfc2V0dGluZ3MtPm1pbmltdW1Mb2dpY2Fs Rm9udFNpemUoKTsKICAgICBwcml2LT5zZXR0aW5ncy5mb250X2RlZmF1bHRfc2l6ZSA9IHByaXYt PnBhZ2Vfc2V0dGluZ3MtPmRlZmF1bHRGb250U2l6ZSgpOwpAQCAtNTk3LDYgKzYwNCw3IEBAIHN0 YXRpYyBFd2tfVmlld19Qcml2YXRlX0RhdGEqIF9ld2tfdmlld18KICAgICBwcml2LT5zZXR0aW5n cy5wcml2YXRlX2Jyb3dzaW5nID0gcHJpdi0+cGFnZV9zZXR0aW5ncy0+cHJpdmF0ZUJyb3dzaW5n RW5hYmxlZCgpOwogICAgIHByaXYtPnNldHRpbmdzLmNhcmV0X2Jyb3dzaW5nID0gcHJpdi0+cGFn ZV9zZXR0aW5ncy0+Y2FyZXRCcm93c2luZ0VuYWJsZWQoKTsKICAgICBwcml2LT5zZXR0aW5ncy5s b2NhbF9zdG9yYWdlID0gcHJpdi0+cGFnZV9zZXR0aW5ncy0+bG9jYWxTdG9yYWdlRW5hYmxlZCgp OworICAgIHByaXYtPnNldHRpbmdzLm9mZmxpbmVfYXBwX2NhY2hlID0gdHJ1ZTsgLy8gWFhYIG5v IGZ1bmN0aW9uIHRvIHJlYWQgc2V0dGluZzsgdGhpcyBrZWVwcyB0aGUgb3JpZ2luYWwgc2V0dGlu ZwogCiAgICAgLy8gU2luY2UgdGhlcmUncyBubyBzY2FsZSBzZXBhcmF0ZWQgZnJvbSB6b29taW5n IGluIHdlYmtpdC1lZmwsIHRoaXMgZnVuY3Rpb25hbGl0eSBvZgogICAgIC8vIHZpZXdwb3J0IG1l dGEgdGFnIGlzIGltcGxlbWVudGVkIHVzaW5nIHpvb20uIFdoZW4gc2NhbGUgem9vbSBpcyBzdXBw b3J0ZWQgYnkgd2Via2l0LWVmbCwKQEAgLTY0Myw2ICs2NTEsNyBAQCBzdGF0aWMgdm9pZCBfZXdr X3ZpZXdfcHJpdl9kZWwoRXdrX1ZpZXdfCiAgICAgZWluYV9zdHJpbmdzaGFyZV9kZWwocHJpdi0+ c2V0dGluZ3MudXNlcl9zdHlsZXNoZWV0KTsKICAgICBlaW5hX3N0cmluZ3NoYXJlX2RlbChwcml2 LT5zZXR0aW5ncy5lbmNvZGluZ19kZWZhdWx0KTsKICAgICBlaW5hX3N0cmluZ3NoYXJlX2RlbChw cml2LT5zZXR0aW5ncy5lbmNvZGluZ19jdXN0b20pOworICAgIGVpbmFfc3RyaW5nc2hhcmVfZGVs KHByaXYtPnNldHRpbmdzLmNhY2hlX2RpcmVjdG9yeSk7CiAgICAgZWluYV9zdHJpbmdzaGFyZV9k ZWwocHJpdi0+c2V0dGluZ3MuZm9udF9zdGFuZGFyZCk7CiAgICAgZWluYV9zdHJpbmdzaGFyZV9k ZWwocHJpdi0+c2V0dGluZ3MuZm9udF9jdXJzaXZlKTsKICAgICBlaW5hX3N0cmluZ3NoYXJlX2Rl bChwcml2LT5zZXR0aW5ncy5mb250X21vbm9zcGFjZSk7CkBAIC0yMzg3LDYgKzIzOTYsMjYgQEAg RWluYV9Cb29sIGV3a192aWV3X3NldHRpbmdfcHJpdmF0ZV9icm93cwogICAgIHJldHVybiBFSU5B X1RSVUU7CiB9CiAKK0VpbmFfQm9vbCBld2tfdmlld19zZXR0aW5nX29mZmxpbmVfYXBwX2NhY2hl X2dldChjb25zdCBFdmFzX09iamVjdCogbykKK3sKKyAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVU VVJOKG8sIHNkLCBFSU5BX0ZBTFNFKTsKKyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4o c2QsIHByaXYsIEVJTkFfRkFMU0UpOworICAgIHJldHVybiBwcml2LT5zZXR0aW5ncy5vZmZsaW5l X2FwcF9jYWNoZTsKK30KKworRWluYV9Cb29sIGV3a192aWV3X3NldHRpbmdfb2ZmbGluZV9hcHBf Y2FjaGVfc2V0KEV2YXNfT2JqZWN0KiBvLCBFaW5hX0Jvb2wgZW5hYmxlKQoreworICAgIEVXS19W SUVXX1NEX0dFVF9PUl9SRVRVUk4obywgc2QsIEVJTkFfRkFMU0UpOworICAgIEVXS19WSUVXX1BS SVZfR0VUX09SX1JFVFVSTihzZCwgcHJpdiwgRUlOQV9GQUxTRSk7CisgICAgZW5hYmxlID0gISFl bmFibGU7CisgICAgaWYgKHByaXYtPnNldHRpbmdzLm9mZmxpbmVfYXBwX2NhY2hlICE9IGVuYWJs ZSkgeworICAgICAgICBwcml2LT5wYWdlX3NldHRpbmdzLT5zZXRPZmZsaW5lV2ViQXBwbGljYXRp b25DYWNoZUVuYWJsZWQoZW5hYmxlKTsKKyAgICAgICAgcHJpdi0+c2V0dGluZ3Mub2ZmbGluZV9h cHBfY2FjaGUgPSBlbmFibGU7CisgICAgfQorICAgIHJldHVybiBFSU5BX1RSVUU7Cit9CisKKwog RWluYV9Cb29sIGV3a192aWV3X3NldHRpbmdfY2FyZXRfYnJvd3NpbmdfZ2V0KGNvbnN0IEV2YXNf T2JqZWN0KiBvKQogewogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4obywgc2QsIEVJTkFf RkFMU0UpOwpAQCAtMjQ2Nyw2ICsyNDk2LDIyIEBAIEVpbmFfQm9vbCBld2tfdmlld19zZXR0aW5n X2VuY29kaW5nX2RlZmEKICAgICByZXR1cm4gRUlOQV9UUlVFOwogfQogCitjb25zdCBjaGFyKiBl d2tfdmlld19zZXR0aW5nX2NhY2hlX2RpcmVjdG9yeV9nZXQoY29uc3QgRXZhc19PYmplY3QqIG8p Cit7CisgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihvLCBzZCwgMCk7CisgICAgRVdLX1ZJ RVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNkLCBwcml2LCAwKTsKKyAgICByZXR1cm4gcHJpdi0+c2V0 dGluZ3MuY2FjaGVfZGlyZWN0b3J5OworfQorCitFaW5hX0Jvb2wgZXdrX3ZpZXdfc2V0dGluZ19j YWNoZV9kaXJlY3Rvcnlfc2V0KEV2YXNfT2JqZWN0KiBvLCBjb25zdCBjaGFyKiBwYXRoKQorewor ICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4obywgc2QsIEVJTkFfRkFMU0UpOworICAgIEVX S19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzZCwgcHJpdiwgRUlOQV9GQUxTRSk7CisgICAgaWYg KGVpbmFfc3RyaW5nc2hhcmVfcmVwbGFjZSgmcHJpdi0+c2V0dGluZ3MuY2FjaGVfZGlyZWN0b3J5 LCBwYXRoKSkKKyAgICAgICAgV2ViQ29yZTo6Y2FjaGVTdG9yYWdlKCkuc2V0Q2FjaGVEaXJlY3Rv cnkoV1RGOjpTdHJpbmc6OmZyb21VVEY4KHBhdGgpKTsKKyAgICByZXR1cm4gRUlOQV9UUlVFOwor fQorCiBpbnQgZXdrX3ZpZXdfc2V0dGluZ19mb250X21pbmltdW1fc2l6ZV9nZXQoY29uc3QgRXZh c19PYmplY3QqIG8pCiB7CiAgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihvLCBzZCwgMCk7 CkluZGV4OiBXZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9l ZmwvZXdrL2V3a192aWV3LmgJKHJldmlzaW9uIDY2MDk2KQorKysgV2ViS2l0L2VmbC9ld2svZXdr X3ZpZXcuaAkod29ya2luZyBjb3B5KQpAQCAtNDAzLDYgKzQwMyw4IEBAIEVBUEkgRWluYV9Cb29s ICAgIGV3a192aWV3X3NldHRpbmdfdXNlcl8KIAogRUFQSSBFaW5hX0Jvb2wgICAgZXdrX3ZpZXdf c2V0dGluZ19wcml2YXRlX2Jyb3dzaW5nX2dldChjb25zdCBFdmFzX09iamVjdCAqbyk7CiBFQVBJ IEVpbmFfQm9vbCAgICBld2tfdmlld19zZXR0aW5nX3ByaXZhdGVfYnJvd3Npbmdfc2V0KEV2YXNf T2JqZWN0ICpvLCBFaW5hX0Jvb2wgZW5hYmxlKTsKK0VBUEkgRWluYV9Cb29sICAgIGV3a192aWV3 X3NldHRpbmdfb2ZmbGluZV9hcHBfY2FjaGVfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0ICpvKTsKK0VB UEkgRWluYV9Cb29sICAgIGV3a192aWV3X3NldHRpbmdfb2ZmbGluZV9hcHBfY2FjaGVfc2V0KEV2 YXNfT2JqZWN0ICpvLCBFaW5hX0Jvb2wgZW5hYmxlKTsKIAogRUFQSSBFaW5hX0Jvb2wgICAgZXdr X3ZpZXdfc2V0dGluZ19jYXJldF9icm93c2luZ19nZXQoY29uc3QgRXZhc19PYmplY3QgKm8pOwog RUFQSSBFaW5hX0Jvb2wgICAgZXdrX3ZpZXdfc2V0dGluZ19jYXJldF9icm93c2luZ19zZXQoRXZh c19PYmplY3QgKm8sIEVpbmFfQm9vbCBlbmFibGUpOwpAQCAtNDExLDYgKzQxMyw4IEBAIEVBUEkg Y29uc3QgY2hhciAgKmV3a192aWV3X3NldHRpbmdfZW5jb2QKIEVBUEkgRWluYV9Cb29sICAgIGV3 a192aWV3X3NldHRpbmdfZW5jb2RpbmdfY3VzdG9tX3NldChFdmFzX09iamVjdCAqbywgY29uc3Qg Y2hhciAqZW5jb2RpbmcpOwogRUFQSSBjb25zdCBjaGFyICAqZXdrX3ZpZXdfc2V0dGluZ19lbmNv ZGluZ19kZWZhdWx0X2dldChjb25zdCBFdmFzX09iamVjdCAqbyk7CiBFQVBJIEVpbmFfQm9vbCAg ICBld2tfdmlld19zZXR0aW5nX2VuY29kaW5nX2RlZmF1bHRfc2V0KEV2YXNfT2JqZWN0ICpvLCBj b25zdCBjaGFyICplbmNvZGluZyk7CitFQVBJIGNvbnN0IGNoYXIgICpld2tfdmlld19zZXR0aW5n X2NhY2hlX2RpcmVjdG9yeV9nZXQoY29uc3QgRXZhc19PYmplY3QgKm8pOworRUFQSSBFaW5hX0Jv b2wgICAgZXdrX3ZpZXdfc2V0dGluZ19jYWNoZV9kaXJlY3Rvcnlfc2V0KEV2YXNfT2JqZWN0ICpv LCBjb25zdCBjaGFyICpwYXRoKTsKIAogRUFQSSBpbnQgICAgICAgICAgZXdrX3ZpZXdfc2V0dGlu Z19mb250X21pbmltdW1fc2l6ZV9nZXQoY29uc3QgRXZhc19PYmplY3QgKm8pOwogRUFQSSBFaW5h X0Jvb2wgICAgZXdrX3ZpZXdfc2V0dGluZ19mb250X21pbmltdW1fc2l6ZV9zZXQoRXZhc19PYmpl Y3QgKm8sIGludCBzaXplKTsK 65693 2010-08-27 02:30:29 -0700 2010-08-30 01:53:03 -0700 Patch against r66192 with fixes as described in the ticket. Webkit-patch-r66192+bug44239 text/plain 10712 m.malecki SW5kZXg6IFdlYktpdC9lZmwvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9lZmwvQ2hh bmdlTG9nCShyZXZpc2lvbiA2NjE5MikKKysrIFdlYktpdC9lZmwvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTAtMDgtMjYgIE1pa2/FgmFqIE1hxYJlY2tpICA8 bS5tYWxlY2tpQHNhbXN1bmcuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IFJhZmFlbCBBbnRv Z25vbGxpLgorCisgICAgICAgIFtFRkxdIEFkZGVkIGluaXRpYWwgc2V0dGluZyB0byB0dXJuIG9u IG9mZmxpbmUgcGFnZXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD00NDIzOQorCisgICAgICAgICogZXdrL2V3a19tYWluLmNwcDogVG9ybiBvZmYgbm9u LUVGTCBpbml0IHRvIF9ld2tfaW5pdF9ib2R5CisgICAgICAgIChld2tfaW5pdCk6IENoYW5nZWQg bm9uLUVGTCBpbml0IHRvIGNhbGwgX2V3a19pbml0X2JvZHkKKyAgICAgICAgKF9ld2tfaW5pdF9i b2R5KTogTW92ZWQgaW50ZXJuYWwgaW5pdCBoZXJlIGFuZCBhZGRlZCBjYWNoZSBkaXJlY3Rvcnkg cGF0aCBzZXR0aW5nLgorICAgICAgICAqIGV3ay9ld2tfdmlldy5jcHA6IEFkZGVkIG5ldyBjb25m aWcgaXRlbXM6IG9mZmxpbmVfYXBwX2NhY2hlIGFuZCBjYWNoZV9kaXJlY3RvcnkKKyAgICAgICAg KF9ld2tfdmlld19wcml2X25ldyk6IGNyZWF0aW5nIGNhY2hlX2RpcmVjdG9yeSBzdHJpbmcKKyAg ICAgICAgKF9ld2tfdmlld19wcml2X2RlbCk6IGRlbGV0aW5nIGNhY2hlX2RpcmVjdG9yeSBzdHJp bmcKKyAgICAgICAgKGV3a192aWV3X3NldHRpbmdfb2ZmbGluZV9hcHBfY2FjaGVfZ2V0KToKKyAg ICAgICAgKGV3a192aWV3X3NldHRpbmdfb2ZmbGluZV9hcHBfY2FjaGVfc2V0KToKKyAgICAgICAg KGV3a192aWV3X3NldHRpbmdfY2FjaGVfZGlyZWN0b3J5X2dldCk6CisgICAgICAgIChld2tfdmll d19zZXR0aW5nX2NhY2hlX2RpcmVjdG9yeV9zZXQpOgorICAgICAgICAqIGV3ay9ld2tfdmlldy5o OiBhZGRlZCBvZmZsaW5lX2FwcF9jYWNoZSBhbmQgY2FjaGVfZGlyZWN0b3J5IHByb3BzIHRvIGV3 ayBBUEkKKwogMjAxMC0wOC0yNiAgTWlyb3NsYXcgU3p5bWFuc2tpICA8bWlyb3NsYXcuc0BzYW1z dW5nLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNl bi4KSW5kZXg6IFdlYktpdC9lZmwvZXdrL2V3a19tYWluLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJL aXQvZWZsL2V3ay9ld2tfbWFpbi5jcHAJKHJldmlzaW9uIDY2MTkyKQorKysgV2ViS2l0L2VmbC9l d2svZXdrX21haW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMSw2ICsyMSw3IEBACiAjaW5jbHVk ZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiZXdrX21haW4uaCIKIAorI2luY2x1ZGUgImFwcGNhY2hl L0FwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlLmgiCiAjaW5jbHVkZSAiRVdlYktpdC5oIgogI2luY2x1 ZGUgIkxvZ2dpbmcuaCIKICNpbmNsdWRlICJQYWdlQ2FjaGUuaCIKQEAgLTM2LDYgKzM3LDcgQEAK ICNpbmNsdWRlIDxFaW5hLmg+CiAjaW5jbHVkZSA8RXZhcy5oPgogI2luY2x1ZGUgPHN0ZGxpYi5o PgorI2luY2x1ZGUgPHN5cy9zdGF0Lmg+CiAKICNpZiBFTkFCTEUoR0xJQl9TVVBQT1JUKQogI2lu Y2x1ZGUgPGdsaWItb2JqZWN0Lmg+CkBAIC01Niw2ICs1OCw4IEBACiBzdGF0aWMgaW50IF9ld2tf aW5pdF9jb3VudCA9IDA7CiBpbnQgX2V3a19sb2dfZG9tID0gLTE7CiAKK3N0YXRpYyBFaW5hX0Jv b2wgX2V3a19pbml0X2JvZHkodm9pZCk7CisKIGludCBld2tfaW5pdCh2b2lkKQogewogICAgIGlm IChfZXdrX2luaXRfY291bnQpCkBAIC05MCw2ICs5NCw0NCBAQCBpbnQgZXdrX2luaXQodm9pZCkK ICAgICAgICAgZ290byBlcnJvcl9lZGplOwogICAgIH0KIAorICAgIF9ld2tfaW5pdF9ib2R5KCk7 CisKKyAgICByZXR1cm4gKytfZXdrX2luaXRfY291bnQ7CisKK2Vycm9yX2VkamU6CisgICAgZWNv cmVfZXZhc19zaHV0ZG93bigpOworZXJyb3JfZWNvcmVfZXZhczoKKyAgICBlY29yZV9zaHV0ZG93 bigpOworZXJyb3JfZWNvcmU6CisgICAgZXZhc19zaHV0ZG93bigpOworZXJyb3JfZXZhczoKKyAg ICBlaW5hX2xvZ19kb21haW5fdW5yZWdpc3RlcihfZXdrX2xvZ19kb20pOworICAgIF9ld2tfbG9n X2RvbSA9IC0xOworZXJyb3JfbG9nX2RvbWFpbjoKKyAgICBlaW5hX3NodXRkb3duKCk7CitlcnJv cl9laW5hOgorICAgIHJldHVybiAwOworfQorCitpbnQgZXdrX3NodXRkb3duKHZvaWQpCit7Cisg ICAgX2V3a19pbml0X2NvdW50LS07CisgICAgaWYgKF9ld2tfaW5pdF9jb3VudCkKKyAgICAgICAg cmV0dXJuIF9ld2tfaW5pdF9jb3VudDsKKworICAgIGVjb3JlX2V2YXNfc2h1dGRvd24oKTsKKyAg ICBlY29yZV9zaHV0ZG93bigpOworICAgIGV2YXNfc2h1dGRvd24oKTsKKyAgICBlaW5hX2xvZ19k b21haW5fdW5yZWdpc3RlcihfZXdrX2xvZ19kb20pOworICAgIF9ld2tfbG9nX2RvbSA9IC0xOwor ICAgIGVpbmFfc2h1dGRvd24oKTsKKworICAgIHJldHVybiAwOworfQorCitFaW5hX0Jvb2wgX2V3 a19pbml0X2JvZHkodm9pZCkKK3sKKwogI2lmIEVOQUJMRShHTElCX1NVUFBPUlQpCiAgICAgZ190 eXBlX2luaXQoKTsKIApAQCAtMTE3LDggKzE1OSwyNCBAQCBpbnQgZXdrX2luaXQodm9pZCkKICAg ICBXZWJDb3JlOjpwYWdlQ2FjaGUoKS0+c2V0Q2FwYWNpdHkoMyk7CiAgICAgV2ViQ29yZTo6UGFn ZUdyb3VwOjpzZXRTaG91bGRUcmFja1Zpc2l0ZWRMaW5rcyh0cnVlKTsKIAotICAgIC8vIHNldCBk ZWZhdWx0IGxvY2F0aW9uIG9mIHdlYiBkYXRhYmFzZSBwYXRoCi0gICAgZXdrX3NldHRpbmdzX3dl Yl9kYXRhYmFzZV9wYXRoX3NldChnZXRlbnYoIkhPTUUiKSk7CisgICAgLy8gc2V0IGRlZmF1bHQg bG9jYXRpb24gb2Ygd2ViIGRhdGFiYXNlIHBhdGggYW5kIGFwcGNhY2hlIGRpcgorICAgIGNvbnN0 IGNoYXIqIGhvbWUgPSBnZXRlbnYoIkhPTUUiKTsKKyAgICBpZiAoIWhvbWUpIC8vIGRvbid0IGZv cmdldCBhYm91dCB0aGUgaG9tZWxlc3MKKyAgICAgICAgaG9tZSA9ICIvdG1wIjsgLy8gdGhpcyBk aXJlY3RvcnkgbXVzdCBhbHdheXMgZXhpc3QKKworICAgIC8vIGFueXdheSwgY2hlY2sgaXQgZmly c3QKKyAgICBzdHJ1Y3Qgc3RhdCBzdGF0ZTsKKyAgICBpZiAoc3RhdChob21lLCAmc3RhdGUpID09 IC0xKSB7CisgICAgICAgIC8vIEV4aXQgbm93IC0gb3RoZXJ3aXNlIHlvdSBtYXkgaGF2ZSBzb21l IGNyYXNoIGxhdGVyCisgICAgICAgIGludCBlcnJub3dhcyA9IGVycm5vOworICAgICAgICBDUklU SUNBTCgiQ2FuJ3QgYWNjZXNzIEhPTUUgZGlyIChvciAvdG1wKSAtIG5vIHBsYWNlIHRvIHNhdmUg ZGF0YWJhc2VzOiAlcyIsIHN0cmVycm9yKGVycm5vd2FzKSk7CisgICAgICAgIHJldHVybiBFSU5B X0ZBTFNFOworICAgIH0KKworICAgIFdURjo6U3RyaW5nIHdrZGlyID0gV1RGOjpTdHJpbmcoaG9t ZSkgKyAiLy53ZWJraXQiOworICAgIGV3a19zZXR0aW5nc193ZWJfZGF0YWJhc2VfcGF0aF9zZXQo d2tkaXIudXRmOCgpLmRhdGEoKSk7CisKKyAgICBXZWJDb3JlOjpjYWNoZVN0b3JhZ2UoKS5zZXRD YWNoZURpcmVjdG9yeSh3a2Rpcik7CiAKICAgICAvLyBUT0RPOiB0aGlzIHNob3VsZCBtb3ZlIHRv IFdlYkNvcmUsIGFscmVhZHkgcmVwb3J0ZWQgdG8gd2Via2l0LWd0ayBmb2xrczoKICNpZmRlZiBX VEZfVVNFX1NPVVAKQEAgLTEyOSwzNiArMTg3LDYgQEAgaW50IGV3a19pbml0KHZvaWQpCiAgICAg fQogI2VuZGlmCiAKLSAgICByZXR1cm4gKytfZXdrX2luaXRfY291bnQ7Ci0KLWVycm9yX2VkamU6 Ci0gICAgZWNvcmVfZXZhc19zaHV0ZG93bigpOwotZXJyb3JfZWNvcmVfZXZhczoKLSAgICBlY29y ZV9zaHV0ZG93bigpOwotZXJyb3JfZWNvcmU6Ci0gICAgZXZhc19zaHV0ZG93bigpOwotZXJyb3Jf ZXZhczoKLSAgICBlaW5hX2xvZ19kb21haW5fdW5yZWdpc3RlcihfZXdrX2xvZ19kb20pOwotICAg IF9ld2tfbG9nX2RvbSA9IC0xOwotZXJyb3JfbG9nX2RvbWFpbjoKLSAgICBlaW5hX3NodXRkb3du KCk7Ci1lcnJvcl9laW5hOgotICAgIHJldHVybiAwOwotfQotCi1pbnQgZXdrX3NodXRkb3duKHZv aWQpCi17Ci0gICAgX2V3a19pbml0X2NvdW50LS07Ci0gICAgaWYgKF9ld2tfaW5pdF9jb3VudCkK LSAgICAgICAgcmV0dXJuIF9ld2tfaW5pdF9jb3VudDsKLQotICAgIGVjb3JlX2V2YXNfc2h1dGRv d24oKTsKLSAgICBlY29yZV9zaHV0ZG93bigpOwotICAgIGV2YXNfc2h1dGRvd24oKTsKLSAgICBl aW5hX2xvZ19kb21haW5fdW5yZWdpc3RlcihfZXdrX2xvZ19kb20pOwotICAgIF9ld2tfbG9nX2Rv bSA9IC0xOwotICAgIGVpbmFfc2h1dGRvd24oKTsKLQotICAgIHJldHVybiAwOworICAgIHJldHVy biBFSU5BX1RSVUU7CiB9CiAKSW5kZXg6IFdlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAJKHJldmlzaW9uIDY2MTkyKQor KysgV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMiw2ICsy Miw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiZXdrX3ZpZXcuaCIKIAorI2lu Y2x1ZGUgImFwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlLmgiCiAjaW5jbHVkZSAiQ2hy b21lQ2xpZW50RWZsLmgiCiAjaW5jbHVkZSAiQ29udGV4dE1lbnVDbGllbnRFZmwuaCIKICNpbmNs dWRlICJDb250ZXh0TWVudUNvbnRyb2xsZXIuaCIKQEAgLTg4LDYgKzg5LDcgQEAgc3RydWN0IF9F d2tfVmlld19Qcml2YXRlX0RhdGEgewogICAgICAgICBjb25zdCBjaGFyKiB1c2VyX3N0eWxlc2hl ZXQ7CiAgICAgICAgIGNvbnN0IGNoYXIqIGVuY29kaW5nX2RlZmF1bHQ7CiAgICAgICAgIGNvbnN0 IGNoYXIqIGVuY29kaW5nX2N1c3RvbTsKKyAgICAgICAgY29uc3QgY2hhciogY2FjaGVfZGlyZWN0 b3J5OwogICAgICAgICBpbnQgZm9udF9taW5pbXVtX3NpemU7CiAgICAgICAgIGludCBmb250X21p bmltdW1fbG9naWNhbF9zaXplOwogICAgICAgICBpbnQgZm9udF9kZWZhdWx0X3NpemU7CkBAIC0x MDksNiArMTExLDcgQEAgc3RydWN0IF9Fd2tfVmlld19Qcml2YXRlX0RhdGEgewogICAgICAgICBF aW5hX0Jvb2wgY2FyZXRfYnJvd3Npbmc6MTsKICAgICAgICAgRWluYV9Cb29sIHNwYXRpYWxfbmF2 aWdhdGlvbjoxOwogICAgICAgICBFaW5hX0Jvb2wgbG9jYWxfc3RvcmFnZToxOworICAgICAgICBF aW5hX0Jvb2wgb2ZmbGluZV9hcHBfY2FjaGU6IDE7CiAgICAgICAgIHN0cnVjdCB7CiAgICAgICAg ICAgICBmbG9hdCB3OwogICAgICAgICAgICAgZmxvYXQgaDsKQEAgLTU2MSw2ICs1NjQsNyBAQCBz dGF0aWMgRXdrX1ZpZXdfUHJpdmF0ZV9EYXRhKiBfZXdrX3ZpZXdfCiAgICAgcHJpdi0+cGFnZV9z ZXR0aW5ncy0+c2V0SmF2YVNjcmlwdEVuYWJsZWQodHJ1ZSk7CiAgICAgcHJpdi0+cGFnZV9zZXR0 aW5ncy0+c2V0UGx1Z2luc0VuYWJsZWQodHJ1ZSk7CiAgICAgcHJpdi0+cGFnZV9zZXR0aW5ncy0+ c2V0TG9jYWxTdG9yYWdlRW5hYmxlZCh0cnVlKTsKKyAgICBwcml2LT5wYWdlX3NldHRpbmdzLT5z ZXRPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZUVuYWJsZWQodHJ1ZSk7CiAKICAgICB1cmwgPSBw cml2LT5wYWdlX3NldHRpbmdzLT51c2VyU3R5bGVTaGVldExvY2F0aW9uKCk7CiAgICAgcHJpdi0+ c2V0dGluZ3MudXNlcl9zdHlsZXNoZWV0ID0gZWluYV9zdHJpbmdzaGFyZV9hZGQodXJsLnByZXR0 eVVSTCgpLnV0ZjgoKS5kYXRhKCkpOwpAQCAtNTY5LDYgKzU3Myw5IEBAIHN0YXRpYyBFd2tfVmll d19Qcml2YXRlX0RhdGEqIF9ld2tfdmlld18KICAgICAgICAgKHByaXYtPnBhZ2Vfc2V0dGluZ3Mt PmRlZmF1bHRUZXh0RW5jb2RpbmdOYW1lKCkudXRmOCgpLmRhdGEoKSk7CiAgICAgcHJpdi0+c2V0 dGluZ3MuZW5jb2RpbmdfY3VzdG9tID0gMDsKIAorICAgIHByaXYtPnNldHRpbmdzLmNhY2hlX2Rp cmVjdG9yeSA9IGVpbmFfc3RyaW5nc2hhcmVfYWRkCisgICAgICAgIChXZWJDb3JlOjpjYWNoZVN0 b3JhZ2UoKS5jYWNoZURpcmVjdG9yeSgpLnV0ZjgoKS5kYXRhKCkpOworCiAgICAgcHJpdi0+c2V0 dGluZ3MuZm9udF9taW5pbXVtX3NpemUgPSBwcml2LT5wYWdlX3NldHRpbmdzLT5taW5pbXVtRm9u dFNpemUoKTsKICAgICBwcml2LT5zZXR0aW5ncy5mb250X21pbmltdW1fbG9naWNhbF9zaXplID0g cHJpdi0+cGFnZV9zZXR0aW5ncy0+bWluaW11bUxvZ2ljYWxGb250U2l6ZSgpOwogICAgIHByaXYt PnNldHRpbmdzLmZvbnRfZGVmYXVsdF9zaXplID0gcHJpdi0+cGFnZV9zZXR0aW5ncy0+ZGVmYXVs dEZvbnRTaXplKCk7CkBAIC01OTcsNiArNjA0LDcgQEAgc3RhdGljIEV3a19WaWV3X1ByaXZhdGVf RGF0YSogX2V3a192aWV3XwogICAgIHByaXYtPnNldHRpbmdzLnByaXZhdGVfYnJvd3NpbmcgPSBw cml2LT5wYWdlX3NldHRpbmdzLT5wcml2YXRlQnJvd3NpbmdFbmFibGVkKCk7CiAgICAgcHJpdi0+ c2V0dGluZ3MuY2FyZXRfYnJvd3NpbmcgPSBwcml2LT5wYWdlX3NldHRpbmdzLT5jYXJldEJyb3dz aW5nRW5hYmxlZCgpOwogICAgIHByaXYtPnNldHRpbmdzLmxvY2FsX3N0b3JhZ2UgPSBwcml2LT5w YWdlX3NldHRpbmdzLT5sb2NhbFN0b3JhZ2VFbmFibGVkKCk7CisgICAgcHJpdi0+c2V0dGluZ3Mu b2ZmbGluZV9hcHBfY2FjaGUgPSB0cnVlOyAvLyBYWFggbm8gZnVuY3Rpb24gdG8gcmVhZCBzZXR0 aW5nOyB0aGlzIGtlZXBzIHRoZSBvcmlnaW5hbCBzZXR0aW5nCiAKICAgICAvLyBTaW5jZSB0aGVy ZSdzIG5vIHNjYWxlIHNlcGFyYXRlZCBmcm9tIHpvb21pbmcgaW4gd2Via2l0LWVmbCwgdGhpcyBm dW5jdGlvbmFsaXR5IG9mCiAgICAgLy8gdmlld3BvcnQgbWV0YSB0YWcgaXMgaW1wbGVtZW50ZWQg dXNpbmcgem9vbS4gV2hlbiBzY2FsZSB6b29tIGlzIHN1cHBvcnRlZCBieSB3ZWJraXQtZWZsLApA QCAtNjQzLDYgKzY1MSw3IEBAIHN0YXRpYyB2b2lkIF9ld2tfdmlld19wcml2X2RlbChFd2tfVmll d18KICAgICBlaW5hX3N0cmluZ3NoYXJlX2RlbChwcml2LT5zZXR0aW5ncy51c2VyX3N0eWxlc2hl ZXQpOwogICAgIGVpbmFfc3RyaW5nc2hhcmVfZGVsKHByaXYtPnNldHRpbmdzLmVuY29kaW5nX2Rl ZmF1bHQpOwogICAgIGVpbmFfc3RyaW5nc2hhcmVfZGVsKHByaXYtPnNldHRpbmdzLmVuY29kaW5n X2N1c3RvbSk7CisgICAgZWluYV9zdHJpbmdzaGFyZV9kZWwocHJpdi0+c2V0dGluZ3MuY2FjaGVf ZGlyZWN0b3J5KTsKICAgICBlaW5hX3N0cmluZ3NoYXJlX2RlbChwcml2LT5zZXR0aW5ncy5mb250 X3N0YW5kYXJkKTsKICAgICBlaW5hX3N0cmluZ3NoYXJlX2RlbChwcml2LT5zZXR0aW5ncy5mb250 X2N1cnNpdmUpOwogICAgIGVpbmFfc3RyaW5nc2hhcmVfZGVsKHByaXYtPnNldHRpbmdzLmZvbnRf bW9ub3NwYWNlKTsKQEAgLTIzOTAsNiArMjM5OSwyNiBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfc2V0 dGluZ19wcml2YXRlX2Jyb3dzCiAgICAgcmV0dXJuIEVJTkFfVFJVRTsKIH0KIAorRWluYV9Cb29s IGV3a192aWV3X3NldHRpbmdfb2ZmbGluZV9hcHBfY2FjaGVfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0 KiBvKQoreworICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4obywgc2QsIEVJTkFfRkFMU0Up OworICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzZCwgcHJpdiwgRUlOQV9GQUxTRSk7 CisgICAgcmV0dXJuIHByaXYtPnNldHRpbmdzLm9mZmxpbmVfYXBwX2NhY2hlOworfQorCitFaW5h X0Jvb2wgZXdrX3ZpZXdfc2V0dGluZ19vZmZsaW5lX2FwcF9jYWNoZV9zZXQoRXZhc19PYmplY3Qq IG8sIEVpbmFfQm9vbCBlbmFibGUpCit7CisgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihv LCBzZCwgRUlOQV9GQUxTRSk7CisgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNkLCBw cml2LCBFSU5BX0ZBTFNFKTsKKyAgICBlbmFibGUgPSAhIWVuYWJsZTsKKyAgICBpZiAocHJpdi0+ c2V0dGluZ3Mub2ZmbGluZV9hcHBfY2FjaGUgIT0gZW5hYmxlKSB7CisgICAgICAgIHByaXYtPnBh Z2Vfc2V0dGluZ3MtPnNldE9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZChlbmFibGUp OworICAgICAgICBwcml2LT5zZXR0aW5ncy5vZmZsaW5lX2FwcF9jYWNoZSA9IGVuYWJsZTsKKyAg ICB9CisgICAgcmV0dXJuIEVJTkFfVFJVRTsKK30KKworCiBFaW5hX0Jvb2wgZXdrX3ZpZXdfc2V0 dGluZ19jYXJldF9icm93c2luZ19nZXQoY29uc3QgRXZhc19PYmplY3QqIG8pCiB7CiAgICAgRVdL X1ZJRVdfU0RfR0VUX09SX1JFVFVSTihvLCBzZCwgRUlOQV9GQUxTRSk7CkBAIC0yNDcwLDYgKzI0 OTksMjIgQEAgRWluYV9Cb29sIGV3a192aWV3X3NldHRpbmdfZW5jb2RpbmdfZGVmYQogICAgIHJl dHVybiBFSU5BX1RSVUU7CiB9CiAKK2NvbnN0IGNoYXIqIGV3a192aWV3X3NldHRpbmdfY2FjaGVf ZGlyZWN0b3J5X2dldChjb25zdCBFdmFzX09iamVjdCogbykKK3sKKyAgICBFV0tfVklFV19TRF9H RVRfT1JfUkVUVVJOKG8sIHNkLCAwKTsKKyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4o c2QsIHByaXYsIDApOworICAgIHJldHVybiBwcml2LT5zZXR0aW5ncy5jYWNoZV9kaXJlY3Rvcnk7 Cit9CisKK0VpbmFfQm9vbCBld2tfdmlld19zZXR0aW5nX2NhY2hlX2RpcmVjdG9yeV9zZXQoRXZh c19PYmplY3QqIG8sIGNvbnN0IGNoYXIqIHBhdGgpCit7CisgICAgRVdLX1ZJRVdfU0RfR0VUX09S X1JFVFVSTihvLCBzZCwgRUlOQV9GQUxTRSk7CisgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVU VVJOKHNkLCBwcml2LCBFSU5BX0ZBTFNFKTsKKyAgICBpZiAoZWluYV9zdHJpbmdzaGFyZV9yZXBs YWNlKCZwcml2LT5zZXR0aW5ncy5jYWNoZV9kaXJlY3RvcnksIHBhdGgpKQorICAgICAgICBXZWJD b3JlOjpjYWNoZVN0b3JhZ2UoKS5zZXRDYWNoZURpcmVjdG9yeShXVEY6OlN0cmluZzo6ZnJvbVVU RjgocGF0aCkpOworICAgIHJldHVybiBFSU5BX1RSVUU7Cit9CisKIGludCBld2tfdmlld19zZXR0 aW5nX2ZvbnRfbWluaW11bV9zaXplX2dldChjb25zdCBFdmFzX09iamVjdCogbykKIHsKICAgICBF V0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKG8sIHNkLCAwKTsKSW5kZXg6IFdlYktpdC9lZmwvZXdr L2V3a192aWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaAkocmV2 aXNpb24gNjYxOTIpCisrKyBXZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5oCSh3b3JraW5nIGNvcHkp CkBAIC00MDQsNiArNDA0LDggQEAgRUFQSSBFaW5hX0Jvb2wgICAgZXdrX3ZpZXdfc2V0dGluZ191 c2VyXwogCiBFQVBJIEVpbmFfQm9vbCAgICBld2tfdmlld19zZXR0aW5nX3ByaXZhdGVfYnJvd3Np bmdfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0ICpvKTsKIEVBUEkgRWluYV9Cb29sICAgIGV3a192aWV3 X3NldHRpbmdfcHJpdmF0ZV9icm93c2luZ19zZXQoRXZhc19PYmplY3QgKm8sIEVpbmFfQm9vbCBl bmFibGUpOworRUFQSSBFaW5hX0Jvb2wgICAgZXdrX3ZpZXdfc2V0dGluZ19vZmZsaW5lX2FwcF9j YWNoZV9nZXQoY29uc3QgRXZhc19PYmplY3QgKm8pOworRUFQSSBFaW5hX0Jvb2wgICAgZXdrX3Zp ZXdfc2V0dGluZ19vZmZsaW5lX2FwcF9jYWNoZV9zZXQoRXZhc19PYmplY3QgKm8sIEVpbmFfQm9v bCBlbmFibGUpOwogCiBFQVBJIEVpbmFfQm9vbCAgICBld2tfdmlld19zZXR0aW5nX2NhcmV0X2Jy b3dzaW5nX2dldChjb25zdCBFdmFzX09iamVjdCAqbyk7CiBFQVBJIEVpbmFfQm9vbCAgICBld2tf dmlld19zZXR0aW5nX2NhcmV0X2Jyb3dzaW5nX3NldChFdmFzX09iamVjdCAqbywgRWluYV9Cb29s IGVuYWJsZSk7CkBAIC00MTIsNiArNDE0LDggQEAgRUFQSSBjb25zdCBjaGFyICAqZXdrX3ZpZXdf c2V0dGluZ19lbmNvZAogRUFQSSBFaW5hX0Jvb2wgICAgZXdrX3ZpZXdfc2V0dGluZ19lbmNvZGlu Z19jdXN0b21fc2V0KEV2YXNfT2JqZWN0ICpvLCBjb25zdCBjaGFyICplbmNvZGluZyk7CiBFQVBJ IGNvbnN0IGNoYXIgICpld2tfdmlld19zZXR0aW5nX2VuY29kaW5nX2RlZmF1bHRfZ2V0KGNvbnN0 IEV2YXNfT2JqZWN0ICpvKTsKIEVBUEkgRWluYV9Cb29sICAgIGV3a192aWV3X3NldHRpbmdfZW5j b2RpbmdfZGVmYXVsdF9zZXQoRXZhc19PYmplY3QgKm8sIGNvbnN0IGNoYXIgKmVuY29kaW5nKTsK K0VBUEkgY29uc3QgY2hhciAgKmV3a192aWV3X3NldHRpbmdfY2FjaGVfZGlyZWN0b3J5X2dldChj b25zdCBFdmFzX09iamVjdCAqbyk7CitFQVBJIEVpbmFfQm9vbCAgICBld2tfdmlld19zZXR0aW5n X2NhY2hlX2RpcmVjdG9yeV9zZXQoRXZhc19PYmplY3QgKm8sIGNvbnN0IGNoYXIgKnBhdGgpOwog CiBFQVBJIGludCAgICAgICAgICBld2tfdmlld19zZXR0aW5nX2ZvbnRfbWluaW11bV9zaXplX2dl dChjb25zdCBFdmFzX09iamVjdCAqbyk7CiBFQVBJIEVpbmFfQm9vbCAgICBld2tfdmlld19zZXR0 aW5nX2ZvbnRfbWluaW11bV9zaXplX3NldChFdmFzX09iamVjdCAqbywgaW50IHNpemUpOwo= 65891 2010-08-30 01:53:03 -0700 2010-08-30 02:14:11 -0700 Patch against r66371 with fixes as described in the ticket Webkit-patch-r66371+bug44239 text/plain 10708 m.malecki SW5kZXg6IFdlYktpdC9lZmwvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9lZmwvQ2hh bmdlTG9nCShyZXZpc2lvbiA2NjM3MSkKKysrIFdlYktpdC9lZmwvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTAtMDgtMjYgIE1pa2/FgmFqIE1hxYJlY2tpICA8 bS5tYWxlY2tpQHNhbXN1bmcuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpCisKKyAgICAgICAgW0VGTF0gQWRkZWQgaW5pdGlhbCBzZXR0aW5nIHRvIHR1cm4gb24gb2Zm bGluZSBwYWdlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTQ0MjM5CisKKyAgICAgICAgKiBld2svZXdrX21haW4uY3BwOiBUb3JuIG9mZiBub24tRUZM IGluaXQgdG8gX2V3a19pbml0X2JvZHkKKyAgICAgICAgKGV3a19pbml0KTogQ2hhbmdlZCBub24t RUZMIGluaXQgdG8gY2FsbCBfZXdrX2luaXRfYm9keQorICAgICAgICAoX2V3a19pbml0X2JvZHkp OiBNb3ZlZCBpbnRlcm5hbCBpbml0IGhlcmUgYW5kIGFkZGVkIGNhY2hlIGRpcmVjdG9yeSBwYXRo IHNldHRpbmcuCisgICAgICAgICogZXdrL2V3a192aWV3LmNwcDogQWRkZWQgbmV3IGNvbmZpZyBp dGVtczogb2ZmbGluZV9hcHBfY2FjaGUgYW5kIGNhY2hlX2RpcmVjdG9yeQorICAgICAgICAoX2V3 a192aWV3X3ByaXZfbmV3KTogY3JlYXRpbmcgY2FjaGVfZGlyZWN0b3J5IHN0cmluZworICAgICAg ICAoX2V3a192aWV3X3ByaXZfZGVsKTogZGVsZXRpbmcgY2FjaGVfZGlyZWN0b3J5IHN0cmluZwor ICAgICAgICAoZXdrX3ZpZXdfc2V0dGluZ19vZmZsaW5lX2FwcF9jYWNoZV9nZXQpOgorICAgICAg ICAoZXdrX3ZpZXdfc2V0dGluZ19vZmZsaW5lX2FwcF9jYWNoZV9zZXQpOgorICAgICAgICAoZXdr X3ZpZXdfc2V0dGluZ19jYWNoZV9kaXJlY3RvcnlfZ2V0KToKKyAgICAgICAgKGV3a192aWV3X3Nl dHRpbmdfY2FjaGVfZGlyZWN0b3J5X3NldCk6CisgICAgICAgICogZXdrL2V3a192aWV3Lmg6IGFk ZGVkIG9mZmxpbmVfYXBwX2NhY2hlIGFuZCBjYWNoZV9kaXJlY3RvcnkgcHJvcHMgdG8gZXdrIEFQ SQorCiAyMDEwLTA4LTI2ICBNaXJvc2xhdyBTenltYW5za2kgIDxtaXJvc2xhdy5zQHNhbXN1bmcu Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgpJ bmRleDogV2ViS2l0L2VmbC9ld2svZXdrX21haW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9l ZmwvZXdrL2V3a19tYWluLmNwcAkocmV2aXNpb24gNjYzNzEpCisrKyBXZWJLaXQvZWZsL2V3ay9l d2tfbWFpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxLDYgKzIxLDcgQEAKICNpbmNsdWRlICJj b25maWcuaCIKICNpbmNsdWRlICJld2tfbWFpbi5oIgogCisjaW5jbHVkZSAiYXBwY2FjaGUvQXBw bGljYXRpb25DYWNoZVN0b3JhZ2UuaCIKICNpbmNsdWRlICJFV2ViS2l0LmgiCiAjaW5jbHVkZSAi TG9nZ2luZy5oIgogI2luY2x1ZGUgIlBhZ2VDYWNoZS5oIgpAQCAtMzYsNiArMzcsNyBAQAogI2lu Y2x1ZGUgPEVpbmEuaD4KICNpbmNsdWRlIDxFdmFzLmg+CiAjaW5jbHVkZSA8c3RkbGliLmg+Cisj aW5jbHVkZSA8c3lzL3N0YXQuaD4KIAogI2lmIEVOQUJMRShHTElCX1NVUFBPUlQpCiAjaW5jbHVk ZSA8Z2xpYi1vYmplY3QuaD4KQEAgLTU2LDYgKzU4LDggQEAKIHN0YXRpYyBpbnQgX2V3a19pbml0 X2NvdW50ID0gMDsKIGludCBfZXdrX2xvZ19kb20gPSAtMTsKIAorc3RhdGljIEVpbmFfQm9vbCBf ZXdrX2luaXRfYm9keSh2b2lkKTsKKwogaW50IGV3a19pbml0KHZvaWQpCiB7CiAgICAgaWYgKF9l d2tfaW5pdF9jb3VudCkKQEAgLTkwLDYgKzk0LDQ0IEBAIGludCBld2tfaW5pdCh2b2lkKQogICAg ICAgICBnb3RvIGVycm9yX2VkamU7CiAgICAgfQogCisgICAgX2V3a19pbml0X2JvZHkoKTsKKwor ICAgIHJldHVybiArK19ld2tfaW5pdF9jb3VudDsKKworZXJyb3JfZWRqZToKKyAgICBlY29yZV9l dmFzX3NodXRkb3duKCk7CitlcnJvcl9lY29yZV9ldmFzOgorICAgIGVjb3JlX3NodXRkb3duKCk7 CitlcnJvcl9lY29yZToKKyAgICBldmFzX3NodXRkb3duKCk7CitlcnJvcl9ldmFzOgorICAgIGVp bmFfbG9nX2RvbWFpbl91bnJlZ2lzdGVyKF9ld2tfbG9nX2RvbSk7CisgICAgX2V3a19sb2dfZG9t ID0gLTE7CitlcnJvcl9sb2dfZG9tYWluOgorICAgIGVpbmFfc2h1dGRvd24oKTsKK2Vycm9yX2Vp bmE6CisgICAgcmV0dXJuIDA7Cit9CisKK2ludCBld2tfc2h1dGRvd24odm9pZCkKK3sKKyAgICBf ZXdrX2luaXRfY291bnQtLTsKKyAgICBpZiAoX2V3a19pbml0X2NvdW50KQorICAgICAgICByZXR1 cm4gX2V3a19pbml0X2NvdW50OworCisgICAgZWNvcmVfZXZhc19zaHV0ZG93bigpOworICAgIGVj b3JlX3NodXRkb3duKCk7CisgICAgZXZhc19zaHV0ZG93bigpOworICAgIGVpbmFfbG9nX2RvbWFp bl91bnJlZ2lzdGVyKF9ld2tfbG9nX2RvbSk7CisgICAgX2V3a19sb2dfZG9tID0gLTE7CisgICAg ZWluYV9zaHV0ZG93bigpOworCisgICAgcmV0dXJuIDA7Cit9CisKK0VpbmFfQm9vbCBfZXdrX2lu aXRfYm9keSh2b2lkKQoreworCiAjaWYgRU5BQkxFKEdMSUJfU1VQUE9SVCkKICAgICBnX3R5cGVf aW5pdCgpOwogCkBAIC0xMTcsOCArMTU5LDI0IEBAIGludCBld2tfaW5pdCh2b2lkKQogICAgIFdl YkNvcmU6OnBhZ2VDYWNoZSgpLT5zZXRDYXBhY2l0eSgzKTsKICAgICBXZWJDb3JlOjpQYWdlR3Jv dXA6OnNldFNob3VsZFRyYWNrVmlzaXRlZExpbmtzKHRydWUpOwogCi0gICAgLy8gc2V0IGRlZmF1 bHQgbG9jYXRpb24gb2Ygd2ViIGRhdGFiYXNlIHBhdGgKLSAgICBld2tfc2V0dGluZ3Nfd2ViX2Rh dGFiYXNlX3BhdGhfc2V0KGdldGVudigiSE9NRSIpKTsKKyAgICAvLyBzZXQgZGVmYXVsdCBsb2Nh dGlvbiBvZiB3ZWIgZGF0YWJhc2UgcGF0aCBhbmQgYXBwY2FjaGUgZGlyCisgICAgY29uc3QgY2hh ciogaG9tZSA9IGdldGVudigiSE9NRSIpOworICAgIGlmICghaG9tZSkgLy8gZG9uJ3QgZm9yZ2V0 IGFib3V0IHRoZSBob21lbGVzcworICAgICAgICBob21lID0gIi90bXAiOyAvLyB0aGlzIGRpcmVj dG9yeSBtdXN0IGFsd2F5cyBleGlzdAorCisgICAgLy8gYW55d2F5LCBjaGVjayBpdCBmaXJzdAor ICAgIHN0cnVjdCBzdGF0IHN0YXRlOworICAgIGlmIChzdGF0KGhvbWUsICZzdGF0ZSkgPT0gLTEp IHsKKyAgICAgICAgLy8gRXhpdCBub3cgLSBvdGhlcndpc2UgeW91IG1heSBoYXZlIHNvbWUgY3Jh c2ggbGF0ZXIKKyAgICAgICAgaW50IGVycm5vd2FzID0gZXJybm87CisgICAgICAgIENSSVRJQ0FM KCJDYW4ndCBhY2Nlc3MgSE9NRSBkaXIgKG9yIC90bXApIC0gbm8gcGxhY2UgdG8gc2F2ZSBkYXRh YmFzZXM6ICVzIiwgc3RyZXJyb3IoZXJybm93YXMpKTsKKyAgICAgICAgcmV0dXJuIEVJTkFfRkFM U0U7CisgICAgfQorCisgICAgV1RGOjpTdHJpbmcgd2tkaXIgPSBXVEY6OlN0cmluZyhob21lKSAr ICIvLndlYmtpdCI7CisgICAgZXdrX3NldHRpbmdzX3dlYl9kYXRhYmFzZV9wYXRoX3NldCh3a2Rp ci51dGY4KCkuZGF0YSgpKTsKKworICAgIFdlYkNvcmU6OmNhY2hlU3RvcmFnZSgpLnNldENhY2hl RGlyZWN0b3J5KHdrZGlyKTsKIAogICAgIC8vIFRPRE86IHRoaXMgc2hvdWxkIG1vdmUgdG8gV2Vi Q29yZSwgYWxyZWFkeSByZXBvcnRlZCB0byB3ZWJraXQtZ3RrIGZvbGtzOgogI2lmZGVmIFdURl9V U0VfU09VUApAQCAtMTI5LDM2ICsxODcsNiBAQCBpbnQgZXdrX2luaXQodm9pZCkKICAgICB9CiAj ZW5kaWYKIAotICAgIHJldHVybiArK19ld2tfaW5pdF9jb3VudDsKLQotZXJyb3JfZWRqZToKLSAg ICBlY29yZV9ldmFzX3NodXRkb3duKCk7Ci1lcnJvcl9lY29yZV9ldmFzOgotICAgIGVjb3JlX3No dXRkb3duKCk7Ci1lcnJvcl9lY29yZToKLSAgICBldmFzX3NodXRkb3duKCk7Ci1lcnJvcl9ldmFz OgotICAgIGVpbmFfbG9nX2RvbWFpbl91bnJlZ2lzdGVyKF9ld2tfbG9nX2RvbSk7Ci0gICAgX2V3 a19sb2dfZG9tID0gLTE7Ci1lcnJvcl9sb2dfZG9tYWluOgotICAgIGVpbmFfc2h1dGRvd24oKTsK LWVycm9yX2VpbmE6Ci0gICAgcmV0dXJuIDA7Ci19Ci0KLWludCBld2tfc2h1dGRvd24odm9pZCkK LXsKLSAgICBfZXdrX2luaXRfY291bnQtLTsKLSAgICBpZiAoX2V3a19pbml0X2NvdW50KQotICAg ICAgICByZXR1cm4gX2V3a19pbml0X2NvdW50OwotCi0gICAgZWNvcmVfZXZhc19zaHV0ZG93bigp OwotICAgIGVjb3JlX3NodXRkb3duKCk7Ci0gICAgZXZhc19zaHV0ZG93bigpOwotICAgIGVpbmFf bG9nX2RvbWFpbl91bnJlZ2lzdGVyKF9ld2tfbG9nX2RvbSk7Ci0gICAgX2V3a19sb2dfZG9tID0g LTE7Ci0gICAgZWluYV9zaHV0ZG93bigpOwotCi0gICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIEVJ TkFfVFJVRTsKIH0KIApJbmRleDogV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAkocmV2aXNpb24gNjYzNzEpCisrKyBX ZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIyLDYgKzIyLDcg QEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJld2tfdmlldy5oIgogCisjaW5jbHVk ZSAiYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZVN0b3JhZ2UuaCIKICNpbmNsdWRlICJDaHJvbWVD bGllbnRFZmwuaCIKICNpbmNsdWRlICJDb250ZXh0TWVudUNsaWVudEVmbC5oIgogI2luY2x1ZGUg IkNvbnRleHRNZW51Q29udHJvbGxlci5oIgpAQCAtODgsNiArODksNyBAQCBzdHJ1Y3QgX0V3a19W aWV3X1ByaXZhdGVfRGF0YSB7CiAgICAgICAgIGNvbnN0IGNoYXIqIHVzZXJfc3R5bGVzaGVldDsK ICAgICAgICAgY29uc3QgY2hhciogZW5jb2RpbmdfZGVmYXVsdDsKICAgICAgICAgY29uc3QgY2hh ciogZW5jb2RpbmdfY3VzdG9tOworICAgICAgICBjb25zdCBjaGFyKiBjYWNoZV9kaXJlY3Rvcnk7 CiAgICAgICAgIGludCBmb250X21pbmltdW1fc2l6ZTsKICAgICAgICAgaW50IGZvbnRfbWluaW11 bV9sb2dpY2FsX3NpemU7CiAgICAgICAgIGludCBmb250X2RlZmF1bHRfc2l6ZTsKQEAgLTEwOSw2 ICsxMTEsNyBAQCBzdHJ1Y3QgX0V3a19WaWV3X1ByaXZhdGVfRGF0YSB7CiAgICAgICAgIEVpbmFf Qm9vbCBjYXJldF9icm93c2luZzoxOwogICAgICAgICBFaW5hX0Jvb2wgc3BhdGlhbF9uYXZpZ2F0 aW9uOjE7CiAgICAgICAgIEVpbmFfQm9vbCBsb2NhbF9zdG9yYWdlOjE7CisgICAgICAgIEVpbmFf Qm9vbCBvZmZsaW5lX2FwcF9jYWNoZTogMTsKICAgICAgICAgc3RydWN0IHsKICAgICAgICAgICAg IGZsb2F0IHc7CiAgICAgICAgICAgICBmbG9hdCBoOwpAQCAtNTYxLDYgKzU2NCw3IEBAIHN0YXRp YyBFd2tfVmlld19Qcml2YXRlX0RhdGEqIF9ld2tfdmlld18KICAgICBwcml2LT5wYWdlX3NldHRp bmdzLT5zZXRKYXZhU2NyaXB0RW5hYmxlZCh0cnVlKTsKICAgICBwcml2LT5wYWdlX3NldHRpbmdz LT5zZXRQbHVnaW5zRW5hYmxlZCh0cnVlKTsKICAgICBwcml2LT5wYWdlX3NldHRpbmdzLT5zZXRM b2NhbFN0b3JhZ2VFbmFibGVkKHRydWUpOworICAgIHByaXYtPnBhZ2Vfc2V0dGluZ3MtPnNldE9m ZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCh0cnVlKTsKIAogICAgIHVybCA9IHByaXYt PnBhZ2Vfc2V0dGluZ3MtPnVzZXJTdHlsZVNoZWV0TG9jYXRpb24oKTsKICAgICBwcml2LT5zZXR0 aW5ncy51c2VyX3N0eWxlc2hlZXQgPSBlaW5hX3N0cmluZ3NoYXJlX2FkZCh1cmwucHJldHR5VVJM KCkudXRmOCgpLmRhdGEoKSk7CkBAIC01NjksNiArNTczLDkgQEAgc3RhdGljIEV3a19WaWV3X1By aXZhdGVfRGF0YSogX2V3a192aWV3XwogICAgICAgICAocHJpdi0+cGFnZV9zZXR0aW5ncy0+ZGVm YXVsdFRleHRFbmNvZGluZ05hbWUoKS51dGY4KCkuZGF0YSgpKTsKICAgICBwcml2LT5zZXR0aW5n cy5lbmNvZGluZ19jdXN0b20gPSAwOwogCisgICAgcHJpdi0+c2V0dGluZ3MuY2FjaGVfZGlyZWN0 b3J5ID0gZWluYV9zdHJpbmdzaGFyZV9hZGQKKyAgICAgICAgKFdlYkNvcmU6OmNhY2hlU3RvcmFn ZSgpLmNhY2hlRGlyZWN0b3J5KCkudXRmOCgpLmRhdGEoKSk7CisKICAgICBwcml2LT5zZXR0aW5n cy5mb250X21pbmltdW1fc2l6ZSA9IHByaXYtPnBhZ2Vfc2V0dGluZ3MtPm1pbmltdW1Gb250U2l6 ZSgpOwogICAgIHByaXYtPnNldHRpbmdzLmZvbnRfbWluaW11bV9sb2dpY2FsX3NpemUgPSBwcml2 LT5wYWdlX3NldHRpbmdzLT5taW5pbXVtTG9naWNhbEZvbnRTaXplKCk7CiAgICAgcHJpdi0+c2V0 dGluZ3MuZm9udF9kZWZhdWx0X3NpemUgPSBwcml2LT5wYWdlX3NldHRpbmdzLT5kZWZhdWx0Rm9u dFNpemUoKTsKQEAgLTU5Nyw2ICs2MDQsNyBAQCBzdGF0aWMgRXdrX1ZpZXdfUHJpdmF0ZV9EYXRh KiBfZXdrX3ZpZXdfCiAgICAgcHJpdi0+c2V0dGluZ3MucHJpdmF0ZV9icm93c2luZyA9IHByaXYt PnBhZ2Vfc2V0dGluZ3MtPnByaXZhdGVCcm93c2luZ0VuYWJsZWQoKTsKICAgICBwcml2LT5zZXR0 aW5ncy5jYXJldF9icm93c2luZyA9IHByaXYtPnBhZ2Vfc2V0dGluZ3MtPmNhcmV0QnJvd3NpbmdF bmFibGVkKCk7CiAgICAgcHJpdi0+c2V0dGluZ3MubG9jYWxfc3RvcmFnZSA9IHByaXYtPnBhZ2Vf c2V0dGluZ3MtPmxvY2FsU3RvcmFnZUVuYWJsZWQoKTsKKyAgICBwcml2LT5zZXR0aW5ncy5vZmZs aW5lX2FwcF9jYWNoZSA9IHRydWU7IC8vIFhYWCBubyBmdW5jdGlvbiB0byByZWFkIHNldHRpbmc7 IHRoaXMga2VlcHMgdGhlIG9yaWdpbmFsIHNldHRpbmcKIAogICAgIC8vIFNpbmNlIHRoZXJlJ3Mg bm8gc2NhbGUgc2VwYXJhdGVkIGZyb20gem9vbWluZyBpbiB3ZWJraXQtZWZsLCB0aGlzIGZ1bmN0 aW9uYWxpdHkgb2YKICAgICAvLyB2aWV3cG9ydCBtZXRhIHRhZyBpcyBpbXBsZW1lbnRlZCB1c2lu ZyB6b29tLiBXaGVuIHNjYWxlIHpvb20gaXMgc3VwcG9ydGVkIGJ5IHdlYmtpdC1lZmwsCkBAIC02 NDMsNiArNjUxLDcgQEAgc3RhdGljIHZvaWQgX2V3a192aWV3X3ByaXZfZGVsKEV3a19WaWV3Xwog ICAgIGVpbmFfc3RyaW5nc2hhcmVfZGVsKHByaXYtPnNldHRpbmdzLnVzZXJfc3R5bGVzaGVldCk7 CiAgICAgZWluYV9zdHJpbmdzaGFyZV9kZWwocHJpdi0+c2V0dGluZ3MuZW5jb2RpbmdfZGVmYXVs dCk7CiAgICAgZWluYV9zdHJpbmdzaGFyZV9kZWwocHJpdi0+c2V0dGluZ3MuZW5jb2RpbmdfY3Vz dG9tKTsKKyAgICBlaW5hX3N0cmluZ3NoYXJlX2RlbChwcml2LT5zZXR0aW5ncy5jYWNoZV9kaXJl Y3RvcnkpOwogICAgIGVpbmFfc3RyaW5nc2hhcmVfZGVsKHByaXYtPnNldHRpbmdzLmZvbnRfc3Rh bmRhcmQpOwogICAgIGVpbmFfc3RyaW5nc2hhcmVfZGVsKHByaXYtPnNldHRpbmdzLmZvbnRfY3Vy c2l2ZSk7CiAgICAgZWluYV9zdHJpbmdzaGFyZV9kZWwocHJpdi0+c2V0dGluZ3MuZm9udF9tb25v c3BhY2UpOwpAQCAtMjM5MCw2ICsyMzk5LDI2IEBAIEVpbmFfQm9vbCBld2tfdmlld19zZXR0aW5n X3ByaXZhdGVfYnJvd3MKICAgICByZXR1cm4gRUlOQV9UUlVFOwogfQogCitFaW5hX0Jvb2wgZXdr X3ZpZXdfc2V0dGluZ19vZmZsaW5lX2FwcF9jYWNoZV9nZXQoY29uc3QgRXZhc19PYmplY3QqIG8p Cit7CisgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihvLCBzZCwgRUlOQV9GQUxTRSk7Cisg ICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNkLCBwcml2LCBFSU5BX0ZBTFNFKTsKKyAg ICByZXR1cm4gcHJpdi0+c2V0dGluZ3Mub2ZmbGluZV9hcHBfY2FjaGU7Cit9CisKK0VpbmFfQm9v bCBld2tfdmlld19zZXR0aW5nX29mZmxpbmVfYXBwX2NhY2hlX3NldChFdmFzX09iamVjdCogbywg RWluYV9Cb29sIGVuYWJsZSkKK3sKKyAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKG8sIHNk LCBFSU5BX0ZBTFNFKTsKKyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc2QsIHByaXYs IEVJTkFfRkFMU0UpOworICAgIGVuYWJsZSA9ICEhZW5hYmxlOworICAgIGlmIChwcml2LT5zZXR0 aW5ncy5vZmZsaW5lX2FwcF9jYWNoZSAhPSBlbmFibGUpIHsKKyAgICAgICAgcHJpdi0+cGFnZV9z ZXR0aW5ncy0+c2V0T2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkKGVuYWJsZSk7Cisg ICAgICAgIHByaXYtPnNldHRpbmdzLm9mZmxpbmVfYXBwX2NhY2hlID0gZW5hYmxlOworICAgIH0K KyAgICByZXR1cm4gRUlOQV9UUlVFOworfQorCisKIEVpbmFfQm9vbCBld2tfdmlld19zZXR0aW5n X2NhcmV0X2Jyb3dzaW5nX2dldChjb25zdCBFdmFzX09iamVjdCogbykKIHsKICAgICBFV0tfVklF V19TRF9HRVRfT1JfUkVUVVJOKG8sIHNkLCBFSU5BX0ZBTFNFKTsKQEAgLTI0NzAsNiArMjQ5OSwy MiBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfc2V0dGluZ19lbmNvZGluZ19kZWZhCiAgICAgcmV0dXJu IEVJTkFfVFJVRTsKIH0KIAorY29uc3QgY2hhciogZXdrX3ZpZXdfc2V0dGluZ19jYWNoZV9kaXJl Y3RvcnlfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBvKQoreworICAgIEVXS19WSUVXX1NEX0dFVF9P Ul9SRVRVUk4obywgc2QsIDApOworICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzZCwg cHJpdiwgMCk7CisgICAgcmV0dXJuIHByaXYtPnNldHRpbmdzLmNhY2hlX2RpcmVjdG9yeTsKK30K KworRWluYV9Cb29sIGV3a192aWV3X3NldHRpbmdfY2FjaGVfZGlyZWN0b3J5X3NldChFdmFzX09i amVjdCogbywgY29uc3QgY2hhciogcGF0aCkKK3sKKyAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVU VVJOKG8sIHNkLCBFSU5BX0ZBTFNFKTsKKyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4o c2QsIHByaXYsIEVJTkFfRkFMU0UpOworICAgIGlmIChlaW5hX3N0cmluZ3NoYXJlX3JlcGxhY2Uo JnByaXYtPnNldHRpbmdzLmNhY2hlX2RpcmVjdG9yeSwgcGF0aCkpCisgICAgICAgIFdlYkNvcmU6 OmNhY2hlU3RvcmFnZSgpLnNldENhY2hlRGlyZWN0b3J5KFdURjo6U3RyaW5nOjpmcm9tVVRGOChw YXRoKSk7CisgICAgcmV0dXJuIEVJTkFfVFJVRTsKK30KKwogaW50IGV3a192aWV3X3NldHRpbmdf Zm9udF9taW5pbXVtX3NpemVfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBvKQogewogICAgIEVXS19W SUVXX1NEX0dFVF9PUl9SRVRVUk4obywgc2QsIDApOwpJbmRleDogV2ViS2l0L2VmbC9ld2svZXdr X3ZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5oCShyZXZpc2lv biA2NjM3MSkKKysrIFdlYktpdC9lZmwvZXdrL2V3a192aWV3LmgJKHdvcmtpbmcgY29weSkKQEAg LTQwNCw2ICs0MDQsOCBAQCBFQVBJIEVpbmFfQm9vbCAgICBld2tfdmlld19zZXR0aW5nX3VzZXJf CiAKIEVBUEkgRWluYV9Cb29sICAgIGV3a192aWV3X3NldHRpbmdfcHJpdmF0ZV9icm93c2luZ19n ZXQoY29uc3QgRXZhc19PYmplY3QgKm8pOwogRUFQSSBFaW5hX0Jvb2wgICAgZXdrX3ZpZXdfc2V0 dGluZ19wcml2YXRlX2Jyb3dzaW5nX3NldChFdmFzX09iamVjdCAqbywgRWluYV9Cb29sIGVuYWJs ZSk7CitFQVBJIEVpbmFfQm9vbCAgICBld2tfdmlld19zZXR0aW5nX29mZmxpbmVfYXBwX2NhY2hl X2dldChjb25zdCBFdmFzX09iamVjdCAqbyk7CitFQVBJIEVpbmFfQm9vbCAgICBld2tfdmlld19z ZXR0aW5nX29mZmxpbmVfYXBwX2NhY2hlX3NldChFdmFzX09iamVjdCAqbywgRWluYV9Cb29sIGVu YWJsZSk7CiAKIEVBUEkgRWluYV9Cb29sICAgIGV3a192aWV3X3NldHRpbmdfY2FyZXRfYnJvd3Np bmdfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0ICpvKTsKIEVBUEkgRWluYV9Cb29sICAgIGV3a192aWV3 X3NldHRpbmdfY2FyZXRfYnJvd3Npbmdfc2V0KEV2YXNfT2JqZWN0ICpvLCBFaW5hX0Jvb2wgZW5h YmxlKTsKQEAgLTQxMiw2ICs0MTQsOCBAQCBFQVBJIGNvbnN0IGNoYXIgICpld2tfdmlld19zZXR0 aW5nX2VuY29kCiBFQVBJIEVpbmFfQm9vbCAgICBld2tfdmlld19zZXR0aW5nX2VuY29kaW5nX2N1 c3RvbV9zZXQoRXZhc19PYmplY3QgKm8sIGNvbnN0IGNoYXIgKmVuY29kaW5nKTsKIEVBUEkgY29u c3QgY2hhciAgKmV3a192aWV3X3NldHRpbmdfZW5jb2RpbmdfZGVmYXVsdF9nZXQoY29uc3QgRXZh c19PYmplY3QgKm8pOwogRUFQSSBFaW5hX0Jvb2wgICAgZXdrX3ZpZXdfc2V0dGluZ19lbmNvZGlu Z19kZWZhdWx0X3NldChFdmFzX09iamVjdCAqbywgY29uc3QgY2hhciAqZW5jb2RpbmcpOworRUFQ SSBjb25zdCBjaGFyICAqZXdrX3ZpZXdfc2V0dGluZ19jYWNoZV9kaXJlY3RvcnlfZ2V0KGNvbnN0 IEV2YXNfT2JqZWN0ICpvKTsKK0VBUEkgRWluYV9Cb29sICAgIGV3a192aWV3X3NldHRpbmdfY2Fj aGVfZGlyZWN0b3J5X3NldChFdmFzX09iamVjdCAqbywgY29uc3QgY2hhciAqcGF0aCk7CiAKIEVB UEkgaW50ICAgICAgICAgIGV3a192aWV3X3NldHRpbmdfZm9udF9taW5pbXVtX3NpemVfZ2V0KGNv bnN0IEV2YXNfT2JqZWN0ICpvKTsKIEVBUEkgRWluYV9Cb29sICAgIGV3a192aWV3X3NldHRpbmdf Zm9udF9taW5pbXVtX3NpemVfc2V0KEV2YXNfT2JqZWN0ICpvLCBpbnQgc2l6ZSk7Cg==