69249 2011-10-03 04:08:19 -0700 [GTK][WEBKIT2] Add webkit_web_view_load_html and webkit_web_view_load_plain_text APIs 2011-11-03 05:53:10 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 68074 1 nayankk webkit-unassigned cgarcia gustavo.noronha gustavo mrobinson webkit.review.bot xan.lopez oldest_to_newest 476880 0 nayankk 2011-10-03 04:08:19 -0700 Add webkit_web_view_load_html_string and webkit_web_view_load_plain_text WebKit2-GTK+ API's. 476882 1 109466 nayankk 2011-10-03 04:15:28 -0700 Created attachment 109466 Add webkit_web_view_load_html_string and webkit_web_view_load_plain_text APIs. 476884 2 webkit.review.bot 2011-10-03 04:17:08 -0700 Attachment 109466 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h:92: Extra space before ( in function call [whitespace/parens] [4] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h:92: The parameter name "web_view" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h:97: Extra space before ( in function call [whitespace/parens] [4] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h:97: The parameter name "web_view" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:233: webkit_web_view_load_html_string is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:249: webkit_web_view_load_plain_text is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 6 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 476886 3 109466 gustavo.noronha 2011-10-03 04:22:09 -0700 Comment on attachment 109466 Add webkit_web_view_load_html_string and webkit_web_view_load_plain_text APIs. Attachment 109466 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/9926004 476897 4 109466 cgarcia 2011-10-03 04:44:03 -0700 Comment on attachment 109466 Add webkit_web_view_load_html_string and webkit_web_view_load_plain_text APIs. View in context: https://bugs.webkit.org/attachment.cgi?id=109466&action=review > Source/WebKit2/GNUmakefile.am:1087 > - Programs/unittests/webkit2/testloading > + Programs/unittests/webkit2/testloading \ > + Programs/unittests/webkit2/testhtmlstringloading \ > + Programs/unittests/webkit2/testplaintextloading I don't think we need new tests, just add two new test cases to the existing testloading. > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:277 > + g_return_if_fail(baseUri); The documentation says NULL is allowed for baseUri, about:blank is used. > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:280 > + WKPageLoadHTMLString(toAPI(page), WKStringCreateWithUTF8CString(content), WKURLCreateWithUTF8CString(baseUri)); You are leaking the WKURL and WKString, see bug https://bugs.webkit.org/show_bug.cgi?id=69247 > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:296 > + WKPageLoadPlainTextString(toAPI(page), WKStringCreateWithUTF8CString(plainText)); And here the WKString 476918 5 109473 nayankk 2011-10-03 05:38:54 -0700 Created attachment 109473 Load HTML String and Plain text API Incorporated review comments. 476919 6 webkit.review.bot 2011-10-03 05:40:51 -0700 Attachment 109473 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h:92: Extra space before ( in function call [whitespace/parens] [4] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h:92: The parameter name "web_view" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h:97: Extra space before ( in function call [whitespace/parens] [4] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h:97: The parameter name "web_view" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:233: webkit_web_view_load_html_string is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:252: webkit_web_view_load_plain_text is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 6 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 476926 7 109473 cgarcia 2011-10-03 05:56:27 -0700 Comment on attachment 109473 Load HTML String and Plain text API View in context: https://bugs.webkit.org/attachment.cgi?id=109473&action=review > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:277 > +void webkit_web_view_load_html_string(WebKitWebView* webView, const gchar* content, const gchar* baseUri) > +{ > + g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView)); > + baseUri can be NULL, but you should check content is not NULL. I didn't notice it was missing in previous patch, sorry. > Source/WebKit2/UIProcess/API/gtk/tests/testloading.c:232 > +typedef struct { > + WebKitWebView *webView; > + GMainLoop *loop; > + gboolean hasBeenFinished; > +} HtmlStringLoadingFixture; You can use the same Fixture for new tests. > Source/WebKit2/UIProcess/API/gtk/tests/testloading.c:234 > +static void htmlStringLoadingNotifyTitleCb(WebKitWebView* webView, GParamSpec* pSpec, HtmlStringLoadingFixture* fixture) Tests are C, not C++, so it should be WebKitWebView *webView, GParamSpec *pSpec, HtmlStringLoadingFixture *fixture) > Source/WebKit2/UIProcess/API/gtk/tests/testloading.c:238 > + const gchar* title = webkit_web_view_get_title(webView); * is missplaced here too. > Source/WebKit2/UIProcess/API/gtk/tests/testloading.c:278 > + g_signal_connect(client, "load-failed", G_CALLBACK(htmlStringLoadStatusLoadFailed), fixture); You should check provisional-load-failed too. 477001 8 109473 nayankk 2011-10-03 08:52:37 -0700 Comment on attachment 109473 Load HTML String and Plain text API View in context: https://bugs.webkit.org/attachment.cgi?id=109473&action=review >> Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:277 >> + > > baseUri can be NULL, but you should check content is not NULL. I didn't notice it was missing in previous patch, sorry. Done. Thank you for pointing it out. >> Source/WebKit2/UIProcess/API/gtk/tests/testloading.c:234 >> +static void htmlStringLoadingNotifyTitleCb(WebKitWebView* webView, GParamSpec* pSpec, HtmlStringLoadingFixture* fixture) > > Tests are C, not C++, so it should be WebKitWebView *webView, GParamSpec *pSpec, HtmlStringLoadingFixture *fixture) Done. >> Source/WebKit2/UIProcess/API/gtk/tests/testloading.c:238 >> + const gchar* title = webkit_web_view_get_title(webView); > > * is missplaced here too. Done. >> Source/WebKit2/UIProcess/API/gtk/tests/testloading.c:278 >> + g_signal_connect(client, "load-failed", G_CALLBACK(htmlStringLoadStatusLoadFailed), fixture); > > You should check provisional-load-failed too. Done. 477002 9 109490 nayankk 2011-10-03 08:53:13 -0700 Created attachment 109490 Add webkit_web_view_load_html_string and webkit_web_view_load_plain_text APIs. Incorporated review comments. 477003 10 webkit.review.bot 2011-10-03 08:55:10 -0700 Attachment 109490 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h:92: Extra space before ( in function call [whitespace/parens] [4] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h:92: The parameter name "web_view" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h:97: Extra space before ( in function call [whitespace/parens] [4] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h:97: The parameter name "web_view" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:233: webkit_web_view_load_html_string is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:253: webkit_web_view_load_plain_text is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 6 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 477191 11 109490 mrobinson 2011-10-03 13:27:58 -0700 Comment on attachment 109490 Add webkit_web_view_load_html_string and webkit_web_view_load_plain_text APIs. View in context: https://bugs.webkit.org/attachment.cgi?id=109490&action=review > Source/WebKit2/ChangeLog:4 > + Add webkit_web_view_load_html_string and > + webkit_web_view_load_plain_text APIs. This should be the bug title exactly and one line. Are you using prepare-ChangeLog to generate your changelogs? > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:267 > + * @content: HTML string to be loaded Should be "the HTML string to load" to avoid the passive voice in this case. > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:268 > + * @base_uri: the base URI for relative locations. If %NULL, defaults to about:blank Doesn't this need to match the parameter name here or in the header? We really need to get the gtkdoc rules going so that we can verify that new documentation does not produce warnings / broken documentation. > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:272 > + * Requests loading of the given @content with the specified @base_uri. > + * The @base_uri represents the @content that is loaded through this API. > + * As such, it is used to resolve any relative URLs. I think this can be more active. Suggestion: Load the given @content string with the specified @base_uri. Relative URLs in the @content will be resolved against @base_uri. > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:290 > + * @plain_text: Text to be displayed You use plan_text here, but not html or html_string above. I suggest making the parameter names consistent. > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:292 > + * Loads the specified text into @web_view. You should probably talk a little bit more about why this is different than webkit_web_view_load_html_string. Namely the mime type of the document is different. > Source/WebKit2/UIProcess/API/gtk/tests/testloading.c:30 > +#define PLAIN_TEXT "Welcome to WebKit GTK+!" Please make this a static const char* and in the local scope of where you use it. > Source/WebKit2/UIProcess/API/gtk/tests/testloading.c:262 > + g_signal_connect(client, "load-finished", G_CALLBACK(htmlStringLoadStatusLoadFinished), fixture); > + g_signal_connect(client, "load-failed", G_CALLBACK(loadStatusLoadFailed), fixture); > + g_signal_connect(client, "provisional-load-failed", G_CALLBACK(loadStatusProvisionalLoadFailed), fixture); > + Instead of doing the same thing that the other loader tests does, it would be better to simply connect to load-finished and assert the contents are what you expect. > Source/WebKit2/UIProcess/API/gtk/tests/testloading.c:294 > + g_signal_connect(client, "load-finished", G_CALLBACK(plainTextLoadStatusLoadFinished), fixture); > + g_signal_connect(client, "load-failed", G_CALLBACK(loadStatusLoadFailed), fixture); > + g_signal_connect(client, "provisional-load-failed", G_CALLBACK(loadStatusProvisionalLoadFailed), fixture); > + Ditto. 477546 12 109490 nayankk 2011-10-04 05:14:02 -0700 Comment on attachment 109490 Add webkit_web_view_load_html_string and webkit_web_view_load_plain_text APIs. View in context: https://bugs.webkit.org/attachment.cgi?id=109490&action=review >> Source/WebKit2/ChangeLog:4 >> + webkit_web_view_load_plain_text APIs. > > This should be the bug title exactly and one line. Are you using prepare-ChangeLog to generate your changelogs? Done. Since the bus title is big, I thought of wrapping it to next line. Sorry about that. >> Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:267 >> + * @content: HTML string to be loaded > > Should be "the HTML string to load" to avoid the passive voice in this case. Done. >> Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:268 >> + * @base_uri: the base URI for relative locations. If %NULL, defaults to about:blank > > Doesn't this need to match the parameter name here or in the header? We really need to get the gtkdoc rules going so that we can verify that new documentation does not produce warnings / broken documentation. Submitted the gtk-doc generation patch at https://bugs.webkit.org/show_bug.cgi?id=69325. gtk-doc matches the parameter name with the one mentioned in header file. >> Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:272 >> + * As such, it is used to resolve any relative URLs. > > I think this can be more active. Suggestion: > > Load the given @content string with the specified @base_uri. Relative URLs in the @content will be resolved against @base_uri. Done. >> Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:290 >> + * @plain_text: Text to be displayed > > You use plan_text here, but not html or html_string above. I suggest making the parameter names consistent. Done. Changed the above variable to html_string. It was done to maintain the consistency between WebKit1 and WebKit2 GTK API. >> Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:292 >> + * Loads the specified text into @web_view. > > You should probably talk a little bit more about why this is different than webkit_web_view_load_html_string. Namely the mime type of the document is different. Done. >> Source/WebKit2/UIProcess/API/gtk/tests/testloading.c:30 >> +#define PLAIN_TEXT "Welcome to WebKit GTK+!" > > Please make this a static const char* and in the local scope of where you use it. Done. >> Source/WebKit2/UIProcess/API/gtk/tests/testloading.c:262 >> + > > Instead of doing the same thing that the other loader tests does, it would be better to simply connect to load-finished and assert the contents are what you expect. Removed connecting to 'load-failed' and 'provisional-load-failed'. Idea of this test was to verify whether document we requested to load is actually loaded, without any errors. We can not assert on the contents what we expect, as there is no way to know the actual content we receive. For load_html_string string test, we can at least assert on what title we had asked to load, and same is implemented in htmlStringLoadingNotifyTitleCb. >> Source/WebKit2/UIProcess/API/gtk/tests/testloading.c:294 >> + > > Ditto. Removed connecting to 'load-failed' and 'provisional-load-failed' signals. Now this test basically just checks whether plain text we asked to load gets loaded successfully. As explained earlier, we can not have the logic of asserting on content we expect, as there is no way to know the content we receive yet. 477547 13 109608 nayankk 2011-10-04 05:14:32 -0700 Created attachment 109608 Add webkit_web_view_load_html_string and webkit_web_view_load_plain_text APIs. 477548 14 webkit.review.bot 2011-10-04 05:17:00 -0700 Attachment 109608 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h:92: Extra space before ( in function call [whitespace/parens] [4] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h:92: The parameter name "web_view" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h:97: Extra space before ( in function call [whitespace/parens] [4] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h:97: The parameter name "web_view" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:235: webkit_web_view_load_html_string is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:256: webkit_web_view_load_plain_text is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 6 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 477549 15 109608 gustavo 2011-10-04 05:17:05 -0700 Comment on attachment 109608 Add webkit_web_view_load_html_string and webkit_web_view_load_plain_text APIs. Attachment 109608 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/9930767 478046 16 109608 mrobinson 2011-10-04 16:15:19 -0700 Comment on attachment 109608 Add webkit_web_view_load_html_string and webkit_web_view_load_plain_text APIs. View in context: https://bugs.webkit.org/attachment.cgi?id=109608&action=review Looking good, but have some nits. > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:274 > + * Mime type of @html_string is assumed to be "text/html". Perhaps "The mime type of the document will be "text/html"." > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:276 > +void webkit_web_view_load_html_string(WebKitWebView* webView, const gchar* htmlString, const gchar* baseUri) I agree with Carlos that this should be called webkit_web_view_load_html. > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:286 > + WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView)); > + WKStringRef htmlStringRef = WKStringCreateWithUTF8CString(htmlString); > + WKURLRef baseUriRef = WKURLCreateWithUTF8CString(baseUri); > + WKPageLoadHTMLString(toAPI(page), htmlStringRef, baseUriRef); > + WKRelease(htmlStringRef); > + WKRelease(baseUriRef); Is there no smart pointer for WK types? If there is we need to use it. > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:292 > + * @plain_text: The plain text to load A plain text string to load? > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:295 > + * Load the specified plain text into @web_view. Plain text is assumed to > + * have the mime-type "text/plain". Same style of sentence for the mime type here. Please use "mime type" everywhere and not "mime-type" in some places. > Source/WebKit2/UIProcess/API/gtk/tests/testloading.c:28 > +#define HTML_TITLE "Hello WebKit GTK+!" I don't think you need to test the title when loading a string. > Source/WebKit2/UIProcess/API/gtk/tests/testloading.c:249 > +static void htmlStringLoadingNotifyTitleCb(WebKitWebView *webView, GParamSpec *pSpec, WebLoadingFixture *fixture) > +{ > + g_assert(!fixture->hasBeenFinished); > + > + const gchar *title = webkit_web_view_get_title(webView); > + g_assert_cmpstr(title, ==, HTML_TITLE); > +} > + > +static void htmlStringLoadingFixtureSetup(WebLoadingFixture *fixture, gconstpointer data) > +{ > + fixture->webView = WEBKIT_WEB_VIEW(webkit_web_view_new()); > + fixture->loop = g_main_loop_new(NULL, TRUE); > + g_object_ref_sink(fixture->webView); > + fixture->hasBeenFinished = FALSE; > + g_signal_connect(fixture->webView, "notify::title", G_CALLBACK(htmlStringLoadingNotifyTitleCb), fixture); > +} > + > +static gboolean htmlStringLoadStatusLoadFinished(WebKitWebLoaderClient *client, WebLoadingFixture *fixture) > +{ > + g_assert(!fixture->hasBeenFinished); > + fixture->hasBeenFinished = TRUE; > + > + g_main_loop_quit(fixture->loop); I guess it's okay to structure the test like this for now, but when we add an API to get the WebView contents, we should restructure this test to simply load the page and assert that the contents are equal. These tests should be in the webkittests file since they are unit tests for the WebView. 478177 17 cgarcia 2011-10-04 23:28:29 -0700 (In reply to comment #16) > > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:286 > > + WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView)); > > + WKStringRef htmlStringRef = WKStringCreateWithUTF8CString(htmlString); > > + WKURLRef baseUriRef = WKURLCreateWithUTF8CString(baseUri); > > + WKPageLoadHTMLString(toAPI(page), htmlStringRef, baseUriRef); > > + WKRelease(htmlStringRef); > > + WKRelease(baseUriRef); > > Is there no smart pointer for WK types? If there is we need to use it. Yes, there's WKRetainPtr, I realized yesterday, I'm already using it in the bf list patch: https://bugs.webkit.org/show_bug.cgi?id=69343 > > Source/WebKit2/UIProcess/API/gtk/tests/testloading.c:249 > > +static void htmlStringLoadingNotifyTitleCb(WebKitWebView *webView, GParamSpec *pSpec, WebLoadingFixture *fixture) > > +{ > > + g_assert(!fixture->hasBeenFinished); > > + > > + const gchar *title = webkit_web_view_get_title(webView); > > + g_assert_cmpstr(title, ==, HTML_TITLE); > > +} > > + > > +static void htmlStringLoadingFixtureSetup(WebLoadingFixture *fixture, gconstpointer data) > > +{ > > + fixture->webView = WEBKIT_WEB_VIEW(webkit_web_view_new()); > > + fixture->loop = g_main_loop_new(NULL, TRUE); > > + g_object_ref_sink(fixture->webView); > > + fixture->hasBeenFinished = FALSE; > > + g_signal_connect(fixture->webView, "notify::title", G_CALLBACK(htmlStringLoadingNotifyTitleCb), fixture); > > +} > > + > > +static gboolean htmlStringLoadStatusLoadFinished(WebKitWebLoaderClient *client, WebLoadingFixture *fixture) > > +{ > > + g_assert(!fixture->hasBeenFinished); > > + fixture->hasBeenFinished = TRUE; > > + > > + g_main_loop_quit(fixture->loop); > > I guess it's okay to structure the test like this for now, but when we add an API to get the WebView contents, we should restructure this test to simply load the page and assert that the contents are equal. These tests should be in the webkittests file since they are unit tests for the WebView. No, we don't need a new fiture for every test, we can just use the loading one, see the load_alternate_html() patch: https://bugs.webkit.org/show_bug.cgi?id=69254 479047 18 109608 nayankk 2011-10-06 03:47:41 -0700 Comment on attachment 109608 Add webkit_web_view_load_html_string and webkit_web_view_load_plain_text APIs. View in context: https://bugs.webkit.org/attachment.cgi?id=109608&action=review >> Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:274 >> + * Mime type of @html_string is assumed to be "text/html". > > Perhaps "The mime type of the document will be "text/html"." Done. >> Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:276 >> +void webkit_web_view_load_html_string(WebKitWebView* webView, const gchar* htmlString, const gchar* baseUri) > > I agree with Carlos that this should be called webkit_web_view_load_html. Sure. I will rename this function name. >> Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:286 >> + WKRelease(baseUriRef); > > Is there no smart pointer for WK types? If there is we need to use it. There is WKRetainPtr, as mentioned by Carlos. I will use it here. >> Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:295 >> + * have the mime-type "text/plain". > > Same style of sentence for the mime type here. Please use "mime type" everywhere and not "mime-type" in some places. Ok. >> Source/WebKit2/UIProcess/API/gtk/tests/testloading.c:28 >> +#define HTML_TITLE "Hello WebKit GTK+!" > > I don't think you need to test the title when loading a string. As we don't have the API to get the loaded content, I thought of asserting on expected text for now. But as you said, for now I will keep this test very simple, just asserting if load is not finished. Once we have the API to get content loaded, I will modify this test, >> Source/WebKit2/UIProcess/API/gtk/tests/testloading.c:249 >> + g_main_loop_quit(fixture->loop); > > I guess it's okay to structure the test like this for now, but when we add an API to get the WebView contents, we should restructure this test to simply load the page and assert that the contents are equal. These tests should be in the webkittests file since they are unit tests for the WebView. Sorry, I didn't quite understand what you meant by webkittests file? Should I move this test to testwebview.c file? 479164 19 109962 nayankk 2011-10-06 08:19:01 -0700 Created attachment 109962 Load HTML String and Plain text API Updated the patch as per review comments. Please note that tests included in this patch are same as 'webkit_web_view_load_alternate_html'. Since there aren't any more _load API's, I think its OK to leave the tests the way it is. 479165 20 109962 webkit.review.bot 2011-10-06 08:19:13 -0700 Comment on attachment 109962 Load HTML String and Plain text API Rejecting attachment 109962 from commit-queue. nayankk@motorola.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 479166 21 webkit.review.bot 2011-10-06 08:20:56 -0700 Attachment 109962 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h:92: Extra space before ( in function call [whitespace/parens] [4] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h:92: The parameter name "web_view" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h:97: Extra space before ( in function call [whitespace/parens] [4] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h:97: The parameter name "web_view" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:263: webkit_web_view_load_html is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:282: webkit_web_view_load_plain_text is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 6 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 479901 22 109962 cgarcia 2011-10-07 02:47:21 -0700 Comment on attachment 109962 Load HTML String and Plain text API View in context: https://bugs.webkit.org/attachment.cgi?id=109962&action=review > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:256 > + * @html: The HTML string to load Use content instead of html for consistency with webkit_web_view_load_alternate_html. > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:262 > + * The mime type of the document will be "text/html". > + */ Please add: * You can monitor the status of the load operation using the * #WebKitWebLoaderClient of @web_view. See webkit_web_view_get_loader_client(). > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:264 > +void webkit_web_view_load_html(WebKitWebView* webView, const gchar* html, const gchar* baseUri) > +{ Use baseURI instead of baseUri. > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:281 > + * Load the specified plain text string into @web_view. The mime type of > + * document will be "text/plain". > + */ Please add: * You can monitor the status of the load operation using the * #WebKitWebLoaderClient of @web_view. See webkit_web_view_get_loader_client(). 479910 23 110117 nayankk 2011-10-07 03:10:13 -0700 Created attachment 110117 Load HTML String and Plain text API 486835 24 110117 cgarcia 2011-10-19 09:10:35 -0700 Comment on attachment 110117 Load HTML String and Plain text API View in context: https://bugs.webkit.org/attachment.cgi?id=110117&action=review Patch looks good to me, I think you just need to update it to current git master and use the new unit tests stuff. Look at how load_alternate_content is tested in TestWebKitWebLoaderClient.cpp and add somethihng similar for html and plain_text. Thanks! > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:257 > + * @base_uri: the base URI for relative locations. If %NULL, defaults to about:blank. add an introspection tag to indicate that base_uri can be null: @base_uri: (allo-none): the base URI for relative locations or %NULL. and move the comment that when null it defaults to about:blank below to the main doc body. 487466 25 111751 nayankk 2011-10-20 04:08:12 -0700 Created attachment 111751 Add webkit_web_view_load_html and webkit_web_view_load_plain_text API's. 487478 26 111751 cgarcia 2011-10-20 04:29:25 -0700 Comment on attachment 111751 Add webkit_web_view_load_html and webkit_web_view_load_plain_text API's. View in context: https://bugs.webkit.org/attachment.cgi?id=111751&action=review Patch looks good to me. > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:268 > + * When @base_uri is NULL, it defaults to "about:blank". The mime type Use %NULL here too. > Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp:76 > + webkit_web_view_load_plain_text(test->m_webView, > + "Hello WebKit-GTK+"); I think this could be better as a single line 487556 27 111770 nayankk 2011-10-20 07:42:34 -0700 Created attachment 111770 Load HTML String and Plain text API 488233 28 111770 mrobinson 2011-10-21 00:08:12 -0700 Comment on attachment 111770 Load HTML String and Plain text API View in context: https://bugs.webkit.org/attachment.cgi?id=111770&action=review > Source/WebKit2/ChangeLog:8 > + This patch adds support for 2 more load api's, namely Nit: api's -> APIs > Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp:72 > +static void testLoadHtml(LoadTrackingTest* test, gconstpointer) > +{ > + webkit_web_view_load_html(test->m_webView, "<html><body>Hello WebKit-GTK+</body></html>", 0); > + test->waitUntilLoadFinished(); > + assertNormalLoadHappenedAndClearEvents(test->m_loadEvents); > +} > + > +static void testPlainText(LoadTrackingTest* test, gconstpointer) These tests should be in TestWebKitWebView. The other WebKitWebView tests should be moving there shortly as well. 492950 29 112972 nayankk 2011-10-29 12:01:05 -0700 Created attachment 112972 New API addition. 492951 30 webkit.review.bot 2011-10-29 12:04:18 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 494610 31 112972 cgarcia 2011-11-02 07:23:23 -0700 Comment on attachment 112972 New API addition. Patch looks good to me, the only thing missing is adding new symbols to UIProcess/API/gtk/docs/webkit2gtk-sections.txt, see http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 494702 32 112972 mrobinson 2011-11-02 10:25:22 -0700 Comment on attachment 112972 New API addition. This looks fine to me, but it's missing the sections of the gtkdoc, as Carlos said. 495328 33 113455 nayankk 2011-11-03 04:00:21 -0700 Created attachment 113455 New API addition. 495330 34 113456 nayankk 2011-11-03 04:06:53 -0700 Created attachment 113456 New API addition. Few changes made in this patch, a). Re-based the patch to latest trunk. b). Restructured the unit tests as per the current design. Please note that TestWebKitWebLoaderClient.cpp file (under WebKitWebView suite name), to be consistent with rest of the similar tests (e.g. testAlternateContent). c). Added new API's in 'webkit2gtk-sections.txt' file. 495341 35 113456 cgarcia 2011-11-03 04:27:46 -0700 Comment on attachment 113456 New API addition. LGTM 495351 36 113456 pnormand 2011-11-03 04:46:00 -0700 Comment on attachment 113456 New API addition. Ok, let's do this! Thanks for the patch Nayan. 495390 37 113456 webkit.review.bot 2011-11-03 05:53:02 -0700 Comment on attachment 113456 New API addition. Clearing flags on attachment: 113456 Committed r99176: <http://trac.webkit.org/changeset/99176> 495391 38 webkit.review.bot 2011-11-03 05:53:10 -0700 All reviewed patches have been landed. Closing bug. 109466 2011-10-03 04:15:28 -0700 2011-10-03 05:38:54 -0700 Add webkit_web_view_load_html_string and webkit_web_view_load_plain_text APIs. AddLoadAPIs.diff text/plain 13559 nayankk ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA1ODhjYmNiLi5jN2IyODg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzQg QEAKIDIwMTEtMTAtMDMgIE5heWFuIEt1bWFyIEsgIDxuYXlhbmtrQG1vdG9yb2xhLmNvbT4KIAor ICAgICAgICBBZGQgd2Via2l0X3dlYl92aWV3X2xvYWRfaHRtbF9zdHJpbmcgYW5kCisgICAgICAg IHdlYmtpdF93ZWJfdmlld19sb2FkX3BsYWluX3RleHQgQVBJcy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5MjQ5CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBHTlVtYWtlZmlsZS5hbToKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcDoKKyAgICAgICAgKHdlYmtpdF93 ZWJfdmlld19sb2FkX2h0bWxfc3RyaW5nKTogQVBJIHRvIGxvYWQgaHRtbCBzdHJpbmcuCisgICAg ICAgICh3ZWJraXRfd2ViX3ZpZXdfbG9hZF9wbGFpbl90ZXh0KTogQVBJIHRvIGxvYWQgcGxhaW4g dGV4dC4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3Lmg6IEFkZGVk IHB1YmxpYyBBUElzLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL3Rlc3RodG1s c3RyaW5nbG9hZGluZy5jOiBBZGRlZC4KKyAgICAgICAgKG5vdGlmeVRpdGxlQ2IpOiBOb3RpZnkg J3RpdGxlJyBjaGFuZ2UuCisgICAgICAgIChodG1sU3RyaW5nTG9hZGluZ0ZpeHR1cmVTZXR1cCk6 IFRlc3QgZml4dHVyZSBzZXR1cC4KKyAgICAgICAgKGh0bWxTdHJpbmdMb2FkaW5nRml4dHVyZVRl YXJkb3duKTogVGVzdCBmaXh0dXJlIHRlYXJkb3duLgorICAgICAgICAobG9hZFN0YXR1c0xvYWRG aW5pc2hlZCk6IENhbGxiYWNrIHdoaWNoIGdldHMgdHJpZ2VycmVkIHVwb24gbG9hZCBmaXNpc2gu CisgICAgICAgIChsb2FkU3RhdHVzTG9hZEZhaWxlZCk6IENhbGxiYWNrIHdoaWNoIGdldHMgdHJp Z2VycmVkIHVwb24gbG9hZCBmYWlsLgorICAgICAgICAodGVzdEh0bWxTdHJpbmdMb2FkaW5nU3Rh dHVzKTogVGVzdCB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9odG1sX3N0cmluZyBBUEkuCisgICAgICAg IChtYWluKTogQWRkIEhUTUwgc3RyaW5nIGxvYWQgdGVzdC4KKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL2d0ay90ZXN0cy90ZXN0cGxhaW50ZXh0bG9hZGluZy5jOiBBZGRlZC4KKyAgICAgICAgKHBs YWluVGV4dExvYWRpbmdGaXh0dXJlU2V0dXApOiBUZXN0IGZpeHR1cmUgc2V0dXAuCisgICAgICAg IChwbGFpblRleHRMb2FkaW5nRml4dHVyZVRlYXJkb3duKTogVGVzdCBmaXh0dXJlIHRlYXJkb3du LgorICAgICAgICAobG9hZFN0YXR1c0xvYWRGaW5pc2hlZCk6IENhbGxiYWNrIHdoaWNoIGdldHMg dHJpZ2VycmVkIHVwb24gbG9hZCBmaXNpc2guCisgICAgICAgIChsb2FkU3RhdHVzTG9hZEZhaWxl ZCk6IENhbGxiYWNrIHdoaWNoIGdldHMgdHJpZ2VycmVkIHVwb24gbG9hZCBmYWlsLgorICAgICAg ICAodGVzdFBsYWluVGV4dExvYWRpbmdTdGF0dXMpOiBUZXN0IHdlYmtpdF93ZWJfdmlld19sb2Fk X3BsYWluX3RleHQgQVBJLgorICAgICAgICAobWFpbik6IEFkZCBwbGFpbiB0ZXh0IGxvYWQgdGVz dC4KKworMjAxMS0xMC0wMyAgTmF5YW4gS3VtYXIgSyAgPG5heWFua2tAbW90b3JvbGEuY29tPgor CiAgICAgICAgIFtHVEtdW1dFQktJVDJdIEFkZCBzdXBwb3J0IGZvciB0aXRsZSBwcm9wZXJ0eSBp biBXZWJLaXRXZWJWaWV3CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD02ODA3NAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9HTlVtYWtlZmlsZS5h bSBiL1NvdXJjZS9XZWJLaXQyL0dOVW1ha2VmaWxlLmFtCmluZGV4IGMxMWE2ZTEuLmYwNDQ4NjQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0dOVW1ha2VmaWxlLmFtCisrKyBiL1NvdXJjZS9X ZWJLaXQyL0dOVW1ha2VmaWxlLmFtCkBAIC0xMDgyLDcgKzEwODIsOSBAQCBESVNUQ0xFQU5GSUxF UyArPSBcCiBURVNUX1BST0dTICs9IFwKIAlQcm9ncmFtcy91bml0dGVzdHMvd2Via2l0Mi90ZXN0 d2ViY29udGV4dCBcCiAJUHJvZ3JhbXMvdW5pdHRlc3RzL3dlYmtpdDIvdGVzdHdlYnZpZXcgXAot CVByb2dyYW1zL3VuaXR0ZXN0cy93ZWJraXQyL3Rlc3Rsb2FkaW5nCisJUHJvZ3JhbXMvdW5pdHRl c3RzL3dlYmtpdDIvdGVzdGxvYWRpbmcgXAorCVByb2dyYW1zL3VuaXR0ZXN0cy93ZWJraXQyL3Rl c3RodG1sc3RyaW5nbG9hZGluZyBcCisJUHJvZ3JhbXMvdW5pdHRlc3RzL3dlYmtpdDIvdGVzdHBs YWludGV4dGxvYWRpbmcKIAogbm9pbnN0X1BST0dSQU1TICs9ICQoVEVTVF9QUk9HUykKIHdlYmtp dDJfdGVzdHNfY2ZsYWdzID0gXApAQCAtMTEyNSw2ICsxMTI3LDE2IEBAIFByb2dyYW1zX3VuaXR0 ZXN0c193ZWJraXQyX3Rlc3Rsb2FkaW5nX0NGTEFHUyA9ICQod2Via2l0Ml90ZXN0c19jZmxhZ3Mp CiBQcm9ncmFtc191bml0dGVzdHNfd2Via2l0Ml90ZXN0bG9hZGluZ19MREFERCA9ICQod2Via2l0 Ml90ZXN0c19sZGFkZCkKIFByb2dyYW1zX3VuaXR0ZXN0c193ZWJraXQyX3Rlc3Rsb2FkaW5nX0xE RkxBR1MgPSAkKHdlYmtpdDJfdGVzdHNfbGRmbGFncykKIAorUHJvZ3JhbXNfdW5pdHRlc3RzX3dl YmtpdDJfdGVzdGh0bWxzdHJpbmdsb2FkaW5nX1NPVVJDRVMgPSBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay90ZXN0cy90ZXN0aHRtbHN0cmluZ2xvYWRpbmcuYworUHJvZ3JhbXNfdW5p dHRlc3RzX3dlYmtpdDJfdGVzdGh0bWxzdHJpbmdsb2FkaW5nX0NGTEFHUyA9ICQod2Via2l0Ml90 ZXN0c19jZmxhZ3MpCitQcm9ncmFtc191bml0dGVzdHNfd2Via2l0Ml90ZXN0aHRtbHN0cmluZ2xv YWRpbmdfTERBREQgPSAkKHdlYmtpdDJfdGVzdHNfbGRhZGQpCitQcm9ncmFtc191bml0dGVzdHNf d2Via2l0Ml90ZXN0aHRtbHN0cmluZ2xvYWRpbmdfTERGTEFHUyA9ICQod2Via2l0Ml90ZXN0c19s ZGZsYWdzKQorCitQcm9ncmFtc191bml0dGVzdHNfd2Via2l0Ml90ZXN0cGxhaW50ZXh0bG9hZGlu Z19TT1VSQ0VTID0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvdGVzdHBs YWludGV4dGxvYWRpbmcuYworUHJvZ3JhbXNfdW5pdHRlc3RzX3dlYmtpdDJfdGVzdHBsYWludGV4 dGxvYWRpbmdfQ0ZMQUdTID0gJCh3ZWJraXQyX3Rlc3RzX2NmbGFncykKK1Byb2dyYW1zX3VuaXR0 ZXN0c193ZWJraXQyX3Rlc3RwbGFpbnRleHRsb2FkaW5nX0xEQUREID0gJCh3ZWJraXQyX3Rlc3Rz X2xkYWRkKQorUHJvZ3JhbXNfdW5pdHRlc3RzX3dlYmtpdDJfdGVzdHBsYWludGV4dGxvYWRpbmdf TERGTEFHUyA9ICQod2Via2l0Ml90ZXN0c19sZGZsYWdzKQorCiAjIFdlYktpdFdlYlByb2Nlc3MK IGxpYmV4ZWNfUFJPR1JBTVMgKz0gXAogCVByb2dyYW1zL1dlYktpdFdlYlByb2Nlc3MKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3Bw IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAKaW5k ZXggZjBlYTE5OS4uNGJmYWM4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAKQEAgLTI2Miw2ICsyNjIsNDEgQEAgdm9pZCB3ZWJr aXRfd2ViX3ZpZXdfbG9hZF91cmkoV2ViS2l0V2ViVmlldyogd2ViVmlldywgY29uc3QgZ2NoYXIq IHVyaSkKIH0KIAogLyoqCisgKiB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9odG1sX3N0cmluZzoKKyAq IEB3ZWJWaWV3OiBhICNXZWJLaXRXZWJWaWV3CisgKiBAY29udGVudDogSFRNTCBzdHJpbmcgdG8g YmUgbG9hZGVkCisgKiBAYmFzZV91cmk6IHRoZSBiYXNlIFVSSSBmb3IgcmVsYXRpdmUgbG9jYXRp b25zLiBJZiAlTlVMTCwgZGVmYXVsdHMgdG8gYWJvdXQ6YmxhbmsKKyAqCisgKiBSZXF1ZXN0cyBs b2FkaW5nIG9mIHRoZSBnaXZlbiBAY29udGVudCB3aXRoIHRoZSBzcGVjaWZpZWQgQGJhc2VfdXJp LiAKKyAqIFRoZSBAYmFzZV91cmkgcmVwcmVzZW50cyB0aGUgQGNvbnRlbnQgdGhhdCBpcyBsb2Fk ZWQgdGhyb3VnaCB0aGlzIEFQSS4KKyAqIEFzIHN1Y2gsIGl0IGlzIHVzZWQgdG8gcmVzb2x2ZSBh bnkgcmVsYXRpdmUgVVJMcy4KKyAqLwordm9pZCB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9odG1sX3N0 cmluZyhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBjb25zdCBnY2hhciogY29udGVudCwgY29uc3Qg Z2NoYXIqIGJhc2VVcmkpCit7CisgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJ RVcod2ViVmlldykpOworICAgIGdfcmV0dXJuX2lmX2ZhaWwoYmFzZVVyaSk7CisKKyAgICBXZWJQ YWdlUHJveHkqIHBhZ2UgPSB3ZWJraXRXZWJWaWV3QmFzZUdldFBhZ2UoV0VCS0lUX1dFQl9WSUVX X0JBU0Uod2ViVmlldykpOworICAgIFdLUGFnZUxvYWRIVE1MU3RyaW5nKHRvQVBJKHBhZ2UpLCBX S1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZyhjb250ZW50KSwgV0tVUkxDcmVhdGVXaXRoVVRG OENTdHJpbmcoYmFzZVVyaSkpOworfQorCisvKioKKyAqIHdlYmtpdF93ZWJfdmlld19sb2FkX3Bs YWluX3RleHQ6CisgKiBAd2ViVmlldzogYSAjV2ViS2l0V2ViVmlldworICogQHBsYWluX3RleHQ6 IFRleHQgdG8gYmUgZGlzcGxheWVkCisgKgorICogTG9hZHMgdGhlIHNwZWNpZmllZCB0ZXh0IGlu dG8gQHdlYl92aWV3LgorICovCit2b2lkIHdlYmtpdF93ZWJfdmlld19sb2FkX3BsYWluX3RleHQo V2ViS2l0V2ViVmlldyogd2ViVmlldywgY29uc3QgZ2NoYXIqIHBsYWluVGV4dCkKK3sKKyAgICBn X3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJWaWV3KSk7CisgICAgZ19yZXR1 cm5faWZfZmFpbChwbGFpblRleHQpOworCisgICAgV2ViUGFnZVByb3h5KiBwYWdlID0gd2Via2l0 V2ViVmlld0Jhc2VHZXRQYWdlKFdFQktJVF9XRUJfVklFV19CQVNFKHdlYlZpZXcpKTsKKyAgICBX S1BhZ2VMb2FkUGxhaW5UZXh0U3RyaW5nKHRvQVBJKHBhZ2UpLCBXS1N0cmluZ0NyZWF0ZVdpdGhV VEY4Q1N0cmluZyhwbGFpblRleHQpKTsKK30KKworLyoqCiAgKiB3ZWJraXRfd2ViX3ZpZXdfZ29f YmFjazoKICAqIEB3ZWJfdmlldzogYSAjV2ViS2l0V2ViVmlldwogICoKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuaCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuaAppbmRleCA2NTFhOWEyLi43 N2Q5MjAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJL aXRXZWJWaWV3LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 V2ViVmlldy5oCkBAIC05MCw2ICs5MCwxNSBAQCB3ZWJraXRfd2ViX3ZpZXdfbG9hZF91cmkgICAg ICAgICAgKFdlYktpdFdlYlZpZXcgICAgICAgICAqd2ViX3ZpZXcsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNvbnN0IGdjaGFyICAgICAgICAgICAqdXJpKTsKIAogV0tfRVhQ T1JUIHZvaWQKK3dlYmtpdF93ZWJfdmlld19sb2FkX2h0bWxfc3RyaW5nICAoV2ViS2l0V2ViVmll dyAgICAgICAgICp3ZWJfdmlldywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29uc3QgZ2NoYXIgICAgICAgICAgICpjb250ZW50LAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBjb25zdCBnY2hhciAgICAgICAgICAgKmJhc2VfdXJpKTsKKworV0tfRVhQT1JU IHZvaWQgCit3ZWJraXRfd2ViX3ZpZXdfbG9hZF9wbGFpbl90ZXh0ICAgKFdlYktpdFdlYlZpZXcg ICAgICAgICAqd2ViX3ZpZXcsIAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBj b25zdCBnY2hhciAgICAgICAgICAgKnBsYWluX3RleHQpOworCitXS19FWFBPUlQgdm9pZAogd2Vi a2l0X3dlYl92aWV3X2dvX2JhY2sgICAgICAgICAgIChXZWJLaXRXZWJWaWV3ICAgICAgICAgKndl Yl92aWV3KTsKIAogV0tfRVhQT1JUIHZvaWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL3Rlc3RodG1sc3RyaW5nbG9hZGluZy5jIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvdGVzdGh0bWxzdHJpbmdsb2FkaW5nLmMKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNDFmYTRkZQotLS0gL2Rldi9udWxsCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL3Rlc3RodG1sc3RyaW5n bG9hZGluZy5jCkBAIC0wLDAgKzEsMTAyIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDA5LCAy MDEwIEd1c3Rhdm8gTm9yb25oYSBTaWx2YQorICogQ29weXJpZ2h0IChDKSAyMDA5LCAyMDExIEln YWxpYSBTLkwuCisgKiBQb3J0aW9ucyBDb3B5cmlnaHQgKGMpIDIwMTAgTW90b3JvbGEgTW9iaWxp dHksIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogVGhpcyBsaWJyYXJ5IGlzIGZy ZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgorICogbW9kaWZ5IGl0 IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMKKyAqIExp Y2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb247IGVpdGhl cgorICogdmVyc2lvbiAyIG9mIHRoZSBMaWNlbnNlLCBvciAoYXQgeW91ciBvcHRpb24pIGFueSBs YXRlciB2ZXJzaW9uLgorICoKKyAqIFRoaXMgbGlicmFyeSBpcyBkaXN0cmlidXRlZCBpbiB0aGUg aG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAorICogYnV0IFdJVEhPVVQgQU5ZIFdBUlJBTlRZ OyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKKyAqIE1FUkNIQU5UQUJJTElU WSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUgR05VCisgKiBM aWJyYXJ5IEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4KKyAqCisgKiBZ b3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFs IFB1YmxpYyBMaWNlbnNlCisgKiBhbG9uZyB3aXRoIHRoaXMgbGlicmFyeTsgc2VlIHRoZSBmaWxl IENPUFlJTkcuTElCLiAgSWYgbm90LCB3cml0ZSB0bworICogdGhlIEZyZWUgU29mdHdhcmUgRm91 bmRhdGlvbiwgSW5jLiwgNTEgRnJhbmtsaW4gU3RyZWV0LCBGaWZ0aCBGbG9vciwKKyAqIEJvc3Rv biwgTUEgMDIxMTAtMTMwMSwgVVNBLgorICovCisKKyNpbmNsdWRlIDxndGsvZ3RrLmg+CisjaW5j bHVkZSA8c3RyaW5nLmg+CisjaW5jbHVkZSA8d2Via2l0Mi93ZWJraXQyLmg+CisKKyNkZWZpbmUg SFRNTF9USVRMRSAiSGVsbG8gV2ViS2l0IEdUSyshIgorI2RlZmluZSBIVE1MX1NUUklORyAiPGh0 bWw+PGhlYWQ+PHRpdGxlPiJIVE1MX1RJVExFIjwvdGl0bGU+PC9oZWFkPjxib2R5PldlbGNvbWUg dG8gdGhlIHdvcmxkIG9mIFdlYktpdC1HVEsrITwvYm9keT48L2h0bWw+IgorCit0eXBlZGVmIHN0 cnVjdCB7CisgICAgV2ViS2l0V2ViVmlldyAqd2ViVmlldzsKKyAgICBHTWFpbkxvb3AgKmxvb3A7 CisgICAgZ2Jvb2xlYW4gaGFzQmVlbkZpbmlzaGVkOworfSBIdG1sU3RyaW5nTG9hZGluZ0ZpeHR1 cmU7CisKK3N0YXRpYyB2b2lkIG5vdGlmeVRpdGxlQ2IoV2ViS2l0V2ViVmlldyogd2ViVmlldywg R1BhcmFtU3BlYyogcFNwZWMsIEh0bWxTdHJpbmdMb2FkaW5nRml4dHVyZSogZml4dHVyZSkKK3sK KyAgICBnX2Fzc2VydCghZml4dHVyZS0+aGFzQmVlbkZpbmlzaGVkKTsKKworICAgIGNvbnN0IGdj aGFyKiB0aXRsZSA9IHdlYmtpdF93ZWJfdmlld19nZXRfdGl0bGUod2ViVmlldyk7CisgICAgZ19h c3NlcnRfY21wc3RyKHRpdGxlLCA9PSwgSFRNTF9USVRMRSk7Cit9CisKK3N0YXRpYyB2b2lkIGh0 bWxTdHJpbmdMb2FkaW5nRml4dHVyZVNldHVwKEh0bWxTdHJpbmdMb2FkaW5nRml4dHVyZSAqZml4 dHVyZSwgZ2NvbnN0cG9pbnRlciBkYXRhKQoreworICAgIGZpeHR1cmUtPndlYlZpZXcgPSBXRUJL SVRfV0VCX1ZJRVcod2Via2l0X3dlYl92aWV3X25ldygpKTsKKyAgICBmaXh0dXJlLT5sb29wID0g Z19tYWluX2xvb3BfbmV3KE5VTEwsIFRSVUUpOworICAgIGdfb2JqZWN0X3JlZl9zaW5rKGZpeHR1 cmUtPndlYlZpZXcpOworICAgIGZpeHR1cmUtPmhhc0JlZW5GaW5pc2hlZCA9IEZBTFNFOworICAg IGdfc2lnbmFsX2Nvbm5lY3QoZml4dHVyZS0+d2ViVmlldywgIm5vdGlmeTo6dGl0bGUiLCBHX0NB TExCQUNLKG5vdGlmeVRpdGxlQ2IpLCBmaXh0dXJlKTsKK30KKworc3RhdGljIHZvaWQgaHRtbFN0 cmluZ0xvYWRpbmdGaXh0dXJlVGVhcmRvd24oSHRtbFN0cmluZ0xvYWRpbmdGaXh0dXJlICpmaXh0 dXJlLCBnY29uc3Rwb2ludGVyIGRhdGEpCit7CisgICAgZ19vYmplY3RfdW5yZWYoZml4dHVyZS0+ d2ViVmlldyk7CisgICAgZ19tYWluX2xvb3BfdW5yZWYoZml4dHVyZS0+bG9vcCk7Cit9CisKK3N0 YXRpYyBnYm9vbGVhbiBsb2FkU3RhdHVzTG9hZEZpbmlzaGVkKFdlYktpdFdlYkxvYWRlckNsaWVu dCAqY2xpZW50LCBIdG1sU3RyaW5nTG9hZGluZ0ZpeHR1cmUgKmZpeHR1cmUpCit7CisgICAgZ19h c3NlcnQoIWZpeHR1cmUtPmhhc0JlZW5GaW5pc2hlZCk7CisgICAgZml4dHVyZS0+aGFzQmVlbkZp bmlzaGVkID0gVFJVRTsKKworICAgIGdfbWFpbl9sb29wX3F1aXQoZml4dHVyZS0+bG9vcCk7CisK KyAgICByZXR1cm4gVFJVRTsKK30KKworc3RhdGljIGdib29sZWFuIGxvYWRTdGF0dXNMb2FkRmFp bGVkKFdlYktpdFdlYkxvYWRlckNsaWVudCAqY2xpZW50LCBHRXJyb3IgKmVycm9yLCBIdG1sU3Ry aW5nTG9hZGluZ0ZpeHR1cmUgKmZpeHR1cmUpCit7CisgICAgZ19hc3NlcnRfbm90X3JlYWNoZWQo KTsKKyAgICByZXR1cm4gVFJVRTsKK30KKworc3RhdGljIHZvaWQgdGVzdEh0bWxTdHJpbmdMb2Fk aW5nU3RhdHVzKEh0bWxTdHJpbmdMb2FkaW5nRml4dHVyZSAqZml4dHVyZSwgZ2NvbnN0cG9pbnRl ciBkYXRhKQoreworICAgIFdlYktpdFdlYkxvYWRlckNsaWVudCAqY2xpZW50ID0gd2Via2l0X3dl Yl92aWV3X2dldF9sb2FkZXJfY2xpZW50KGZpeHR1cmUtPndlYlZpZXcpOworCisgICAgZ19zaWdu YWxfY29ubmVjdChjbGllbnQsICJsb2FkLWZpbmlzaGVkIiwgR19DQUxMQkFDSyhsb2FkU3RhdHVz TG9hZEZpbmlzaGVkKSwgZml4dHVyZSk7CisgICAgZ19zaWduYWxfY29ubmVjdChjbGllbnQsICJs b2FkLWZhaWxlZCIsIEdfQ0FMTEJBQ0sobG9hZFN0YXR1c0xvYWRGYWlsZWQpLCBmaXh0dXJlKTsK KworICAgIHdlYmtpdF93ZWJfdmlld19sb2FkX2h0bWxfc3RyaW5nKGZpeHR1cmUtPndlYlZpZXcs IEhUTUxfU1RSSU5HLCAiYWJvdXQ6d2Via2l0LWd0aysiKTsKKworICAgIGdfbWFpbl9sb29wX3J1 bihmaXh0dXJlLT5sb29wKTsKKyAgICBnX2Fzc2VydChmaXh0dXJlLT5oYXNCZWVuRmluaXNoZWQp OworfQorCitpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqKmFyZ3YpCit7CisgICAgZ190aHJlYWRf aW5pdChOVUxMKTsKKyAgICBndGtfdGVzdF9pbml0KCZhcmdjLCAmYXJndiwgTlVMTCk7CisKKyAg ICBnX3NldGVudigiV0VCS0lUX0VYRUNfUEFUSCIsIFdFQktJVF9FWEVDX1BBVEgsIEZBTFNFKTsK KworICAgIGdfdGVzdF9idWdfYmFzZSgiaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvIik7CisgICAg Z190ZXN0X2FkZCgiL3dlYmtpdDIvaHRtbHN0cmluZ2xvYWRpbmcvc3RhdHVzIiwKKyAgICAgICAg ICAgICAgIEh0bWxTdHJpbmdMb2FkaW5nRml4dHVyZSwgTlVMTCwKKyAgICAgICAgICAgICAgIGh0 bWxTdHJpbmdMb2FkaW5nRml4dHVyZVNldHVwLAorICAgICAgICAgICAgICAgdGVzdEh0bWxTdHJp bmdMb2FkaW5nU3RhdHVzLAorICAgICAgICAgICAgICAgaHRtbFN0cmluZ0xvYWRpbmdGaXh0dXJl VGVhcmRvd24pOworCisgICAgcmV0dXJuIGdfdGVzdF9ydW4oKTsKK30KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL3Rlc3RwbGFpbnRleHRsb2FkaW5n LmMgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy90ZXN0cGxhaW50ZXh0 bG9hZGluZy5jCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjMwMGVhOGIKLS0t IC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy90 ZXN0cGxhaW50ZXh0bG9hZGluZy5jCkBAIC0wLDAgKzEsOTIgQEAKKy8qCisgKiBDb3B5cmlnaHQg KEMpIDIwMDksIDIwMTAgR3VzdGF2byBOb3JvbmhhIFNpbHZhCisgKiBDb3B5cmlnaHQgKEMpIDIw MDksIDIwMTEgSWdhbGlhIFMuTC4KKyAqIFBvcnRpb25zIENvcHlyaWdodCAoYykgMjAxMCBNb3Rv cm9sYSBNb2JpbGl0eSwgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBUaGlzIGxp YnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCisg KiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1 YmxpYworICogTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRh dGlvbjsgZWl0aGVyCisgKiB2ZXJzaW9uIDIgb2YgdGhlIExpY2Vuc2UsIG9yIChhdCB5b3VyIG9w dGlvbikgYW55IGxhdGVyIHZlcnNpb24uCisgKgorICogVGhpcyBsaWJyYXJ5IGlzIGRpc3RyaWJ1 dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsCisgKiBidXQgV0lUSE9VVCBB TlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgorICogTUVS Q0hBTlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2VlIHRo ZSBHTlUKKyAqIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxz LgorICoKKyAqIFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBMaWJy YXJ5IEdlbmVyYWwgUHVibGljIExpY2Vuc2UKKyAqIGFsb25nIHdpdGggdGhpcyBsaWJyYXJ5OyBz ZWUgdGhlIGZpbGUgQ09QWUlORy5MSUIuICBJZiBub3QsIHdyaXRlIHRvCisgKiB0aGUgRnJlZSBT b2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBTdHJlZXQsIEZpZnRoIEZsb29y LAorICogQm9zdG9uLCBNQSAwMjExMC0xMzAxLCBVU0EuCisgKi8KKworI2luY2x1ZGUgPGd0ay9n dGsuaD4KKyNpbmNsdWRlIDxzdHJpbmcuaD4KKyNpbmNsdWRlIDx3ZWJraXQyL3dlYmtpdDIuaD4K KworI2RlZmluZSBQTEFJTl9URVhUICJXZWxjb21lIHRvIFdlYktpdCBHVEsrISIKKwordHlwZWRl ZiBzdHJ1Y3QgeworICAgIFdlYktpdFdlYlZpZXcgKndlYlZpZXc7CisgICAgR01haW5Mb29wICps b29wOworICAgIGdib29sZWFuIGhhc0JlZW5GaW5pc2hlZDsKK30gUGxhaW5UZXh0TG9hZGluZ0Zp eHR1cmU7CisKK3N0YXRpYyB2b2lkIHBsYWluVGV4dExvYWRpbmdGaXh0dXJlU2V0dXAoUGxhaW5U ZXh0TG9hZGluZ0ZpeHR1cmUgKmZpeHR1cmUsIGdjb25zdHBvaW50ZXIgZGF0YSkKK3sKKyAgICBm aXh0dXJlLT53ZWJWaWV3ID0gV0VCS0lUX1dFQl9WSUVXKHdlYmtpdF93ZWJfdmlld19uZXcoKSk7 CisgICAgZml4dHVyZS0+bG9vcCA9IGdfbWFpbl9sb29wX25ldyhOVUxMLCBUUlVFKTsKKyAgICBn X29iamVjdF9yZWZfc2luayhmaXh0dXJlLT53ZWJWaWV3KTsKKyAgICBmaXh0dXJlLT5oYXNCZWVu RmluaXNoZWQgPSBGQUxTRTsKK30KKworc3RhdGljIHZvaWQgcGxhaW5UZXh0TG9hZGluZ0ZpeHR1 cmVUZWFyZG93bihQbGFpblRleHRMb2FkaW5nRml4dHVyZSAqZml4dHVyZSwgZ2NvbnN0cG9pbnRl ciBkYXRhKQoreworICAgIGdfb2JqZWN0X3VucmVmKGZpeHR1cmUtPndlYlZpZXcpOworICAgIGdf bWFpbl9sb29wX3VucmVmKGZpeHR1cmUtPmxvb3ApOworfQorCitzdGF0aWMgZ2Jvb2xlYW4gbG9h ZFN0YXR1c0xvYWRGaW5pc2hlZChXZWJLaXRXZWJMb2FkZXJDbGllbnQgKmNsaWVudCwgUGxhaW5U ZXh0TG9hZGluZ0ZpeHR1cmUgKmZpeHR1cmUpCit7CisgICAgZ19hc3NlcnQoIWZpeHR1cmUtPmhh c0JlZW5GaW5pc2hlZCk7CisgICAgZml4dHVyZS0+aGFzQmVlbkZpbmlzaGVkID0gVFJVRTsKKwor ICAgIGdfbWFpbl9sb29wX3F1aXQoZml4dHVyZS0+bG9vcCk7CisKKyAgICByZXR1cm4gVFJVRTsK K30KKworc3RhdGljIGdib29sZWFuIGxvYWRTdGF0dXNMb2FkRmFpbGVkKFdlYktpdFdlYkxvYWRl ckNsaWVudCAqY2xpZW50LCBHRXJyb3IgKmVycm9yLCBQbGFpblRleHRMb2FkaW5nRml4dHVyZSAq Zml4dHVyZSkKK3sKKyAgICBnX2Fzc2VydF9ub3RfcmVhY2hlZCgpOworICAgIHJldHVybiBUUlVF OworfQorCitzdGF0aWMgdm9pZCB0ZXN0UGxhaW5UZXh0TG9hZGluZ1N0YXR1cyhQbGFpblRleHRM b2FkaW5nRml4dHVyZSAqZml4dHVyZSwgZ2NvbnN0cG9pbnRlciBkYXRhKQoreworICAgIFdlYktp dFdlYkxvYWRlckNsaWVudCAqY2xpZW50ID0gd2Via2l0X3dlYl92aWV3X2dldF9sb2FkZXJfY2xp ZW50KGZpeHR1cmUtPndlYlZpZXcpOworCisgICAgZ19zaWduYWxfY29ubmVjdChjbGllbnQsICJs b2FkLWZpbmlzaGVkIiwgR19DQUxMQkFDSyhsb2FkU3RhdHVzTG9hZEZpbmlzaGVkKSwgZml4dHVy ZSk7CisgICAgZ19zaWduYWxfY29ubmVjdChjbGllbnQsICJsb2FkLWZhaWxlZCIsIEdfQ0FMTEJB Q0sobG9hZFN0YXR1c0xvYWRGYWlsZWQpLCBmaXh0dXJlKTsKKworICAgIHdlYmtpdF93ZWJfdmll d19sb2FkX3BsYWluX3RleHQoZml4dHVyZS0+d2ViVmlldywgUExBSU5fVEVYVCk7CisKKyAgICBn X21haW5fbG9vcF9ydW4oZml4dHVyZS0+bG9vcCk7CisgICAgZ19hc3NlcnQoZml4dHVyZS0+aGFz QmVlbkZpbmlzaGVkKTsKK30KKworaW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKiphcmd2KQorewor ICAgIGdfdGhyZWFkX2luaXQoTlVMTCk7CisgICAgZ3RrX3Rlc3RfaW5pdCgmYXJnYywgJmFyZ3Ys IE5VTEwpOworCisgICAgZ19zZXRlbnYoIldFQktJVF9FWEVDX1BBVEgiLCBXRUJLSVRfRVhFQ19Q QVRILCBGQUxTRSk7CisKKyAgICBnX3Rlc3RfYnVnX2Jhc2UoImh0dHBzOi8vYnVncy53ZWJraXQu b3JnLyIpOworICAgIGdfdGVzdF9hZGQoIi93ZWJraXQyL3BsYWludGV4dGxvYWRpbmcvc3RhdHVz IiwKKyAgICAgICAgICAgICAgIFBsYWluVGV4dExvYWRpbmdGaXh0dXJlLCBOVUxMLAorICAgICAg ICAgICAgICAgcGxhaW5UZXh0TG9hZGluZ0ZpeHR1cmVTZXR1cCwKKyAgICAgICAgICAgICAgIHRl c3RQbGFpblRleHRMb2FkaW5nU3RhdHVzLAorICAgICAgICAgICAgICAgcGxhaW5UZXh0TG9hZGlu Z0ZpeHR1cmVUZWFyZG93bik7CisKKyAgICByZXR1cm4gZ190ZXN0X3J1bigpOworfQo= 109473 2011-10-03 05:38:54 -0700 2011-10-03 08:53:13 -0700 Load HTML String and Plain text API 0001-Add-html-string-and-plain-text-load-API.patch text/plain 11796 nayankk RnJvbSBkYzg0ZDQ3MzUyODIxMjBhYWM1M2VkNWNjOTk2OTk2YzhiZTUyOTUxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBOYXlhbiBLdW1hciBLIDxuYXlhbmtrQG1vdG9yb2xhLmNvbT4K RGF0ZTogTW9uLCAzIE9jdCAyMDExIDE4OjA3OjI1ICswNTMwClN1YmplY3Q6IFtQQVRDSF0gQWRk IGh0bWwgc3RyaW5nIGFuZCBwbGFpbiB0ZXh0IGxvYWQgQVBJCgotLS0KIFNvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAyNiArKysrCiBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcCB8ICAgNDAgKysrKysr KwogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5oICAgfCAg ICA5ICsrCiAuLi4vV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy90ZXN0bG9hZGluZy5j ICB8ICAxMjEgKysrKysrKysrKysrKysrKysrKy0KIDQgZmlsZXMgY2hhbmdlZCwgMTk1IGluc2Vy dGlvbnMoKyksIDEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDU4OGNiY2IuLjgyMWM4ZjYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzMSBAQAogMjAxMS0xMC0wMyAgTmF5YW4gS3VtYXIgSyAg PG5heWFua2tAbW90b3JvbGEuY29tPgogCisgICAgICAgIEFkZCB3ZWJraXRfd2ViX3ZpZXdfbG9h ZF9odG1sX3N0cmluZyBhbmQKKyAgICAgICAgd2Via2l0X3dlYl92aWV3X2xvYWRfcGxhaW5fdGV4 dCBBUElzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NjkyNDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwOgorICAgICAgICAod2Via2l0X3dl Yl92aWV3X2xvYWRfaHRtbF9zdHJpbmcpOiBBUEkgdG8gbG9hZCBodG1sIHN0cmluZy4KKyAgICAg ICAgKHdlYmtpdF93ZWJfdmlld19sb2FkX3BsYWluX3RleHQpOiBBUEkgdG8gbG9hZCBwbGFpbiB0 ZXh0LgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuaDogQWRkZWQg cHVibGljIEFQSXMuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvdGVzdGxvYWRp bmcuYzoKKyAgICAgICAgKGh0bWxTdHJpbmdMb2FkaW5nTm90aWZ5VGl0bGVDYik6IE5vdGlmeSAn dGl0bGUnIGNoYW5nZS4KKyAgICAgICAgKGh0bWxTdHJpbmdMb2FkaW5nRml4dHVyZVNldHVwKTog VGVzdCBmaXh0dXJlIHNldHVwLgorICAgICAgICAoaHRtbFN0cmluZ0xvYWRpbmdGaXh0dXJlVGVh cmRvd24pOiBUZXN0IGZpeHR1cmUgdGVhcmRvd24uCisgICAgICAgIChodG1sU3RyaW5nTG9hZFN0 YXR1c0xvYWRGaW5pc2hlZCk6IENhbGxiYWNrIHdoaWNoIGdldHMgdHJpZ2VycmVkIHVwb24gbG9h ZCBmaXNpc2guCisgICAgICAgIChodG1sU3RyaW5nTG9hZFN0YXR1c0xvYWRGYWlsZWQpOiBDYWxs YmFjayB3aGljaCBnZXRzIHRyaWdlcnJlZCB1cG9uIGxvYWQgZmFpbC4KKyAgICAgICAgKHRlc3RI dG1sU3RyaW5nTG9hZGluZ1N0YXR1cyk6IFRlc3Qgd2Via2l0X3dlYl92aWV3X2xvYWRfaHRtbF9z dHJpbmcgQVBJLgorICAgICAgICAocGxhaW5UZXh0TG9hZGluZ0ZpeHR1cmVTZXR1cCk6IFBsYWlu IHRleHQgdGVzdCBmaXh0dXJlIHNldHVwLgorICAgICAgICAocGxhaW5UZXh0TG9hZGluZ0ZpeHR1 cmVUZWFyZG93bik6IFBsYWluIHRleHQgdGVzdCBmaXh0dXJlIHRlYXJkb3duLgorICAgICAgICAo cGxhaW5UZXh0TG9hZFN0YXR1c0xvYWRGaW5pc2hlZCk6IENhbGxiYWNrIHdoaWNoIGdldHMgdHJp Z2VycmVkIHVwb24gbG9hZCBmaXNpc2guCisgICAgICAgIChwbGFpblRleHRMb2FkU3RhdHVzTG9h ZEZhaWxlZCk6IENhbGxiYWNrIHdoaWNoIGdldHMgdHJpZ2VycmVkIHVwb24gbG9hZCBmYWlsLgor ICAgICAgICAodGVzdFBsYWluVGV4dExvYWRpbmdTdGF0dXMpOiBUZXN0IHdlYmtpdF93ZWJfdmll d19sb2FkX3BsYWluX3RleHQgQVBJLgorICAgICAgICAobWFpbik6IEFkZCBIVE1MIHN0cmluZyBh bmQgcGxhaW4gdGV4dCB0ZXN0cy4KKworMjAxMS0xMC0wMyAgTmF5YW4gS3VtYXIgSyAgPG5heWFu a2tAbW90b3JvbGEuY29tPgorCiAgICAgICAgIFtHVEtdW1dFQktJVDJdIEFkZCBzdXBwb3J0IGZv ciB0aXRsZSBwcm9wZXJ0eSBpbiBXZWJLaXRXZWJWaWV3CiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02ODA3NAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCmluZGV4IGYwZWExOTkuLjgyYTM4 N2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdl YlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdl YlZpZXcuY3BwCkBAIC0yNjIsNiArMjYyLDQ2IEBAIHZvaWQgd2Via2l0X3dlYl92aWV3X2xvYWRf dXJpKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGNvbnN0IGdjaGFyKiB1cmkpCiB9CiAKIC8qKgor ICogd2Via2l0X3dlYl92aWV3X2xvYWRfaHRtbF9zdHJpbmc6CisgKiBAd2ViVmlldzogYSAjV2Vi S2l0V2ViVmlldworICogQGNvbnRlbnQ6IEhUTUwgc3RyaW5nIHRvIGJlIGxvYWRlZAorICogQGJh c2VfdXJpOiB0aGUgYmFzZSBVUkkgZm9yIHJlbGF0aXZlIGxvY2F0aW9ucy4gSWYgJU5VTEwsIGRl ZmF1bHRzIHRvIGFib3V0OmJsYW5rCisgKgorICogUmVxdWVzdHMgbG9hZGluZyBvZiB0aGUgZ2l2 ZW4gQGNvbnRlbnQgd2l0aCB0aGUgc3BlY2lmaWVkIEBiYXNlX3VyaS4gCisgKiBUaGUgQGJhc2Vf dXJpIHJlcHJlc2VudHMgdGhlIEBjb250ZW50IHRoYXQgaXMgbG9hZGVkIHRocm91Z2ggdGhpcyBB UEkuCisgKiBBcyBzdWNoLCBpdCBpcyB1c2VkIHRvIHJlc29sdmUgYW55IHJlbGF0aXZlIFVSTHMu CisgKi8KK3ZvaWQgd2Via2l0X3dlYl92aWV3X2xvYWRfaHRtbF9zdHJpbmcoV2ViS2l0V2ViVmll dyogd2ViVmlldywgY29uc3QgZ2NoYXIqIGNvbnRlbnQsIGNvbnN0IGdjaGFyKiBiYXNlVXJpKQor eworICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9WSUVXKHdlYlZpZXcpKTsKKwor ICAgIFdlYlBhZ2VQcm94eSogcGFnZSA9IHdlYmtpdFdlYlZpZXdCYXNlR2V0UGFnZShXRUJLSVRf V0VCX1ZJRVdfQkFTRSh3ZWJWaWV3KSk7CisgICAgV0tTdHJpbmdSZWYgY29udGVudFJlZiA9IFdL U3RyaW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5nKGNvbnRlbnQpOworICAgIFdLVVJMUmVmIGJhc2VV cmlSZWYgPSBXS1VSTENyZWF0ZVdpdGhVVEY4Q1N0cmluZyhiYXNlVXJpKTsKKyAgICBXS1BhZ2VM b2FkSFRNTFN0cmluZyh0b0FQSShwYWdlKSwgY29udGVudFJlZiwgYmFzZVVyaVJlZik7CisgICAg V0tSZWxlYXNlKGNvbnRlbnRSZWYpOworICAgIFdLUmVsZWFzZShiYXNlVXJpUmVmKTsKK30KKwor LyoqCisgKiB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9wbGFpbl90ZXh0OgorICogQHdlYlZpZXc6IGEg I1dlYktpdFdlYlZpZXcKKyAqIEBwbGFpbl90ZXh0OiBUZXh0IHRvIGJlIGRpc3BsYXllZAorICoK KyAqIExvYWRzIHRoZSBzcGVjaWZpZWQgdGV4dCBpbnRvIEB3ZWJfdmlldy4KKyAqLwordm9pZCB3 ZWJraXRfd2ViX3ZpZXdfbG9hZF9wbGFpbl90ZXh0KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGNv bnN0IGdjaGFyKiBwbGFpblRleHQpCit7CisgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNf V0VCX1ZJRVcod2ViVmlldykpOworICAgIGdfcmV0dXJuX2lmX2ZhaWwocGxhaW5UZXh0KTsKKwor ICAgIFdlYlBhZ2VQcm94eSogcGFnZSA9IHdlYmtpdFdlYlZpZXdCYXNlR2V0UGFnZShXRUJLSVRf V0VCX1ZJRVdfQkFTRSh3ZWJWaWV3KSk7CisgICAgV0tTdHJpbmdSZWYgcGxhaW5UZXh0UmVmID0g V0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcocGxhaW5UZXh0KTsKKyAgICBXS1BhZ2VMb2Fk UGxhaW5UZXh0U3RyaW5nKHRvQVBJKHBhZ2UpLCBwbGFpblRleHRSZWYpOworICAgIFdLUmVsZWFz ZShwbGFpblRleHRSZWYpOworfQorCisvKioKICAqIHdlYmtpdF93ZWJfdmlld19nb19iYWNrOgog ICogQHdlYl92aWV3OiBhICNXZWJLaXRXZWJWaWV3CiAgKgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5oIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5oCmluZGV4IDY1MWE5YTIuLjc3ZDkyMDEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZp ZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3 LmgKQEAgLTkwLDYgKzkwLDE1IEBAIHdlYmtpdF93ZWJfdmlld19sb2FkX3VyaSAgICAgICAgICAo V2ViS2l0V2ViVmlldyAgICAgICAgICp3ZWJfdmlldywKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgY29uc3QgZ2NoYXIgICAgICAgICAgICp1cmkpOwogCiBXS19FWFBPUlQgdm9p ZAord2Via2l0X3dlYl92aWV3X2xvYWRfaHRtbF9zdHJpbmcgIChXZWJLaXRXZWJWaWV3ICAgICAg ICAgKndlYl92aWV3LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBn Y2hhciAgICAgICAgICAgKmNvbnRlbnQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGNvbnN0IGdjaGFyICAgICAgICAgICAqYmFzZV91cmkpOworCitXS19FWFBPUlQgdm9pZCAK K3dlYmtpdF93ZWJfdmlld19sb2FkX3BsYWluX3RleHQgICAoV2ViS2l0V2ViVmlldyAgICAgICAg ICp3ZWJfdmlldywgCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGdj aGFyICAgICAgICAgICAqcGxhaW5fdGV4dCk7CisKK1dLX0VYUE9SVCB2b2lkCiB3ZWJraXRfd2Vi X3ZpZXdfZ29fYmFjayAgICAgICAgICAgKFdlYktpdFdlYlZpZXcgICAgICAgICAqd2ViX3ZpZXcp OwogCiBXS19FWFBPUlQgdm9pZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvdGVzdHMvdGVzdGxvYWRpbmcuYyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL3Rlc3RzL3Rlc3Rsb2FkaW5nLmMKaW5kZXggMjY5MzNiNy4uNjUwOTU3YiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvdGVzdGxvYWRpbmcu YworKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy90ZXN0bG9hZGlu Zy5jCkBAIC0yNSw3ICsyNSw5IEBACiAKIC8qIFRoaXMgc3RyaW5nIGhhcyB0byBiZSByYXRoZXIg YmlnIGJlY2F1c2Ugb2YgdGhlIGNhbmNlbGxlZCB0ZXN0IC0gaXQKICAqIGxvb2tzIGxpa2Ugc291 cCByZWZ1c2VzIHRvIHNlbmQgb3IgcmVjZWl2ZSBhIHRvbyBzbWFsbCBjaHVuayAqLwotI2RlZmlu ZSBIVE1MX1NUUklORyAiPGh0bWw+PGJvZHk+VGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGlu ZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5n IVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3Rpbmch VGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFU ZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRl c3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVz dGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0 aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3Rp bmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGlu ZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5n IVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3Rpbmch VGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFU ZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nITwvYm9keT48L2h0bWw+IgorI2RlZmluZSBI VE1MX1RJVExFICJIZWxsbyBXZWJLaXQgR1RLKyEiCisjZGVmaW5lIEhUTUxfU1RSSU5HICI8aHRt bD48aGVhZD48dGl0bGU+IkhUTUxfVElUTEUiPC90aXRsZT48L2hlYWQ+PGJvZHk+VGVzdGluZyFU ZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRl c3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVz dGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0 aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3Rp bmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGlu ZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5n IVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3Rpbmch VGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFU ZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRl c3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVz dGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0 aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nITwvYm9k eT48L2h0bWw+IgorI2RlZmluZSBQTEFJTl9URVhUICJXZWxjb21lIHRvIFdlYktpdCBHVEsrISIK IAogU291cFVSSSAqYmFzZVVSSTsKIApAQCAtMjIzLDYgKzIyNSwxMTMgQEAgc3RhdGljIHZvaWQg dGVzdExvYWRpbmdFcnJvcihXZWJMb2FkaW5nRml4dHVyZSAqZml4dHVyZSwgZ2NvbnN0cG9pbnRl ciBkYXRhKQogICAgIGdfYXNzZXJ0KGZpeHR1cmUtPmhhc0JlZW5GYWlsZWQpOwogfQogCit0eXBl ZGVmIHN0cnVjdCB7CisgICAgV2ViS2l0V2ViVmlldyAqd2ViVmlldzsKKyAgICBHTWFpbkxvb3Ag Kmxvb3A7CisgICAgZ2Jvb2xlYW4gaGFzQmVlbkZpbmlzaGVkOworfSBIdG1sU3RyaW5nTG9hZGlu Z0ZpeHR1cmU7CisKK3N0YXRpYyB2b2lkIGh0bWxTdHJpbmdMb2FkaW5nTm90aWZ5VGl0bGVDYihX ZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBHUGFyYW1TcGVjKiBwU3BlYywgSHRtbFN0cmluZ0xvYWRp bmdGaXh0dXJlKiBmaXh0dXJlKQoreworICAgIGdfYXNzZXJ0KCFmaXh0dXJlLT5oYXNCZWVuRmlu aXNoZWQpOworCisgICAgY29uc3QgZ2NoYXIqIHRpdGxlID0gd2Via2l0X3dlYl92aWV3X2dldF90 aXRsZSh3ZWJWaWV3KTsKKyAgICBnX2Fzc2VydF9jbXBzdHIodGl0bGUsID09LCBIVE1MX1RJVExF KTsKK30KKworc3RhdGljIHZvaWQgaHRtbFN0cmluZ0xvYWRpbmdGaXh0dXJlU2V0dXAoSHRtbFN0 cmluZ0xvYWRpbmdGaXh0dXJlICpmaXh0dXJlLCBnY29uc3Rwb2ludGVyIGRhdGEpCit7CisgICAg Zml4dHVyZS0+d2ViVmlldyA9IFdFQktJVF9XRUJfVklFVyh3ZWJraXRfd2ViX3ZpZXdfbmV3KCkp OworICAgIGZpeHR1cmUtPmxvb3AgPSBnX21haW5fbG9vcF9uZXcoTlVMTCwgVFJVRSk7CisgICAg Z19vYmplY3RfcmVmX3NpbmsoZml4dHVyZS0+d2ViVmlldyk7CisgICAgZml4dHVyZS0+aGFzQmVl bkZpbmlzaGVkID0gRkFMU0U7CisgICAgZ19zaWduYWxfY29ubmVjdChmaXh0dXJlLT53ZWJWaWV3 LCAibm90aWZ5Ojp0aXRsZSIsIEdfQ0FMTEJBQ0soaHRtbFN0cmluZ0xvYWRpbmdOb3RpZnlUaXRs ZUNiKSwgZml4dHVyZSk7Cit9CisKK3N0YXRpYyB2b2lkIGh0bWxTdHJpbmdMb2FkaW5nRml4dHVy ZVRlYXJkb3duKEh0bWxTdHJpbmdMb2FkaW5nRml4dHVyZSAqZml4dHVyZSwgZ2NvbnN0cG9pbnRl ciBkYXRhKQoreworICAgIGdfb2JqZWN0X3VucmVmKGZpeHR1cmUtPndlYlZpZXcpOworICAgIGdf bWFpbl9sb29wX3VucmVmKGZpeHR1cmUtPmxvb3ApOworfQorCitzdGF0aWMgZ2Jvb2xlYW4gaHRt bFN0cmluZ0xvYWRTdGF0dXNMb2FkRmluaXNoZWQoV2ViS2l0V2ViTG9hZGVyQ2xpZW50ICpjbGll bnQsIEh0bWxTdHJpbmdMb2FkaW5nRml4dHVyZSAqZml4dHVyZSkKK3sKKyAgICBnX2Fzc2VydCgh Zml4dHVyZS0+aGFzQmVlbkZpbmlzaGVkKTsKKyAgICBmaXh0dXJlLT5oYXNCZWVuRmluaXNoZWQg PSBUUlVFOworCisgICAgZ19tYWluX2xvb3BfcXVpdChmaXh0dXJlLT5sb29wKTsKKworICAgIHJl dHVybiBUUlVFOworfQorCitzdGF0aWMgZ2Jvb2xlYW4gaHRtbFN0cmluZ0xvYWRTdGF0dXNMb2Fk RmFpbGVkKFdlYktpdFdlYkxvYWRlckNsaWVudCAqY2xpZW50LCBHRXJyb3IgKmVycm9yLCBIdG1s U3RyaW5nTG9hZGluZ0ZpeHR1cmUgKmZpeHR1cmUpCit7CisgICAgZ19hc3NlcnRfbm90X3JlYWNo ZWQoKTsKKyAgICByZXR1cm4gVFJVRTsKK30KKworc3RhdGljIHZvaWQgdGVzdEh0bWxTdHJpbmdM b2FkaW5nU3RhdHVzKEh0bWxTdHJpbmdMb2FkaW5nRml4dHVyZSAqZml4dHVyZSwgZ2NvbnN0cG9p bnRlciBkYXRhKQoreworICAgIFdlYktpdFdlYkxvYWRlckNsaWVudCAqY2xpZW50ID0gd2Via2l0 X3dlYl92aWV3X2dldF9sb2FkZXJfY2xpZW50KGZpeHR1cmUtPndlYlZpZXcpOworCisgICAgZ19z aWduYWxfY29ubmVjdChjbGllbnQsICJsb2FkLWZpbmlzaGVkIiwgR19DQUxMQkFDSyhodG1sU3Ry aW5nTG9hZFN0YXR1c0xvYWRGaW5pc2hlZCksIGZpeHR1cmUpOworICAgIGdfc2lnbmFsX2Nvbm5l Y3QoY2xpZW50LCAibG9hZC1mYWlsZWQiLCBHX0NBTExCQUNLKGh0bWxTdHJpbmdMb2FkU3RhdHVz TG9hZEZhaWxlZCksIGZpeHR1cmUpOworCisgICAgd2Via2l0X3dlYl92aWV3X2xvYWRfaHRtbF9z dHJpbmcoZml4dHVyZS0+d2ViVmlldywgSFRNTF9TVFJJTkcsICJhYm91dDp3ZWJraXQtZ3RrKyIp OworCisgICAgZ19tYWluX2xvb3BfcnVuKGZpeHR1cmUtPmxvb3ApOworICAgIGdfYXNzZXJ0KGZp eHR1cmUtPmhhc0JlZW5GaW5pc2hlZCk7Cit9CisKK3R5cGVkZWYgc3RydWN0IHsKKyAgICBXZWJL aXRXZWJWaWV3ICp3ZWJWaWV3OworICAgIEdNYWluTG9vcCAqbG9vcDsKKyAgICBnYm9vbGVhbiBo YXNCZWVuRmluaXNoZWQ7Cit9IFBsYWluVGV4dExvYWRpbmdGaXh0dXJlOworCitzdGF0aWMgdm9p ZCBwbGFpblRleHRMb2FkaW5nRml4dHVyZVNldHVwKFBsYWluVGV4dExvYWRpbmdGaXh0dXJlICpm aXh0dXJlLCBnY29uc3Rwb2ludGVyIGRhdGEpCit7CisgICAgZml4dHVyZS0+d2ViVmlldyA9IFdF QktJVF9XRUJfVklFVyh3ZWJraXRfd2ViX3ZpZXdfbmV3KCkpOworICAgIGZpeHR1cmUtPmxvb3Ag PSBnX21haW5fbG9vcF9uZXcoTlVMTCwgVFJVRSk7CisgICAgZ19vYmplY3RfcmVmX3NpbmsoZml4 dHVyZS0+d2ViVmlldyk7CisgICAgZml4dHVyZS0+aGFzQmVlbkZpbmlzaGVkID0gRkFMU0U7Cit9 CisKK3N0YXRpYyB2b2lkIHBsYWluVGV4dExvYWRpbmdGaXh0dXJlVGVhcmRvd24oUGxhaW5UZXh0 TG9hZGluZ0ZpeHR1cmUgKmZpeHR1cmUsIGdjb25zdHBvaW50ZXIgZGF0YSkKK3sKKyAgICBnX29i amVjdF91bnJlZihmaXh0dXJlLT53ZWJWaWV3KTsKKyAgICBnX21haW5fbG9vcF91bnJlZihmaXh0 dXJlLT5sb29wKTsKK30KKworc3RhdGljIGdib29sZWFuIHBsYWluVGV4dExvYWRTdGF0dXNMb2Fk RmluaXNoZWQoV2ViS2l0V2ViTG9hZGVyQ2xpZW50ICpjbGllbnQsIFBsYWluVGV4dExvYWRpbmdG aXh0dXJlICpmaXh0dXJlKQoreworICAgIGdfYXNzZXJ0KCFmaXh0dXJlLT5oYXNCZWVuRmluaXNo ZWQpOworICAgIGZpeHR1cmUtPmhhc0JlZW5GaW5pc2hlZCA9IFRSVUU7CisKKyAgICBnX21haW5f bG9vcF9xdWl0KGZpeHR1cmUtPmxvb3ApOworCisgICAgcmV0dXJuIFRSVUU7Cit9CisKK3N0YXRp YyBnYm9vbGVhbiBwbGFpblRleHRMb2FkU3RhdHVzTG9hZEZhaWxlZChXZWJLaXRXZWJMb2FkZXJD bGllbnQgKmNsaWVudCwgR0Vycm9yICplcnJvciwgUGxhaW5UZXh0TG9hZGluZ0ZpeHR1cmUgKmZp eHR1cmUpCit7CisgICAgZ19hc3NlcnRfbm90X3JlYWNoZWQoKTsKKyAgICByZXR1cm4gVFJVRTsK K30KKworc3RhdGljIHZvaWQgdGVzdFBsYWluVGV4dExvYWRpbmdTdGF0dXMoUGxhaW5UZXh0TG9h ZGluZ0ZpeHR1cmUgKmZpeHR1cmUsIGdjb25zdHBvaW50ZXIgZGF0YSkKK3sKKyAgICBXZWJLaXRX ZWJMb2FkZXJDbGllbnQgKmNsaWVudCA9IHdlYmtpdF93ZWJfdmlld19nZXRfbG9hZGVyX2NsaWVu dChmaXh0dXJlLT53ZWJWaWV3KTsKKworICAgIGdfc2lnbmFsX2Nvbm5lY3QoY2xpZW50LCAibG9h ZC1maW5pc2hlZCIsIEdfQ0FMTEJBQ0socGxhaW5UZXh0TG9hZFN0YXR1c0xvYWRGaW5pc2hlZCks IGZpeHR1cmUpOworICAgIGdfc2lnbmFsX2Nvbm5lY3QoY2xpZW50LCAibG9hZC1mYWlsZWQiLCBH X0NBTExCQUNLKHBsYWluVGV4dExvYWRTdGF0dXNMb2FkRmFpbGVkKSwgZml4dHVyZSk7CisKKyAg ICB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9wbGFpbl90ZXh0KGZpeHR1cmUtPndlYlZpZXcsIFBMQUlO X1RFWFQpOworCisgICAgZ19tYWluX2xvb3BfcnVuKGZpeHR1cmUtPmxvb3ApOworICAgIGdfYXNz ZXJ0KGZpeHR1cmUtPmhhc0JlZW5GaW5pc2hlZCk7Cit9CisKIGludCBtYWluKGludCBhcmdjLCBj aGFyICoqYXJndikKIHsKICAgICBTb3VwU2VydmVyICpzZXJ2ZXI7CkBAIC0yNTEsNiArMzYwLDE2 IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyICoqYXJndikKICAgICAgICAgICAgICAgIHdlYkxv YWRpbmdGaXh0dXJlU2V0dXAsCiAgICAgICAgICAgICAgICB0ZXN0TG9hZGluZ0Vycm9yLAogICAg ICAgICAgICAgICAgd2ViTG9hZGluZ0ZpeHR1cmVUZWFyZG93bik7CisgICAgZ190ZXN0X2FkZCgi L3dlYmtpdDIvaHRtbHN0cmluZ2xvYWRpbmcvc3RhdHVzIiwKKyAgICAgICAgICAgICAgIEh0bWxT dHJpbmdMb2FkaW5nRml4dHVyZSwgTlVMTCwKKyAgICAgICAgICAgICAgIGh0bWxTdHJpbmdMb2Fk aW5nRml4dHVyZVNldHVwLAorICAgICAgICAgICAgICAgdGVzdEh0bWxTdHJpbmdMb2FkaW5nU3Rh dHVzLAorICAgICAgICAgICAgICAgaHRtbFN0cmluZ0xvYWRpbmdGaXh0dXJlVGVhcmRvd24pOwor ICAgIGdfdGVzdF9hZGQoIi93ZWJraXQyL3BsYWludGV4dGxvYWRpbmcvc3RhdHVzIiwKKyAgICAg ICAgICAgICAgIFBsYWluVGV4dExvYWRpbmdGaXh0dXJlLCBOVUxMLAorICAgICAgICAgICAgICAg cGxhaW5UZXh0TG9hZGluZ0ZpeHR1cmVTZXR1cCwKKyAgICAgICAgICAgICAgIHRlc3RQbGFpblRl eHRMb2FkaW5nU3RhdHVzLAorICAgICAgICAgICAgICAgcGxhaW5UZXh0TG9hZGluZ0ZpeHR1cmVU ZWFyZG93bik7CiAKICAgICByZXR1cm4gZ190ZXN0X3J1bigpOwogfQotLSAKMS43LjQuMQoK 109490 2011-10-03 08:53:13 -0700 2011-10-04 05:14:32 -0700 Add webkit_web_view_load_html_string and webkit_web_view_load_plain_text APIs. 0001-Added-webkit_web_view_load_html_string-and-webkit_we.patch text/plain 10738 nayankk RnJvbSBiOTFhM2Y1MmRhMGIyYzYyNGZmZTJjZWI4OWEwYmMwMjFkOGRmZGMxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBOYXlhbiBLdW1hciBLIDxuYXlhbmtrQG1vdG9yb2xhLmNvbT4K RGF0ZTogTW9uLCAzIE9jdCAyMDExIDIxOjE4OjMzICswNTMwClN1YmplY3Q6IFtQQVRDSF0gQWRk ZWQgd2Via2l0X3dlYl92aWV3X2xvYWRfaHRtbF9zdHJpbmcgYW5kIHdlYmtpdF93ZWJfdmlld19s b2FkX3BsYWluX3RleHQgQVBJCgotLS0KIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyAgICAgICAg ICAgICAgICAgICAgICAgICAgIHwgICAyMiArKysrKwogU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAgfCAgIDQxICsrKysrKysrKwogU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5oICAgfCAgICA5ICsrCiAuLi4vV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy90ZXN0bG9hZGluZy5jICB8ICAgODcgKysrKysr KysrKysrKysrKysrKy0KIDQgZmlsZXMgY2hhbmdlZCwgMTU4IGluc2VydGlvbnMoKyksIDEgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDU4OGNiY2IuLjgxNzM5MGEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAg LTEsNSArMSwyNyBAQAogMjAxMS0xMC0wMyAgTmF5YW4gS3VtYXIgSyAgPG5heWFua2tAbW90b3Jv bGEuY29tPgogCisgICAgICAgIEFkZCB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9odG1sX3N0cmluZyBh bmQKKyAgICAgICAgd2Via2l0X3dlYl92aWV3X2xvYWRfcGxhaW5fdGV4dCBBUElzLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjkyNDkKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdFdlYlZpZXcuY3BwOgorICAgICAgICAod2Via2l0X3dlYl92aWV3X2xvYWRfaHRt bF9zdHJpbmcpOiBBUEkgdG8gbG9hZCBodG1sIHN0cmluZy4KKyAgICAgICAgKHdlYmtpdF93ZWJf dmlld19sb2FkX3BsYWluX3RleHQpOiBBUEkgdG8gbG9hZCBwbGFpbiB0ZXh0LgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuaDogQWRkZWQgcHVibGljIEFQSXMuCisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvdGVzdGxvYWRpbmcuYzoKKyAgICAgICAg KGh0bWxTdHJpbmdMb2FkaW5nTm90aWZ5VGl0bGVDYik6IE5vdGlmeSAndGl0bGUnIHByb3BlcnR5 IGNoYW5nZS4KKyAgICAgICAgKGh0bWxTdHJpbmdMb2FkaW5nRml4dHVyZVNldHVwKTogTG9hZCBo dG1sIHN0cmluZyBmaXh0dXJlIHNldHVwLgorICAgICAgICAoaHRtbFN0cmluZ0xvYWRTdGF0dXNM b2FkRmluaXNoZWQpOiBDYWxsYmFjayB3aGljaCBnZXRzIHRyaWdlcnJlZCB1cG9uIGh0bWwgc3Ry aW5nIGxvYWQgY29tcGxldGUuCisgICAgICAgICh0ZXN0SHRtbFN0cmluZ0xvYWRpbmdTdGF0dXMp OiBUZXN0IHdlYmtpdF93ZWJfdmlld19sb2FkX2h0bWxfc3RyaW5nIEFQSS4KKyAgICAgICAgKHBs YWluVGV4dExvYWRpbmdGaXh0dXJlU2V0dXApOiBMb2FkIHBsYWluIHRleHQgZml4dHVyZSBzZXR1 cC4KKyAgICAgICAgKHBsYWluVGV4dExvYWRTdGF0dXNMb2FkRmluaXNoZWQpOiBDYWxsYmFjayB3 aGljaCBnZXRzIHRyaWdlcnJlZCB1cG9uIHBsYWluIHRleHQgbG9hZCBjb21wbGV0ZS4KKyAgICAg ICAgKHRlc3RQbGFpblRleHRMb2FkaW5nU3RhdHVzKTogVGVzdCB3ZWJraXRfd2ViX3ZpZXdfbG9h ZF9wbGFpbl90ZXh0IEFQSS4KKyAgICAgICAgKG1haW4pOiBBZGQgSFRNTCBzdHJpbmcgbG9hZCBh bmQgcGxhaW4gdGV4dCBsb2FkIHRlc3RzLgorCisyMDExLTEwLTAzICBOYXlhbiBLdW1hciBLICA8 bmF5YW5ra0Btb3Rvcm9sYS5jb20+CisKICAgICAgICAgW0dUS11bV0VCS0lUMl0gQWRkIHN1cHBv cnQgZm9yIHRpdGxlIHByb3BlcnR5IGluIFdlYktpdFdlYlZpZXcKICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4MDc0CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAKaW5kZXggZjBlYTE5OS4u NjUwZjYwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0V2ViVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0V2ViVmlldy5jcHAKQEAgLTI2Miw2ICsyNjIsNDcgQEAgdm9pZCB3ZWJraXRfd2ViX3ZpZXdf bG9hZF91cmkoV2ViS2l0V2ViVmlldyogd2ViVmlldywgY29uc3QgZ2NoYXIqIHVyaSkKIH0KIAog LyoqCisgKiB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9odG1sX3N0cmluZzoKKyAqIEB3ZWJWaWV3OiBh ICNXZWJLaXRXZWJWaWV3CisgKiBAY29udGVudDogSFRNTCBzdHJpbmcgdG8gYmUgbG9hZGVkCisg KiBAYmFzZV91cmk6IHRoZSBiYXNlIFVSSSBmb3IgcmVsYXRpdmUgbG9jYXRpb25zLiBJZiAlTlVM TCwgZGVmYXVsdHMgdG8gYWJvdXQ6YmxhbmsKKyAqCisgKiBSZXF1ZXN0cyBsb2FkaW5nIG9mIHRo ZSBnaXZlbiBAY29udGVudCB3aXRoIHRoZSBzcGVjaWZpZWQgQGJhc2VfdXJpLiAKKyAqIFRoZSBA YmFzZV91cmkgcmVwcmVzZW50cyB0aGUgQGNvbnRlbnQgdGhhdCBpcyBsb2FkZWQgdGhyb3VnaCB0 aGlzIEFQSS4KKyAqIEFzIHN1Y2gsIGl0IGlzIHVzZWQgdG8gcmVzb2x2ZSBhbnkgcmVsYXRpdmUg VVJMcy4KKyAqLwordm9pZCB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9odG1sX3N0cmluZyhXZWJLaXRX ZWJWaWV3KiB3ZWJWaWV3LCBjb25zdCBnY2hhciogY29udGVudCwgY29uc3QgZ2NoYXIqIGJhc2VV cmkpCit7CisgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcod2ViVmlldykp OworICAgIGdfcmV0dXJuX2lmX2ZhaWwoY29udGVudCk7CisKKyAgICBXZWJQYWdlUHJveHkqIHBh Z2UgPSB3ZWJraXRXZWJWaWV3QmFzZUdldFBhZ2UoV0VCS0lUX1dFQl9WSUVXX0JBU0Uod2ViVmll dykpOworICAgIFdLU3RyaW5nUmVmIGNvbnRlbnRSZWYgPSBXS1N0cmluZ0NyZWF0ZVdpdGhVVEY4 Q1N0cmluZyhjb250ZW50KTsKKyAgICBXS1VSTFJlZiBiYXNlVXJpUmVmID0gV0tVUkxDcmVhdGVX aXRoVVRGOENTdHJpbmcoYmFzZVVyaSk7CisgICAgV0tQYWdlTG9hZEhUTUxTdHJpbmcodG9BUEko cGFnZSksIGNvbnRlbnRSZWYsIGJhc2VVcmlSZWYpOworICAgIFdLUmVsZWFzZShjb250ZW50UmVm KTsKKyAgICBXS1JlbGVhc2UoYmFzZVVyaVJlZik7Cit9CisKKy8qKgorICogd2Via2l0X3dlYl92 aWV3X2xvYWRfcGxhaW5fdGV4dDoKKyAqIEB3ZWJWaWV3OiBhICNXZWJLaXRXZWJWaWV3CisgKiBA cGxhaW5fdGV4dDogVGV4dCB0byBiZSBkaXNwbGF5ZWQKKyAqCisgKiBMb2FkcyB0aGUgc3BlY2lm aWVkIHRleHQgaW50byBAd2ViX3ZpZXcuCisgKi8KK3ZvaWQgd2Via2l0X3dlYl92aWV3X2xvYWRf cGxhaW5fdGV4dChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBjb25zdCBnY2hhciogcGxhaW5UZXh0 KQoreworICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9WSUVXKHdlYlZpZXcpKTsK KyAgICBnX3JldHVybl9pZl9mYWlsKHBsYWluVGV4dCk7CisKKyAgICBXZWJQYWdlUHJveHkqIHBh Z2UgPSB3ZWJraXRXZWJWaWV3QmFzZUdldFBhZ2UoV0VCS0lUX1dFQl9WSUVXX0JBU0Uod2ViVmll dykpOworICAgIFdLU3RyaW5nUmVmIHBsYWluVGV4dFJlZiA9IFdLU3RyaW5nQ3JlYXRlV2l0aFVU RjhDU3RyaW5nKHBsYWluVGV4dCk7CisgICAgV0tQYWdlTG9hZFBsYWluVGV4dFN0cmluZyh0b0FQ SShwYWdlKSwgcGxhaW5UZXh0UmVmKTsKKyAgICBXS1JlbGVhc2UocGxhaW5UZXh0UmVmKTsKK30K KworLyoqCiAgKiB3ZWJraXRfd2ViX3ZpZXdfZ29fYmFjazoKICAqIEB3ZWJfdmlldzogYSAjV2Vi S2l0V2ViVmlldwogICoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdFdlYlZpZXcuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdFdlYlZpZXcuaAppbmRleCA2NTFhOWEyLi43N2Q5MjAxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmgKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5oCkBAIC05MCw2ICs5MCwxNSBA QCB3ZWJraXRfd2ViX3ZpZXdfbG9hZF91cmkgICAgICAgICAgKFdlYktpdFdlYlZpZXcgICAgICAg ICAqd2ViX3ZpZXcsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGdj aGFyICAgICAgICAgICAqdXJpKTsKIAogV0tfRVhQT1JUIHZvaWQKK3dlYmtpdF93ZWJfdmlld19s b2FkX2h0bWxfc3RyaW5nICAoV2ViS2l0V2ViVmlldyAgICAgICAgICp3ZWJfdmlldywKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2NoYXIgICAgICAgICAgICpjb250 ZW50LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAg ICAgICAgKmJhc2VfdXJpKTsKKworV0tfRVhQT1JUIHZvaWQgCit3ZWJraXRfd2ViX3ZpZXdfbG9h ZF9wbGFpbl90ZXh0ICAgKFdlYktpdFdlYlZpZXcgICAgICAgICAqd2ViX3ZpZXcsIAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAgICAgICAgKnBsYWlu X3RleHQpOworCitXS19FWFBPUlQgdm9pZAogd2Via2l0X3dlYl92aWV3X2dvX2JhY2sgICAgICAg ICAgIChXZWJLaXRXZWJWaWV3ICAgICAgICAgKndlYl92aWV3KTsKIAogV0tfRVhQT1JUIHZvaWQK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL3Rlc3Rs b2FkaW5nLmMgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy90ZXN0bG9h ZGluZy5jCmluZGV4IDI2OTMzYjcuLjdmYzkzMzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL3Rlc3Rsb2FkaW5nLmMKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvdGVzdGxvYWRpbmcuYwpAQCAtMjUsNyArMjUsOSBA QAogCiAvKiBUaGlzIHN0cmluZyBoYXMgdG8gYmUgcmF0aGVyIGJpZyBiZWNhdXNlIG9mIHRoZSBj YW5jZWxsZWQgdGVzdCAtIGl0CiAgKiBsb29rcyBsaWtlIHNvdXAgcmVmdXNlcyB0byBzZW5kIG9y IHJlY2VpdmUgYSB0b28gc21hbGwgY2h1bmsgKi8KLSNkZWZpbmUgSFRNTF9TVFJJTkcgIjxodG1s Pjxib2R5PlRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRl c3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVz dGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0 aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3Rp bmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGlu ZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5n IVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3Rpbmch VGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFU ZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRl c3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVz dGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0 aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3Rp bmchVGVzdGluZyE8L2JvZHk+PC9odG1sPiIKKyNkZWZpbmUgSFRNTF9USVRMRSAiSGVsbG8gV2Vi S2l0IEdUSyshIgorI2RlZmluZSBIVE1MX1NUUklORyAiPGh0bWw+PGhlYWQ+PHRpdGxlPiJIVE1M X1RJVExFIjwvdGl0bGU+PC9oZWFkPjxib2R5PlRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3Rp bmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGlu ZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5n IVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3Rpbmch VGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFU ZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRl c3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVz dGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0 aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3Rp bmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGlu ZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5n IVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3Rpbmch VGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyE8L2JvZHk+PC9odG1sPiIKKyNkZWZpbmUg UExBSU5fVEVYVCAiV2VsY29tZSB0byBXZWJLaXQgR1RLKyEiCiAKIFNvdXBVUkkgKmJhc2VVUkk7 CiAKQEAgLTIyMyw2ICsyMjUsNzkgQEAgc3RhdGljIHZvaWQgdGVzdExvYWRpbmdFcnJvcihXZWJM b2FkaW5nRml4dHVyZSAqZml4dHVyZSwgZ2NvbnN0cG9pbnRlciBkYXRhKQogICAgIGdfYXNzZXJ0 KGZpeHR1cmUtPmhhc0JlZW5GYWlsZWQpOwogfQogCitzdGF0aWMgdm9pZCBodG1sU3RyaW5nTG9h ZGluZ05vdGlmeVRpdGxlQ2IoV2ViS2l0V2ViVmlldyAqd2ViVmlldywgR1BhcmFtU3BlYyAqcFNw ZWMsIFdlYkxvYWRpbmdGaXh0dXJlICpmaXh0dXJlKQoreworICAgIGdfYXNzZXJ0KCFmaXh0dXJl LT5oYXNCZWVuRmluaXNoZWQpOworCisgICAgY29uc3QgZ2NoYXIgKnRpdGxlID0gd2Via2l0X3dl Yl92aWV3X2dldF90aXRsZSh3ZWJWaWV3KTsKKyAgICBnX2Fzc2VydF9jbXBzdHIodGl0bGUsID09 LCBIVE1MX1RJVExFKTsKK30KKworc3RhdGljIHZvaWQgaHRtbFN0cmluZ0xvYWRpbmdGaXh0dXJl U2V0dXAoV2ViTG9hZGluZ0ZpeHR1cmUgKmZpeHR1cmUsIGdjb25zdHBvaW50ZXIgZGF0YSkKK3sK KyAgICBmaXh0dXJlLT53ZWJWaWV3ID0gV0VCS0lUX1dFQl9WSUVXKHdlYmtpdF93ZWJfdmlld19u ZXcoKSk7CisgICAgZml4dHVyZS0+bG9vcCA9IGdfbWFpbl9sb29wX25ldyhOVUxMLCBUUlVFKTsK KyAgICBnX29iamVjdF9yZWZfc2luayhmaXh0dXJlLT53ZWJWaWV3KTsKKyAgICBmaXh0dXJlLT5o YXNCZWVuRmluaXNoZWQgPSBGQUxTRTsKKyAgICBnX3NpZ25hbF9jb25uZWN0KGZpeHR1cmUtPndl YlZpZXcsICJub3RpZnk6OnRpdGxlIiwgR19DQUxMQkFDSyhodG1sU3RyaW5nTG9hZGluZ05vdGlm eVRpdGxlQ2IpLCBmaXh0dXJlKTsKK30KKworc3RhdGljIGdib29sZWFuIGh0bWxTdHJpbmdMb2Fk U3RhdHVzTG9hZEZpbmlzaGVkKFdlYktpdFdlYkxvYWRlckNsaWVudCAqY2xpZW50LCBXZWJMb2Fk aW5nRml4dHVyZSAqZml4dHVyZSkKK3sKKyAgICBnX2Fzc2VydCghZml4dHVyZS0+aGFzQmVlbkZp bmlzaGVkKTsKKyAgICBmaXh0dXJlLT5oYXNCZWVuRmluaXNoZWQgPSBUUlVFOworCisgICAgZ19t YWluX2xvb3BfcXVpdChmaXh0dXJlLT5sb29wKTsKKworICAgIHJldHVybiBUUlVFOworfQorCitz dGF0aWMgdm9pZCB0ZXN0SHRtbFN0cmluZ0xvYWRpbmdTdGF0dXMoV2ViTG9hZGluZ0ZpeHR1cmUg KmZpeHR1cmUsIGdjb25zdHBvaW50ZXIgZGF0YSkKK3sKKyAgICBXZWJLaXRXZWJMb2FkZXJDbGll bnQgKmNsaWVudCA9IHdlYmtpdF93ZWJfdmlld19nZXRfbG9hZGVyX2NsaWVudChmaXh0dXJlLT53 ZWJWaWV3KTsKKworICAgIGdfc2lnbmFsX2Nvbm5lY3QoY2xpZW50LCAibG9hZC1maW5pc2hlZCIs IEdfQ0FMTEJBQ0soaHRtbFN0cmluZ0xvYWRTdGF0dXNMb2FkRmluaXNoZWQpLCBmaXh0dXJlKTsK KyAgICBnX3NpZ25hbF9jb25uZWN0KGNsaWVudCwgImxvYWQtZmFpbGVkIiwgR19DQUxMQkFDSyhs b2FkU3RhdHVzTG9hZEZhaWxlZCksIGZpeHR1cmUpOworICAgIGdfc2lnbmFsX2Nvbm5lY3QoY2xp ZW50LCAicHJvdmlzaW9uYWwtbG9hZC1mYWlsZWQiLCBHX0NBTExCQUNLKGxvYWRTdGF0dXNQcm92 aXNpb25hbExvYWRGYWlsZWQpLCBmaXh0dXJlKTsKKworICAgIHdlYmtpdF93ZWJfdmlld19sb2Fk X2h0bWxfc3RyaW5nKGZpeHR1cmUtPndlYlZpZXcsIEhUTUxfU1RSSU5HLCAiYWJvdXQ6d2Via2l0 LWd0aysiKTsKKworICAgIGdfbWFpbl9sb29wX3J1bihmaXh0dXJlLT5sb29wKTsKKyAgICBnX2Fz c2VydChmaXh0dXJlLT5oYXNCZWVuRmluaXNoZWQpOworfQorCitzdGF0aWMgdm9pZCBwbGFpblRl eHRMb2FkaW5nRml4dHVyZVNldHVwKFdlYkxvYWRpbmdGaXh0dXJlICpmaXh0dXJlLCBnY29uc3Rw b2ludGVyIGRhdGEpCit7CisgICAgZml4dHVyZS0+d2ViVmlldyA9IFdFQktJVF9XRUJfVklFVyh3 ZWJraXRfd2ViX3ZpZXdfbmV3KCkpOworICAgIGZpeHR1cmUtPmxvb3AgPSBnX21haW5fbG9vcF9u ZXcoTlVMTCwgVFJVRSk7CisgICAgZ19vYmplY3RfcmVmX3NpbmsoZml4dHVyZS0+d2ViVmlldyk7 CisgICAgZml4dHVyZS0+aGFzQmVlbkZpbmlzaGVkID0gRkFMU0U7Cit9CisKK3N0YXRpYyBnYm9v bGVhbiBwbGFpblRleHRMb2FkU3RhdHVzTG9hZEZpbmlzaGVkKFdlYktpdFdlYkxvYWRlckNsaWVu dCAqY2xpZW50LCBXZWJMb2FkaW5nRml4dHVyZSAqZml4dHVyZSkKK3sKKyAgICBnX2Fzc2VydCgh Zml4dHVyZS0+aGFzQmVlbkZpbmlzaGVkKTsKKyAgICBmaXh0dXJlLT5oYXNCZWVuRmluaXNoZWQg PSBUUlVFOworCisgICAgZ19tYWluX2xvb3BfcXVpdChmaXh0dXJlLT5sb29wKTsKKworICAgIHJl dHVybiBUUlVFOworfQorCitzdGF0aWMgdm9pZCB0ZXN0UGxhaW5UZXh0TG9hZGluZ1N0YXR1cyhX ZWJMb2FkaW5nRml4dHVyZSAqZml4dHVyZSwgZ2NvbnN0cG9pbnRlciBkYXRhKQoreworICAgIFdl YktpdFdlYkxvYWRlckNsaWVudCAqY2xpZW50ID0gd2Via2l0X3dlYl92aWV3X2dldF9sb2FkZXJf Y2xpZW50KGZpeHR1cmUtPndlYlZpZXcpOworCisgICAgZ19zaWduYWxfY29ubmVjdChjbGllbnQs ICJsb2FkLWZpbmlzaGVkIiwgR19DQUxMQkFDSyhwbGFpblRleHRMb2FkU3RhdHVzTG9hZEZpbmlz aGVkKSwgZml4dHVyZSk7CisgICAgZ19zaWduYWxfY29ubmVjdChjbGllbnQsICJsb2FkLWZhaWxl ZCIsIEdfQ0FMTEJBQ0sobG9hZFN0YXR1c0xvYWRGYWlsZWQpLCBmaXh0dXJlKTsKKyAgICBnX3Np Z25hbF9jb25uZWN0KGNsaWVudCwgInByb3Zpc2lvbmFsLWxvYWQtZmFpbGVkIiwgR19DQUxMQkFD Syhsb2FkU3RhdHVzUHJvdmlzaW9uYWxMb2FkRmFpbGVkKSwgZml4dHVyZSk7CisKKyAgICB3ZWJr aXRfd2ViX3ZpZXdfbG9hZF9wbGFpbl90ZXh0KGZpeHR1cmUtPndlYlZpZXcsIFBMQUlOX1RFWFQp OworCisgICAgZ19tYWluX2xvb3BfcnVuKGZpeHR1cmUtPmxvb3ApOworICAgIGdfYXNzZXJ0KGZp eHR1cmUtPmhhc0JlZW5GaW5pc2hlZCk7Cit9CisKIGludCBtYWluKGludCBhcmdjLCBjaGFyICoq YXJndikKIHsKICAgICBTb3VwU2VydmVyICpzZXJ2ZXI7CkBAIC0yNTEsNiArMzI2LDE2IEBAIGlu dCBtYWluKGludCBhcmdjLCBjaGFyICoqYXJndikKICAgICAgICAgICAgICAgIHdlYkxvYWRpbmdG aXh0dXJlU2V0dXAsCiAgICAgICAgICAgICAgICB0ZXN0TG9hZGluZ0Vycm9yLAogICAgICAgICAg ICAgICAgd2ViTG9hZGluZ0ZpeHR1cmVUZWFyZG93bik7CisgICAgZ190ZXN0X2FkZCgiL3dlYmtp dDIvaHRtbHN0cmluZ2xvYWRpbmcvc3RhdHVzIiwKKyAgICAgICAgICAgICAgIFdlYkxvYWRpbmdG aXh0dXJlLCBOVUxMLAorICAgICAgICAgICAgICAgaHRtbFN0cmluZ0xvYWRpbmdGaXh0dXJlU2V0 dXAsCisgICAgICAgICAgICAgICB0ZXN0SHRtbFN0cmluZ0xvYWRpbmdTdGF0dXMsCisgICAgICAg ICAgICAgICB3ZWJMb2FkaW5nRml4dHVyZVRlYXJkb3duKTsKKyAgICBnX3Rlc3RfYWRkKCIvd2Vi a2l0Mi9wbGFpbnRleHRsb2FkaW5nL3N0YXR1cyIsCisgICAgICAgICAgICAgICBXZWJMb2FkaW5n Rml4dHVyZSwgTlVMTCwKKyAgICAgICAgICAgICAgIHBsYWluVGV4dExvYWRpbmdGaXh0dXJlU2V0 dXAsCisgICAgICAgICAgICAgICB0ZXN0UGxhaW5UZXh0TG9hZGluZ1N0YXR1cywKKyAgICAgICAg ICAgICAgIHdlYkxvYWRpbmdGaXh0dXJlVGVhcmRvd24pOwogCiAgICAgcmV0dXJuIGdfdGVzdF9y dW4oKTsKIH0KLS0gCjEuNy40LjEKCg== 109608 2011-10-04 05:14:32 -0700 2011-10-06 08:19:01 -0700 Add webkit_web_view_load_html_string and webkit_web_view_load_plain_text APIs. AddedHTMLStringAndPlainTextLoad.diff text/plain 9799 nayankk ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkYmIzMWVjLi43ZGQ0NmMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjYg QEAKIDIwMTEtMTAtMDMgIE5heWFuIEt1bWFyIEsgIDxuYXlhbmtrQG1vdG9yb2xhLmNvbT4KIAor ICAgICAgICBBZGQgd2Via2l0X3dlYl92aWV3X2xvYWRfaHRtbF9zdHJpbmcgYW5kIHdlYmtpdF93 ZWJfdmlld19sb2FkX3BsYWluX3RleHQgQVBJcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTY5MjQ5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNw cDoKKyAgICAgICAgKHdlYmtpdF93ZWJfdmlld19sb2FkX2h0bWxfc3RyaW5nKTogQVBJIHRvIGxv YWQgaHRtbCBzdHJpbmcuCisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfbG9hZF9wbGFpbl90ZXh0 KTogQVBJIHRvIGxvYWQgcGxhaW4gdGV4dC4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9X ZWJLaXRXZWJWaWV3Lmg6IEFkZGVkIHB1YmxpYyBBUElzLgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvZ3RrL3Rlc3RzL3Rlc3Rsb2FkaW5nLmM6CisgICAgICAgIChodG1sU3RyaW5nTG9hZGluZ05v dGlmeVRpdGxlQ2IpOiBOb3RpZnkgJ3RpdGxlJyBwcm9wZXJ0eSBjaGFuZ2UuCisgICAgICAgICho dG1sU3RyaW5nTG9hZGluZ0ZpeHR1cmVTZXR1cCk6IExvYWQgaHRtbCBzdHJpbmcgZml4dHVyZSBz ZXR1cC4KKyAgICAgICAgKGh0bWxTdHJpbmdMb2FkU3RhdHVzTG9hZEZpbmlzaGVkKTogQ2FsbGJh Y2sgd2hpY2ggZ2V0cyB0cmlnZXJyZWQgdXBvbiBodG1sIHN0cmluZyBsb2FkIGNvbXBsZXRlLgor ICAgICAgICAodGVzdEh0bWxTdHJpbmdMb2FkaW5nU3RhdHVzKTogVGVzdCB3ZWJraXRfd2ViX3Zp ZXdfbG9hZF9odG1sX3N0cmluZyBBUEkuCisgICAgICAgIChwbGFpblRleHRMb2FkaW5nRml4dHVy ZVNldHVwKTogTG9hZCBwbGFpbiB0ZXh0IGZpeHR1cmUgc2V0dXAuCisgICAgICAgIChwbGFpblRl eHRMb2FkU3RhdHVzTG9hZEZpbmlzaGVkKTogQ2FsbGJhY2sgd2hpY2ggZ2V0cyB0cmlnZXJyZWQg dXBvbiBwbGFpbiB0ZXh0IGxvYWQgY29tcGxldGUuCisgICAgICAgICh0ZXN0UGxhaW5UZXh0TG9h ZGluZ1N0YXR1cyk6IFRlc3Qgd2Via2l0X3dlYl92aWV3X2xvYWRfcGxhaW5fdGV4dCBBUEkuCisg ICAgICAgIChtYWluKTogQWRkIEhUTUwgc3RyaW5nIGxvYWQgYW5kIHBsYWluIHRleHQgbG9hZCB0 ZXN0cy4KKworMjAxMS0xMC0wMyAgTmF5YW4gS3VtYXIgSyAgPG5heWFua2tAbW90b3JvbGEuY29t PgorCiAgICAgICAgIFtHVEtdW1dFQktJVDJdIEFkZCBzdXBwb3J0IGZvciB0aXRsZSBwcm9wZXJ0 eSBpbiBXZWJLaXRXZWJWaWV3CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD02ODA3NAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdFdlYlZpZXcuY3BwCmluZGV4IDA0Y2ZjZmEuLjFhNWQ3ZTggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCkBAIC0y NjQsNiArMjY0LDQ4IEBAIHZvaWQgd2Via2l0X3dlYl92aWV3X2xvYWRfdXJpKFdlYktpdFdlYlZp ZXcqIHdlYlZpZXcsIGNvbnN0IGdjaGFyKiB1cmkpCiB9CiAKIC8qKgorICogd2Via2l0X3dlYl92 aWV3X2xvYWRfaHRtbF9zdHJpbmc6CisgKiBAd2ViX3ZpZXc6IGEgI1dlYktpdFdlYlZpZXcKKyAq IEBodG1sX3N0cmluZzogVGhlIEhUTUwgc3RyaW5nIHRvIGxvYWQKKyAqIEBiYXNlX3VyaTogdGhl IGJhc2UgVVJJIGZvciByZWxhdGl2ZSBsb2NhdGlvbnMuIElmICVOVUxMLCBkZWZhdWx0cyB0byBh Ym91dDpibGFuaworICoKKyAqIExvYWQgdGhlIGdpdmVuIEBodG1sX3N0cmluZyBzdHJpbmcgd2l0 aCB0aGUgc3BlY2lmaWVkIEBiYXNlX3VyaS4gCisgKiBSZWxhdGl2ZSBVUkxzIGluIHRoZSBAaHRt bF9zdHJpbmcgd2lsbCBiZSByZXNvbHZlZCBhZ2FpbnN0IEBiYXNlX3VyaS4KKyAqIE1pbWUgdHlw ZSBvZiBAaHRtbF9zdHJpbmcgaXMgYXNzdW1lZCB0byBiZSAidGV4dC9odG1sIi4KKyAqLwordm9p ZCB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9odG1sX3N0cmluZyhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3 LCBjb25zdCBnY2hhciogaHRtbFN0cmluZywgY29uc3QgZ2NoYXIqIGJhc2VVcmkpCit7CisgICAg Z19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcod2ViVmlldykpOworICAgIGdfcmV0 dXJuX2lmX2ZhaWwoaHRtbFN0cmluZyk7CisKKyAgICBXZWJQYWdlUHJveHkqIHBhZ2UgPSB3ZWJr aXRXZWJWaWV3QmFzZUdldFBhZ2UoV0VCS0lUX1dFQl9WSUVXX0JBU0Uod2ViVmlldykpOworICAg IFdLU3RyaW5nUmVmIGh0bWxTdHJpbmdSZWYgPSBXS1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmlu ZyhodG1sU3RyaW5nKTsKKyAgICBXS1VSTFJlZiBiYXNlVXJpUmVmID0gV0tVUkxDcmVhdGVXaXRo VVRGOENTdHJpbmcoYmFzZVVyaSk7CisgICAgV0tQYWdlTG9hZEhUTUxTdHJpbmcodG9BUEkocGFn ZSksIGh0bWxTdHJpbmdSZWYsIGJhc2VVcmlSZWYpOworICAgIFdLUmVsZWFzZShodG1sU3RyaW5n UmVmKTsKKyAgICBXS1JlbGVhc2UoYmFzZVVyaVJlZik7Cit9CisKKy8qKgorICogd2Via2l0X3dl Yl92aWV3X2xvYWRfcGxhaW5fdGV4dDoKKyAqIEB3ZWJfdmlldzogYSAjV2ViS2l0V2ViVmlldwor ICogQHBsYWluX3RleHQ6IFRoZSBwbGFpbiB0ZXh0IHRvIGxvYWQKKyAqCisgKiBMb2FkIHRoZSBz cGVjaWZpZWQgcGxhaW4gdGV4dCBpbnRvIEB3ZWJfdmlldy4gUGxhaW4gdGV4dCBpcyBhc3N1bWVk IHRvCisgKiBoYXZlIHRoZSBtaW1lLXR5cGUgInRleHQvcGxhaW4iLgorICovCit2b2lkIHdlYmtp dF93ZWJfdmlld19sb2FkX3BsYWluX3RleHQoV2ViS2l0V2ViVmlldyogd2ViVmlldywgY29uc3Qg Z2NoYXIqIHBsYWluVGV4dCkKK3sKKyAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19XRUJf VklFVyh3ZWJWaWV3KSk7CisgICAgZ19yZXR1cm5faWZfZmFpbChwbGFpblRleHQpOworCisgICAg V2ViUGFnZVByb3h5KiBwYWdlID0gd2Via2l0V2ViVmlld0Jhc2VHZXRQYWdlKFdFQktJVF9XRUJf VklFV19CQVNFKHdlYlZpZXcpKTsKKyAgICBXS1N0cmluZ1JlZiBwbGFpblRleHRSZWYgPSBXS1N0 cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZyhwbGFpblRleHQpOworICAgIFdLUGFnZUxvYWRQbGFp blRleHRTdHJpbmcodG9BUEkocGFnZSksIHBsYWluVGV4dFJlZik7CisgICAgV0tSZWxlYXNlKHBs YWluVGV4dFJlZik7Cit9CisKKy8qKgogICogd2Via2l0X3dlYl92aWV3X2dvX2JhY2s6CiAgKiBA d2ViX3ZpZXc6IGEgI1dlYktpdFdlYlZpZXcKICAqCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmgKaW5kZXggNjUxYTlhMi4uZTkxM2RhOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5o CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuaApA QCAtOTAsNiArOTAsMTUgQEAgd2Via2l0X3dlYl92aWV3X2xvYWRfdXJpICAgICAgICAgIChXZWJL aXRXZWJWaWV3ICAgICAgICAgKndlYl92aWV3LAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBjb25zdCBnY2hhciAgICAgICAgICAgKnVyaSk7CiAKIFdLX0VYUE9SVCB2b2lkCit3 ZWJraXRfd2ViX3ZpZXdfbG9hZF9odG1sX3N0cmluZyAgKFdlYktpdFdlYlZpZXcgICAgICAgICAq d2ViX3ZpZXcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGdjaGFy ICAgICAgICAgICAqaHRtbF9zdHJpbmcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGNvbnN0IGdjaGFyICAgICAgICAgICAqYmFzZV91cmkpOworCitXS19FWFBPUlQgdm9pZCAK K3dlYmtpdF93ZWJfdmlld19sb2FkX3BsYWluX3RleHQgICAoV2ViS2l0V2ViVmlldyAgICAgICAg ICp3ZWJfdmlldywgCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGdj aGFyICAgICAgICAgICAqcGxhaW5fdGV4dCk7CisKK1dLX0VYUE9SVCB2b2lkCiB3ZWJraXRfd2Vi X3ZpZXdfZ29fYmFjayAgICAgICAgICAgKFdlYktpdFdlYlZpZXcgICAgICAgICAqd2ViX3ZpZXcp OwogCiBXS19FWFBPUlQgdm9pZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvdGVzdHMvdGVzdGxvYWRpbmcuYyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL3Rlc3RzL3Rlc3Rsb2FkaW5nLmMKaW5kZXggNzQ5ODJjMC4uN2M1NGVlMyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvdGVzdGxvYWRpbmcu YworKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy90ZXN0bG9hZGlu Zy5jCkBAIC0yNSw3ICsyNSw4IEBACiAKIC8qIFRoaXMgc3RyaW5nIGhhcyB0byBiZSByYXRoZXIg YmlnIGJlY2F1c2Ugb2YgdGhlIGNhbmNlbGxlZCB0ZXN0IC0gaXQKICAqIGxvb2tzIGxpa2Ugc291 cCByZWZ1c2VzIHRvIHNlbmQgb3IgcmVjZWl2ZSBhIHRvbyBzbWFsbCBjaHVuayAqLwotI2RlZmlu ZSBIVE1MX1NUUklORyAiPGh0bWw+PGJvZHk+VGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGlu ZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5n IVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3Rpbmch VGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFU ZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRl c3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVz dGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0 aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3Rp bmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGlu ZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5n IVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3Rpbmch VGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFU ZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nITwvYm9keT48L2h0bWw+IgorI2RlZmluZSBI VE1MX1RJVExFICJIZWxsbyBXZWJLaXQgR1RLKyEiCisjZGVmaW5lIEhUTUxfU1RSSU5HICI8aHRt bD48aGVhZD48dGl0bGU+IkhUTUxfVElUTEUiPC90aXRsZT48L2hlYWQ+PGJvZHk+VGVzdGluZyFU ZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRl c3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVz dGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0 aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3Rp bmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGlu ZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5n IVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3Rpbmch VGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFU ZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRl c3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVz dGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0 aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyFUZXN0aW5nITwvYm9k eT48L2h0bWw+IgogCiBTb3VwVVJJICpiYXNlVVJJOwogCkBAIC0yMjMsNiArMjI0LDczIEBAIHN0 YXRpYyB2b2lkIHRlc3RMb2FkaW5nRXJyb3IoV2ViTG9hZGluZ0ZpeHR1cmUgKmZpeHR1cmUsIGdj b25zdHBvaW50ZXIgZGF0YSkKICAgICBnX2Fzc2VydChmaXh0dXJlLT5oYXNCZWVuRmFpbGVkKTsK IH0KIAorc3RhdGljIHZvaWQgaHRtbFN0cmluZ0xvYWRpbmdOb3RpZnlUaXRsZUNiKFdlYktpdFdl YlZpZXcgKndlYlZpZXcsIEdQYXJhbVNwZWMgKnBTcGVjLCBXZWJMb2FkaW5nRml4dHVyZSAqZml4 dHVyZSkKK3sKKyAgICBnX2Fzc2VydCghZml4dHVyZS0+aGFzQmVlbkZpbmlzaGVkKTsKKworICAg IGNvbnN0IGdjaGFyICp0aXRsZSA9IHdlYmtpdF93ZWJfdmlld19nZXRfdGl0bGUod2ViVmlldyk7 CisgICAgZ19hc3NlcnRfY21wc3RyKHRpdGxlLCA9PSwgSFRNTF9USVRMRSk7Cit9CisKK3N0YXRp YyB2b2lkIGh0bWxTdHJpbmdMb2FkaW5nRml4dHVyZVNldHVwKFdlYkxvYWRpbmdGaXh0dXJlICpm aXh0dXJlLCBnY29uc3Rwb2ludGVyIGRhdGEpCit7CisgICAgZml4dHVyZS0+d2ViVmlldyA9IFdF QktJVF9XRUJfVklFVyh3ZWJraXRfd2ViX3ZpZXdfbmV3KCkpOworICAgIGZpeHR1cmUtPmxvb3Ag PSBnX21haW5fbG9vcF9uZXcoTlVMTCwgVFJVRSk7CisgICAgZ19vYmplY3RfcmVmX3NpbmsoZml4 dHVyZS0+d2ViVmlldyk7CisgICAgZml4dHVyZS0+aGFzQmVlbkZpbmlzaGVkID0gRkFMU0U7Cisg ICAgZ19zaWduYWxfY29ubmVjdChmaXh0dXJlLT53ZWJWaWV3LCAibm90aWZ5Ojp0aXRsZSIsIEdf Q0FMTEJBQ0soaHRtbFN0cmluZ0xvYWRpbmdOb3RpZnlUaXRsZUNiKSwgZml4dHVyZSk7Cit9CisK K3N0YXRpYyBnYm9vbGVhbiBodG1sU3RyaW5nTG9hZFN0YXR1c0xvYWRGaW5pc2hlZChXZWJLaXRX ZWJMb2FkZXJDbGllbnQgKmNsaWVudCwgV2ViTG9hZGluZ0ZpeHR1cmUgKmZpeHR1cmUpCit7Cisg ICAgZ19hc3NlcnQoIWZpeHR1cmUtPmhhc0JlZW5GaW5pc2hlZCk7CisgICAgZml4dHVyZS0+aGFz QmVlbkZpbmlzaGVkID0gVFJVRTsKKworICAgIGdfbWFpbl9sb29wX3F1aXQoZml4dHVyZS0+bG9v cCk7CisKKyAgICByZXR1cm4gVFJVRTsKK30KKworc3RhdGljIHZvaWQgdGVzdEh0bWxTdHJpbmdM b2FkaW5nU3RhdHVzKFdlYkxvYWRpbmdGaXh0dXJlICpmaXh0dXJlLCBnY29uc3Rwb2ludGVyIGRh dGEpCit7CisgICAgV2ViS2l0V2ViTG9hZGVyQ2xpZW50ICpjbGllbnQgPSB3ZWJraXRfd2ViX3Zp ZXdfZ2V0X2xvYWRlcl9jbGllbnQoZml4dHVyZS0+d2ViVmlldyk7CisKKyAgICBnX3NpZ25hbF9j b25uZWN0KGNsaWVudCwgImxvYWQtZmluaXNoZWQiLCBHX0NBTExCQUNLKGh0bWxTdHJpbmdMb2Fk U3RhdHVzTG9hZEZpbmlzaGVkKSwgZml4dHVyZSk7CisgICAgd2Via2l0X3dlYl92aWV3X2xvYWRf aHRtbF9zdHJpbmcoZml4dHVyZS0+d2ViVmlldywgSFRNTF9TVFJJTkcsICJhYm91dDp3ZWJraXQt Z3RrKyIpOworICAgIGdfbWFpbl9sb29wX3J1bihmaXh0dXJlLT5sb29wKTsKKworICAgIGdfYXNz ZXJ0KGZpeHR1cmUtPmhhc0JlZW5GaW5pc2hlZCk7Cit9CisKK3N0YXRpYyB2b2lkIHBsYWluVGV4 dExvYWRpbmdGaXh0dXJlU2V0dXAoV2ViTG9hZGluZ0ZpeHR1cmUgKmZpeHR1cmUsIGdjb25zdHBv aW50ZXIgZGF0YSkKK3sKKyAgICBmaXh0dXJlLT53ZWJWaWV3ID0gV0VCS0lUX1dFQl9WSUVXKHdl YmtpdF93ZWJfdmlld19uZXcoKSk7CisgICAgZml4dHVyZS0+bG9vcCA9IGdfbWFpbl9sb29wX25l dyhOVUxMLCBUUlVFKTsKKyAgICBnX29iamVjdF9yZWZfc2luayhmaXh0dXJlLT53ZWJWaWV3KTsK KyAgICBmaXh0dXJlLT5oYXNCZWVuRmluaXNoZWQgPSBGQUxTRTsKK30KKworc3RhdGljIGdib29s ZWFuIHBsYWluVGV4dExvYWRTdGF0dXNMb2FkRmluaXNoZWQoV2ViS2l0V2ViTG9hZGVyQ2xpZW50 ICpjbGllbnQsIFdlYkxvYWRpbmdGaXh0dXJlICpmaXh0dXJlKQoreworICAgIGdfYXNzZXJ0KCFm aXh0dXJlLT5oYXNCZWVuRmluaXNoZWQpOworICAgIGZpeHR1cmUtPmhhc0JlZW5GaW5pc2hlZCA9 IFRSVUU7CisKKyAgICBnX21haW5fbG9vcF9xdWl0KGZpeHR1cmUtPmxvb3ApOworCisgICAgcmV0 dXJuIFRSVUU7Cit9CisKK3N0YXRpYyB2b2lkIHRlc3RQbGFpblRleHRMb2FkaW5nU3RhdHVzKFdl YkxvYWRpbmdGaXh0dXJlICpmaXh0dXJlLCBnY29uc3Rwb2ludGVyIGRhdGEpCit7CisgICAgV2Vi S2l0V2ViTG9hZGVyQ2xpZW50ICpjbGllbnQgPSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2xvYWRlcl9j bGllbnQoZml4dHVyZS0+d2ViVmlldyk7CisKKyAgICBnX3NpZ25hbF9jb25uZWN0KGNsaWVudCwg ImxvYWQtZmluaXNoZWQiLCBHX0NBTExCQUNLKHBsYWluVGV4dExvYWRTdGF0dXNMb2FkRmluaXNo ZWQpLCBmaXh0dXJlKTsKKyAgICB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9wbGFpbl90ZXh0KGZpeHR1 cmUtPndlYlZpZXcsICJXZWxjb21lIHRvIFdlYktpdCBHVEsrISIpOworICAgIGdfbWFpbl9sb29w X3J1bihmaXh0dXJlLT5sb29wKTsKKyAgICAKKyAgICBnX2Fzc2VydChmaXh0dXJlLT5oYXNCZWVu RmluaXNoZWQpOworfQorCiBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiB7CiAgICAg U291cFNlcnZlciAqc2VydmVyOwpAQCAtMjUxLDYgKzMxOSwxNiBAQCBpbnQgbWFpbihpbnQgYXJn YywgY2hhciAqKmFyZ3YpCiAgICAgICAgICAgICAgICB3ZWJMb2FkaW5nRml4dHVyZVNldHVwLAog ICAgICAgICAgICAgICAgdGVzdExvYWRpbmdFcnJvciwKICAgICAgICAgICAgICAgIHdlYkxvYWRp bmdGaXh0dXJlVGVhcmRvd24pOworICAgIGdfdGVzdF9hZGQoIi93ZWJraXQyL2h0bWxzdHJpbmds b2FkaW5nL3N0YXR1cyIsCisgICAgICAgICAgICAgICBXZWJMb2FkaW5nRml4dHVyZSwgTlVMTCwK KyAgICAgICAgICAgICAgIGh0bWxTdHJpbmdMb2FkaW5nRml4dHVyZVNldHVwLAorICAgICAgICAg ICAgICAgdGVzdEh0bWxTdHJpbmdMb2FkaW5nU3RhdHVzLAorICAgICAgICAgICAgICAgd2ViTG9h ZGluZ0ZpeHR1cmVUZWFyZG93bik7CisgICAgZ190ZXN0X2FkZCgiL3dlYmtpdDIvcGxhaW50ZXh0 bG9hZGluZy9zdGF0dXMiLAorICAgICAgICAgICAgICAgV2ViTG9hZGluZ0ZpeHR1cmUsIE5VTEws CisgICAgICAgICAgICAgICBwbGFpblRleHRMb2FkaW5nRml4dHVyZVNldHVwLAorICAgICAgICAg ICAgICAgdGVzdFBsYWluVGV4dExvYWRpbmdTdGF0dXMsCisgICAgICAgICAgICAgICB3ZWJMb2Fk aW5nRml4dHVyZVRlYXJkb3duKTsKIAogICAgIHJldHVybiBnX3Rlc3RfcnVuKCk7CiB9Cg== 109962 2011-10-06 08:19:01 -0700 2011-10-07 03:10:13 -0700 Load HTML String and Plain text API load_html_and_plain_text.diff text/plain 7645 nayankk ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBiMjYxMzFjLi4xNmZiMmIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTEtMTAtMDYgIE5heWFuIEt1bWFyIEsgIDxuYXlhbmtrQG1vdG9yb2xhLmNvbT4KKwor ICAgICAgICBBZGQgd2Via2l0X3dlYl92aWV3X2xvYWRfaHRtbCBhbmQgd2Via2l0X3dlYl92aWV3 X2xvYWRfcGxhaW5fdGV4dCBBUElzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NjkyNDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGlzIHBhdGNoIGFkZHMgc3VwcG9ydCBmb3IgMiBtb3JlIGxvYWQgYXBp J3MsIG5hbWVseQorICAgICAgICB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9odG1sIGFuZCB3ZWJraXRf d2ViX3ZpZXdfbG9hZF9wbGFpbl90ZXh0LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsv V2ViS2l0V2ViVmlldy5jcHA6CisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfbG9hZF9odG1sKTog QVBJIHRvIGxvYWQgSFRNTCBzdHJpbmcuCisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfbG9hZF9w bGFpbl90ZXh0KTogQVBJIHRvIGxvYWQgcGxhaW4gdGV4dC4KKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRXZWJWaWV3Lmg6IEFkZGVkIHB1YmxpYyBBUElzLgorICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL3Rlc3Rsb2FkaW5nLmM6IEFkZGVkIHVuaXQgdGVzdHMgZm9y IG5ldyBBUEkncy4KKyAgICAgICAgKGxvYWRIdG1sTG9hZEZpbmlzaGVkKTogSFRNTCBzdHJpbmcg bG9hZC1maW5pc2hlZCBjYWxsYmFjay4KKyAgICAgICAgKGxvYWRIdG1sTG9hZEZhaWxlZCk6IEhU TUwgc3RyaW5nIGxvYWQtZmFpbGVkIGNhbGxiYWNrLgorICAgICAgICAodGVzdExvYWRIdG1sKTog VGVzdCBwbGFpbiB0ZXh0IGxvYWQuCisgICAgICAgIChsb2FkUGxhaW5UZXh0TG9hZEZpbmlzaGVk KTogUGxhaW4gdGV4dCBsb2FkLWZpbmlzaGVkIGNhbGxiYWNrLgorICAgICAgICAobG9hZFBsYWlu VGV4dExvYWRGYWlsZWQpOiBQbGFpbiB0ZXh0IGxvYWQtZmFpbGVkIGNhbGxiYWNrLgorICAgICAg ICAodGVzdExvYWRQbGFpblRleHQpOiBUZXN0IHBsYWluIHRleHQgbG9hZC4KKyAgICAgICAgKG1h aW4pOiBBZGRlZCBuZXcgdGVzdHMuCisKIDIwMTEtMTAtMDYgIEFsZXhpcyBNZW5hcmQgIDxhbGV4 aXMubWVuYXJkQG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgW1F0XVtXSzJdIEN1cnNvciBzaG91 bGQgY2hhbmdlIHdoZW4gaG92ZXJpbmcgbGlua3Mgb3IgaW5wdXQgZmllbGRzLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcAppbmRleCAy YzMzZjMzLi5kMWIyOTA1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvV2ViS2l0V2ViVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvV2ViS2l0V2ViVmlldy5jcHAKQEAgLTI1MSw2ICsyNTEsNDUgQEAgdm9pZCB3ZWJraXRf d2ViX3ZpZXdfbG9hZF9hbHRlcm5hdGVfaHRtbChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBjb25z dCBnY2hhciogY28KIH0KIAogLyoqCisgKiB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9odG1sOgorICog QHdlYl92aWV3OiBhICNXZWJLaXRXZWJWaWV3CisgKiBAaHRtbDogVGhlIEhUTUwgc3RyaW5nIHRv IGxvYWQKKyAqIEBiYXNlX3VyaTogdGhlIGJhc2UgVVJJIGZvciByZWxhdGl2ZSBsb2NhdGlvbnMu IElmICVOVUxMLCBkZWZhdWx0cyB0byBhYm91dDpibGFuay4KKyAqCisgKiBMb2FkIHRoZSBnaXZl biBAaHRtbCBzdHJpbmcgd2l0aCB0aGUgc3BlY2lmaWVkIEBiYXNlX3VyaS4gCisgKiBSZWxhdGl2 ZSBVUkxzIGluIHRoZSBAaHRtbCB3aWxsIGJlIHJlc29sdmVkIGFnYWluc3QgQGJhc2VfdXJpLgor ICogVGhlIG1pbWUgdHlwZSBvZiB0aGUgZG9jdW1lbnQgd2lsbCBiZSAidGV4dC9odG1sIi4KKyAq Lwordm9pZCB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9odG1sKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcs IGNvbnN0IGdjaGFyKiBodG1sLCBjb25zdCBnY2hhciogYmFzZVVyaSkKK3sKKyAgICBnX3JldHVy bl9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJWaWV3KSk7CisgICAgZ19yZXR1cm5faWZf ZmFpbChodG1sKTsKKworICAgIFdlYlBhZ2VQcm94eSogcGFnZSA9IHdlYmtpdFdlYlZpZXdCYXNl R2V0UGFnZShXRUJLSVRfV0VCX1ZJRVdfQkFTRSh3ZWJWaWV3KSk7CisgICAgV0tSZXRhaW5QdHI8 V0tTdHJpbmdSZWY+IGh0bWxSZWYoQWRvcHRXSywgIFdLU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3Ry aW5nKGh0bWwpKTsKKyAgICBXS1JldGFpblB0cjxXS1VSTFJlZj4gYmFzZVVyaVJlZiA9IGJhc2VV cmkgPyBhZG9wdFdLKFdLVVJMQ3JlYXRlV2l0aFVURjhDU3RyaW5nKGJhc2VVcmkpKSA6IDA7Cisg ICAgV0tQYWdlTG9hZEhUTUxTdHJpbmcodG9BUEkocGFnZSksIGh0bWxSZWYuZ2V0KCksIGJhc2VV cmlSZWYuZ2V0KCkpOworfQorCisvKioKKyAqIHdlYmtpdF93ZWJfdmlld19sb2FkX3BsYWluX3Rl eHQ6CisgKiBAd2ViX3ZpZXc6IGEgI1dlYktpdFdlYlZpZXcKKyAqIEBwbGFpbl90ZXh0OiBUaGUg cGxhaW4gdGV4dCBzdHJpbmcgdG8gbG9hZAorICoKKyAqIExvYWQgdGhlIHNwZWNpZmllZCBwbGFp biB0ZXh0IHN0cmluZyBpbnRvIEB3ZWJfdmlldy4gVGhlIG1pbWUgdHlwZSBvZgorICogZG9jdW1l bnQgd2lsbCBiZSAidGV4dC9wbGFpbiIuCisgKi8KK3ZvaWQgd2Via2l0X3dlYl92aWV3X2xvYWRf cGxhaW5fdGV4dChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBjb25zdCBnY2hhciogcGxhaW5UZXh0 KQoreworICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9WSUVXKHdlYlZpZXcpKTsK KyAgICBnX3JldHVybl9pZl9mYWlsKHBsYWluVGV4dCk7CisKKyAgICBXZWJQYWdlUHJveHkqIHBh Z2UgPSB3ZWJraXRXZWJWaWV3QmFzZUdldFBhZ2UoV0VCS0lUX1dFQl9WSUVXX0JBU0Uod2ViVmll dykpOworICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiBwbGFpblRleHRSZWYoQWRvcHRXSywg V0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcocGxhaW5UZXh0KSk7CisgICAgV0tQYWdlTG9h ZFBsYWluVGV4dFN0cmluZyh0b0FQSShwYWdlKSwgcGxhaW5UZXh0UmVmLmdldCgpKTsKK30KKwor LyoqCiAgKiB3ZWJraXRfd2ViX3ZpZXdfZ29fYmFjazoKICAqIEB3ZWJfdmlldzogYSAjV2ViS2l0 V2ViVmlldwogICoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdFdlYlZpZXcuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktp dFdlYlZpZXcuaAppbmRleCBiZmY5NzI4Li44YzVkMzA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmgKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5oCkBAIC04OSw2ICs4OSwxNiBAQCB3 ZWJraXRfd2ViX3ZpZXdfbG9hZF91cmkgICAgICAgICAgICAoV2ViS2l0V2ViVmlldyAgICAgICAg ICp3ZWJfdmlldywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBn Y2hhciAgICAgICAgICAgKnVyaSk7CiAKIFdLX0VYUE9SVCB2b2lkCit3ZWJraXRfd2ViX3ZpZXdf bG9hZF9odG1sICAgICAgICAgICAoV2ViS2l0V2ViVmlldyAgICAgICAgICp3ZWJfdmlldywKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAgICAgICAg Kmh0bWwsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2NoYXIg ICAgICAgICAgICpiYXNlX3VyaSk7CisKK1dLX0VYUE9SVCB2b2lkIAord2Via2l0X3dlYl92aWV3 X2xvYWRfcGxhaW5fdGV4dCAgICAgKFdlYktpdFdlYlZpZXcgICAgICAgICAqd2ViX3ZpZXcsIAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGdjaGFyICAgICAgICAg ICAqcGxhaW5fdGV4dCk7CisKKworV0tfRVhQT1JUIHZvaWQKIHdlYmtpdF93ZWJfdmlld19sb2Fk X2FsdGVybmF0ZV9odG1sIChXZWJLaXRXZWJWaWV3ICAgICAgICAgKndlYl92aWV3LAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGdjaGFyICAgICAgICAgICAqY29u dGVudCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAg ICAgICAgICAgKmJhc2VfdXJpLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvdGVzdHMvdGVzdGxvYWRpbmcuYyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL3Rlc3RzL3Rlc3Rsb2FkaW5nLmMKaW5kZXggNzUwYzhjYy4uNTQyM2ZlZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvdGVzdGxvYWRpbmcu YworKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy90ZXN0bG9hZGlu Zy5jCkBAIC0yMjMsNiArMjIzLDU4IEBAIHN0YXRpYyB2b2lkIHRlc3RMb2FkaW5nRXJyb3IoV2Vi TG9hZGluZ0ZpeHR1cmUgKmZpeHR1cmUsIGdjb25zdHBvaW50ZXIgZGF0YSkKICAgICBnX2Fzc2Vy dChmaXh0dXJlLT5oYXNCZWVuRmFpbGVkKTsKIH0KIAorc3RhdGljIGdib29sZWFuIGxvYWRIdG1s TG9hZEZpbmlzaGVkKFdlYktpdFdlYkxvYWRlckNsaWVudCAqY2xpZW50LCBXZWJMb2FkaW5nRml4 dHVyZSAqZml4dHVyZSkKK3sKKyAgICBnX21haW5fbG9vcF9xdWl0KGZpeHR1cmUtPmxvb3ApOwor CisgICAgcmV0dXJuIFRSVUU7Cit9CisKK3N0YXRpYyBnYm9vbGVhbiBsb2FkSHRtbExvYWRGYWls ZWQoV2ViS2l0V2ViTG9hZGVyQ2xpZW50ICpjbGllbnQsIGNvbnN0IGdjaGFyICpmYWlsaW5nVVJJ LCBHRXJyb3IgKmVycm9yLCBXZWJMb2FkaW5nRml4dHVyZSAqZml4dHVyZSkKK3sKKyAgICBnX2Fz c2VydF9ub3RfcmVhY2hlZCgpOworICAgIHJldHVybiBUUlVFOworfQorCitzdGF0aWMgdm9pZCB0 ZXN0TG9hZEh0bWwoV2ViTG9hZGluZ0ZpeHR1cmUgKmZpeHR1cmUsIGdjb25zdHBvaW50ZXIgZGF0 YSkKK3sKKyAgICBXZWJLaXRXZWJMb2FkZXJDbGllbnQgKmNsaWVudCA9IHdlYmtpdF93ZWJfdmll d19nZXRfbG9hZGVyX2NsaWVudChmaXh0dXJlLT53ZWJWaWV3KTsKKworICAgIGdfc2lnbmFsX2Nv bm5lY3QoY2xpZW50LCAibG9hZC1maW5pc2hlZCIsIEdfQ0FMTEJBQ0sobG9hZEh0bWxMb2FkRmlu aXNoZWQpLCBmaXh0dXJlKTsKKyAgICBnX3NpZ25hbF9jb25uZWN0KGNsaWVudCwgInByb3Zpc2lv bmFsLWxvYWQtZmFpbGVkIiwgR19DQUxMQkFDSyhsb2FkSHRtbExvYWRGYWlsZWQpLCBmaXh0dXJl KTsKKyAgICBnX3NpZ25hbF9jb25uZWN0KGNsaWVudCwgImxvYWQtZmFpbGVkIiwgR19DQUxMQkFD Syhsb2FkSHRtbExvYWRGYWlsZWQpLCBmaXh0dXJlKTsKKworICAgIHdlYmtpdF93ZWJfdmlld19s b2FkX2h0bWwoZml4dHVyZS0+d2ViVmlldywgIjxodG1sPjxib2R5PldlbGNvbWUgdG8gV2ViS2l0 LUdUSyshPC9ib2R5PjwvaHRtbD4iLCAwKTsKKworICAgIGdfbWFpbl9sb29wX3J1bihmaXh0dXJl LT5sb29wKTsKK30KKworc3RhdGljIGdib29sZWFuIGxvYWRQbGFpblRleHRMb2FkRmluaXNoZWQo V2ViS2l0V2ViTG9hZGVyQ2xpZW50ICpjbGllbnQsIFdlYkxvYWRpbmdGaXh0dXJlICpmaXh0dXJl KQoreworICAgIGdfbWFpbl9sb29wX3F1aXQoZml4dHVyZS0+bG9vcCk7CisKKyAgICByZXR1cm4g VFJVRTsKK30KKworc3RhdGljIGdib29sZWFuIGxvYWRQbGFpblRleHRMb2FkRmFpbGVkKFdlYktp dFdlYkxvYWRlckNsaWVudCAqY2xpZW50LCBjb25zdCBnY2hhciAqZmFpbGluZ1VSSSwgR0Vycm9y ICplcnJvciwgV2ViTG9hZGluZ0ZpeHR1cmUgKmZpeHR1cmUpCit7CisgICAgZ19hc3NlcnRfbm90 X3JlYWNoZWQoKTsKKyAgICByZXR1cm4gVFJVRTsKK30KKworc3RhdGljIHZvaWQgdGVzdExvYWRQ bGFpblRleHQoV2ViTG9hZGluZ0ZpeHR1cmUgKmZpeHR1cmUsIGdjb25zdHBvaW50ZXIgZGF0YSkK K3sKKyAgICBXZWJLaXRXZWJMb2FkZXJDbGllbnQgKmNsaWVudCA9IHdlYmtpdF93ZWJfdmlld19n ZXRfbG9hZGVyX2NsaWVudChmaXh0dXJlLT53ZWJWaWV3KTsKKworICAgIGdfc2lnbmFsX2Nvbm5l Y3QoY2xpZW50LCAibG9hZC1maW5pc2hlZCIsIEdfQ0FMTEJBQ0sobG9hZFBsYWluVGV4dExvYWRG aW5pc2hlZCksIGZpeHR1cmUpOworICAgIGdfc2lnbmFsX2Nvbm5lY3QoY2xpZW50LCAicHJvdmlz aW9uYWwtbG9hZC1mYWlsZWQiLCBHX0NBTExCQUNLKGxvYWRQbGFpblRleHRMb2FkRmFpbGVkKSwg Zml4dHVyZSk7CisgICAgZ19zaWduYWxfY29ubmVjdChjbGllbnQsICJsb2FkLWZhaWxlZCIsIEdf Q0FMTEJBQ0sobG9hZFBsYWluVGV4dExvYWRGYWlsZWQpLCBmaXh0dXJlKTsKKworICAgIHdlYmtp dF93ZWJfdmlld19sb2FkX3BsYWluX3RleHQoZml4dHVyZS0+d2ViVmlldywgIldlbGNvbWUgdG8g V2ViS2l0LUdUSyshIik7CisKKyAgICBnX21haW5fbG9vcF9ydW4oZml4dHVyZS0+bG9vcCk7Cit9 CisKIHN0YXRpYyBnYm9vbGVhbiBsb2FkQWx0ZXJuYXRlQ29udGVudExvYWRGaW5pc2hlZChXZWJL aXRXZWJMb2FkZXJDbGllbnQgKmNsaWVudCwgV2ViTG9hZGluZ0ZpeHR1cmUgKmZpeHR1cmUpCiB7 CiAgICAgZ19tYWluX2xvb3BfcXVpdChmaXh0dXJlLT5sb29wKTsKQEAgLTI4MCw2ICszMzIsMTYg QEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogICAgICAgICAgICAgICAgd2ViTG9h ZGluZ0ZpeHR1cmVTZXR1cCwKICAgICAgICAgICAgICAgIHRlc3RMb2FkaW5nRXJyb3IsCiAgICAg ICAgICAgICAgICB3ZWJMb2FkaW5nRml4dHVyZVRlYXJkb3duKTsKKyAgICBnX3Rlc3RfYWRkKCIv d2Via2l0Mi9sb2FkaW5nL2h0bWwiLAorICAgICAgICAgICAgICAgV2ViTG9hZGluZ0ZpeHR1cmUs IE5VTEwsCisgICAgICAgICAgICAgICB3ZWJMb2FkaW5nRml4dHVyZVNldHVwLAorICAgICAgICAg ICAgICAgdGVzdExvYWRIdG1sLAorICAgICAgICAgICAgICAgd2ViTG9hZGluZ0ZpeHR1cmVUZWFy ZG93bik7CisgICAgZ190ZXN0X2FkZCgiL3dlYmtpdDIvbG9hZGluZy9wbGFpbl90ZXh0IiwKKyAg ICAgICAgICAgICAgIFdlYkxvYWRpbmdGaXh0dXJlLCBOVUxMLAorICAgICAgICAgICAgICAgd2Vi TG9hZGluZ0ZpeHR1cmVTZXR1cCwKKyAgICAgICAgICAgICAgIHRlc3RMb2FkUGxhaW5UZXh0LAor ICAgICAgICAgICAgICAgd2ViTG9hZGluZ0ZpeHR1cmVUZWFyZG93bik7CiAgICAgZ190ZXN0X2Fk ZCgiL3dlYmtpdDIvbG9hZGluZy9hbHRlcm5hdGVfY29udGVudCIsCiAgICAgICAgICAgICAgICBX ZWJMb2FkaW5nRml4dHVyZSwgTlVMTCwKICAgICAgICAgICAgICAgIHdlYkxvYWRpbmdGaXh0dXJl U2V0dXAsCg== 110117 2011-10-07 03:10:13 -0700 2011-10-20 04:08:12 -0700 Load HTML String and Plain text API load_html.diff text/plain 7953 nayankk ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA1OWQ5MGU5Li4zOTJiOTJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTEtMTAtMDYgIE5heWFuIEt1bWFyIEsgIDxuYXlhbmtrQG1vdG9yb2xhLmNvbT4KKwor ICAgICAgICBBZGQgd2Via2l0X3dlYl92aWV3X2xvYWRfaHRtbCBhbmQgd2Via2l0X3dlYl92aWV3 X2xvYWRfcGxhaW5fdGV4dCBBUElzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NjkyNDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGlzIHBhdGNoIGFkZHMgc3VwcG9ydCBmb3IgMiBtb3JlIGxvYWQgYXBp J3MsIG5hbWVseQorICAgICAgICB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9odG1sIGFuZCB3ZWJraXRf d2ViX3ZpZXdfbG9hZF9wbGFpbl90ZXh0LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsv V2ViS2l0V2ViVmlldy5jcHA6CisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfbG9hZF9odG1sKTog QVBJIHRvIGxvYWQgSFRNTCBzdHJpbmcuCisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfbG9hZF9w bGFpbl90ZXh0KTogQVBJIHRvIGxvYWQgcGxhaW4gdGV4dC4KKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRXZWJWaWV3Lmg6IEFkZGVkIHB1YmxpYyBBUElzLgorICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL3Rlc3Rsb2FkaW5nLmM6IEFkZGVkIHVuaXQgdGVzdHMgZm9y IG5ldyBBUEkncy4KKyAgICAgICAgKGxvYWRIdG1sTG9hZEZpbmlzaGVkKTogSFRNTCBzdHJpbmcg bG9hZC1maW5pc2hlZCBjYWxsYmFjay4KKyAgICAgICAgKGxvYWRIdG1sTG9hZEZhaWxlZCk6IEhU TUwgc3RyaW5nIGxvYWQtZmFpbGVkIGNhbGxiYWNrLgorICAgICAgICAodGVzdExvYWRIdG1sKTog VGVzdCBwbGFpbiB0ZXh0IGxvYWQuCisgICAgICAgIChsb2FkUGxhaW5UZXh0TG9hZEZpbmlzaGVk KTogUGxhaW4gdGV4dCBsb2FkLWZpbmlzaGVkIGNhbGxiYWNrLgorICAgICAgICAobG9hZFBsYWlu VGV4dExvYWRGYWlsZWQpOiBQbGFpbiB0ZXh0IGxvYWQtZmFpbGVkIGNhbGxiYWNrLgorICAgICAg ICAodGVzdExvYWRQbGFpblRleHQpOiBUZXN0IHBsYWluIHRleHQgbG9hZC4KKyAgICAgICAgKG1h aW4pOiBBZGRlZCBuZXcgdGVzdHMuCisKIDIwMTEtMTAtMDYgIEJyZW50IEZ1bGdoYW0gIDxiZnVs Z2hhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIFtXaW5DYWlyb10gQ29ycmVjdCBpbXByb3BlciBp ZGVudGlmaWNhdGlvbiBvZiBXS1FDIGV4dGVuc2lvbnMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCmluZGV4IDJjMzNmMzMuLjkzNTEy NTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdl YlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdl YlZpZXcuY3BwCkBAIC0yNTEsNiArMjUxLDQ5IEBAIHZvaWQgd2Via2l0X3dlYl92aWV3X2xvYWRf YWx0ZXJuYXRlX2h0bWwoV2ViS2l0V2ViVmlldyogd2ViVmlldywgY29uc3QgZ2NoYXIqIGNvCiB9 CiAKIC8qKgorICogd2Via2l0X3dlYl92aWV3X2xvYWRfaHRtbDoKKyAqIEB3ZWJfdmlldzogYSAj V2ViS2l0V2ViVmlldworICogQGNvbnRlbnQ6IFRoZSBIVE1MIHN0cmluZyB0byBsb2FkCisgKiBA YmFzZV91cmk6IHRoZSBiYXNlIFVSSSBmb3IgcmVsYXRpdmUgbG9jYXRpb25zLiBJZiAlTlVMTCwg ZGVmYXVsdHMgdG8gYWJvdXQ6YmxhbmsuCisgKgorICogTG9hZCB0aGUgZ2l2ZW4gQGNvbnRlbnQg c3RyaW5nIHdpdGggdGhlIHNwZWNpZmllZCBAYmFzZV91cmkuIAorICogUmVsYXRpdmUgVVJMcyBp biB0aGUgQGNvbnRlbnQgd2lsbCBiZSByZXNvbHZlZCBhZ2FpbnN0IEBiYXNlX3VyaS4KKyAqIFRo ZSBtaW1lIHR5cGUgb2YgdGhlIGRvY3VtZW50IHdpbGwgYmUgInRleHQvaHRtbCIuIAorICogWW91 IGNhbiBtb25pdG9yICB0aGUgc3RhdHVzIG9mIHRoZSBsb2FkIG9wZXJhdGlvbiB1c2luZyB0aGUg CisgKiAjV2ViS2l0V2ViTG9hZGVyQ2xpZW50IG9mIEB3ZWJfdmlldy4gU2VlIHdlYmtpdF93ZWJf dmlld19nZXRfbG9hZGVyX2NsaWVudCgpLgorICovCit2b2lkIHdlYmtpdF93ZWJfdmlld19sb2Fk X2h0bWwoV2ViS2l0V2ViVmlldyogd2ViVmlldywgY29uc3QgZ2NoYXIqIGNvbnRlbnQsIGNvbnN0 IGdjaGFyKiBiYXNlVVJJKQoreworICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9W SUVXKHdlYlZpZXcpKTsKKyAgICBnX3JldHVybl9pZl9mYWlsKGNvbnRlbnQpOworCisgICAgV2Vi UGFnZVByb3h5KiBwYWdlID0gd2Via2l0V2ViVmlld0Jhc2VHZXRQYWdlKFdFQktJVF9XRUJfVklF V19CQVNFKHdlYlZpZXcpKTsKKyAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4gY29udGVudFJl ZihBZG9wdFdLLCAgV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcoY29udGVudCkpOworICAg IFdLUmV0YWluUHRyPFdLVVJMUmVmPiBiYXNlVVJJUmVmID0gYmFzZVVSSSA/IGFkb3B0V0soV0tV UkxDcmVhdGVXaXRoVVRGOENTdHJpbmcoYmFzZVVSSSkpIDogMDsKKyAgICBXS1BhZ2VMb2FkSFRN TFN0cmluZyh0b0FQSShwYWdlKSwgY29udGVudFJlZi5nZXQoKSwgYmFzZVVSSVJlZi5nZXQoKSk7 Cit9CisKKy8qKgorICogd2Via2l0X3dlYl92aWV3X2xvYWRfcGxhaW5fdGV4dDoKKyAqIEB3ZWJf dmlldzogYSAjV2ViS2l0V2ViVmlldworICogQHBsYWluX3RleHQ6IFRoZSBwbGFpbiB0ZXh0IHN0 cmluZyB0byBsb2FkCisgKgorICogTG9hZCB0aGUgc3BlY2lmaWVkIHBsYWluIHRleHQgc3RyaW5n IGludG8gQHdlYl92aWV3LiBUaGUgbWltZSB0eXBlIG9mCisgKiBkb2N1bWVudCB3aWxsIGJlICJ0 ZXh0L3BsYWluIi4KKyAqIFlvdSBjYW4gbW9uaXRvciAgdGhlIHN0YXR1cyBvZiB0aGUgbG9hZCBv cGVyYXRpb24gdXNpbmcgdGhlIAorICogI1dlYktpdFdlYkxvYWRlckNsaWVudCBvZiBAd2ViX3Zp ZXcuIFNlZSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2xvYWRlcl9jbGllbnQoKS4KKyAqLwordm9pZCB3 ZWJraXRfd2ViX3ZpZXdfbG9hZF9wbGFpbl90ZXh0KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGNv bnN0IGdjaGFyKiBwbGFpblRleHQpCit7CisgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNf V0VCX1ZJRVcod2ViVmlldykpOworICAgIGdfcmV0dXJuX2lmX2ZhaWwocGxhaW5UZXh0KTsKKwor ICAgIFdlYlBhZ2VQcm94eSogcGFnZSA9IHdlYmtpdFdlYlZpZXdCYXNlR2V0UGFnZShXRUJLSVRf V0VCX1ZJRVdfQkFTRSh3ZWJWaWV3KSk7CisgICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+IHBs YWluVGV4dFJlZihBZG9wdFdLLCBXS1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZyhwbGFpblRl eHQpKTsKKyAgICBXS1BhZ2VMb2FkUGxhaW5UZXh0U3RyaW5nKHRvQVBJKHBhZ2UpLCBwbGFpblRl eHRSZWYuZ2V0KCkpOworfQorCisvKioKICAqIHdlYmtpdF93ZWJfdmlld19nb19iYWNrOgogICog QHdlYl92aWV3OiBhICNXZWJLaXRXZWJWaWV3CiAgKgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5oIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5oCmluZGV4IGRlMjZhODUuLjBkYTRiYjQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcu aAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmgK QEAgLTkwLDYgKzkwLDE2IEBAIHdlYmtpdF93ZWJfdmlld19sb2FkX3VyaSAgICAgICAgICAgIChX ZWJLaXRXZWJWaWV3ICAgICAgICAgKndlYl92aWV3LAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGNvbnN0IGdjaGFyICAgICAgICAgICAqdXJpKTsKIAogV0VCS0lUX0FQSSB2 b2lkCit3ZWJraXRfd2ViX3ZpZXdfbG9hZF9odG1sICAgICAgICAgICAoV2ViS2l0V2ViVmlldyAg ICAgICAgICp3ZWJfdmlldywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBj b25zdCBnY2hhciAgICAgICAgICAgKmh0bWwsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgY29uc3QgZ2NoYXIgICAgICAgICAgICpiYXNlX3VyaSk7CisKK1dFQktJVF9BUEkg dm9pZCAKK3dlYmtpdF93ZWJfdmlld19sb2FkX3BsYWluX3RleHQgICAgIChXZWJLaXRXZWJWaWV3 ICAgICAgICAgKndlYl92aWV3LCAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjb25zdCBnY2hhciAgICAgICAgICAgKnBsYWluX3RleHQpOworCisKK1dFQktJVF9BUEkgdm9p ZAogd2Via2l0X3dlYl92aWV3X2xvYWRfYWx0ZXJuYXRlX2h0bWwgKFdlYktpdFdlYlZpZXcgICAg ICAgICAqd2ViX3ZpZXcsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29u c3QgZ2NoYXIgICAgICAgICAgICpjb250ZW50LAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGNvbnN0IGdjaGFyICAgICAgICAgICAqYmFzZV91cmksCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy90ZXN0bG9hZGluZy5jIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvdGVzdGxvYWRpbmcuYwppbmRleCA2 ODEzYjIzLi5hMGU4M2MyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay90ZXN0cy90ZXN0bG9hZGluZy5jCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL3Rlc3RzL3Rlc3Rsb2FkaW5nLmMKQEAgLTIyNSw2ICsyMjUsNTggQEAgc3RhdGljIHZv aWQgdGVzdExvYWRpbmdFcnJvcihXZWJMb2FkaW5nRml4dHVyZSAqZml4dHVyZSwgZ2NvbnN0cG9p bnRlciBkYXRhKQogICAgIGdfYXNzZXJ0KGZpeHR1cmUtPmhhc0JlZW5GYWlsZWQpOwogfQogCitz dGF0aWMgZ2Jvb2xlYW4gbG9hZEh0bWxMb2FkRmluaXNoZWQoV2ViS2l0V2ViTG9hZGVyQ2xpZW50 ICpjbGllbnQsIFdlYkxvYWRpbmdGaXh0dXJlICpmaXh0dXJlKQoreworICAgIGdfbWFpbl9sb29w X3F1aXQoZml4dHVyZS0+bG9vcCk7CisKKyAgICByZXR1cm4gVFJVRTsKK30KKworc3RhdGljIGdi b29sZWFuIGxvYWRIdG1sTG9hZEZhaWxlZChXZWJLaXRXZWJMb2FkZXJDbGllbnQgKmNsaWVudCwg Y29uc3QgZ2NoYXIgKmZhaWxpbmdVUkksIEdFcnJvciAqZXJyb3IsIFdlYkxvYWRpbmdGaXh0dXJl ICpmaXh0dXJlKQoreworICAgIGdfYXNzZXJ0X25vdF9yZWFjaGVkKCk7CisgICAgcmV0dXJuIFRS VUU7Cit9CisKK3N0YXRpYyB2b2lkIHRlc3RMb2FkSHRtbChXZWJMb2FkaW5nRml4dHVyZSAqZml4 dHVyZSwgZ2NvbnN0cG9pbnRlciBkYXRhKQoreworICAgIFdlYktpdFdlYkxvYWRlckNsaWVudCAq Y2xpZW50ID0gd2Via2l0X3dlYl92aWV3X2dldF9sb2FkZXJfY2xpZW50KGZpeHR1cmUtPndlYlZp ZXcpOworCisgICAgZ19zaWduYWxfY29ubmVjdChjbGllbnQsICJsb2FkLWZpbmlzaGVkIiwgR19D QUxMQkFDSyhsb2FkSHRtbExvYWRGaW5pc2hlZCksIGZpeHR1cmUpOworICAgIGdfc2lnbmFsX2Nv bm5lY3QoY2xpZW50LCAicHJvdmlzaW9uYWwtbG9hZC1mYWlsZWQiLCBHX0NBTExCQUNLKGxvYWRI dG1sTG9hZEZhaWxlZCksIGZpeHR1cmUpOworICAgIGdfc2lnbmFsX2Nvbm5lY3QoY2xpZW50LCAi bG9hZC1mYWlsZWQiLCBHX0NBTExCQUNLKGxvYWRIdG1sTG9hZEZhaWxlZCksIGZpeHR1cmUpOwor CisgICAgd2Via2l0X3dlYl92aWV3X2xvYWRfaHRtbChmaXh0dXJlLT53ZWJWaWV3LCAiPGh0bWw+ PGJvZHk+V2VsY29tZSB0byBXZWJLaXQtR1RLKyE8L2JvZHk+PC9odG1sPiIsIDApOworCisgICAg Z19tYWluX2xvb3BfcnVuKGZpeHR1cmUtPmxvb3ApOworfQorCitzdGF0aWMgZ2Jvb2xlYW4gbG9h ZFBsYWluVGV4dExvYWRGaW5pc2hlZChXZWJLaXRXZWJMb2FkZXJDbGllbnQgKmNsaWVudCwgV2Vi TG9hZGluZ0ZpeHR1cmUgKmZpeHR1cmUpCit7CisgICAgZ19tYWluX2xvb3BfcXVpdChmaXh0dXJl LT5sb29wKTsKKworICAgIHJldHVybiBUUlVFOworfQorCitzdGF0aWMgZ2Jvb2xlYW4gbG9hZFBs YWluVGV4dExvYWRGYWlsZWQoV2ViS2l0V2ViTG9hZGVyQ2xpZW50ICpjbGllbnQsIGNvbnN0IGdj aGFyICpmYWlsaW5nVVJJLCBHRXJyb3IgKmVycm9yLCBXZWJMb2FkaW5nRml4dHVyZSAqZml4dHVy ZSkKK3sKKyAgICBnX2Fzc2VydF9ub3RfcmVhY2hlZCgpOworICAgIHJldHVybiBUUlVFOworfQor CitzdGF0aWMgdm9pZCB0ZXN0TG9hZFBsYWluVGV4dChXZWJMb2FkaW5nRml4dHVyZSAqZml4dHVy ZSwgZ2NvbnN0cG9pbnRlciBkYXRhKQoreworICAgIFdlYktpdFdlYkxvYWRlckNsaWVudCAqY2xp ZW50ID0gd2Via2l0X3dlYl92aWV3X2dldF9sb2FkZXJfY2xpZW50KGZpeHR1cmUtPndlYlZpZXcp OworCisgICAgZ19zaWduYWxfY29ubmVjdChjbGllbnQsICJsb2FkLWZpbmlzaGVkIiwgR19DQUxM QkFDSyhsb2FkUGxhaW5UZXh0TG9hZEZpbmlzaGVkKSwgZml4dHVyZSk7CisgICAgZ19zaWduYWxf Y29ubmVjdChjbGllbnQsICJwcm92aXNpb25hbC1sb2FkLWZhaWxlZCIsIEdfQ0FMTEJBQ0sobG9h ZFBsYWluVGV4dExvYWRGYWlsZWQpLCBmaXh0dXJlKTsKKyAgICBnX3NpZ25hbF9jb25uZWN0KGNs aWVudCwgImxvYWQtZmFpbGVkIiwgR19DQUxMQkFDSyhsb2FkUGxhaW5UZXh0TG9hZEZhaWxlZCks IGZpeHR1cmUpOworCisgICAgd2Via2l0X3dlYl92aWV3X2xvYWRfcGxhaW5fdGV4dChmaXh0dXJl LT53ZWJWaWV3LCAiV2VsY29tZSB0byBXZWJLaXQtR1RLKyEiKTsKKworICAgIGdfbWFpbl9sb29w X3J1bihmaXh0dXJlLT5sb29wKTsKK30KKwogc3RhdGljIGdib29sZWFuIGxvYWRBbHRlcm5hdGVD b250ZW50TG9hZEZpbmlzaGVkKFdlYktpdFdlYkxvYWRlckNsaWVudCAqY2xpZW50LCBXZWJMb2Fk aW5nRml4dHVyZSAqZml4dHVyZSkKIHsKICAgICBnX21haW5fbG9vcF9xdWl0KGZpeHR1cmUtPmxv b3ApOwpAQCAtMzEzLDYgKzM2NSwxNiBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqKmFyZ3Yp CiAgICAgICAgICAgICAgICB3ZWJMb2FkaW5nRml4dHVyZVNldHVwLAogICAgICAgICAgICAgICAg dGVzdExvYWRpbmdFcnJvciwKICAgICAgICAgICAgICAgIHdlYkxvYWRpbmdGaXh0dXJlVGVhcmRv d24pOworICAgIGdfdGVzdF9hZGQoIi93ZWJraXQyL2xvYWRpbmcvaHRtbCIsCisgICAgICAgICAg ICAgICBXZWJMb2FkaW5nRml4dHVyZSwgTlVMTCwKKyAgICAgICAgICAgICAgIHdlYkxvYWRpbmdG aXh0dXJlU2V0dXAsCisgICAgICAgICAgICAgICB0ZXN0TG9hZEh0bWwsCisgICAgICAgICAgICAg ICB3ZWJMb2FkaW5nRml4dHVyZVRlYXJkb3duKTsKKyAgICBnX3Rlc3RfYWRkKCIvd2Via2l0Mi9s b2FkaW5nL3BsYWluX3RleHQiLAorICAgICAgICAgICAgICAgV2ViTG9hZGluZ0ZpeHR1cmUsIE5V TEwsCisgICAgICAgICAgICAgICB3ZWJMb2FkaW5nRml4dHVyZVNldHVwLAorICAgICAgICAgICAg ICAgdGVzdExvYWRQbGFpblRleHQsCisgICAgICAgICAgICAgICB3ZWJMb2FkaW5nRml4dHVyZVRl YXJkb3duKTsKICAgICBnX3Rlc3RfYWRkKCIvd2Via2l0Mi9sb2FkaW5nL2FsdGVybmF0ZV9jb250 ZW50IiwKICAgICAgICAgICAgICAgIFdlYkxvYWRpbmdGaXh0dXJlLCBOVUxMLAogICAgICAgICAg ICAgICAgd2ViTG9hZGluZ0ZpeHR1cmVTZXR1cCwK 111751 2011-10-20 04:08:12 -0700 2011-10-20 07:42:34 -0700 Add webkit_web_view_load_html and webkit_web_view_load_plain_text API's. LoadHtml.diff text/plain 6498 nayankk ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA3MzU5MzBkLi4zZTQ2YjAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTEtMTAtMjAgIE5heWFuIEt1bWFyIEsgIDxuYXlhbmtrQG1vdG9yb2xhLmNvbT4KKwor ICAgICAgICBBZGQgd2Via2l0X3dlYl92aWV3X2xvYWRfaHRtbCBhbmQgd2Via2l0X3dlYl92aWV3 X2xvYWRfcGxhaW5fdGV4dCBBUElzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NjkyNDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGlzIHBhdGNoIGFkZHMgc3VwcG9ydCBmb3IgMiBtb3JlIGxvYWQgYXBp J3MsIG5hbWVseQorICAgICAgICB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9odG1sIGFuZCB3ZWJraXRf d2ViX3ZpZXdfbG9hZF9wbGFpbl90ZXh0LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsv V2ViS2l0V2ViVmlldy5jcHA6CisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfbG9hZF9odG1sKTog QVBJIHRvIGxvYWQgSFRNTCBzdHJpbmcuCisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfbG9hZF9w bGFpbl90ZXh0KTogQVBJIHRvIGxvYWQgcGxhaW4gdGV4dC4KKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRXZWJWaWV3Lmg6IEFkZGVkIHB1YmxpYyBBUEkncy4KKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0V2ViTG9hZGVyQ2xpZW50LmNwcDoKKyAg ICAgICAgKHRlc3RMb2FkSHRtbCk6IFRlc3Qgd2Via2l0X3dlYl92aWV3X2xvYWRfaHRtbC4KKyAg ICAgICAgKHRlc3RQbGFpblRleHQpOiBUZXN0IHdlYmtpdF93ZWJfdmlld19sb2FkX3BsYWluX3Rl eHQuCisgICAgICAgIChiZWZvcmVBbGwpOiBBZGQgdGVzdHMuCisKIDIwMTEtMTAtMTAgIE1hcnRp biBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIFtXZWJL aXQyXSBBbGxvdyBzaGFyaW5nIHBhZ2UgY2xpZW50cyBiZXR3ZWVuIFdlYlZpZXdzCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCmluZGV4 IDMwNjhhMjUuLjFlYzJmNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCkBAIC0yNTgsNiArMjU4LDUwIEBAIHZvaWQgd2Via2l0 X3dlYl92aWV3X2xvYWRfdXJpKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGNvbnN0IGdjaGFyKiB1 cmkpCiB9CiAKIC8qKgorICogd2Via2l0X3dlYl92aWV3X2xvYWRfaHRtbDoKKyAqIEB3ZWJfdmll dzogYSAjV2ViS2l0V2ViVmlldworICogQGNvbnRlbnQ6IFRoZSBIVE1MIHN0cmluZyB0byBsb2Fk CisgKiBAYmFzZV91cmk6IChhbGxvdy1ub25lKTogVGhlIGJhc2UgVVJJIGZvciByZWxhdGl2ZSBs b2NhdGlvbnMgb3IgJU5VTEwKKyAqCisgKiBMb2FkIHRoZSBnaXZlbiBAY29udGVudCBzdHJpbmcg d2l0aCB0aGUgc3BlY2lmaWVkIEBiYXNlX3VyaS4gCisgKiBSZWxhdGl2ZSBVUkxzIGluIHRoZSBA Y29udGVudCB3aWxsIGJlIHJlc29sdmVkIGFnYWluc3QgQGJhc2VfdXJpLgorICogV2hlbiBAYmFz ZV91cmkgaXMgTlVMTCwgaXQgZGVmYXVsdHMgdG8gImFib3V0OmJsYW5rIi4gVGhlIG1pbWUgdHlw ZSAKKyAqIG9mIHRoZSBkb2N1bWVudCB3aWxsIGJlICJ0ZXh0L2h0bWwiLiBZb3UgY2FuIG1vbml0 b3IgdGhlIHN0YXR1cyBvZiAKKyAqIHRoZSBsb2FkIG9wZXJhdGlvbiB1c2luZyB0aGUgI1dlYktp dFdlYkxvYWRlckNsaWVudCBvZiBAd2ViX3ZpZXcuIAorICogU2VlIHdlYmtpdF93ZWJfdmlld19n ZXRfbG9hZGVyX2NsaWVudCgpLgorICovCit2b2lkIHdlYmtpdF93ZWJfdmlld19sb2FkX2h0bWwo V2ViS2l0V2ViVmlldyogd2ViVmlldywgY29uc3QgZ2NoYXIqIGNvbnRlbnQsIGNvbnN0IGdjaGFy KiBiYXNlVVJJKQoreworICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9WSUVXKHdl YlZpZXcpKTsKKyAgICBnX3JldHVybl9pZl9mYWlsKGNvbnRlbnQpOworCisgICAgV2ViUGFnZVBy b3h5KiBwYWdlID0gd2Via2l0V2ViVmlld0Jhc2VHZXRQYWdlKFdFQktJVF9XRUJfVklFV19CQVNF KHdlYlZpZXcpKTsKKyAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4gY29udGVudFJlZihBZG9w dFdLLCAgV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcoY29udGVudCkpOworICAgIFdLUmV0 YWluUHRyPFdLVVJMUmVmPiBiYXNlVVJJUmVmID0gYmFzZVVSSSA/IGFkb3B0V0soV0tVUkxDcmVh dGVXaXRoVVRGOENTdHJpbmcoYmFzZVVSSSkpIDogMDsKKyAgICBXS1BhZ2VMb2FkSFRNTFN0cmlu Zyh0b0FQSShwYWdlKSwgY29udGVudFJlZi5nZXQoKSwgYmFzZVVSSVJlZi5nZXQoKSk7Cit9CisK Ky8qKgorICogd2Via2l0X3dlYl92aWV3X2xvYWRfcGxhaW5fdGV4dDoKKyAqIEB3ZWJfdmlldzog YSAjV2ViS2l0V2ViVmlldworICogQHBsYWluX3RleHQ6IFRoZSBwbGFpbiB0ZXh0IHRvIGxvYWQK KyAqCisgKiBMb2FkIHRoZSBzcGVjaWZpZWQgQHBsYWluX3RleHQgc3RyaW5nIGludG8gQHdlYl92 aWV3LiBUaGUgbWltZSB0eXBlIG9mCisgKiBkb2N1bWVudCB3aWxsIGJlICJ0ZXh0L3BsYWluIi4g WW91IGNhbiBtb25pdG9yICB0aGUgc3RhdHVzIG9mIHRoZSBsb2FkIAorICogb3BlcmF0aW9uIHVz aW5nIHRoZSAjV2ViS2l0V2ViTG9hZGVyQ2xpZW50IG9mIEB3ZWJfdmlldy4gCisgKiBTZWUgd2Vi a2l0X3dlYl92aWV3X2dldF9sb2FkZXJfY2xpZW50KCkuCisgKi8KK3ZvaWQgd2Via2l0X3dlYl92 aWV3X2xvYWRfcGxhaW5fdGV4dChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBjb25zdCBnY2hhciog cGxhaW5UZXh0KQoreworICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9WSUVXKHdl YlZpZXcpKTsKKyAgICBnX3JldHVybl9pZl9mYWlsKHBsYWluVGV4dCk7CisKKyAgICBXZWJQYWdl UHJveHkqIHBhZ2UgPSB3ZWJraXRXZWJWaWV3QmFzZUdldFBhZ2UoV0VCS0lUX1dFQl9WSUVXX0JB U0Uod2ViVmlldykpOworICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiBwbGFpblRleHRSZWYo QWRvcHRXSywgV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcocGxhaW5UZXh0KSk7CisgICAg V0tQYWdlTG9hZFBsYWluVGV4dFN0cmluZyh0b0FQSShwYWdlKSwgcGxhaW5UZXh0UmVmLmdldCgp KTsKK30KKworLyoqCiAgKiB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9hbHRlcm5hdGVfaHRtbDoKICAq IEB3ZWJfdmlldzogYSAjV2ViS2l0V2ViVmlldwogICogQGNvbnRlbnQ6IHRoZSBhbHRlcm5hdGUg Y29udGVudCB0byBkaXNwbGF5IGFzIHRoZSBtYWluIHBhZ2Ugb2YgdGhlIEB3ZWJfdmlldwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5o IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5oCmluZGV4 IGYzMzUzZWQuLjM2YTUzMjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL1dlYktpdFdlYlZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRXZWJWaWV3LmgKQEAgLTg2LDYgKzg2LDE0IEBAIHdlYmtpdF93ZWJfdmlld19z ZXRfbG9hZGVyX2NsaWVudCAgICAgICAgICAgKFdlYktpdFdlYlZpZXcgICAgICAgICAqd2ViX3Zp ZXcsCiBXRUJLSVRfQVBJIHZvaWQKIHdlYmtpdF93ZWJfdmlld19sb2FkX3VyaSAgICAgICAgICAg ICAgICAgICAgKFdlYktpdFdlYlZpZXcgICAgICAgICAqd2ViX3ZpZXcsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAgICAgICAgKnVy aSk7CitXRUJLSVRfQVBJIHZvaWQKK3dlYmtpdF93ZWJfdmlld19sb2FkX2h0bWwgICAgICAgICAg ICAgICAgICAgKFdlYktpdFdlYlZpZXcgICAgICAgICAqd2ViX3ZpZXcsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAgICAgICAgKmNv bnRlbnQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25z dCBnY2hhciAgICAgICAgICAgKmJhc2VfdXJpKTsKKworV0VCS0lUX0FQSSB2b2lkCit3ZWJraXRf d2ViX3ZpZXdfbG9hZF9wbGFpbl90ZXh0ICAgICAgICAgICAgIChXZWJLaXRXZWJWaWV3ICAgICAg ICAgKndlYl92aWV3LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgY29uc3QgZ2NoYXIgICAgICAgICAgICpwbGFpbl90ZXh0KTsKIAogV0VCS0lUX0FQSSB2b2lk CiB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9hbHRlcm5hdGVfaHRtbCAgICAgICAgIChXZWJLaXRXZWJW aWV3ICAgICAgICAgKndlYl92aWV3LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktpdFdlYkxvYWRlckNsaWVudC5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0V2ViTG9hZGVyQ2xpZW50 LmNwcAppbmRleCBhMzExYjk2Li4xNTAxZWU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0V2ViTG9hZGVyQ2xpZW50LmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0V2ViTG9h ZGVyQ2xpZW50LmNwcApAQCAtNjEsNiArNjEsMjMgQEAgc3RhdGljIHZvaWQgYXNzZXJ0Tm9ybWFs TG9hZEhhcHBlbmVkQW5kQ2xlYXJFdmVudHMoVmVjdG9yPExvYWRUcmFja2luZ1Rlc3Q6OkxvYWQK ICAgICBldmVudHMuY2xlYXIoKTsKIH0KIAorc3RhdGljIHZvaWQgdGVzdExvYWRIdG1sKExvYWRU cmFja2luZ1Rlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCit7CisgICAgd2Via2l0X3dlYl92aWV3 X2xvYWRfaHRtbCh0ZXN0LT5tX3dlYlZpZXcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAiPGh0bWw+PGJvZHk+SGVsbG8gV2ViS2l0LUdUSys8L2JvZHk+PC9odG1sPiIsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAwKTsKKyAgICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNo ZWQoKTsKKyAgICBhc3NlcnROb3JtYWxMb2FkSGFwcGVuZWRBbmRDbGVhckV2ZW50cyh0ZXN0LT5t X2xvYWRFdmVudHMpOworfQorCitzdGF0aWMgdm9pZCB0ZXN0UGxhaW5UZXh0KExvYWRUcmFja2lu Z1Rlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCit7CisgICAgd2Via2l0X3dlYl92aWV3X2xvYWRf cGxhaW5fdGV4dCh0ZXN0LT5tX3dlYlZpZXcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAiSGVsbG8gV2ViS2l0LUdUSysiKTsKKyAgICB0ZXN0LT53YWl0VW50aWxMb2FkRmlu aXNoZWQoKTsKKyAgICBhc3NlcnROb3JtYWxMb2FkSGFwcGVuZWRBbmRDbGVhckV2ZW50cyh0ZXN0 LT5tX2xvYWRFdmVudHMpOworfQorCiBzdGF0aWMgdm9pZCB0ZXN0TG9hZEFsdGVybmF0ZUNvbnRl bnQoTG9hZFRyYWNraW5nVGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKIHsKICAgICB3ZWJraXRf d2ViX3ZpZXdfbG9hZF9hbHRlcm5hdGVfaHRtbCh0ZXN0LT5tX3dlYlZpZXcsCkBAIC0xMjksNiAr MTQ2LDggQEAgdm9pZCBiZWZvcmVBbGwoKQogCiAgICAgTG9hZFRyYWNraW5nVGVzdDo6YWRkKCJX ZWJLaXRXZWJMb2FkZXJDbGllbnQiLCAibG9hZGluZy1zdGF0dXMiLCB0ZXN0TG9hZGluZ1N0YXR1 cyk7CiAgICAgTG9hZFRyYWNraW5nVGVzdDo6YWRkKCJXZWJLaXRXZWJMb2FkZXJDbGllbnQiLCAi bG9hZGluZy1lcnJvciIsIHRlc3RMb2FkaW5nRXJyb3IpOworICAgIExvYWRUcmFja2luZ1Rlc3Q6 OmFkZCgiV2ViS2l0V2ViTG9hZGVyQ2xpZW50IiwgImxvYWQtaHRtbCIsIHRlc3RMb2FkSHRtbCk7 CisgICAgTG9hZFRyYWNraW5nVGVzdDo6YWRkKCJXZWJLaXRXZWJMb2FkZXJDbGllbnQiLCAibG9h ZC1wbGFpbi10ZXh0IiwgdGVzdFBsYWluVGV4dCk7CiAgICAgTG9hZFRyYWNraW5nVGVzdDo6YWRk KCJXZWJLaXRXZWJMb2FkZXJDbGllbnQiLCAibG9hZC1hbHRlcm5hdGUtY29udGVudCIsIHRlc3RM b2FkQWx0ZXJuYXRlQ29udGVudCk7CiAgICAgTG9hZFRyYWNraW5nVGVzdDo6YWRkKCJXZWJLaXRX ZWJWaWV3IiwgInByb2dyZXNzIiwgdGVzdExvYWRQcm9ncmVzcyk7CiAgICAgTG9hZFRyYWNraW5n VGVzdDo6YWRkKCJXZWJLaXRXZWJWaWV3IiwgInJlbG9hZCIsIHRlc3RXZWJWaWV3UmVsb2FkKTsK 111770 2011-10-20 07:42:34 -0700 2011-10-29 12:01:05 -0700 Load HTML String and Plain text API 0001-Load-HTML-and-Load-Plain-Text.patch text/plain 7900 nayankk RnJvbSA2ZjY5MWI5ZmY1MTkwMmM0OGFmNmFhYmZkM2M5OTJlYzRjNzYwMTkxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBOYXlhbiBLdW1hciBLIDxuYXlhbmtrQG1vdG9yb2xhLmNvbT4K RGF0ZTogVGh1LCAyMCBPY3QgMjAxMSAxNjozOTowNSArMDUzMApTdWJqZWN0OiBbUEFUQ0hdIExv YWQgSFRNTCBhbmQgTG9hZCBQbGFpbiBUZXh0CgotLS0KIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxOSArKysrKysrKwogU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAgfCAgIDQ1ICsrKysrKysrKysr KysrKysrKysrCiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3 LmggICB8ICAgIDkgKysrKwogLi4uL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktpdFdlYkxvYWRlckNs aWVudC5jcHAgICAgfCAgIDE3ICsrKysrKysKIDQgZmlsZXMgY2hhbmdlZCwgOTAgaW5zZXJ0aW9u cygrKSwgMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNzM1OTMwZC4uNzZkNjQzYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDExLTEwLTIwICBOYXlhbiBLdW1hciBLICA8bmF5 YW5ra0Btb3Rvcm9sYS5jb20+CisKKyAgICAgICAgQWRkIHdlYmtpdF93ZWJfdmlld19sb2FkX2h0 bWwgYW5kIHdlYmtpdF93ZWJfdmlld19sb2FkX3BsYWluX3RleHQgQVBJcy4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5MjQ5CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBhZGRzIHN1cHBv cnQgZm9yIDIgbW9yZSBsb2FkIGFwaSdzLCBuYW1lbHkKKyAgICAgICAgd2Via2l0X3dlYl92aWV3 X2xvYWRfaHRtbCBhbmQgd2Via2l0X3dlYl92aWV3X2xvYWRfcGxhaW5fdGV4dC4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwOgorICAgICAgICAod2Via2l0 X3dlYl92aWV3X2xvYWRfaHRtbCk6IEFQSSB0byBsb2FkIEhUTUwgc3RyaW5nLgorICAgICAgICAo d2Via2l0X3dlYl92aWV3X2xvYWRfcGxhaW5fdGV4dCk6IEFQSSB0byBsb2FkIHBsYWluIHRleHQu CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5oOiBBZGRlZCBwdWJs aWMgQVBJJ3MuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktpdFdl YkxvYWRlckNsaWVudC5jcHA6CisgICAgICAgICh0ZXN0TG9hZEh0bWwpOiBUZXN0IHdlYmtpdF93 ZWJfdmlld19sb2FkX2h0bWwuCisgICAgICAgICh0ZXN0UGxhaW5UZXh0KTogVGVzdCB3ZWJraXRf d2ViX3ZpZXdfbG9hZF9wbGFpbl90ZXh0LgorICAgICAgICAoYmVmb3JlQWxsKTogQWRkIG5ldyB0 ZXN0cy4KKwogMjAxMS0xMC0xMCAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5j b20+CiAKICAgICAgICAgW0dUS10gW1dlYktpdDJdIEFsbG93IHNoYXJpbmcgcGFnZSBjbGllbnRz IGJldHdlZW4gV2ViVmlld3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9n dGsvV2ViS2l0V2ViVmlldy5jcHAKaW5kZXggMzA2OGEyNS4uYzMwMTQ4NiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAKQEAgLTEs NSArMSw2IEBACiAvKgogICogQ29weXJpZ2h0IChDKSAyMDExIElnYWxpYSBTLkwuCisgKiBQb3J0 aW9ucyBDb3B5cmlnaHQgKGMpIDIwMTEgTW90b3JvbGEgTW9iaWxpdHksIEluYy4gIEFsbCByaWdo dHMgcmVzZXJ2ZWQuCiAgKgogICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBj YW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgogICogbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBv ZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMKQEAgLTI1OCw2ICsyNTksNTAgQEAgdm9p ZCB3ZWJraXRfd2ViX3ZpZXdfbG9hZF91cmkoV2ViS2l0V2ViVmlldyogd2ViVmlldywgY29uc3Qg Z2NoYXIqIHVyaSkKIH0KIAogLyoqCisgKiB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9odG1sOgorICog QHdlYl92aWV3OiBhICNXZWJLaXRXZWJWaWV3CisgKiBAY29udGVudDogVGhlIEhUTUwgc3RyaW5n IHRvIGxvYWQKKyAqIEBiYXNlX3VyaTogKGFsbG93LW5vbmUpOiBUaGUgYmFzZSBVUkkgZm9yIHJl bGF0aXZlIGxvY2F0aW9ucyBvciAlTlVMTAorICoKKyAqIExvYWQgdGhlIGdpdmVuIEBjb250ZW50 IHN0cmluZyB3aXRoIHRoZSBzcGVjaWZpZWQgQGJhc2VfdXJpLiAKKyAqIFJlbGF0aXZlIFVSTHMg aW4gdGhlIEBjb250ZW50IHdpbGwgYmUgcmVzb2x2ZWQgYWdhaW5zdCBAYmFzZV91cmkuCisgKiBX aGVuIEBiYXNlX3VyaSBpcyAlTlVMTCwgaXQgZGVmYXVsdHMgdG8gImFib3V0OmJsYW5rIi4gVGhl IG1pbWUgdHlwZSAKKyAqIG9mIHRoZSBkb2N1bWVudCB3aWxsIGJlICJ0ZXh0L2h0bWwiLiBZb3Ug Y2FuIG1vbml0b3IgdGhlIHN0YXR1cyBvZiAKKyAqIHRoZSBsb2FkIG9wZXJhdGlvbiB1c2luZyB0 aGUgI1dlYktpdFdlYkxvYWRlckNsaWVudCBvZiBAd2ViX3ZpZXcuIAorICogU2VlIHdlYmtpdF93 ZWJfdmlld19nZXRfbG9hZGVyX2NsaWVudCgpLgorICovCit2b2lkIHdlYmtpdF93ZWJfdmlld19s b2FkX2h0bWwoV2ViS2l0V2ViVmlldyogd2ViVmlldywgY29uc3QgZ2NoYXIqIGNvbnRlbnQsIGNv bnN0IGdjaGFyKiBiYXNlVVJJKQoreworICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dF Ql9WSUVXKHdlYlZpZXcpKTsKKyAgICBnX3JldHVybl9pZl9mYWlsKGNvbnRlbnQpOworCisgICAg V2ViUGFnZVByb3h5KiBwYWdlID0gd2Via2l0V2ViVmlld0Jhc2VHZXRQYWdlKFdFQktJVF9XRUJf VklFV19CQVNFKHdlYlZpZXcpKTsKKyAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4gY29udGVu dFJlZihBZG9wdFdLLCAgV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcoY29udGVudCkpOwor ICAgIFdLUmV0YWluUHRyPFdLVVJMUmVmPiBiYXNlVVJJUmVmID0gYmFzZVVSSSA/IGFkb3B0V0so V0tVUkxDcmVhdGVXaXRoVVRGOENTdHJpbmcoYmFzZVVSSSkpIDogMDsKKyAgICBXS1BhZ2VMb2Fk SFRNTFN0cmluZyh0b0FQSShwYWdlKSwgY29udGVudFJlZi5nZXQoKSwgYmFzZVVSSVJlZi5nZXQo KSk7Cit9CisKKy8qKgorICogd2Via2l0X3dlYl92aWV3X2xvYWRfcGxhaW5fdGV4dDoKKyAqIEB3 ZWJfdmlldzogYSAjV2ViS2l0V2ViVmlldworICogQHBsYWluX3RleHQ6IFRoZSBwbGFpbiB0ZXh0 IHRvIGxvYWQKKyAqCisgKiBMb2FkIHRoZSBzcGVjaWZpZWQgQHBsYWluX3RleHQgc3RyaW5nIGlu dG8gQHdlYl92aWV3LiBUaGUgbWltZSB0eXBlIG9mCisgKiBkb2N1bWVudCB3aWxsIGJlICJ0ZXh0 L3BsYWluIi4gWW91IGNhbiBtb25pdG9yICB0aGUgc3RhdHVzIG9mIHRoZSBsb2FkIAorICogb3Bl cmF0aW9uIHVzaW5nIHRoZSAjV2ViS2l0V2ViTG9hZGVyQ2xpZW50IG9mIEB3ZWJfdmlldy4gCisg KiBTZWUgd2Via2l0X3dlYl92aWV3X2dldF9sb2FkZXJfY2xpZW50KCkuCisgKi8KK3ZvaWQgd2Vi a2l0X3dlYl92aWV3X2xvYWRfcGxhaW5fdGV4dChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBjb25z dCBnY2hhciogcGxhaW5UZXh0KQoreworICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dF Ql9WSUVXKHdlYlZpZXcpKTsKKyAgICBnX3JldHVybl9pZl9mYWlsKHBsYWluVGV4dCk7CisKKyAg ICBXZWJQYWdlUHJveHkqIHBhZ2UgPSB3ZWJraXRXZWJWaWV3QmFzZUdldFBhZ2UoV0VCS0lUX1dF Ql9WSUVXX0JBU0Uod2ViVmlldykpOworICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiBwbGFp blRleHRSZWYoQWRvcHRXSywgV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcocGxhaW5UZXh0 KSk7CisgICAgV0tQYWdlTG9hZFBsYWluVGV4dFN0cmluZyh0b0FQSShwYWdlKSwgcGxhaW5UZXh0 UmVmLmdldCgpKTsKK30KKworLyoqCiAgKiB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9hbHRlcm5hdGVf aHRtbDoKICAqIEB3ZWJfdmlldzogYSAjV2ViS2l0V2ViVmlldwogICogQGNvbnRlbnQ6IHRoZSBh bHRlcm5hdGUgY29udGVudCB0byBkaXNwbGF5IGFzIHRoZSBtYWluIHBhZ2Ugb2YgdGhlIEB3ZWJf dmlldwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 V2ViVmlldy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmll dy5oCmluZGV4IGYzMzUzZWQuLmM1NzJmNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmgKQEAgLTMsNiArMyw3IEBACiAgKiBDb3B5cmln aHQgKEMpIDIwMDcsIDIwMDggQWxwIFRva2VyIDxhbHBAYXRva2VyLmNvbT4KICAqIENvcHlyaWdo dCAoQykgMjAwOCBDb2xsYWJvcmEgTHRkLgogICogQ29weXJpZ2h0IChDKSAyMDExIElnYWxpYSBT LkwuCisgKiBQb3J0aW9ucyBDb3B5cmlnaHQgKGMpIDIwMTEgTW90b3JvbGEgTW9iaWxpdHksIElu Yy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29m dHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgogICogbW9kaWZ5IGl0IHVuZGVy IHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMKQEAgLTg2LDYgKzg3 LDE0IEBAIHdlYmtpdF93ZWJfdmlld19zZXRfbG9hZGVyX2NsaWVudCAgICAgICAgICAgKFdlYktp dFdlYlZpZXcgICAgICAgICAqd2ViX3ZpZXcsCiBXRUJLSVRfQVBJIHZvaWQKIHdlYmtpdF93ZWJf dmlld19sb2FkX3VyaSAgICAgICAgICAgICAgICAgICAgKFdlYktpdFdlYlZpZXcgICAgICAgICAq d2ViX3ZpZXcsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBj b25zdCBnY2hhciAgICAgICAgICAgKnVyaSk7CitXRUJLSVRfQVBJIHZvaWQKK3dlYmtpdF93ZWJf dmlld19sb2FkX2h0bWwgICAgICAgICAgICAgICAgICAgKFdlYktpdFdlYlZpZXcgICAgICAgICAq d2ViX3ZpZXcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBj b25zdCBnY2hhciAgICAgICAgICAgKmNvbnRlbnQsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAgICAgICAgKmJhc2VfdXJpKTsKKwor V0VCS0lUX0FQSSB2b2lkCit3ZWJraXRfd2ViX3ZpZXdfbG9hZF9wbGFpbl90ZXh0ICAgICAgICAg ICAgIChXZWJLaXRXZWJWaWV3ICAgICAgICAgKndlYl92aWV3LAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2NoYXIgICAgICAgICAgICpwbGFpbl90 ZXh0KTsKIAogV0VCS0lUX0FQSSB2b2lkCiB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9hbHRlcm5hdGVf aHRtbCAgICAgICAgIChXZWJLaXRXZWJWaWV3ICAgICAgICAgKndlYl92aWV3LApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktpdFdlYkxv YWRlckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9U ZXN0V2ViS2l0V2ViTG9hZGVyQ2xpZW50LmNwcAppbmRleCBhMzExYjk2Li5hNTJmMzkzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0 V2ViTG9hZGVyQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay90ZXN0cy9UZXN0V2ViS2l0V2ViTG9hZGVyQ2xpZW50LmNwcApAQCAtMSw2ICsxLDcgQEAKIC8q CiAgKiBDb3B5cmlnaHQgKEMpIDIwMDksIDIwMTAgR3VzdGF2byBOb3JvbmhhIFNpbHZhCiAgKiBD b3B5cmlnaHQgKEMpIDIwMDksIDIwMTEgSWdhbGlhIFMuTC4KKyAqIFBvcnRpb25zIENvcHlyaWdo dCAoYykgMjAxMSBNb3Rvcm9sYSBNb2JpbGl0eSwgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4K ICAqCiAgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1 dGUgaXQgYW5kL29yCiAgKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGli cmFyeSBHZW5lcmFsIFB1YmxpYwpAQCAtNjEsNiArNjIsMjAgQEAgc3RhdGljIHZvaWQgYXNzZXJ0 Tm9ybWFsTG9hZEhhcHBlbmVkQW5kQ2xlYXJFdmVudHMoVmVjdG9yPExvYWRUcmFja2luZ1Rlc3Q6 OkxvYWQKICAgICBldmVudHMuY2xlYXIoKTsKIH0KIAorc3RhdGljIHZvaWQgdGVzdExvYWRIdG1s KExvYWRUcmFja2luZ1Rlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCit7CisgICAgd2Via2l0X3dl Yl92aWV3X2xvYWRfaHRtbCh0ZXN0LT5tX3dlYlZpZXcsICI8aHRtbD48Ym9keT5IZWxsbyBXZWJL aXQtR1RLKzwvYm9keT48L2h0bWw+IiwgMCk7CisgICAgdGVzdC0+d2FpdFVudGlsTG9hZEZpbmlz aGVkKCk7CisgICAgYXNzZXJ0Tm9ybWFsTG9hZEhhcHBlbmVkQW5kQ2xlYXJFdmVudHModGVzdC0+ bV9sb2FkRXZlbnRzKTsKK30KKworc3RhdGljIHZvaWQgdGVzdFBsYWluVGV4dChMb2FkVHJhY2tp bmdUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQoreworICAgIHdlYmtpdF93ZWJfdmlld19sb2Fk X3BsYWluX3RleHQodGVzdC0+bV93ZWJWaWV3LCAiSGVsbG8gV2ViS2l0LUdUSysiKTsKKyAgICB0 ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKKyAgICBhc3NlcnROb3JtYWxMb2FkSGFwcGVu ZWRBbmRDbGVhckV2ZW50cyh0ZXN0LT5tX2xvYWRFdmVudHMpOworfQorCiBzdGF0aWMgdm9pZCB0 ZXN0TG9hZEFsdGVybmF0ZUNvbnRlbnQoTG9hZFRyYWNraW5nVGVzdCogdGVzdCwgZ2NvbnN0cG9p bnRlcikKIHsKICAgICB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9hbHRlcm5hdGVfaHRtbCh0ZXN0LT5t X3dlYlZpZXcsCkBAIC0xMjksNiArMTQ0LDggQEAgdm9pZCBiZWZvcmVBbGwoKQogCiAgICAgTG9h ZFRyYWNraW5nVGVzdDo6YWRkKCJXZWJLaXRXZWJMb2FkZXJDbGllbnQiLCAibG9hZGluZy1zdGF0 dXMiLCB0ZXN0TG9hZGluZ1N0YXR1cyk7CiAgICAgTG9hZFRyYWNraW5nVGVzdDo6YWRkKCJXZWJL aXRXZWJMb2FkZXJDbGllbnQiLCAibG9hZGluZy1lcnJvciIsIHRlc3RMb2FkaW5nRXJyb3IpOwor ICAgIExvYWRUcmFja2luZ1Rlc3Q6OmFkZCgiV2ViS2l0V2ViTG9hZGVyQ2xpZW50IiwgImxvYWQt aHRtbCIsIHRlc3RMb2FkSHRtbCk7CisgICAgTG9hZFRyYWNraW5nVGVzdDo6YWRkKCJXZWJLaXRX ZWJMb2FkZXJDbGllbnQiLCAibG9hZC1wbGFpbi10ZXh0IiwgdGVzdFBsYWluVGV4dCk7CiAgICAg TG9hZFRyYWNraW5nVGVzdDo6YWRkKCJXZWJLaXRXZWJMb2FkZXJDbGllbnQiLCAibG9hZC1hbHRl cm5hdGUtY29udGVudCIsIHRlc3RMb2FkQWx0ZXJuYXRlQ29udGVudCk7CiAgICAgTG9hZFRyYWNr aW5nVGVzdDo6YWRkKCJXZWJLaXRXZWJWaWV3IiwgInByb2dyZXNzIiwgdGVzdExvYWRQcm9ncmVz cyk7CiAgICAgTG9hZFRyYWNraW5nVGVzdDo6YWRkKCJXZWJLaXRXZWJWaWV3IiwgInJlbG9hZCIs IHRlc3RXZWJWaWV3UmVsb2FkKTsKLS0gCjEuNy41LjQKCg== 112972 2011-10-29 12:01:05 -0700 2011-11-03 04:00:21 -0700 New API addition. NewAPIs.diff text/plain 7272 nayankk ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA3NzQ1MWIzLi43NDFkOWY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTEtMTAtMjkgIE5heWFuIEt1bWFyIEsgIDxuYXlhbmtrQG1vdG9yb2xhLmNvbT4KKwor ICAgICAgICBBZGQgd2Via2l0X3dlYl92aWV3X2xvYWRfaHRtbCBhbmQgd2Via2l0X3dlYl92aWV3 X2xvYWRfcGxhaW5fdGV4dCBBUElzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NjkyNDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGlzIHBhdGNoIGFkZHMgc3VwcG9ydCBmb3IgMiBtb3JlIGxvYWQgQVBJ cywgbmFtZWx5CisgICAgICAgIHdlYmtpdF93ZWJfdmlld19sb2FkX2h0bWwgYW5kIHdlYmtpdF93 ZWJfdmlld19sb2FkX3BsYWluX3RleHQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9X ZWJLaXRXZWJWaWV3LmNwcDoKKyAgICAgICAgKHdlYmtpdF93ZWJfdmlld19sb2FkX2h0bWwpOiBO ZXcgQVBJIHRvIGxvYWQgaHRtbCBzdHJpbmcuCisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfbG9h ZF9wbGFpbl90ZXh0KTogTmV3IEFQSSB0byBsb2FkIHBsYWluIHRleHQuCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5oOiBQdWJsaWMgQVBJIGFkZGl0aW9uLgorICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRXZWJWaWV3LmNwcDogTmV3 IHRlc3RzLgorICAgICAgICAoYXNzZXJ0Tm9ybWFsTG9hZEhhcHBlbmVkQW5kQ2xlYXJFdmVudHMp OiBDaGVjayB0aGUgY29ycmVjdG5lc3Mgb2YKKyAgICAgICAgdHJpZ2VycmVkIGxvYWQgZXZlbnRz LgorICAgICAgICAodGVzdFdlYlZpZXdMb2FkSHRtbCk6IFRlc3QgZm9yIHdlYmtpdF93ZWJfdmll d19sb2FkX2h0bWwuCisgICAgICAgICh0ZXN0V2ViVmlld1BsYWluVGV4dCk6IFRlc3QgZm9yIHdl YmtpdF93ZWJfdmlld19sb2FkX3BsYWluX3RleHQuCisgICAgICAgIChiZWZvcmVBbGwpOiBBZGQg bmV3IHRlc3RzLgorCiAyMDExLTEwLTI3ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdh bGlhLmNvbT4KIAogICAgICAgICBGaXggdGhlIEdUSysgYnVpbGQgYWZ0ZXIgcjk4NjY0LgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcApp bmRleCAwMjJhYmE4Li4wMjEwYzUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcApAQCAtMSw1ICsxLDYgQEAKIC8qCiAgKiBDb3B5 cmlnaHQgKEMpIDIwMTEgSWdhbGlhIFMuTC4KKyAqIFBvcnRpb25zIENvcHlyaWdodCAoYykgMjAx MSBNb3Rvcm9sYSBNb2JpbGl0eSwgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBU aGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5k L29yCiAgKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGlicmFyeSBHZW5l cmFsIFB1YmxpYwpAQCAtMjc0LDYgKzI3NSw1MCBAQCB2b2lkIHdlYmtpdF93ZWJfdmlld19sb2Fk X3VyaShXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBjb25zdCBnY2hhciogdXJpKQogfQogCiAvKioK KyAqIHdlYmtpdF93ZWJfdmlld19sb2FkX2h0bWw6CisgKiBAd2ViX3ZpZXc6IGEgI1dlYktpdFdl YlZpZXcKKyAqIEBjb250ZW50OiBUaGUgSFRNTCBzdHJpbmcgdG8gbG9hZAorICogQGJhc2VfdXJp OiAoYWxsb3ctbm9uZSk6IFRoZSBiYXNlIFVSSSBmb3IgcmVsYXRpdmUgbG9jYXRpb25zIG9yICVO VUxMCisgKgorICogTG9hZCB0aGUgZ2l2ZW4gQGNvbnRlbnQgc3RyaW5nIHdpdGggdGhlIHNwZWNp ZmllZCBAYmFzZV91cmkuIAorICogUmVsYXRpdmUgVVJMcyBpbiB0aGUgQGNvbnRlbnQgd2lsbCBi ZSByZXNvbHZlZCBhZ2FpbnN0IEBiYXNlX3VyaS4KKyAqIFdoZW4gQGJhc2VfdXJpIGlzICVOVUxM LCBpdCBkZWZhdWx0cyB0byAiYWJvdXQ6YmxhbmsiLiBUaGUgbWltZSB0eXBlIAorICogb2YgdGhl IGRvY3VtZW50IHdpbGwgYmUgInRleHQvaHRtbCIuIFlvdSBjYW4gbW9uaXRvciB0aGUgc3RhdHVz IG9mIAorICogdGhlIGxvYWQgb3BlcmF0aW9uIHVzaW5nIHRoZSAjV2ViS2l0V2ViTG9hZGVyQ2xp ZW50IG9mIEB3ZWJfdmlldy4gCisgKiBTZWUgd2Via2l0X3dlYl92aWV3X2dldF9sb2FkZXJfY2xp ZW50KCkuCisgKi8KK3ZvaWQgd2Via2l0X3dlYl92aWV3X2xvYWRfaHRtbChXZWJLaXRXZWJWaWV3 KiB3ZWJWaWV3LCBjb25zdCBnY2hhciogY29udGVudCwgY29uc3QgZ2NoYXIqIGJhc2VVUkkpCit7 CisgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcod2ViVmlldykpOworICAg IGdfcmV0dXJuX2lmX2ZhaWwoY29udGVudCk7CisKKyAgICBXZWJQYWdlUHJveHkqIHBhZ2UgPSB3 ZWJraXRXZWJWaWV3QmFzZUdldFBhZ2UoV0VCS0lUX1dFQl9WSUVXX0JBU0Uod2ViVmlldykpOwor ICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiBjb250ZW50UmVmKEFkb3B0V0ssICBXS1N0cmlu Z0NyZWF0ZVdpdGhVVEY4Q1N0cmluZyhjb250ZW50KSk7CisgICAgV0tSZXRhaW5QdHI8V0tVUkxS ZWY+IGJhc2VVUklSZWYgPSBiYXNlVVJJID8gYWRvcHRXSyhXS1VSTENyZWF0ZVdpdGhVVEY4Q1N0 cmluZyhiYXNlVVJJKSkgOiAwOworICAgIFdLUGFnZUxvYWRIVE1MU3RyaW5nKHRvQVBJKHBhZ2Up LCBjb250ZW50UmVmLmdldCgpLCBiYXNlVVJJUmVmLmdldCgpKTsKK30KKworLyoqCisgKiB3ZWJr aXRfd2ViX3ZpZXdfbG9hZF9wbGFpbl90ZXh0OgorICogQHdlYl92aWV3OiBhICNXZWJLaXRXZWJW aWV3CisgKiBAcGxhaW5fdGV4dDogVGhlIHBsYWluIHRleHQgdG8gbG9hZAorICoKKyAqIExvYWQg dGhlIHNwZWNpZmllZCBAcGxhaW5fdGV4dCBzdHJpbmcgaW50byBAd2ViX3ZpZXcuIFRoZSBtaW1l IHR5cGUgb2YKKyAqIGRvY3VtZW50IHdpbGwgYmUgInRleHQvcGxhaW4iLiBZb3UgY2FuIG1vbml0 b3IgIHRoZSBzdGF0dXMgb2YgdGhlIGxvYWQgCisgKiBvcGVyYXRpb24gdXNpbmcgdGhlICNXZWJL aXRXZWJMb2FkZXJDbGllbnQgb2YgQHdlYl92aWV3LiAKKyAqIFNlZSB3ZWJraXRfd2ViX3ZpZXdf Z2V0X2xvYWRlcl9jbGllbnQoKS4KKyAqLwordm9pZCB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9wbGFp bl90ZXh0KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGNvbnN0IGdjaGFyKiBwbGFpblRleHQpCit7 CisgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcod2ViVmlldykpOworICAg IGdfcmV0dXJuX2lmX2ZhaWwocGxhaW5UZXh0KTsKKworICAgIFdlYlBhZ2VQcm94eSogcGFnZSA9 IHdlYmtpdFdlYlZpZXdCYXNlR2V0UGFnZShXRUJLSVRfV0VCX1ZJRVdfQkFTRSh3ZWJWaWV3KSk7 CisgICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+IHBsYWluVGV4dFJlZihBZG9wdFdLLCBXS1N0 cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZyhwbGFpblRleHQpKTsKKyAgICBXS1BhZ2VMb2FkUGxh aW5UZXh0U3RyaW5nKHRvQVBJKHBhZ2UpLCBwbGFpblRleHRSZWYuZ2V0KCkpOworfQorCisvKioK ICAqIHdlYmtpdF93ZWJfdmlld19sb2FkX2FsdGVybmF0ZV9odG1sOgogICogQHdlYl92aWV3OiBh ICNXZWJLaXRXZWJWaWV3CiAgKiBAY29udGVudDogdGhlIGFsdGVybmF0ZSBjb250ZW50IHRvIGRp c3BsYXkgYXMgdGhlIG1haW4gcGFnZSBvZiB0aGUgQHdlYl92aWV3CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmggYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmgKaW5kZXggMGRiYmU0MC4uYzdj Mjg0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 V2ViVmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdl YlZpZXcuaApAQCAtMyw2ICszLDcgQEAKICAqIENvcHlyaWdodCAoQykgMjAwNywgMjAwOCBBbHAg VG9rZXIgPGFscEBhdG9rZXIuY29tPgogICogQ29weXJpZ2h0IChDKSAyMDA4IENvbGxhYm9yYSBM dGQuCiAgKiBDb3B5cmlnaHQgKEMpIDIwMTEgSWdhbGlhIFMuTC4KKyAqIFBvcnRpb25zIENvcHly aWdodCAoYykgMjAxMSBNb3Rvcm9sYSBNb2JpbGl0eSwgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZl ZC4KICAqCiAgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3Ry aWJ1dGUgaXQgYW5kL29yCiAgKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUg TGlicmFyeSBHZW5lcmFsIFB1YmxpYwpAQCAtODksNiArOTAsMTUgQEAgd2Via2l0X3dlYl92aWV3 X2xvYWRfdXJpICAgICAgICAgICAgICAgICAgICAgKFdlYktpdFdlYlZpZXcgICAgICAgICAgICAg KndlYl92aWUKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBj b25zdCBnY2hhciAgICAgICAgICAgICAgICp1cmkpOwogCiBXRUJLSVRfQVBJIHZvaWQKK3dlYmtp dF93ZWJfdmlld19sb2FkX2h0bWwgICAgICAgICAgICAgICAgICAgIChXZWJLaXRXZWJWaWV3ICAg ICAgICAgKndlYl92aWV3LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGNvbnN0IGdjaGFyICAgICAgICAgICAqY29udGVudCwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAgICAgICAgKmJhc2Vf dXJpKTsKKworV0VCS0lUX0FQSSB2b2lkCit3ZWJraXRfd2ViX3ZpZXdfbG9hZF9wbGFpbl90ZXh0 ICAgICAgICAgICAgICAoV2ViS2l0V2ViVmlldyAgICAgICAgICp3ZWJfdmlldywKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAgICAg ICAgKnBsYWluX3RleHQpOworCitXRUJLSVRfQVBJIHZvaWQKIHdlYmtpdF93ZWJfdmlld19sb2Fk X2FsdGVybmF0ZV9odG1sICAgICAgICAgIChXZWJLaXRXZWJWaWV3ICAgICAgICAgICAgICp3ZWJf dmlldywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25z dCBnY2hhciAgICAgICAgICAgICAgICpjb250ZW50LAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGdjaGFyICAgICAgICAgICAgICAgKmJhc2VfdXJp LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVz dFdlYktpdFdlYlZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVz dHMvVGVzdFdlYktpdFdlYlZpZXcuY3BwCmluZGV4IGEyOTNlZWYuLjZlNzBlNGIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRXZWJW aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0 V2ViS2l0V2ViVmlldy5jcHAKQEAgLTQ3LDEwICs0NywzNSBAQCBzdGF0aWMgdm9pZCB0ZXN0V2Vi Vmlld3NTaGFyZUNsaWVudHMoVGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKICAgICBnX2Fzc2Vy dChjbGllbnQxID09IGNsaWVudDIpOwogfQogCitzdGF0aWMgdm9pZCBhc3NlcnROb3JtYWxMb2Fk SGFwcGVuZWRBbmRDbGVhckV2ZW50cyhWZWN0b3I8TG9hZFRyYWNraW5nVGVzdDo6TG9hZEV2ZW50 cz4mIGV2ZW50cykKK3sKKyAgICBnX2Fzc2VydF9jbXBpbnQoZXZlbnRzLnNpemUoKSwgPT0sIDMp OworICAgIGdfYXNzZXJ0X2NtcGludChldmVudHNbMF0sID09LCBMb2FkVHJhY2tpbmdUZXN0OjpQ cm92aXNpb25hbExvYWRTdGFydGVkKTsKKyAgICBnX2Fzc2VydF9jbXBpbnQoZXZlbnRzWzFdLCA9 PSwgTG9hZFRyYWNraW5nVGVzdDo6TG9hZENvbW1pdHRlZCk7CisgICAgZ19hc3NlcnRfY21waW50 KGV2ZW50c1syXSwgPT0sIExvYWRUcmFja2luZ1Rlc3Q6OkxvYWRGaW5pc2hlZCk7CisgICAgZXZl bnRzLmNsZWFyKCk7Cit9CisKK3N0YXRpYyB2b2lkIHRlc3RXZWJWaWV3TG9hZEh0bWwoTG9hZFRy YWNraW5nVGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKK3sKKyAgICB3ZWJraXRfd2ViX3ZpZXdf bG9hZF9odG1sKHRlc3QtPm1fd2ViVmlldywgIjxodG1sPjxib2R5PkhlbGxvIFdlYktpdC1HVEsr PC9ib2R5PjwvaHRtbD4iLCAwKTsKKyAgICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsK KyAgICBhc3NlcnROb3JtYWxMb2FkSGFwcGVuZWRBbmRDbGVhckV2ZW50cyh0ZXN0LT5tX2xvYWRF dmVudHMpOworfQorCitzdGF0aWMgdm9pZCB0ZXN0V2ViVmlld1BsYWluVGV4dChMb2FkVHJhY2tp bmdUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQoreworICAgIHdlYmtpdF93ZWJfdmlld19sb2Fk X3BsYWluX3RleHQodGVzdC0+bV93ZWJWaWV3LCAiSGVsbG8gV2ViS2l0LUdUSysiKTsKKyAgICB0 ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKKyAgICBhc3NlcnROb3JtYWxMb2FkSGFwcGVu ZWRBbmRDbGVhckV2ZW50cyh0ZXN0LT5tX2xvYWRFdmVudHMpOworfQorCiB2b2lkIGJlZm9yZUFs bCgpCiB7CiAgICAgV2ViVmlld1Rlc3Q6OmFkZCgiV2ViS2l0V2ViVmlldyIsICJkZWZhdWx0LWNv bnRleHQiLCB0ZXN0V2ViVmlld0RlZmF1bHRDb250ZXh0KTsKICAgICBXZWJWaWV3VGVzdDo6YWRk KCJXZWJLaXRXZWJWaWV3IiwgImN1c3RvbS1jaGFyc2V0IiwgdGVzdFdlYlZpZXdDdXN0b21DaGFy c2V0KTsKKyAgICBMb2FkVHJhY2tpbmdUZXN0OjphZGQoIldlYktpdFdlYlZpZXciLCAibG9hZC1o dG1sIiwgdGVzdFdlYlZpZXdMb2FkSHRtbCk7CisgICAgTG9hZFRyYWNraW5nVGVzdDo6YWRkKCJX ZWJLaXRXZWJWaWV3IiwgImxvYWQtcGxhaW4tdGV4dCIsIHRlc3RXZWJWaWV3UGxhaW5UZXh0KTsK ICAgICBUZXN0OjphZGQoIldlYktpdFdlYlZpZXciLCAid2Vidmlld3Mtc2hhcmUtY2xpZW50cyIs IHRlc3RXZWJWaWV3c1NoYXJlQ2xpZW50cyk7CiB9CiAK 113455 2011-11-03 04:00:21 -0700 2011-11-03 04:06:53 -0700 New API addition. NewAPIs.diff text/plain 9713 nayankk ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0NTg5Yjc3Li42MjVlYjNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTEtMTEtMDMgIE5heWFuIEt1bWFyIEsgIDxuYXlhbmtrQG1vdG9yb2xhLmNvbT4KKwor ICAgICAgICBBZGQgd2Via2l0X3dlYl92aWV3X2xvYWRfaHRtbCBhbmQgd2Via2l0X3dlYl92aWV3 X2xvYWRfcGxhaW5fdGV4dCBBUElzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NjkyNDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGlzIHBhdGNoIGFkZHMgc3VwcG9ydCBmb3IgMiBtb3JlIGxvYWQgQVBJ cywgbmFtZWx5CisgICAgICAgIHdlYmtpdF93ZWJfdmlld19sb2FkX2h0bWwgYW5kIHdlYmtpdF93 ZWJfdmlld19sb2FkX3BsYWluX3RleHQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9X ZWJLaXRXZWJWaWV3LmNwcDoKKyAgICAgICAgKHdlYmtpdF93ZWJfdmlld19sb2FkX2h0bWwpOiBO ZXcgQVBJIHRvIGxvYWQgaHRtbCBzdHJpbmcuCisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfbG9h ZF9wbGFpbl90ZXh0KTogTmV3IEFQSSB0byBsb2FkIHBsYWluIHRleHQuCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5oOiBQdWJsaWMgQVBJIGFkZGl0aW9uLgorICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRXZWJMb2FkZXJDbGllbnQu Y3BwOgorICAgICAgICAodGVzdExvYWRIdG1sKTogVGVzdCB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9o dG1sIEFQSS4KKyAgICAgICAgKHRlc3RMb2FkUGxhaW5UZXh0KTogVGVzdCB3ZWJraXRfd2ViX3Zp ZXdfbG9hZF9wbGFpbl90ZXh0IEFQSS4KKyAgICAgICAgKGJlZm9yZUFsbCk6IEFkZCBuZXcgdGVz dHMuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvV2ViVmlld1Rlc3QuY3BwOgor ICAgICAgICAoV2ViVmlld1Rlc3Q6OmxvYWRIdG1sKTogVGVzdCB3ZWJraXRfd2ViX3ZpZXdfbG9h ZF9odG1sIEFQSS4KKyAgICAgICAgKFdlYlZpZXdUZXN0Ojpsb2FkUGxhaW5UZXh0KTogVGVzdCB3 ZWJraXRfd2ViX3ZpZXdfbG9hZF9wbGFpbl90ZXh0IEFQSS4KKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL2d0ay90ZXN0cy9XZWJWaWV3VGVzdC5oOgorCiAyMDExLTExLTAyICBWaWF0Y2hlc2xhdiBP c3RhcGVua28gIDxvc3RhcGVua28udmlhdGNoZXNsYXZAbm9raWEuY29tPgogCiAgICAgICAgIFtR dF0gW1dLXSBEZWJ1ZyBidWlsZCBicm9rZW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAKaW5kZXggYWQyODBjZi4uNTMyZWRmMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5j cHAKQEAgLTEsNSArMSw2IEBACiAvKgogICogQ29weXJpZ2h0IChDKSAyMDExIElnYWxpYSBTLkwu CisgKiBQb3J0aW9ucyBDb3B5cmlnaHQgKGMpIDIwMTEgTW90b3JvbGEgTW9iaWxpdHksIEluYy4g IEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdh cmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgogICogbW9kaWZ5IGl0IHVuZGVyIHRo ZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMKQEAgLTMxMiw2ICszMTMs NTAgQEAgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfbG9hZF91cmkoV2ViS2l0V2ViVmlldyogd2ViVmll dywgY29uc3QgZ2NoYXIqIHVyaSkKIH0KIAogLyoqCisgKiB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9o dG1sOgorICogQHdlYl92aWV3OiBhICNXZWJLaXRXZWJWaWV3CisgKiBAY29udGVudDogVGhlIEhU TUwgc3RyaW5nIHRvIGxvYWQKKyAqIEBiYXNlX3VyaTogKGFsbG93LW5vbmUpOiBUaGUgYmFzZSBV UkkgZm9yIHJlbGF0aXZlIGxvY2F0aW9ucyBvciAlTlVMTAorICoKKyAqIExvYWQgdGhlIGdpdmVu IEBjb250ZW50IHN0cmluZyB3aXRoIHRoZSBzcGVjaWZpZWQgQGJhc2VfdXJpLiAKKyAqIFJlbGF0 aXZlIFVSTHMgaW4gdGhlIEBjb250ZW50IHdpbGwgYmUgcmVzb2x2ZWQgYWdhaW5zdCBAYmFzZV91 cmkuCisgKiBXaGVuIEBiYXNlX3VyaSBpcyAlTlVMTCwgaXQgZGVmYXVsdHMgdG8gImFib3V0OmJs YW5rIi4gVGhlIG1pbWUgdHlwZSAKKyAqIG9mIHRoZSBkb2N1bWVudCB3aWxsIGJlICJ0ZXh0L2h0 bWwiLiBZb3UgY2FuIG1vbml0b3IgdGhlIHN0YXR1cyBvZiAKKyAqIHRoZSBsb2FkIG9wZXJhdGlv biB1c2luZyB0aGUgI1dlYktpdFdlYkxvYWRlckNsaWVudCBvZiBAd2ViX3ZpZXcuIAorICogU2Vl IHdlYmtpdF93ZWJfdmlld19nZXRfbG9hZGVyX2NsaWVudCgpLgorICovCit2b2lkIHdlYmtpdF93 ZWJfdmlld19sb2FkX2h0bWwoV2ViS2l0V2ViVmlldyogd2ViVmlldywgY29uc3QgZ2NoYXIqIGNv bnRlbnQsIGNvbnN0IGdjaGFyKiBiYXNlVVJJKQoreworICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VC S0lUX0lTX1dFQl9WSUVXKHdlYlZpZXcpKTsKKyAgICBnX3JldHVybl9pZl9mYWlsKGNvbnRlbnQp OworCisgICAgV2ViUGFnZVByb3h5KiBwYWdlID0gd2Via2l0V2ViVmlld0Jhc2VHZXRQYWdlKFdF QktJVF9XRUJfVklFV19CQVNFKHdlYlZpZXcpKTsKKyAgICBXS1JldGFpblB0cjxXS1N0cmluZ1Jl Zj4gY29udGVudFJlZihBZG9wdFdLLCAgV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcoY29u dGVudCkpOworICAgIFdLUmV0YWluUHRyPFdLVVJMUmVmPiBiYXNlVVJJUmVmID0gYmFzZVVSSSA/ IGFkb3B0V0soV0tVUkxDcmVhdGVXaXRoVVRGOENTdHJpbmcoYmFzZVVSSSkpIDogMDsKKyAgICBX S1BhZ2VMb2FkSFRNTFN0cmluZyh0b0FQSShwYWdlKSwgY29udGVudFJlZi5nZXQoKSwgYmFzZVVS SVJlZi5nZXQoKSk7Cit9CisKKy8qKgorICogd2Via2l0X3dlYl92aWV3X2xvYWRfcGxhaW5fdGV4 dDoKKyAqIEB3ZWJfdmlldzogYSAjV2ViS2l0V2ViVmlldworICogQHBsYWluX3RleHQ6IFRoZSBw bGFpbiB0ZXh0IHRvIGxvYWQKKyAqCisgKiBMb2FkIHRoZSBzcGVjaWZpZWQgQHBsYWluX3RleHQg c3RyaW5nIGludG8gQHdlYl92aWV3LiBUaGUgbWltZSB0eXBlIG9mCisgKiBkb2N1bWVudCB3aWxs IGJlICJ0ZXh0L3BsYWluIi4gWW91IGNhbiBtb25pdG9yICB0aGUgc3RhdHVzIG9mIHRoZSBsb2Fk IAorICogb3BlcmF0aW9uIHVzaW5nIHRoZSAjV2ViS2l0V2ViTG9hZGVyQ2xpZW50IG9mIEB3ZWJf dmlldy4gCisgKiBTZWUgd2Via2l0X3dlYl92aWV3X2dldF9sb2FkZXJfY2xpZW50KCkuCisgKi8K K3ZvaWQgd2Via2l0X3dlYl92aWV3X2xvYWRfcGxhaW5fdGV4dChXZWJLaXRXZWJWaWV3KiB3ZWJW aWV3LCBjb25zdCBnY2hhciogcGxhaW5UZXh0KQoreworICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VC S0lUX0lTX1dFQl9WSUVXKHdlYlZpZXcpKTsKKyAgICBnX3JldHVybl9pZl9mYWlsKHBsYWluVGV4 dCk7CisKKyAgICBXZWJQYWdlUHJveHkqIHBhZ2UgPSB3ZWJraXRXZWJWaWV3QmFzZUdldFBhZ2Uo V0VCS0lUX1dFQl9WSUVXX0JBU0Uod2ViVmlldykpOworICAgIFdLUmV0YWluUHRyPFdLU3RyaW5n UmVmPiBwbGFpblRleHRSZWYoQWRvcHRXSywgV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmco cGxhaW5UZXh0KSk7CisgICAgV0tQYWdlTG9hZFBsYWluVGV4dFN0cmluZyh0b0FQSShwYWdlKSwg cGxhaW5UZXh0UmVmLmdldCgpKTsKK30KKworLyoqCiAgKiB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9h bHRlcm5hdGVfaHRtbDoKICAqIEB3ZWJfdmlldzogYSAjV2ViS2l0V2ViVmlldwogICogQGNvbnRl bnQ6IHRoZSBhbHRlcm5hdGUgY29udGVudCB0byBkaXNwbGF5IGFzIHRoZSBtYWluIHBhZ2Ugb2Yg dGhlIEB3ZWJfdmlldwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9n dGsvV2ViS2l0V2ViVmlldy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0V2ViVmlldy5oCmluZGV4IDFhOGExNzUuLmFkYzc1YzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuaAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmgKQEAgLTMsNiArMyw3IEBACiAg KiBDb3B5cmlnaHQgKEMpIDIwMDcsIDIwMDggQWxwIFRva2VyIDxhbHBAYXRva2VyLmNvbT4KICAq IENvcHlyaWdodCAoQykgMjAwOCBDb2xsYWJvcmEgTHRkLgogICogQ29weXJpZ2h0IChDKSAyMDEx IElnYWxpYSBTLkwuCisgKiBQb3J0aW9ucyBDb3B5cmlnaHQgKGMpIDIwMTEgTW90b3JvbGEgTW9i aWxpdHksIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogVGhpcyBsaWJyYXJ5IGlz IGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgogICogbW9kaWZ5 IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMKQEAg LTkwLDYgKzkxLDE1IEBAIHdlYmtpdF93ZWJfdmlld19sb2FkX3VyaSAgICAgICAgICAgICAgICAg ICAgIChXZWJLaXRXZWJWaWV3ICAgICAgICAgICAgICp3ZWJfdmllCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2NoYXIgICAgICAgICAgICAgICAq dXJpKTsKIAogV0VCS0lUX0FQSSB2b2lkCit3ZWJraXRfd2ViX3ZpZXdfbG9hZF9odG1sICAgICAg ICAgICAgICAgICAgICAoV2ViS2l0V2ViVmlldyAgICAgICAgICp3ZWJfdmlldywKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAgICAg ICAgKmNvbnRlbnQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgY29uc3QgZ2NoYXIgICAgICAgICAgICpiYXNlX3VyaSk7CisKK1dFQktJVF9BUEkgdm9pZAor d2Via2l0X3dlYl92aWV3X2xvYWRfcGxhaW5fdGV4dCAgICAgICAgICAgICAgKFdlYktpdFdlYlZp ZXcgICAgICAgICAqd2ViX3ZpZXcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgY29uc3QgZ2NoYXIgICAgICAgICAgICpwbGFpbl90ZXh0KTsKKworV0VCS0lU X0FQSSB2b2lkCiB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9hbHRlcm5hdGVfaHRtbCAgICAgICAgICAo V2ViS2l0V2ViVmlldyAgICAgICAgICAgICAqd2ViX3ZpZXcsCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2NoYXIgICAgICAgICAgICAgICAqY29u dGVudCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25z dCBnY2hhciAgICAgICAgICAgICAgICpiYXNlX3VyaSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRXZWJMb2FkZXJDbGllbnQuY3Bw IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktpdFdlYkxv YWRlckNsaWVudC5jcHAKaW5kZXggMTY3ZGVlOC4uMzFhMjllYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktpdFdlYkxvYWRlckNsaWVu dC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdl YktpdFdlYkxvYWRlckNsaWVudC5jcHAKQEAgLTEsNiArMSw3IEBACiAvKgogICogQ29weXJpZ2h0 IChDKSAyMDA5LCAyMDEwIEd1c3Rhdm8gTm9yb25oYSBTaWx2YQogICogQ29weXJpZ2h0IChDKSAy MDA5LCAyMDExIElnYWxpYSBTLkwuCisgKiBQb3J0aW9ucyBDb3B5cmlnaHQgKGMpIDIwMTEgTW90 b3JvbGEgTW9iaWxpdHksIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogVGhpcyBs aWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgog ICogbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQ dWJsaWMKQEAgLTYyLDYgKzYzLDIwIEBAIHN0YXRpYyB2b2lkIGFzc2VydE5vcm1hbExvYWRIYXBw ZW5lZEFuZENsZWFyRXZlbnRzKFZlY3RvcjxMb2FkVHJhY2tpbmdUZXN0OjpMb2FkCiAgICAgZXZl bnRzLmNsZWFyKCk7CiB9CiAKK3N0YXRpYyB2b2lkIHRlc3RMb2FkSHRtbChMb2FkVHJhY2tpbmdU ZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQoreworICAgIHRlc3QtPmxvYWRIdG1sKCI8aHRtbD48 Ym9keT5IZWxsbyBXZWJLaXQtR1RLKzwvYm9keT48L2h0bWw+IiwgMCk7CisgICAgdGVzdC0+d2Fp dFVudGlsTG9hZEZpbmlzaGVkKCk7CisgICAgYXNzZXJ0Tm9ybWFsTG9hZEhhcHBlbmVkQW5kQ2xl YXJFdmVudHModGVzdC0+bV9sb2FkRXZlbnRzKTsKK30KKworc3RhdGljIHZvaWQgdGVzdExvYWRQ bGFpblRleHQoTG9hZFRyYWNraW5nVGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKK3sKKyAgICB0 ZXN0LT5sb2FkUGxhaW5UZXh0KCJIZWxsbyBXZWJLaXQtR1RLKyIpOworICAgIHRlc3QtPndhaXRV bnRpbExvYWRGaW5pc2hlZCgpOworICAgIGFzc2VydE5vcm1hbExvYWRIYXBwZW5lZEFuZENsZWFy RXZlbnRzKHRlc3QtPm1fbG9hZEV2ZW50cyk7Cit9CisKIHN0YXRpYyB2b2lkIHRlc3RMb2FkQWx0 ZXJuYXRlQ29udGVudChMb2FkVHJhY2tpbmdUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQogewog ICAgIHRlc3QtPmxvYWRBbHRlcm5hdGVIVE1MKCI8aHRtbD48Ym9keT5BbHRlcm5hdGUgQ29udGVu dDwvYm9keT48L2h0bWw+IiwgMCwga1NlcnZlci0+Z2V0VVJJRm9yUGF0aCgiL2FsdGVybmF0ZSIp LmRhdGEoKSk7CkBAIC0yMjAsNiArMjM1LDggQEAgdm9pZCBiZWZvcmVBbGwoKQogCiAgICAgTG9h ZFRyYWNraW5nVGVzdDo6YWRkKCJXZWJLaXRXZWJMb2FkZXJDbGllbnQiLCAibG9hZGluZy1zdGF0 dXMiLCB0ZXN0TG9hZGluZ1N0YXR1cyk7CiAgICAgTG9hZFRyYWNraW5nVGVzdDo6YWRkKCJXZWJL aXRXZWJMb2FkZXJDbGllbnQiLCAibG9hZGluZy1lcnJvciIsIHRlc3RMb2FkaW5nRXJyb3IpOwor ICAgIExvYWRUcmFja2luZ1Rlc3Q6OmFkZCgiV2ViS2l0V2ViVmlldyIsICJsb2FkLWh0bWwiLCB0 ZXN0TG9hZEh0bWwpOworICAgIExvYWRUcmFja2luZ1Rlc3Q6OmFkZCgiV2ViS2l0V2ViVmlldyIs ICJsb2FkLXBsYWluLXRleHQiLCB0ZXN0TG9hZFBsYWluVGV4dCk7CiAgICAgTG9hZFRyYWNraW5n VGVzdDo6YWRkKCJXZWJLaXRXZWJMb2FkZXJDbGllbnQiLCAibG9hZC1hbHRlcm5hdGUtY29udGVu dCIsIHRlc3RMb2FkQWx0ZXJuYXRlQ29udGVudCk7CiAgICAgTG9hZFN0b3BUcmFja2luZ1Rlc3Q6 OmFkZCgiV2ViS2l0V2ViVmlldyIsICJzdG9wLWxvYWRpbmciLCB0ZXN0TG9hZENhbmNlbGxlZCk7 CiAgICAgTG9hZFRyYWNraW5nVGVzdDo6YWRkKCJXZWJLaXRXZWJWaWV3IiwgInByb2dyZXNzIiwg dGVzdExvYWRQcm9ncmVzcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay90ZXN0cy9XZWJWaWV3VGVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay90ZXN0cy9XZWJWaWV3VGVzdC5jcHAKaW5kZXggZGZlNTgwMC4uYjU4OTgyMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvV2ViVmlld1Rl c3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1dlYlZp ZXdUZXN0LmNwcApAQCAtMSw1ICsxLDYgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMTEgSWdh bGlhIFMuTC4KKyAqIFBvcnRpb25zIENvcHlyaWdodCAoYykgMjAxMSBNb3Rvcm9sYSBNb2JpbGl0 eSwgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBUaGlzIGxpYnJhcnkgaXMgZnJl ZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCiAgKiBtb2RpZnkgaXQg dW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYwpAQCAtNDUs NiArNDYsMTggQEAgdm9pZCBXZWJWaWV3VGVzdDo6bG9hZFVSSShjb25zdCBjaGFyKiB1cmkpCiAg ICAgd2Via2l0X3dlYl92aWV3X2xvYWRfdXJpKG1fd2ViVmlldywgdXJpKTsKIH0KIAordm9pZCBX ZWJWaWV3VGVzdDo6bG9hZEh0bWwoY29uc3QgY2hhciogaHRtbCwgY29uc3QgY2hhciogYmFzZVVS SSkKK3sKKyAgICBtX2FjdGl2ZVVSSSA9ICJhYm91dDpibGFuayI7CisgICAgd2Via2l0X3dlYl92 aWV3X2xvYWRfaHRtbChtX3dlYlZpZXcsIGh0bWwsIGJhc2VVUkkpOworfQorCit2b2lkIFdlYlZp ZXdUZXN0Ojpsb2FkUGxhaW5UZXh0KGNvbnN0IGNoYXIqIHBsYWluVGV4dCkKK3sKKyAgICBtX2Fj dGl2ZVVSSSA9ICJhYm91dDpibGFuayI7CisgICAgd2Via2l0X3dlYl92aWV3X2xvYWRfcGxhaW5f dGV4dChtX3dlYlZpZXcsIHBsYWluVGV4dCk7Cit9CisKIHZvaWQgV2ViVmlld1Rlc3Q6OmxvYWRB bHRlcm5hdGVIVE1MKGNvbnN0IGNoYXIqIGh0bWwsIGNvbnN0IGNoYXIqIGJhc2VVUkksIGNvbnN0 IGNoYXIqIHVucmVhY2hhYmxlVVJJKQogewogICAgIG1fYWN0aXZlVVJJID0gImFib3V0OmJsYW5r IjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1dl YlZpZXdUZXN0LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9XZWJW aWV3VGVzdC5oCmluZGV4IDVjYTAwYzkuLmM4ZmIzOTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1dlYlZpZXdUZXN0LmgKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvV2ViVmlld1Rlc3QuaApAQCAtMSw1ICsxLDYg QEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMTEgSWdhbGlhIFMuTC4KKyAqIFBvcnRpb25zIENv cHlyaWdodCAoYykgMjAxMSBNb3Rvcm9sYSBNb2JpbGl0eSwgSW5jLiAgQWxsIHJpZ2h0cyByZXNl cnZlZC4KICAqCiAgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRp c3RyaWJ1dGUgaXQgYW5kL29yCiAgKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBH TlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYwpAQCAtMzEsNiArMzIsOCBAQCBwdWJsaWM6CiAgICAg dmlydHVhbCB+V2ViVmlld1Rlc3QoKTsKIAogICAgIHZvaWQgbG9hZFVSSShjb25zdCBjaGFyKiB1 cmkpOworICAgIHZvaWQgbG9hZEh0bWwoY29uc3QgY2hhciogaHRtbCwgY29uc3QgY2hhciogYmFz ZVVSSSk7CisgICAgdm9pZCBsb2FkUGxhaW5UZXh0KGNvbnN0IGNoYXIqIHBsYWluVGV4dCk7CiAg ICAgdm9pZCBsb2FkQWx0ZXJuYXRlSFRNTChjb25zdCBjaGFyKiBodG1sLCBjb25zdCBjaGFyKiBi YXNlVVJJLCBjb25zdCBjaGFyKiB1bnJlYWNoYWJsZVVSSSk7CiAgICAgdm9pZCBnb0JhY2soKTsK ICAgICB2b2lkIGdvRm9yd2FyZCgpOwo= 113456 2011-11-03 04:06:53 -0700 2011-11-03 05:53:02 -0700 New API addition. NewAPIs.diff text/plain 10311 nayankk ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0NTg5Yjc3Li42MjVlYjNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTEtMTEtMDMgIE5heWFuIEt1bWFyIEsgIDxuYXlhbmtrQG1vdG9yb2xhLmNvbT4KKwor ICAgICAgICBBZGQgd2Via2l0X3dlYl92aWV3X2xvYWRfaHRtbCBhbmQgd2Via2l0X3dlYl92aWV3 X2xvYWRfcGxhaW5fdGV4dCBBUElzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NjkyNDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGlzIHBhdGNoIGFkZHMgc3VwcG9ydCBmb3IgMiBtb3JlIGxvYWQgQVBJ cywgbmFtZWx5CisgICAgICAgIHdlYmtpdF93ZWJfdmlld19sb2FkX2h0bWwgYW5kIHdlYmtpdF93 ZWJfdmlld19sb2FkX3BsYWluX3RleHQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9X ZWJLaXRXZWJWaWV3LmNwcDoKKyAgICAgICAgKHdlYmtpdF93ZWJfdmlld19sb2FkX2h0bWwpOiBO ZXcgQVBJIHRvIGxvYWQgaHRtbCBzdHJpbmcuCisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfbG9h ZF9wbGFpbl90ZXh0KTogTmV3IEFQSSB0byBsb2FkIHBsYWluIHRleHQuCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5oOiBQdWJsaWMgQVBJIGFkZGl0aW9uLgorICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRXZWJMb2FkZXJDbGllbnQu Y3BwOgorICAgICAgICAodGVzdExvYWRIdG1sKTogVGVzdCB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9o dG1sIEFQSS4KKyAgICAgICAgKHRlc3RMb2FkUGxhaW5UZXh0KTogVGVzdCB3ZWJraXRfd2ViX3Zp ZXdfbG9hZF9wbGFpbl90ZXh0IEFQSS4KKyAgICAgICAgKGJlZm9yZUFsbCk6IEFkZCBuZXcgdGVz dHMuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvV2ViVmlld1Rlc3QuY3BwOgor ICAgICAgICAoV2ViVmlld1Rlc3Q6OmxvYWRIdG1sKTogVGVzdCB3ZWJraXRfd2ViX3ZpZXdfbG9h ZF9odG1sIEFQSS4KKyAgICAgICAgKFdlYlZpZXdUZXN0Ojpsb2FkUGxhaW5UZXh0KTogVGVzdCB3 ZWJraXRfd2ViX3ZpZXdfbG9hZF9wbGFpbl90ZXh0IEFQSS4KKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL2d0ay90ZXN0cy9XZWJWaWV3VGVzdC5oOgorCiAyMDExLTExLTAyICBWaWF0Y2hlc2xhdiBP c3RhcGVua28gIDxvc3RhcGVua28udmlhdGNoZXNsYXZAbm9raWEuY29tPgogCiAgICAgICAgIFtR dF0gW1dLXSBEZWJ1ZyBidWlsZCBicm9rZW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAKaW5kZXggYWQyODBjZi4uNTMyZWRmMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5j cHAKQEAgLTEsNSArMSw2IEBACiAvKgogICogQ29weXJpZ2h0IChDKSAyMDExIElnYWxpYSBTLkwu CisgKiBQb3J0aW9ucyBDb3B5cmlnaHQgKGMpIDIwMTEgTW90b3JvbGEgTW9iaWxpdHksIEluYy4g IEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdh cmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgogICogbW9kaWZ5IGl0IHVuZGVyIHRo ZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMKQEAgLTMxMiw2ICszMTMs NTAgQEAgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfbG9hZF91cmkoV2ViS2l0V2ViVmlldyogd2ViVmll dywgY29uc3QgZ2NoYXIqIHVyaSkKIH0KIAogLyoqCisgKiB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9o dG1sOgorICogQHdlYl92aWV3OiBhICNXZWJLaXRXZWJWaWV3CisgKiBAY29udGVudDogVGhlIEhU TUwgc3RyaW5nIHRvIGxvYWQKKyAqIEBiYXNlX3VyaTogKGFsbG93LW5vbmUpOiBUaGUgYmFzZSBV UkkgZm9yIHJlbGF0aXZlIGxvY2F0aW9ucyBvciAlTlVMTAorICoKKyAqIExvYWQgdGhlIGdpdmVu IEBjb250ZW50IHN0cmluZyB3aXRoIHRoZSBzcGVjaWZpZWQgQGJhc2VfdXJpLiAKKyAqIFJlbGF0 aXZlIFVSTHMgaW4gdGhlIEBjb250ZW50IHdpbGwgYmUgcmVzb2x2ZWQgYWdhaW5zdCBAYmFzZV91 cmkuCisgKiBXaGVuIEBiYXNlX3VyaSBpcyAlTlVMTCwgaXQgZGVmYXVsdHMgdG8gImFib3V0OmJs YW5rIi4gVGhlIG1pbWUgdHlwZSAKKyAqIG9mIHRoZSBkb2N1bWVudCB3aWxsIGJlICJ0ZXh0L2h0 bWwiLiBZb3UgY2FuIG1vbml0b3IgdGhlIHN0YXR1cyBvZiAKKyAqIHRoZSBsb2FkIG9wZXJhdGlv biB1c2luZyB0aGUgI1dlYktpdFdlYkxvYWRlckNsaWVudCBvZiBAd2ViX3ZpZXcuIAorICogU2Vl IHdlYmtpdF93ZWJfdmlld19nZXRfbG9hZGVyX2NsaWVudCgpLgorICovCit2b2lkIHdlYmtpdF93 ZWJfdmlld19sb2FkX2h0bWwoV2ViS2l0V2ViVmlldyogd2ViVmlldywgY29uc3QgZ2NoYXIqIGNv bnRlbnQsIGNvbnN0IGdjaGFyKiBiYXNlVVJJKQoreworICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VC S0lUX0lTX1dFQl9WSUVXKHdlYlZpZXcpKTsKKyAgICBnX3JldHVybl9pZl9mYWlsKGNvbnRlbnQp OworCisgICAgV2ViUGFnZVByb3h5KiBwYWdlID0gd2Via2l0V2ViVmlld0Jhc2VHZXRQYWdlKFdF QktJVF9XRUJfVklFV19CQVNFKHdlYlZpZXcpKTsKKyAgICBXS1JldGFpblB0cjxXS1N0cmluZ1Jl Zj4gY29udGVudFJlZihBZG9wdFdLLCAgV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcoY29u dGVudCkpOworICAgIFdLUmV0YWluUHRyPFdLVVJMUmVmPiBiYXNlVVJJUmVmID0gYmFzZVVSSSA/ IGFkb3B0V0soV0tVUkxDcmVhdGVXaXRoVVRGOENTdHJpbmcoYmFzZVVSSSkpIDogMDsKKyAgICBX S1BhZ2VMb2FkSFRNTFN0cmluZyh0b0FQSShwYWdlKSwgY29udGVudFJlZi5nZXQoKSwgYmFzZVVS SVJlZi5nZXQoKSk7Cit9CisKKy8qKgorICogd2Via2l0X3dlYl92aWV3X2xvYWRfcGxhaW5fdGV4 dDoKKyAqIEB3ZWJfdmlldzogYSAjV2ViS2l0V2ViVmlldworICogQHBsYWluX3RleHQ6IFRoZSBw bGFpbiB0ZXh0IHRvIGxvYWQKKyAqCisgKiBMb2FkIHRoZSBzcGVjaWZpZWQgQHBsYWluX3RleHQg c3RyaW5nIGludG8gQHdlYl92aWV3LiBUaGUgbWltZSB0eXBlIG9mCisgKiBkb2N1bWVudCB3aWxs IGJlICJ0ZXh0L3BsYWluIi4gWW91IGNhbiBtb25pdG9yICB0aGUgc3RhdHVzIG9mIHRoZSBsb2Fk IAorICogb3BlcmF0aW9uIHVzaW5nIHRoZSAjV2ViS2l0V2ViTG9hZGVyQ2xpZW50IG9mIEB3ZWJf dmlldy4gCisgKiBTZWUgd2Via2l0X3dlYl92aWV3X2dldF9sb2FkZXJfY2xpZW50KCkuCisgKi8K K3ZvaWQgd2Via2l0X3dlYl92aWV3X2xvYWRfcGxhaW5fdGV4dChXZWJLaXRXZWJWaWV3KiB3ZWJW aWV3LCBjb25zdCBnY2hhciogcGxhaW5UZXh0KQoreworICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VC S0lUX0lTX1dFQl9WSUVXKHdlYlZpZXcpKTsKKyAgICBnX3JldHVybl9pZl9mYWlsKHBsYWluVGV4 dCk7CisKKyAgICBXZWJQYWdlUHJveHkqIHBhZ2UgPSB3ZWJraXRXZWJWaWV3QmFzZUdldFBhZ2Uo V0VCS0lUX1dFQl9WSUVXX0JBU0Uod2ViVmlldykpOworICAgIFdLUmV0YWluUHRyPFdLU3RyaW5n UmVmPiBwbGFpblRleHRSZWYoQWRvcHRXSywgV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmco cGxhaW5UZXh0KSk7CisgICAgV0tQYWdlTG9hZFBsYWluVGV4dFN0cmluZyh0b0FQSShwYWdlKSwg cGxhaW5UZXh0UmVmLmdldCgpKTsKK30KKworLyoqCiAgKiB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9h bHRlcm5hdGVfaHRtbDoKICAqIEB3ZWJfdmlldzogYSAjV2ViS2l0V2ViVmlldwogICogQGNvbnRl bnQ6IHRoZSBhbHRlcm5hdGUgY29udGVudCB0byBkaXNwbGF5IGFzIHRoZSBtYWluIHBhZ2Ugb2Yg dGhlIEB3ZWJfdmlldwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9n dGsvV2ViS2l0V2ViVmlldy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0V2ViVmlldy5oCmluZGV4IDFhOGExNzUuLmFkYzc1YzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuaAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmgKQEAgLTMsNiArMyw3IEBACiAg KiBDb3B5cmlnaHQgKEMpIDIwMDcsIDIwMDggQWxwIFRva2VyIDxhbHBAYXRva2VyLmNvbT4KICAq IENvcHlyaWdodCAoQykgMjAwOCBDb2xsYWJvcmEgTHRkLgogICogQ29weXJpZ2h0IChDKSAyMDEx IElnYWxpYSBTLkwuCisgKiBQb3J0aW9ucyBDb3B5cmlnaHQgKGMpIDIwMTEgTW90b3JvbGEgTW9i aWxpdHksIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogVGhpcyBsaWJyYXJ5IGlz IGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgogICogbW9kaWZ5 IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMKQEAg LTkwLDYgKzkxLDE1IEBAIHdlYmtpdF93ZWJfdmlld19sb2FkX3VyaSAgICAgICAgICAgICAgICAg ICAgIChXZWJLaXRXZWJWaWV3ICAgICAgICAgICAgICp3ZWJfdmllCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2NoYXIgICAgICAgICAgICAgICAq dXJpKTsKIAogV0VCS0lUX0FQSSB2b2lkCit3ZWJraXRfd2ViX3ZpZXdfbG9hZF9odG1sICAgICAg ICAgICAgICAgICAgICAoV2ViS2l0V2ViVmlldyAgICAgICAgICp3ZWJfdmlldywKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAgICAg ICAgKmNvbnRlbnQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgY29uc3QgZ2NoYXIgICAgICAgICAgICpiYXNlX3VyaSk7CisKK1dFQktJVF9BUEkgdm9pZAor d2Via2l0X3dlYl92aWV3X2xvYWRfcGxhaW5fdGV4dCAgICAgICAgICAgICAgKFdlYktpdFdlYlZp ZXcgICAgICAgICAqd2ViX3ZpZXcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgY29uc3QgZ2NoYXIgICAgICAgICAgICpwbGFpbl90ZXh0KTsKKworV0VCS0lU X0FQSSB2b2lkCiB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9hbHRlcm5hdGVfaHRtbCAgICAgICAgICAo V2ViS2l0V2ViVmlldyAgICAgICAgICAgICAqd2ViX3ZpZXcsCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2NoYXIgICAgICAgICAgICAgICAqY29u dGVudCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25z dCBnY2hhciAgICAgICAgICAgICAgICpiYXNlX3VyaSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay1zZWN0aW9ucy50eHQgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJndGstc2VjdGlvbnMudHh0 CmluZGV4IGU2YjU2NmUuLjQxZDkwOTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay1zZWN0aW9ucy50eHQKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvZG9jcy93ZWJraXQyZ3RrLXNlY3Rpb25zLnR4dApAQCAt NTAsNiArNTAsOCBAQCB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2NvbnRleHQKIHdlYmtpdF93ZWJfdmll d19nZXRfbG9hZGVyX2NsaWVudAogd2Via2l0X3dlYl92aWV3X3NldF9sb2FkZXJfY2xpZW50CiB3 ZWJraXRfd2ViX3ZpZXdfbG9hZF91cmkKK3dlYmtpdF93ZWJfdmlld19sb2FkX2h0bWwKK3dlYmtp dF93ZWJfdmlld19sb2FkX3BsYWluX3RleHQKIHdlYmtpdF93ZWJfdmlld19sb2FkX2FsdGVybmF0 ZV9odG1sCiB3ZWJraXRfd2ViX3ZpZXdfY2FuX2dvX2JhY2sKIHdlYmtpdF93ZWJfdmlld19nb19i YWNrCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9U ZXN0V2ViS2l0V2ViTG9hZGVyQ2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRXZWJMb2FkZXJDbGllbnQuY3BwCmluZGV4IDE2N2RlZTgu LjMxYTI5ZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rl c3RzL1Rlc3RXZWJLaXRXZWJMb2FkZXJDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRXZWJMb2FkZXJDbGllbnQuY3BwCkBAIC0x LDYgKzEsNyBAQAogLyoKICAqIENvcHlyaWdodCAoQykgMjAwOSwgMjAxMCBHdXN0YXZvIE5vcm9u aGEgU2lsdmEKICAqIENvcHlyaWdodCAoQykgMjAwOSwgMjAxMSBJZ2FsaWEgUy5MLgorICogUG9y dGlvbnMgQ29weXJpZ2h0IChjKSAyMDExIE1vdG9yb2xhIE1vYmlsaXR5LCBJbmMuICBBbGwgcmln aHRzIHJlc2VydmVkLgogICoKICAqIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3Ug Y2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKICAqIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMg b2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljCkBAIC02Miw2ICs2MywyMCBAQCBzdGF0 aWMgdm9pZCBhc3NlcnROb3JtYWxMb2FkSGFwcGVuZWRBbmRDbGVhckV2ZW50cyhWZWN0b3I8TG9h ZFRyYWNraW5nVGVzdDo6TG9hZAogICAgIGV2ZW50cy5jbGVhcigpOwogfQogCitzdGF0aWMgdm9p ZCB0ZXN0TG9hZEh0bWwoTG9hZFRyYWNraW5nVGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKK3sK KyAgICB0ZXN0LT5sb2FkSHRtbCgiPGh0bWw+PGJvZHk+SGVsbG8gV2ViS2l0LUdUSys8L2JvZHk+ PC9odG1sPiIsIDApOworICAgIHRlc3QtPndhaXRVbnRpbExvYWRGaW5pc2hlZCgpOworICAgIGFz c2VydE5vcm1hbExvYWRIYXBwZW5lZEFuZENsZWFyRXZlbnRzKHRlc3QtPm1fbG9hZEV2ZW50cyk7 Cit9CisKK3N0YXRpYyB2b2lkIHRlc3RMb2FkUGxhaW5UZXh0KExvYWRUcmFja2luZ1Rlc3QqIHRl c3QsIGdjb25zdHBvaW50ZXIpCit7CisgICAgdGVzdC0+bG9hZFBsYWluVGV4dCgiSGVsbG8gV2Vi S2l0LUdUSysiKTsKKyAgICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKKyAgICBhc3Nl cnROb3JtYWxMb2FkSGFwcGVuZWRBbmRDbGVhckV2ZW50cyh0ZXN0LT5tX2xvYWRFdmVudHMpOwor fQorCiBzdGF0aWMgdm9pZCB0ZXN0TG9hZEFsdGVybmF0ZUNvbnRlbnQoTG9hZFRyYWNraW5nVGVz dCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKIHsKICAgICB0ZXN0LT5sb2FkQWx0ZXJuYXRlSFRNTCgi PGh0bWw+PGJvZHk+QWx0ZXJuYXRlIENvbnRlbnQ8L2JvZHk+PC9odG1sPiIsIDAsIGtTZXJ2ZXIt PmdldFVSSUZvclBhdGgoIi9hbHRlcm5hdGUiKS5kYXRhKCkpOwpAQCAtMjIwLDYgKzIzNSw4IEBA IHZvaWQgYmVmb3JlQWxsKCkKIAogICAgIExvYWRUcmFja2luZ1Rlc3Q6OmFkZCgiV2ViS2l0V2Vi TG9hZGVyQ2xpZW50IiwgImxvYWRpbmctc3RhdHVzIiwgdGVzdExvYWRpbmdTdGF0dXMpOwogICAg IExvYWRUcmFja2luZ1Rlc3Q6OmFkZCgiV2ViS2l0V2ViTG9hZGVyQ2xpZW50IiwgImxvYWRpbmct ZXJyb3IiLCB0ZXN0TG9hZGluZ0Vycm9yKTsKKyAgICBMb2FkVHJhY2tpbmdUZXN0OjphZGQoIldl YktpdFdlYlZpZXciLCAibG9hZC1odG1sIiwgdGVzdExvYWRIdG1sKTsKKyAgICBMb2FkVHJhY2tp bmdUZXN0OjphZGQoIldlYktpdFdlYlZpZXciLCAibG9hZC1wbGFpbi10ZXh0IiwgdGVzdExvYWRQ bGFpblRleHQpOwogICAgIExvYWRUcmFja2luZ1Rlc3Q6OmFkZCgiV2ViS2l0V2ViTG9hZGVyQ2xp ZW50IiwgImxvYWQtYWx0ZXJuYXRlLWNvbnRlbnQiLCB0ZXN0TG9hZEFsdGVybmF0ZUNvbnRlbnQp OwogICAgIExvYWRTdG9wVHJhY2tpbmdUZXN0OjphZGQoIldlYktpdFdlYlZpZXciLCAic3RvcC1s b2FkaW5nIiwgdGVzdExvYWRDYW5jZWxsZWQpOwogICAgIExvYWRUcmFja2luZ1Rlc3Q6OmFkZCgi V2ViS2l0V2ViVmlldyIsICJwcm9ncmVzcyIsIHRlc3RMb2FkUHJvZ3Jlc3MpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvV2ViVmlld1Rlc3QuY3Bw IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvV2ViVmlld1Rlc3QuY3Bw CmluZGV4IGRmZTU4MDAuLmI1ODk4MjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZ3RrL3Rlc3RzL1dlYlZpZXdUZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9XZWJWaWV3VGVzdC5jcHAKQEAgLTEsNSArMSw2IEBACiAv KgogICogQ29weXJpZ2h0IChDKSAyMDExIElnYWxpYSBTLkwuCisgKiBQb3J0aW9ucyBDb3B5cmln aHQgKGMpIDIwMTEgTW90b3JvbGEgTW9iaWxpdHksIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQu CiAgKgogICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmli dXRlIGl0IGFuZC9vcgogICogbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExp YnJhcnkgR2VuZXJhbCBQdWJsaWMKQEAgLTQ1LDYgKzQ2LDE4IEBAIHZvaWQgV2ViVmlld1Rlc3Q6 OmxvYWRVUkkoY29uc3QgY2hhciogdXJpKQogICAgIHdlYmtpdF93ZWJfdmlld19sb2FkX3VyaSht X3dlYlZpZXcsIHVyaSk7CiB9CiAKK3ZvaWQgV2ViVmlld1Rlc3Q6OmxvYWRIdG1sKGNvbnN0IGNo YXIqIGh0bWwsIGNvbnN0IGNoYXIqIGJhc2VVUkkpCit7CisgICAgbV9hY3RpdmVVUkkgPSAiYWJv dXQ6YmxhbmsiOworICAgIHdlYmtpdF93ZWJfdmlld19sb2FkX2h0bWwobV93ZWJWaWV3LCBodG1s LCBiYXNlVVJJKTsKK30KKwordm9pZCBXZWJWaWV3VGVzdDo6bG9hZFBsYWluVGV4dChjb25zdCBj aGFyKiBwbGFpblRleHQpCit7CisgICAgbV9hY3RpdmVVUkkgPSAiYWJvdXQ6YmxhbmsiOworICAg IHdlYmtpdF93ZWJfdmlld19sb2FkX3BsYWluX3RleHQobV93ZWJWaWV3LCBwbGFpblRleHQpOwor fQorCiB2b2lkIFdlYlZpZXdUZXN0Ojpsb2FkQWx0ZXJuYXRlSFRNTChjb25zdCBjaGFyKiBodG1s LCBjb25zdCBjaGFyKiBiYXNlVVJJLCBjb25zdCBjaGFyKiB1bnJlYWNoYWJsZVVSSSkKIHsKICAg ICBtX2FjdGl2ZVVSSSA9ICJhYm91dDpibGFuayI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9XZWJWaWV3VGVzdC5oIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvV2ViVmlld1Rlc3QuaAppbmRleCA1Y2EwMGM5Li5jOGZi Mzk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9X ZWJWaWV3VGVzdC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3Rz L1dlYlZpZXdUZXN0LmgKQEAgLTEsNSArMSw2IEBACiAvKgogICogQ29weXJpZ2h0IChDKSAyMDEx IElnYWxpYSBTLkwuCisgKiBQb3J0aW9ucyBDb3B5cmlnaHQgKGMpIDIwMTEgTW90b3JvbGEgTW9i aWxpdHksIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogVGhpcyBsaWJyYXJ5IGlz IGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgogICogbW9kaWZ5 IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMKQEAg LTMxLDYgKzMyLDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgfldlYlZpZXdUZXN0KCk7CiAKICAg ICB2b2lkIGxvYWRVUkkoY29uc3QgY2hhciogdXJpKTsKKyAgICB2b2lkIGxvYWRIdG1sKGNvbnN0 IGNoYXIqIGh0bWwsIGNvbnN0IGNoYXIqIGJhc2VVUkkpOworICAgIHZvaWQgbG9hZFBsYWluVGV4 dChjb25zdCBjaGFyKiBwbGFpblRleHQpOwogICAgIHZvaWQgbG9hZEFsdGVybmF0ZUhUTUwoY29u c3QgY2hhciogaHRtbCwgY29uc3QgY2hhciogYmFzZVVSSSwgY29uc3QgY2hhciogdW5yZWFjaGFi bGVVUkkpOwogICAgIHZvaWQgZ29CYWNrKCk7CiAgICAgdm9pZCBnb0ZvcndhcmQoKTsK