27028 2009-07-07 06:46:16 -0700 [gtk] Pasteboard/GtkClipboard can't handle the "text/html" target. 2009-08-14 23:17:31 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 1 jhuangjiahua webkit-unassigned jhuangjiahua jmalonzo oldest_to_newest 130197 0 jhuangjiahua 2009-07-07 06:46:16 -0700 when I select some html content, and Copy them use Ctrl-C, the Pasteboard/GtkClipboard can't handle the "text/html" target. I found that the "text/html" target only in X clipboard (GDK_SELECTION_CLIPBOARD), but not gtk Desktop clipboard (GDK_SELECTION_PRIMARY). So we can't use Ctrl-C to Copy rich text from WebkitGtk. 130199 1 32376 jhuangjiahua 2009-07-07 06:54:36 -0700 Created attachment 32376 Fix improper set of enum WebKitWebViewTargetInfo I use this Change: > Index: WebCore/platform/gtk/PasteboardGtk.cpp > =================================================================== > --- WebCore/platform/gtk/PasteboardGtk.cpp (revision 45546) > +++ WebCore/platform/gtk/PasteboardGtk.cpp (working copy) > @@ -37,8 +38,8 @@ namespace WebCore { > /* FIXME: we must get rid of this and use the enum in webkitwebview.h someway */ > typedef enum > { > - WEBKIT_WEB_VIEW_TARGET_INFO_HTML = - 1, > - WEBKIT_WEB_VIEW_TARGET_INFO_TEXT = - 2 > + WEBKIT_WEB_VIEW_TARGET_INFO_HTML, > + WEBKIT_WEB_VIEW_TARGET_INFO_TEXT > } WebKitWebViewTargetInfo; > it works. it can use Ctrl-C to Copy rich text from WebkitGtk page now. 130201 2 jhuangjiahua 2009-07-07 06:59:34 -0700 (In reply to comment #1) > it works. a manual-test WebCore/manual-tests/gtk/copy-htmltext.html has been added. 130217 3 jmalonzo 2009-07-07 08:41:49 -0700 (In reply to comment #1) > Created an attachment (id=32376) [details] > Fix improper set of enum WebKitWebViewTargetInfo > > I use this Change: > > Index: WebCore/platform/gtk/PasteboardGtk.cpp > > =================================================================== > > --- WebCore/platform/gtk/PasteboardGtk.cpp (revision 45546) > > +++ WebCore/platform/gtk/PasteboardGtk.cpp (working copy) > > @@ -37,8 +38,8 @@ namespace WebCore { > > /* FIXME: we must get rid of this and use the enum in webkitwebview.h someway */ > > typedef enum > > { > > - WEBKIT_WEB_VIEW_TARGET_INFO_HTML = - 1, > > - WEBKIT_WEB_VIEW_TARGET_INFO_TEXT = - 2 > > + WEBKIT_WEB_VIEW_TARGET_INFO_HTML, > > + WEBKIT_WEB_VIEW_TARGET_INFO_TEXT > > } WebKitWebViewTargetInfo; Maybe we can remove this altogether by grabbing the target infos via m_helper? 130224 4 jhuangjiahua 2009-07-07 09:15:28 -0700 (In reply to comment #3) > Maybe we can remove this altogether by grabbing the target infos via m_helper? How about it: > Index: WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp > =================================================================== > --- WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp (revision 45595) > +++ WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp (working copy) > @@ -57,8 +57,10 @@ GtkClipboard* PasteboardHelperGtk::getPr > > GtkTargetList* PasteboardHelperGtk::getCopyTargetList(Frame* frame) const > { > - WebKitWebView* webView = webkit_web_frame_get_web_view(kit(frame)); > - return webkit_web_view_get_copy_target_list(webView); > + GtkTargetList* target_list = gtk_target_list_new(NULL, 0); > + gtk_target_list_add(target_list, gdk_atom_intern_static_string("text/html"), 0, WEBKIT_WEB_VIEW_TARGET_INFO_HTML); > + gtk_target_list_add_text_targets(target_list, WEBKIT_WEB_VIEW_TARGET_INFO_TEXT); > + return target_list; > } > > GtkTargetList* PasteboardHelperGtk::getPasteTargetList(Frame* frame) const 130230 5 jhuangjiahua 2009-07-07 09:34:03 -0700 (In reply to comment #4) > How about it: err, no, that is it: > Index: WebCore/platform/gtk/PasteboardGtk.cpp > =================================================================== > --- WebCore/platform/gtk/PasteboardGtk.cpp (revision 45595) > +++ WebCore/platform/gtk/PasteboardGtk.cpp (working copy) > @@ -108,7 +108,10 @@ void Pasteboard::writeSelection(Range* s > PasteboardSelectionData* data = new PasteboardSelectionData(text, markup); > > gint n_targets; > - GtkTargetEntry* targets = gtk_target_table_new_from_list(m_helper->getCopyTargetList(frame), &n_targets); > + GtkTargetList* target_list = gtk_target_list_new(NULL, 0); > + gtk_target_list_add(target_list, gdk_atom_intern_static_string("text/html"), 0, WEBKIT_WEB_VIEW_TARGET_INFO_HTML); > + gtk_target_list_add_text_targets(target_list, WEBKIT_WEB_VIEW_TARGET_INFO_TEXT); > + GtkTargetEntry* targets = gtk_target_table_new_from_list(target_list, &n_targets); > gtk_clipboard_set_with_data(clipboard, targets, n_targets, > clipboard_get_contents_cb, clipboard_clear_contents_cb, data); > gtk_target_table_free(targets, n_targets); 130854 6 jmalonzo 2009-07-10 01:47:21 -0700 (In reply to comment #5) > (In reply to comment #4) > > How about it: > > err, no, that is it: > > > - GtkTargetEntry* targets = gtk_target_table_new_from_list(m_helper->getCopyTargetList(frame), &n_targets); > > + GtkTargetList* target_list = gtk_target_list_new(NULL, 0); > > + gtk_target_list_add(target_list, gdk_atom_intern_static_string("text/html"), 0, WEBKIT_WEB_VIEW_TARGET_INFO_HTML); > > + gtk_target_list_add_text_targets(target_list, WEBKIT_WEB_VIEW_TARGET_INFO_TEXT); > > + GtkTargetEntry* targets = gtk_target_table_new_from_list(target_list, &n_targets); > > gtk_clipboard_set_with_data(clipboard, targets, n_targets, > > clipboard_get_contents_cb, clipboard_clear_contents_cb, data); > > gtk_target_table_free(targets, n_targets); I think a proper fix for this is to add a function in WebKit/gtk/WebCoreSuppoer/PasteboardHelperGtk.cpp that will return the value of WEBKIT_WEB_VIEW_TARGET_INFO_HTML, and use that in clipboard_get_contents_cb. 130856 7 jhuangjiahua 2009-07-10 02:07:39 -0700 (In reply to comment #6) > I think a proper fix for this is to add a function in > WebKit/gtk/WebCoreSuppoer/PasteboardHelperGtk.cpp that will return the value of > WEBKIT_WEB_VIEW_TARGET_INFO_HTML, and use that in clipboard_get_contents_cb. well, I see. I'm trying to do it like that. 130871 8 jhuangjiahua 2009-07-10 05:56:30 -0700 (In reply to comment #6) > I think a proper fix for this is to add a function in > WebKit/gtk/WebCoreSuppoer/PasteboardHelperGtk.cpp that will return the value of > WEBKIT_WEB_VIEW_TARGET_INFO_HTML, and use that in clipboard_get_contents_cb. I agree. How about it: > Index: WebCore/platform/gtk/PasteboardGtk.cpp > =================================================================== > --- WebCore/platform/gtk/PasteboardGtk.cpp (revision 45658) > +++ WebCore/platform/gtk/PasteboardGtk.cpp (working copy) > @@ -35,13 +35,6 @@ > > namespace WebCore { > > -/* FIXME: we must get rid of this and use the enum in webkitwebview.h someway */ > -typedef enum > -{ > - WEBKIT_WEB_VIEW_TARGET_INFO_HTML = - 1, > - WEBKIT_WEB_VIEW_TARGET_INFO_TEXT = - 2 > -} WebKitWebViewTargetInfo; > - > class PasteboardSelectionData { > public: > PasteboardSelectionData(gchar* text, gchar* markup) > @@ -65,7 +58,7 @@ static void clipboard_get_contents_cb(Gt > guint info, gpointer data) { > PasteboardSelectionData* clipboardData = reinterpret_cast<PasteboardSelectionData*>(data); > ASSERT(clipboardData); > - if ((gint)info == WEBKIT_WEB_VIEW_TARGET_INFO_HTML) { > + if ((gint)info == m_helper->PasteboardHelperGtk()) { > gtk_selection_data_set(selection_data, selection_data->target, 8, > reinterpret_cast<const guchar*>(clipboardData->markup()), > g_utf8_strlen(clipboardData->markup(), -1)); > Index: WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp > =================================================================== > --- WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp (revision 45658) > +++ WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp (working copy) > @@ -67,4 +67,14 @@ GtkTargetList* PasteboardHelperGtk::getP > return webkit_web_view_get_paste_target_list(webView); > } > > +gint PasteboardHelperGtk::getWebViewTargetInfoHtml() const > +{ > + return WEBKIT_WEB_VIEW_TARGET_INFO_HTML; > +} > + > +gint PasteboardHelperGtk::getWebViewTargetInfoText() const > +{ > + return WEBKIT_WEB_VIEW_TARGET_INFO_TEXT; > +} > + > } I'm waiting for the rebuild process to complete. 130876 9 32558 jhuangjiahua 2009-07-10 07:33:46 -0700 Created attachment 32558 grabbing the WEBKIT_WEB_VIEW_TARGET_INFO_HTML via m_helper (In reply to comment #6) > I think a proper fix for this is to add a function in > WebKit/gtk/WebCoreSuppoer/PasteboardHelperGtk.cpp that will return the value of > WEBKIT_WEB_VIEW_TARGET_INFO_HTML, and use that in clipboard_get_contents_cb. Done, it works =) 130878 10 32559 jhuangjiahua 2009-07-10 07:51:33 -0700 Created attachment 32559 update patch to svn r45707 130879 11 32560 jhuangjiahua 2009-07-10 08:04:06 -0700 Created attachment 32560 cleanup. update patch to svn r45707 131019 12 32560 jmalonzo 2009-07-10 17:04:47 -0700 Comment on attachment 32560 cleanup. update patch to svn r45707 > Index: WebCore/platform/Pasteboard.h > =================================================================== > --- WebCore/platform/Pasteboard.h (revision 45707) > +++ WebCore/platform/Pasteboard.h (working copy) > @@ -102,6 +102,7 @@ public: > > #if PLATFORM(GTK) > void setHelper(PasteboardHelper*); > + PasteboardHelper* m_helper; > #endif Is there any reason for this change? > - if ((gint)info == WEBKIT_WEB_VIEW_TARGET_INFO_HTML) { > + if ((gint)info == Pasteboard::generalPasteboard()->m_helper->getWebViewTargetInfoHtml()) { I think calling generalPasteboard() is unnecessary here. > + virtual gint getWebViewTargetInfoHtml() const = 0; What's this for? Looks fine otherwise. r- for now as the patch needs to be revised. 131123 13 jhuangjiahua 2009-07-11 11:29:36 -0700 (In reply to comment #12) > Looks fine otherwise. r- for now as the patch needs to be revised. use the enum in webkitwebview.h > Index: GNUmakefile.am > =================================================================== > --- GNUmakefile.am (revision 45707) > +++ GNUmakefile.am (working copy) > @@ -193,6 +193,9 @@ libWebCore_la_SOURCES = \ > $(webcore_sources) \ > $(webcoregtk_sources) > > +webcore_cppflags += \ > + -I$(srcdir)/WebKit/gtk/ > + > libWebCore_la_CXXFLAGS = \ > $(global_cxxflags) \ > $(corekit_cflags) > Index: WebCore/platform/gtk/PasteboardGtk.cpp > =================================================================== > --- WebCore/platform/gtk/PasteboardGtk.cpp (revision 45707) > +++ WebCore/platform/gtk/PasteboardGtk.cpp (working copy) > @@ -30,18 +30,12 @@ > #include "RenderImage.h" > #include "KURL.h" > #include "markup.h" > +#include "webkit/webkitwebview.h" > > #include <gtk/gtk.h> > > namespace WebCore { > > -/* FIXME: we must get rid of this and use the enum in webkitwebview.h someway */ > -typedef enum > -{ > - WEBKIT_WEB_VIEW_TARGET_INFO_HTML = - 1, > - WEBKIT_WEB_VIEW_TARGET_INFO_TEXT = - 2 > -} WebKitWebViewTargetInfo; > - > class PasteboardSelectionData { > public: > PasteboardSelectionData(gchar* text, gchar* markup) 132992 14 33043 jhuangjiahua 2009-07-19 06:16:54 -0700 Created attachment 33043 use the enum in webkitwebview.h (In reply to comment #12) > Looks fine otherwise. r- for now as the patch needs to be revised. Remove the improper set of enum WebKitWebViewTargetInfo in platform/gtk/PasteboardGtk.cpp, and use the enum in webkitwebview.h 133004 15 33043 jmalonzo 2009-07-19 13:00:38 -0700 Comment on attachment 33043 use the enum in webkitwebview.h > +webcore_cppflags += \ > + -I$(srcdir)/WebKit/gtk/ > + This is a layering violation. WebCore should not depend on WebKit. It should go through the *Client interface, or in the case of Pasteboard, should go through PasteboardHelper. The previous patch was already doing that. Why the change? r- because of the layering violation. 138477 16 jhuangjiahua 2009-08-09 05:02:40 -0700 (In reply to comment #15) Dear Alonzo , I'm sorry, I'm so busy these days. Cound you mend it for me, please? Thank you very much. Best regards. 140433 17 32560 jmalonzo 2009-08-14 23:04:53 -0700 Comment on attachment 32560 cleanup. update patch to svn r45707 > - if ((gint)info == WEBKIT_WEB_VIEW_TARGET_INFO_HTML) { > + if ((gint)info == Pasteboard::generalPasteboard()->m_helper->getWebViewTargetInfoHtml()) { > gtk_selection_data_set(selection_data, selection_data->target, 8, > reinterpret_cast<const guchar*>(clipboardData->markup()), > g_utf8_strlen(clipboardData->markup(), -1)); The braces should be removed as there's only one statement here. I've looked into this again and seems I overlooked a few things in my review. This patch is fine. r=me. 140434 18 jmalonzo 2009-08-14 23:09:10 -0700 Landed as http://trac.webkit.org/changeset/47310 140436 19 jhuangjiahua 2009-08-14 23:17:31 -0700 (In reply to comment #18) Hi Alonzo, Many thanks for your review and Landing~ Best regards. 32376 2009-07-07 06:54:36 -0700 2009-07-10 07:33:46 -0700 Fix improper set of enum WebKitWebViewTargetInfo fix-pasteboard-text_html-target.patch text/plain 2752 jhuangjiahua SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NTU5MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDktMDctMDcgIEppYWh1YSBIdWFuZyAgPGpodWFuZ2ppYWh1YUBn bWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgW2d0a10gUGFzdGVib2FyZC9HdGtDbGlwYm9hcmQgY2FuJ3QgaGFuZGxlIHRoZSAidGV4dC9o dG1sIiB0YXJnZXQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yNzAyOAorCisgICAgICAgIEZpeCBpbXByb3BlciBzZXQgb2YgZW51bSBXZWJLaXRXZWJW aWV3VGFyZ2V0SW5mbworCisgICAgICAgICogbWFudWFsLXRlc3RzL2d0ay9jb3B5LWh0bWx0ZXh0 Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9QYXN0ZWJvYXJkR3RrLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6Oik6CisKIDIwMDktMDctMDcgIEppYWh1YSBIdWFuZyAgPGpodWFu Z2ppYWh1YUBnbWFpbC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSmFuIEFsb256by4KSW5k ZXg6IFdlYkNvcmUvbWFudWFsLXRlc3RzL2d0ay9jb3B5LWh0bWx0ZXh0Lmh0bWwKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9tYW51YWwtdGVzdHMvZ3RrL2NvcHktaHRtbHRleHQuaHRtbAkocmV2aXNp b24gMCkKKysrIFdlYkNvcmUvbWFudWFsLXRlc3RzL2d0ay9jb3B5LWh0bWx0ZXh0Lmh0bWwJKHJl dmlzaW9uIDApCkBAIC0wLDAgKzEsMjQgQEAKKzwhRE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8vVzND Ly9EVEQgSFRNTCA0LjAxIFRyYW5zaXRpb25hbC8vRU4iPgorPGh0bWw+CisgICAgPGhlYWQ+Cisg ICAgICAgIDxtZXRhIGh0dHAtZXF1aXY9IkNvbnRlbnQtVHlwZSIgY29udGVudD0idGV4dC9odG1s OyBjaGFyc2V0PXV0Zi04IiAvPgorICAgICAgICA8dGl0bGU+Q29weSBIVE1MIGNvbnRlbnQ8L3Rp dGxlPgorICAgIDwvaGVhZD4KKyAgICA8Ym9keT4KKyAgICAgICAgPGgxPkNvcHkgSFRNTCBjb250 ZW50IGZyb20gY3VycmVudGx5IGVkaXRhYmxlIGFyZWE8L2gxPgorICAgICAgICA8ZGl2IHRpdGxl PSJFZGl0YWJsZUFyZWEiIGNvbnRlbnRFZGl0YWJsZT0idHJ1ZSIgCisgICAgICAgICAgICBzdHls ZT0iZGlzcGxheTogYmxvY2s7IGJvcmRlcjogMnB4IHNvbGlkIGJsYWNrOyBtYXJnaW46IDVweDsg cGFkZGluZzogMTVweDsiPgorICAgICAgICAgICAgSGVyZSBpcyBhIEVkaXRhYmxlIEFyZWEsPGJy IC8+CisgICAgICAgICAgICA8aW1nIHRpdGxlPSJJdCdzIHRoZSB0ZXN0IGltYWdlIiBzcmM9Imh0 dHA6Ly93ZWJraXQub3JnL2ltYWdlcy9pY29uLWdvbGQucG5nIiAvPjxiciAvPjxiciAvPgorICAg ICAgICAgICAgPGI+U1RFUFMgVE8gVEVTVDo8L2I+PGJyIC8+CisgICAgICAgICAgICA8b2w+Cisg ICAgICAgICAgICAgICAgPGxpPlNlbGVjdCBhbGwgdGhhdCB0ZXh0IG9yIHBpY3R1cmUgaW4gdGhp cyBlZGl0YWJsZSBhcmVhICh0eXBlIDxiPkN0cmwtQTwvYj4gLyBPcHRpb24tQSk8L2xpPgorICAg ICAgICAgICAgICAgIDxsaT48Yj5Db3B5PC9iPiB0aGVtIHVzZSA8Yj5DdHJsLUM8L2I+IC8gT3B0 aW9uLUM8L2xpPgorICAgICAgICAgICAgICAgIDxsaT5Nb3ZlIHRoZSBjdXJzb3IgdG8gYSBibGFu ayBsaW5lIGJlbG93PC9saT4KKyAgICAgICAgICAgICAgICA8bGk+UGFzdGUgdGhlbSB1c2UgPGI+ Q3RybC1WPC9iPiAvIE9wdGlvbi1WPC9saT4KKyAgICAgICAgICAgIDwvb2w+CisgICAgICAgICAg ICA8cD48Yj5FbnN1cmU8L2I+IHRoYXQgdGV4dCBhbmQgaW1hZ2UgaGFzIGJlZW4gcGFzdGVkIHdp dGggZm9ybWF0cyBhbmQgbm8gZ2FyYmxlZC48L3A+CisgICAgICAgICAgICA8YnIgLz4gPGJyIC8+ IDxiciAvPiA8YnIgLz4gPGJyIC8+IDxiciAvPiA8YnIgLz4gPGJyIC8+IDxiciAvPiA8YnIgLz4K KyAgICAgICAgPC9kaXY+ICAgICAgIAorICAgIDwvYm9keT4KKzwvaHRtbD4KSW5kZXg6IFdlYkNv cmUvcGxhdGZvcm0vZ3RrL1Bhc3RlYm9hcmRHdGsuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv cGxhdGZvcm0vZ3RrL1Bhc3RlYm9hcmRHdGsuY3BwCShyZXZpc2lvbiA0NTU5MikKKysrIFdlYkNv cmUvcGxhdGZvcm0vZ3RrL1Bhc3RlYm9hcmRHdGsuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zOCw4 ICszOCw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIC8qIEZJWE1FOiB3ZSBtdXN0IGdldCByaWQg b2YgdGhpcyBhbmQgdXNlIHRoZSBlbnVtIGluIHdlYmtpdHdlYnZpZXcuaCBzb21ld2F5ICovCiB0 eXBlZGVmIGVudW0KIHsKLSAgICBXRUJLSVRfV0VCX1ZJRVdfVEFSR0VUX0lORk9fSFRNTCA9IC0g MSwKLSAgICBXRUJLSVRfV0VCX1ZJRVdfVEFSR0VUX0lORk9fVEVYVCA9IC0gMgorICAgIFdFQktJ VF9XRUJfVklFV19UQVJHRVRfSU5GT19IVE1MLAorICAgIFdFQktJVF9XRUJfVklFV19UQVJHRVRf SU5GT19URVhUCiB9IFdlYktpdFdlYlZpZXdUYXJnZXRJbmZvOwogCiBjbGFzcyBQYXN0ZWJvYXJk U2VsZWN0aW9uRGF0YSB7Cg== 32558 2009-07-10 07:33:46 -0700 2009-07-10 07:51:33 -0700 grabbing the WEBKIT_WEB_VIEW_TARGET_INFO_HTML via m_helper webkitgtk-fix-clipboard-targets.patch text/plain 5657 jhuangjiahua SW5kZXg6IFdlYkNvcmUvbWFudWFsLXRlc3RzL2d0ay9jb3B5LWh0bWx0ZXh0Lmh0bWwKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9tYW51YWwtdGVzdHMvZ3RrL2NvcHktaHRtbHRleHQuaHRtbAkocmV2 aXNpb24gMCkKKysrIFdlYkNvcmUvbWFudWFsLXRlc3RzL2d0ay9jb3B5LWh0bWx0ZXh0Lmh0bWwJ KHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMjQgQEAKKzwhRE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8v VzNDLy9EVEQgSFRNTCA0LjAxIFRyYW5zaXRpb25hbC8vRU4iPgorPGh0bWw+CisgICAgPGhlYWQ+ CisgICAgICAgIDxtZXRhIGh0dHAtZXF1aXY9IkNvbnRlbnQtVHlwZSIgY29udGVudD0idGV4dC9o dG1sOyBjaGFyc2V0PXV0Zi04IiAvPgorICAgICAgICA8dGl0bGU+Q29weSBIVE1MIGNvbnRlbnQ8 L3RpdGxlPgorICAgIDwvaGVhZD4KKyAgICA8Ym9keT4KKyAgICAgICAgPGgxPkNvcHkgSFRNTCBj b250ZW50IGZyb20gY3VycmVudGx5IGVkaXRhYmxlIGFyZWE8L2gxPgorICAgICAgICA8ZGl2IHRp dGxlPSJFZGl0YWJsZUFyZWEiIGNvbnRlbnRFZGl0YWJsZT0idHJ1ZSIgCisgICAgICAgICAgICBz dHlsZT0iZGlzcGxheTogYmxvY2s7IGJvcmRlcjogMnB4IHNvbGlkIGJsYWNrOyBtYXJnaW46IDVw eDsgcGFkZGluZzogMTVweDsiPgorICAgICAgICAgICAgSGVyZSBpcyBhIEVkaXRhYmxlIEFyZWEs PGJyIC8+CisgICAgICAgICAgICA8aW1nIHRpdGxlPSJJdCdzIHRoZSB0ZXN0IGltYWdlIiBzcmM9 Imh0dHA6Ly93ZWJraXQub3JnL2ltYWdlcy9pY29uLWdvbGQucG5nIiAvPjxiciAvPjxiciAvPgor ICAgICAgICAgICAgPGI+U1RFUFMgVE8gVEVTVDo8L2I+PGJyIC8+CisgICAgICAgICAgICA8b2w+ CisgICAgICAgICAgICAgICAgPGxpPlNlbGVjdCBhbGwgdGhhdCB0ZXh0IG9yIHBpY3R1cmUgaW4g dGhpcyBlZGl0YWJsZSBhcmVhICh0eXBlIDxiPkN0cmwtQTwvYj4gLyBPcHRpb24tQSk8L2xpPgor ICAgICAgICAgICAgICAgIDxsaT48Yj5Db3B5PC9iPiB0aGVtIHVzZSA8Yj5DdHJsLUM8L2I+IC8g T3B0aW9uLUM8L2xpPgorICAgICAgICAgICAgICAgIDxsaT5Nb3ZlIHRoZSBjdXJzb3IgdG8gYSBi bGFuayBsaW5lIGJlbG93PC9saT4KKyAgICAgICAgICAgICAgICA8bGk+UGFzdGUgdGhlbSB1c2Ug PGI+Q3RybC1WPC9iPiAvIE9wdGlvbi1WPC9saT4KKyAgICAgICAgICAgIDwvb2w+CisgICAgICAg ICAgICA8cD48Yj5FbnN1cmU8L2I+IHRoYXQgdGV4dCBhbmQgaW1hZ2UgaGFzIGJlZW4gcGFzdGVk IHdpdGggZm9ybWF0cyBhbmQgbm8gZ2FyYmxlZC48L3A+CisgICAgICAgICAgICA8YnIgLz4gPGJy IC8+IDxiciAvPiA8YnIgLz4gPGJyIC8+IDxiciAvPiA8YnIgLz4gPGJyIC8+IDxiciAvPiA8YnIg Lz4KKyAgICAgICAgPC9kaXY+ICAgICAgIAorICAgIDwvYm9keT4KKzwvaHRtbD4KSW5kZXg6IFdl YkNvcmUvcGxhdGZvcm0vUGFzdGVib2FyZC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZv cm0vUGFzdGVib2FyZC5oCShyZXZpc2lvbiA0NTY1OCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vUGFz dGVib2FyZC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDIsNiArMTAyLDcgQEAgcHVibGljOgogCiAj aWYgUExBVEZPUk0oR1RLKQogICAgIHZvaWQgc2V0SGVscGVyKFBhc3RlYm9hcmRIZWxwZXIqKTsK KyAgICBQYXN0ZWJvYXJkSGVscGVyKiBtX2hlbHBlcjsKICNlbmRpZgogCiBwcml2YXRlOgpAQCAt MTE3LDEwICsxMTgsNiBAQCBwcml2YXRlOgogICAgIEhXTkQgbV9vd25lcjsKICNlbmRpZgogCi0j aWYgUExBVEZPUk0oR1RLKQotICAgIFBhc3RlYm9hcmRIZWxwZXIqIG1faGVscGVyOwotI2VuZGlm Ci0KICNpZiBQTEFURk9STShRVCkKICAgICBib29sIG1fc2VsZWN0aW9uTW9kZTsKICNlbmRpZgpJ bmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGFzdGVib2FyZEd0ay5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGFzdGVib2FyZEd0ay5jcHAJKHJldmlzaW9uIDQ1NzA2 KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGFzdGVib2FyZEd0ay5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTM1LDEzICszNSw2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotLyogRklYTUU6 IHdlIG11c3QgZ2V0IHJpZCBvZiB0aGlzIGFuZCB1c2UgdGhlIGVudW0gaW4gd2Via2l0d2Vidmll dy5oIHNvbWV3YXkgKi8KLXR5cGVkZWYgZW51bQotewotICAgIFdFQktJVF9XRUJfVklFV19UQVJH RVRfSU5GT19IVE1MID0gLSAxLAotICAgIFdFQktJVF9XRUJfVklFV19UQVJHRVRfSU5GT19URVhU ID0gLSAyCi19IFdlYktpdFdlYlZpZXdUYXJnZXRJbmZvOwotCiBjbGFzcyBQYXN0ZWJvYXJkU2Vs ZWN0aW9uRGF0YSB7CiBwdWJsaWM6CiAgICAgUGFzdGVib2FyZFNlbGVjdGlvbkRhdGEoZ2NoYXIq IHRleHQsIGdjaGFyKiBtYXJrdXApCkBAIC02NSw3ICs1OCw3IEBAIHN0YXRpYyB2b2lkIGNsaXBi b2FyZF9nZXRfY29udGVudHNfY2IoR3QKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZ3VpbnQgaW5mbywgZ3BvaW50ZXIgZGF0YSkgewogICAgIFBhc3RlYm9hcmRTZWxlY3Rp b25EYXRhKiBjbGlwYm9hcmREYXRhID0gcmVpbnRlcnByZXRfY2FzdDxQYXN0ZWJvYXJkU2VsZWN0 aW9uRGF0YSo+KGRhdGEpOwogICAgIEFTU0VSVChjbGlwYm9hcmREYXRhKTsKLSAgICBpZiAoKGdp bnQpaW5mbyA9PSBXRUJLSVRfV0VCX1ZJRVdfVEFSR0VUX0lORk9fSFRNTCkgeworICAgIGlmICgo Z2ludClpbmZvID09IFBhc3RlYm9hcmQ6OmdlbmVyYWxQYXN0ZWJvYXJkKCktPm1faGVscGVyLT5n ZXRXZWJWaWV3VGFyZ2V0SW5mb0h0bWwoKSkgewogICAgICAgICBndGtfc2VsZWN0aW9uX2RhdGFf c2V0KHNlbGVjdGlvbl9kYXRhLCBzZWxlY3Rpb25fZGF0YS0+dGFyZ2V0LCA4LAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgZ3VjaGFyKj4oY2xp cGJvYXJkRGF0YS0+bWFya3VwKCkpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdf dXRmOF9zdHJsZW4oY2xpcGJvYXJkRGF0YS0+bWFya3VwKCksIC0xKSk7CkluZGV4OiBXZWJDb3Jl L3BsYXRmb3JtL2d0ay9QYXN0ZWJvYXJkSGVscGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9w bGF0Zm9ybS9ndGsvUGFzdGVib2FyZEhlbHBlci5oCShyZXZpc2lvbiA0NTY1OCkKKysrIFdlYkNv cmUvcGxhdGZvcm0vZ3RrL1Bhc3RlYm9hcmRIZWxwZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNDMs NiArNDMsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBHdGtDbGlwYm9hcmQqIGdldFByaW1hcnko RnJhbWUqKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCBHdGtUYXJnZXRMaXN0KiBnZXRDb3B5VGFy Z2V0TGlzdChGcmFtZSopIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIEd0a1RhcmdldExpc3QqIGdl dFBhc3RlVGFyZ2V0TGlzdChGcmFtZSopIGNvbnN0ID0gMDsKKyAgICB2aXJ0dWFsIGdpbnQgZ2V0 V2ViVmlld1RhcmdldEluZm9IdG1sKCkgY29uc3QgPSAwOwogfTsKIAogfQpJbmRleDogV2ViS2l0 L2d0ay9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2d0ay9DaGFuZ2VMb2cJKHJldmlz aW9uIDQ1NzA3KQorKysgV2ViS2l0L2d0ay9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEs MyArMSwxOCBAQAorMjAwOS0wNy0xMCAgSmlhaHVhIEh1YW5nICA8amh1YW5namlhaHVhQGdtYWls LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb Z3RrXSBQYXN0ZWJvYXJkL0d0a0NsaXBib2FyZCBjYW4mYXBvczt0IGhhbmRsZSB0aGUgJnF1b3Q7 dGV4dC9odG1sJnF1b3Q7IHRhcmdldC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTI3MDI4CisKKwlBZGQgYSBmdW5jdGlvbiBpbiBXZWJLaXQ6OlBhc3Rl Ym9hcmRIZWxwZXJHdGsgdGhhdCB3aWxsIHJldHVybiB0aGUgCisgICAgICAgIHZhbHVlIG9mIFdF QktJVF9XRUJfVklFV19UQVJHRVRfSU5GT19IVE1MLAorCWFuZCBXZWJDb3JlOjpjbGlwYm9hcmRf Z2V0X2NvbnRlbnRzX2NiIHdpbGwgdXNlIHRoYXQuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9y dC9QYXN0ZWJvYXJkSGVscGVyR3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGFzdGVib2FyZEhl bHBlckd0azo6Z2V0V2ViVmlld1RhcmdldEluZm9IdG1sKToKKyAgICAgICAgKiBXZWJDb3JlU3Vw cG9ydC9QYXN0ZWJvYXJkSGVscGVyR3RrLmg6CisKIDIwMDktMDctMDkgIEJldGggRGFraW4gYW5k IEpvbiBIb25leWN1dHQgPGJkYWtpbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg RGF2ZSBIeWF0dC4KSW5kZXg6IFdlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvUGFzdGVib2FyZEhl bHBlckd0ay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9QYXN0 ZWJvYXJkSGVscGVyR3RrLmNwcAkocmV2aXNpb24gNDU3MDYpCisrKyBXZWJLaXQvZ3RrL1dlYkNv cmVTdXBwb3J0L1Bhc3RlYm9hcmRIZWxwZXJHdGsuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02Nyw0 ICs2Nyw5IEBAIEd0a1RhcmdldExpc3QqIFBhc3RlYm9hcmRIZWxwZXJHdGs6OmdldFAKICAgICBy ZXR1cm4gd2Via2l0X3dlYl92aWV3X2dldF9wYXN0ZV90YXJnZXRfbGlzdCh3ZWJWaWV3KTsKIH0K IAorZ2ludCBQYXN0ZWJvYXJkSGVscGVyR3RrOjpnZXRXZWJWaWV3VGFyZ2V0SW5mb0h0bWwoKSBj b25zdAoreworICAgIHJldHVybiBXRUJLSVRfV0VCX1ZJRVdfVEFSR0VUX0lORk9fSFRNTDsKK30K KwogfQpJbmRleDogV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9QYXN0ZWJvYXJkSGVscGVyR3Rr LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9QYXN0ZWJvYXJkSGVs cGVyR3RrLmgJKHJldmlzaW9uIDQ1NjU4KQorKysgV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9Q YXN0ZWJvYXJkSGVscGVyR3RrLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ1LDYgKzQ1LDcgQEAgcHVi bGljOgogICAgIHZpcnR1YWwgR3RrQ2xpcGJvYXJkKiBnZXRQcmltYXJ5KEZyYW1lKikgY29uc3Q7 CiAgICAgdmlydHVhbCBHdGtUYXJnZXRMaXN0KiBnZXRDb3B5VGFyZ2V0TGlzdChGcmFtZSopIGNv bnN0OwogICAgIHZpcnR1YWwgR3RrVGFyZ2V0TGlzdCogZ2V0UGFzdGVUYXJnZXRMaXN0KEZyYW1l KikgY29uc3Q7CisgICAgdmlydHVhbCBnaW50IGdldFdlYlZpZXdUYXJnZXRJbmZvSHRtbCgpIGNv bnN0OwogfTsKIAogfQo= 32559 2009-07-10 07:51:33 -0700 2009-07-10 08:04:06 -0700 update patch to svn r45707 webkitgtk-fix-clipboard-targets.patch text/plain 5642 jhuangjiahua SW5kZXg6IFdlYkNvcmUvbWFudWFsLXRlc3RzL2d0ay9jb3B5LWh0bWx0ZXh0Lmh0bWwKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9tYW51YWwtdGVzdHMvZ3RrL2NvcHktaHRtbHRleHQuaHRtbAkocmV2 aXNpb24gMCkKKysrIFdlYkNvcmUvbWFudWFsLXRlc3RzL2d0ay9jb3B5LWh0bWx0ZXh0Lmh0bWwJ KHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMjQgQEAKKzwhRE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8v VzNDLy9EVEQgSFRNTCA0LjAxIFRyYW5zaXRpb25hbC8vRU4iPgorPGh0bWw+CisgICAgPGhlYWQ+ CisgICAgICAgIDxtZXRhIGh0dHAtZXF1aXY9IkNvbnRlbnQtVHlwZSIgY29udGVudD0idGV4dC9o dG1sOyBjaGFyc2V0PXV0Zi04IiAvPgorICAgICAgICA8dGl0bGU+Q29weSBIVE1MIGNvbnRlbnQ8 L3RpdGxlPgorICAgIDwvaGVhZD4KKyAgICA8Ym9keT4KKyAgICAgICAgPGgxPkNvcHkgSFRNTCBj b250ZW50IGZyb20gY3VycmVudGx5IGVkaXRhYmxlIGFyZWE8L2gxPgorICAgICAgICA8ZGl2IHRp dGxlPSJFZGl0YWJsZUFyZWEiIGNvbnRlbnRFZGl0YWJsZT0idHJ1ZSIgCisgICAgICAgICAgICBz dHlsZT0iZGlzcGxheTogYmxvY2s7IGJvcmRlcjogMnB4IHNvbGlkIGJsYWNrOyBtYXJnaW46IDVw eDsgcGFkZGluZzogMTVweDsiPgorICAgICAgICAgICAgSGVyZSBpcyBhIEVkaXRhYmxlIEFyZWEs PGJyIC8+CisgICAgICAgICAgICA8aW1nIHRpdGxlPSJJdCdzIHRoZSB0ZXN0IGltYWdlIiBzcmM9 Imh0dHA6Ly93ZWJraXQub3JnL2ltYWdlcy9pY29uLWdvbGQucG5nIiAvPjxiciAvPjxiciAvPgor ICAgICAgICAgICAgPGI+U1RFUFMgVE8gVEVTVDo8L2I+PGJyIC8+CisgICAgICAgICAgICA8b2w+ CisgICAgICAgICAgICAgICAgPGxpPlNlbGVjdCBhbGwgdGhhdCB0ZXh0IG9yIHBpY3R1cmUgaW4g dGhpcyBlZGl0YWJsZSBhcmVhICh0eXBlIDxiPkN0cmwtQTwvYj4gLyBPcHRpb24tQSk8L2xpPgor ICAgICAgICAgICAgICAgIDxsaT48Yj5Db3B5PC9iPiB0aGVtIHVzZSA8Yj5DdHJsLUM8L2I+IC8g T3B0aW9uLUM8L2xpPgorICAgICAgICAgICAgICAgIDxsaT5Nb3ZlIHRoZSBjdXJzb3IgdG8gYSBi bGFuayBsaW5lIGJlbG93PC9saT4KKyAgICAgICAgICAgICAgICA8bGk+UGFzdGUgdGhlbSB1c2Ug PGI+Q3RybC1WPC9iPiAvIE9wdGlvbi1WPC9saT4KKyAgICAgICAgICAgIDwvb2w+CisgICAgICAg ICAgICA8cD48Yj5FbnN1cmU8L2I+IHRoYXQgdGV4dCBhbmQgaW1hZ2UgaGFzIGJlZW4gcGFzdGVk IHdpdGggZm9ybWF0cyBhbmQgbm8gZ2FyYmxlZC48L3A+CisgICAgICAgICAgICA8YnIgLz4gPGJy IC8+IDxiciAvPiA8YnIgLz4gPGJyIC8+IDxiciAvPiA8YnIgLz4gPGJyIC8+IDxiciAvPiA8YnIg Lz4KKyAgICAgICAgPC9kaXY+ICAgICAgIAorICAgIDwvYm9keT4KKzwvaHRtbD4KSW5kZXg6IFdl YkNvcmUvcGxhdGZvcm0vUGFzdGVib2FyZC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZv cm0vUGFzdGVib2FyZC5oCShyZXZpc2lvbiA0NTcwNykKKysrIFdlYkNvcmUvcGxhdGZvcm0vUGFz dGVib2FyZC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDIsNiArMTAyLDcgQEAgcHVibGljOgogCiAj aWYgUExBVEZPUk0oR1RLKQogICAgIHZvaWQgc2V0SGVscGVyKFBhc3RlYm9hcmRIZWxwZXIqKTsK KyAgICBQYXN0ZWJvYXJkSGVscGVyKiBtX2hlbHBlcjsKICNlbmRpZgogCiBwcml2YXRlOgpAQCAt MTE3LDEwICsxMTgsNiBAQCBwcml2YXRlOgogICAgIEhXTkQgbV9vd25lcjsKICNlbmRpZgogCi0j aWYgUExBVEZPUk0oR1RLKQotICAgIFBhc3RlYm9hcmRIZWxwZXIqIG1faGVscGVyOwotI2VuZGlm Ci0KICNpZiBQTEFURk9STShRVCkKICAgICBib29sIG1fc2VsZWN0aW9uTW9kZTsKICNlbmRpZgpJ bmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGFzdGVib2FyZEd0ay5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGFzdGVib2FyZEd0ay5jcHAJKHJldmlzaW9uIDQ1NzA3 KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGFzdGVib2FyZEd0ay5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTM1LDEzICszNSw2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotLyogRklYTUU6 IHdlIG11c3QgZ2V0IHJpZCBvZiB0aGlzIGFuZCB1c2UgdGhlIGVudW0gaW4gd2Via2l0d2Vidmll dy5oIHNvbWV3YXkgKi8KLXR5cGVkZWYgZW51bQotewotICAgIFdFQktJVF9XRUJfVklFV19UQVJH RVRfSU5GT19IVE1MID0gLSAxLAotICAgIFdFQktJVF9XRUJfVklFV19UQVJHRVRfSU5GT19URVhU ID0gLSAyCi19IFdlYktpdFdlYlZpZXdUYXJnZXRJbmZvOwotCiBjbGFzcyBQYXN0ZWJvYXJkU2Vs ZWN0aW9uRGF0YSB7CiBwdWJsaWM6CiAgICAgUGFzdGVib2FyZFNlbGVjdGlvbkRhdGEoZ2NoYXIq IHRleHQsIGdjaGFyKiBtYXJrdXApCkBAIC02NSw3ICs1OCw3IEBAIHN0YXRpYyB2b2lkIGNsaXBi b2FyZF9nZXRfY29udGVudHNfY2IoR3QKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZ3VpbnQgaW5mbywgZ3BvaW50ZXIgZGF0YSkgewogICAgIFBhc3RlYm9hcmRTZWxlY3Rp b25EYXRhKiBjbGlwYm9hcmREYXRhID0gcmVpbnRlcnByZXRfY2FzdDxQYXN0ZWJvYXJkU2VsZWN0 aW9uRGF0YSo+KGRhdGEpOwogICAgIEFTU0VSVChjbGlwYm9hcmREYXRhKTsKLSAgICBpZiAoKGdp bnQpaW5mbyA9PSBXRUJLSVRfV0VCX1ZJRVdfVEFSR0VUX0lORk9fSFRNTCkgeworICAgIGlmICgo Z2ludClpbmZvID09IFBhc3RlYm9hcmQ6OmdlbmVyYWxQYXN0ZWJvYXJkKCktPm1faGVscGVyLT5n ZXRXZWJWaWV3VGFyZ2V0SW5mb0h0bWwoKSkgewogICAgICAgICBndGtfc2VsZWN0aW9uX2RhdGFf c2V0KHNlbGVjdGlvbl9kYXRhLCBzZWxlY3Rpb25fZGF0YS0+dGFyZ2V0LCA4LAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgZ3VjaGFyKj4oY2xp cGJvYXJkRGF0YS0+bWFya3VwKCkpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdf dXRmOF9zdHJsZW4oY2xpcGJvYXJkRGF0YS0+bWFya3VwKCksIC0xKSk7CkluZGV4OiBXZWJDb3Jl L3BsYXRmb3JtL2d0ay9QYXN0ZWJvYXJkSGVscGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9w bGF0Zm9ybS9ndGsvUGFzdGVib2FyZEhlbHBlci5oCShyZXZpc2lvbiA0NTcwNykKKysrIFdlYkNv cmUvcGxhdGZvcm0vZ3RrL1Bhc3RlYm9hcmRIZWxwZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNDMs NiArNDMsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBHdGtDbGlwYm9hcmQqIGdldFByaW1hcnko RnJhbWUqKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCBHdGtUYXJnZXRMaXN0KiBnZXRDb3B5VGFy Z2V0TGlzdChGcmFtZSopIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIEd0a1RhcmdldExpc3QqIGdl dFBhc3RlVGFyZ2V0TGlzdChGcmFtZSopIGNvbnN0ID0gMDsKKyAgICB2aXJ0dWFsIGdpbnQgZ2V0 V2ViVmlld1RhcmdldEluZm9IdG1sKCkgY29uc3QgPSAwOwogfTsKIAogfQpJbmRleDogV2ViS2l0 L2d0ay9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2d0ay9DaGFuZ2VMb2cJKHJldmlz aW9uIDQ1NzA3KQorKysgV2ViS2l0L2d0ay9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEs MyArMSwxOCBAQAorMjAwOS0wNy0xMCAgSmlhaHVhIEh1YW5nICA8amh1YW5namlhaHVhQGdtYWls LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb Z3RrXSBQYXN0ZWJvYXJkL0d0a0NsaXBib2FyZCBjYW4ndCBoYW5kbGUgdGhlICJ0ZXh0L2h0bWwi IHRhcmdldC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTI3MDI4CisKKwlBZGQgYSBmdW5jdGlvbiBpbiBXZWJLaXQ6OlBhc3RlYm9hcmRIZWxwZXJHdGsg dGhhdCB3aWxsIHJldHVybiB0aGUgCisgICAgICAgIHZhbHVlIG9mIFdFQktJVF9XRUJfVklFV19U QVJHRVRfSU5GT19IVE1MLAorCWFuZCBXZWJDb3JlOjpjbGlwYm9hcmRfZ2V0X2NvbnRlbnRzX2Ni IHdpbGwgdXNlIHRoYXQuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9QYXN0ZWJvYXJkSGVs cGVyR3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGFzdGVib2FyZEhlbHBlckd0azo6Z2V0V2Vi Vmlld1RhcmdldEluZm9IdG1sKToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9QYXN0ZWJvYXJk SGVscGVyR3RrLmg6CisKIDIwMDktMDctMDkgIEJldGggRGFraW4gYW5kIEpvbiBIb25leWN1dHQg PGJkYWtpbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2ZSBIeWF0dC4KSW5k ZXg6IFdlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvUGFzdGVib2FyZEhlbHBlckd0ay5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9QYXN0ZWJvYXJkSGVscGVyR3Rr LmNwcAkocmV2aXNpb24gNDU3MDcpCisrKyBXZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L1Bhc3Rl Ym9hcmRIZWxwZXJHdGsuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02Nyw0ICs2Nyw5IEBAIEd0a1Rh cmdldExpc3QqIFBhc3RlYm9hcmRIZWxwZXJHdGs6OmdldFAKICAgICByZXR1cm4gd2Via2l0X3dl Yl92aWV3X2dldF9wYXN0ZV90YXJnZXRfbGlzdCh3ZWJWaWV3KTsKIH0KIAorZ2ludCBQYXN0ZWJv YXJkSGVscGVyR3RrOjpnZXRXZWJWaWV3VGFyZ2V0SW5mb0h0bWwoKSBjb25zdAoreworICAgIHJl dHVybiBXRUJLSVRfV0VCX1ZJRVdfVEFSR0VUX0lORk9fSFRNTDsKK30KKwogfQpJbmRleDogV2Vi S2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9QYXN0ZWJvYXJkSGVscGVyR3RrLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9QYXN0ZWJvYXJkSGVscGVyR3RrLmgJKHJldmlz aW9uIDQ1NzA3KQorKysgV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9QYXN0ZWJvYXJkSGVscGVy R3RrLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ1LDYgKzQ1LDcgQEAgcHVibGljOgogICAgIHZpcnR1 YWwgR3RrQ2xpcGJvYXJkKiBnZXRQcmltYXJ5KEZyYW1lKikgY29uc3Q7CiAgICAgdmlydHVhbCBH dGtUYXJnZXRMaXN0KiBnZXRDb3B5VGFyZ2V0TGlzdChGcmFtZSopIGNvbnN0OwogICAgIHZpcnR1 YWwgR3RrVGFyZ2V0TGlzdCogZ2V0UGFzdGVUYXJnZXRMaXN0KEZyYW1lKikgY29uc3Q7CisgICAg dmlydHVhbCBnaW50IGdldFdlYlZpZXdUYXJnZXRJbmZvSHRtbCgpIGNvbnN0OwogfTsKIAogfQo= 32560 2009-07-10 08:04:06 -0700 2009-08-14 23:04:53 -0700 cleanup. update patch to svn r45707 webkitgtk-fix-clipboard-targets.patch text/plain 6511 jhuangjiahua SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NTcwNykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMDktMDctMTAgIEppYWh1YSBIdWFuZyAgPGpodWFuZ2ppYWh1YUBn bWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgW2d0a10gUGFzdGVib2FyZC9HdGtDbGlwYm9hcmQgY2FuJ3QgaGFuZGxlIHRoZSAidGV4dC9o dG1sIiB0YXJnZXQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yNzAyOAorCisgICAgICAgIFJlbW92ZSB0aGUgaW1wcm9wZXIgc2V0IG9mIGVudW0gV2Vi S2l0V2ViVmlld1RhcmdldEluZm8KKyAgICAgICAgYnkgZ3JhYmJpbmcgdGhlIHRhcmdldCBpbmZv cyB2aWEgbV9oZWxwZXIuCisKKyAgICAgICAgKiBtYW51YWwtdGVzdHMvZ3RrL2NvcHktaHRtbHRl eHQuaHRtbDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vUGFzdGVib2FyZC5oOgorICAgICAg ICAqIHBsYXRmb3JtL2d0ay9QYXN0ZWJvYXJkR3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNs aXBib2FyZF9nZXRfY29udGVudHNfY2IpOgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9QYXN0ZWJv YXJkSGVscGVyLmg6CisKIDIwMDktMDctMDQgIFNyaXJhbSBZYWRhdmFsbGkgIDxzcmlyYW0ueWFk YXZhbGxpQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubi4K SW5kZXg6IFdlYkNvcmUvbWFudWFsLXRlc3RzL2d0ay9jb3B5LWh0bWx0ZXh0Lmh0bWwKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9tYW51YWwtdGVzdHMvZ3RrL2NvcHktaHRtbHRleHQuaHRtbAkocmV2 aXNpb24gMCkKKysrIFdlYkNvcmUvbWFudWFsLXRlc3RzL2d0ay9jb3B5LWh0bWx0ZXh0Lmh0bWwJ KHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMjQgQEAKKzwhRE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8v VzNDLy9EVEQgSFRNTCA0LjAxIFRyYW5zaXRpb25hbC8vRU4iPgorPGh0bWw+CisgICAgPGhlYWQ+ CisgICAgICAgIDxtZXRhIGh0dHAtZXF1aXY9IkNvbnRlbnQtVHlwZSIgY29udGVudD0idGV4dC9o dG1sOyBjaGFyc2V0PXV0Zi04IiAvPgorICAgICAgICA8dGl0bGU+Q29weSBIVE1MIGNvbnRlbnQ8 L3RpdGxlPgorICAgIDwvaGVhZD4KKyAgICA8Ym9keT4KKyAgICAgICAgPGgxPkNvcHkgSFRNTCBj b250ZW50IGZyb20gY3VycmVudGx5IGVkaXRhYmxlIGFyZWE8L2gxPgorICAgICAgICA8ZGl2IHRp dGxlPSJFZGl0YWJsZUFyZWEiIGNvbnRlbnRFZGl0YWJsZT0idHJ1ZSIgCisgICAgICAgICAgICBz dHlsZT0iZGlzcGxheTogYmxvY2s7IGJvcmRlcjogMnB4IHNvbGlkIGJsYWNrOyBtYXJnaW46IDVw eDsgcGFkZGluZzogMTVweDsiPgorICAgICAgICAgICAgSGVyZSBpcyBhIEVkaXRhYmxlIEFyZWEs PGJyIC8+CisgICAgICAgICAgICA8aW1nIHRpdGxlPSJJdCdzIHRoZSB0ZXN0IGltYWdlIiBzcmM9 Imh0dHA6Ly93ZWJraXQub3JnL2ltYWdlcy9pY29uLWdvbGQucG5nIiAvPjxiciAvPjxiciAvPgor ICAgICAgICAgICAgPGI+U1RFUFMgVE8gVEVTVDo8L2I+PGJyIC8+CisgICAgICAgICAgICA8b2w+ CisgICAgICAgICAgICAgICAgPGxpPlNlbGVjdCBhbGwgdGhhdCB0ZXh0IG9yIHBpY3R1cmUgaW4g dGhpcyBlZGl0YWJsZSBhcmVhICh0eXBlIDxiPkN0cmwtQTwvYj4gLyBPcHRpb24tQSk8L2xpPgor ICAgICAgICAgICAgICAgIDxsaT48Yj5Db3B5PC9iPiB0aGVtIHVzZSA8Yj5DdHJsLUM8L2I+IC8g T3B0aW9uLUM8L2xpPgorICAgICAgICAgICAgICAgIDxsaT5Nb3ZlIHRoZSBjdXJzb3IgdG8gYSBi bGFuayBsaW5lIGJlbG93PC9saT4KKyAgICAgICAgICAgICAgICA8bGk+UGFzdGUgdGhlbSB1c2Ug PGI+Q3RybC1WPC9iPiAvIE9wdGlvbi1WPC9saT4KKyAgICAgICAgICAgIDwvb2w+CisgICAgICAg ICAgICA8cD48Yj5FbnN1cmU8L2I+IHRoYXQgdGV4dCBhbmQgaW1hZ2UgaGFzIGJlZW4gcGFzdGVk IHdpdGggZm9ybWF0cyBhbmQgbm8gZ2FyYmxlZC48L3A+CisgICAgICAgICAgICA8YnIgLz4gPGJy IC8+IDxiciAvPiA8YnIgLz4gPGJyIC8+IDxiciAvPiA8YnIgLz4gPGJyIC8+IDxiciAvPiA8YnIg Lz4KKyAgICAgICAgPC9kaXY+ICAgICAgIAorICAgIDwvYm9keT4KKzwvaHRtbD4KSW5kZXg6IFdl YkNvcmUvcGxhdGZvcm0vUGFzdGVib2FyZC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZv cm0vUGFzdGVib2FyZC5oCShyZXZpc2lvbiA0NTcwNykKKysrIFdlYkNvcmUvcGxhdGZvcm0vUGFz dGVib2FyZC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDIsNiArMTAyLDcgQEAgcHVibGljOgogCiAj aWYgUExBVEZPUk0oR1RLKQogICAgIHZvaWQgc2V0SGVscGVyKFBhc3RlYm9hcmRIZWxwZXIqKTsK KyAgICBQYXN0ZWJvYXJkSGVscGVyKiBtX2hlbHBlcjsKICNlbmRpZgogCiBwcml2YXRlOgpAQCAt MTE3LDEwICsxMTgsNiBAQCBwcml2YXRlOgogICAgIEhXTkQgbV9vd25lcjsKICNlbmRpZgogCi0j aWYgUExBVEZPUk0oR1RLKQotICAgIFBhc3RlYm9hcmRIZWxwZXIqIG1faGVscGVyOwotI2VuZGlm Ci0KICNpZiBQTEFURk9STShRVCkKICAgICBib29sIG1fc2VsZWN0aW9uTW9kZTsKICNlbmRpZgpJ bmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGFzdGVib2FyZEd0ay5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGFzdGVib2FyZEd0ay5jcHAJKHJldmlzaW9uIDQ1NzA3 KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGFzdGVib2FyZEd0ay5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTM1LDEzICszNSw2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotLyogRklYTUU6 IHdlIG11c3QgZ2V0IHJpZCBvZiB0aGlzIGFuZCB1c2UgdGhlIGVudW0gaW4gd2Via2l0d2Vidmll dy5oIHNvbWV3YXkgKi8KLXR5cGVkZWYgZW51bQotewotICAgIFdFQktJVF9XRUJfVklFV19UQVJH RVRfSU5GT19IVE1MID0gLSAxLAotICAgIFdFQktJVF9XRUJfVklFV19UQVJHRVRfSU5GT19URVhU ID0gLSAyCi19IFdlYktpdFdlYlZpZXdUYXJnZXRJbmZvOwotCiBjbGFzcyBQYXN0ZWJvYXJkU2Vs ZWN0aW9uRGF0YSB7CiBwdWJsaWM6CiAgICAgUGFzdGVib2FyZFNlbGVjdGlvbkRhdGEoZ2NoYXIq IHRleHQsIGdjaGFyKiBtYXJrdXApCkBAIC02NSw3ICs1OCw3IEBAIHN0YXRpYyB2b2lkIGNsaXBi b2FyZF9nZXRfY29udGVudHNfY2IoR3QKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZ3VpbnQgaW5mbywgZ3BvaW50ZXIgZGF0YSkgewogICAgIFBhc3RlYm9hcmRTZWxlY3Rp b25EYXRhKiBjbGlwYm9hcmREYXRhID0gcmVpbnRlcnByZXRfY2FzdDxQYXN0ZWJvYXJkU2VsZWN0 aW9uRGF0YSo+KGRhdGEpOwogICAgIEFTU0VSVChjbGlwYm9hcmREYXRhKTsKLSAgICBpZiAoKGdp bnQpaW5mbyA9PSBXRUJLSVRfV0VCX1ZJRVdfVEFSR0VUX0lORk9fSFRNTCkgeworICAgIGlmICgo Z2ludClpbmZvID09IFBhc3RlYm9hcmQ6OmdlbmVyYWxQYXN0ZWJvYXJkKCktPm1faGVscGVyLT5n ZXRXZWJWaWV3VGFyZ2V0SW5mb0h0bWwoKSkgewogICAgICAgICBndGtfc2VsZWN0aW9uX2RhdGFf c2V0KHNlbGVjdGlvbl9kYXRhLCBzZWxlY3Rpb25fZGF0YS0+dGFyZ2V0LCA4LAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgZ3VjaGFyKj4oY2xp cGJvYXJkRGF0YS0+bWFya3VwKCkpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdf dXRmOF9zdHJsZW4oY2xpcGJvYXJkRGF0YS0+bWFya3VwKCksIC0xKSk7CkluZGV4OiBXZWJDb3Jl L3BsYXRmb3JtL2d0ay9QYXN0ZWJvYXJkSGVscGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9w bGF0Zm9ybS9ndGsvUGFzdGVib2FyZEhlbHBlci5oCShyZXZpc2lvbiA0NTcwNykKKysrIFdlYkNv cmUvcGxhdGZvcm0vZ3RrL1Bhc3RlYm9hcmRIZWxwZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNDMs NiArNDMsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBHdGtDbGlwYm9hcmQqIGdldFByaW1hcnko RnJhbWUqKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCBHdGtUYXJnZXRMaXN0KiBnZXRDb3B5VGFy Z2V0TGlzdChGcmFtZSopIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIEd0a1RhcmdldExpc3QqIGdl dFBhc3RlVGFyZ2V0TGlzdChGcmFtZSopIGNvbnN0ID0gMDsKKyAgICB2aXJ0dWFsIGdpbnQgZ2V0 V2ViVmlld1RhcmdldEluZm9IdG1sKCkgY29uc3QgPSAwOwogfTsKIAogfQpJbmRleDogV2ViS2l0 L2d0ay9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2d0ay9DaGFuZ2VMb2cJKHJldmlz aW9uIDQ1NzA3KQorKysgV2ViS2l0L2d0ay9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEs MyArMSwxOCBAQAorMjAwOS0wNy0xMCAgSmlhaHVhIEh1YW5nICA8amh1YW5namlhaHVhQGdtYWls LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb Z3RrXSBQYXN0ZWJvYXJkL0d0a0NsaXBib2FyZCBjYW4ndCBoYW5kbGUgdGhlICJ0ZXh0L2h0bWwi IHRhcmdldC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTI3MDI4CisKKyAgICAgICAgQWRkIGEgZnVuY3Rpb24gaW4gV2ViS2l0OjpQYXN0ZWJvYXJkSGVs cGVyR3RrIHRoYXQgd2lsbCByZXR1cm4gdGhlIAorICAgICAgICB2YWx1ZSBvZiBXRUJLSVRfV0VC X1ZJRVdfVEFSR0VUX0lORk9fSFRNTCwKKyAgICAgICAgYW5kIFdlYkNvcmU6OmNsaXBib2FyZF9n ZXRfY29udGVudHNfY2Igd2lsbCB1c2UgdGhhdC4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0 L1Bhc3RlYm9hcmRIZWxwZXJHdGsuY3BwOgorICAgICAgICAoV2ViS2l0OjpQYXN0ZWJvYXJkSGVs cGVyR3RrOjpnZXRXZWJWaWV3VGFyZ2V0SW5mb0h0bWwpOgorICAgICAgICAqIFdlYkNvcmVTdXBw b3J0L1Bhc3RlYm9hcmRIZWxwZXJHdGsuaDoKKwogMjAwOS0wNy0wOSAgQmV0aCBEYWtpbiBhbmQg Sm9uIEhvbmV5Y3V0dCA8YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBE YXZlIEh5YXR0LgpJbmRleDogV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9QYXN0ZWJvYXJkSGVs cGVyR3RrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L1Bhc3Rl Ym9hcmRIZWxwZXJHdGsuY3BwCShyZXZpc2lvbiA0NTcwNykKKysrIFdlYktpdC9ndGsvV2ViQ29y ZVN1cHBvcnQvUGFzdGVib2FyZEhlbHBlckd0ay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY3LDQg KzY3LDkgQEAgR3RrVGFyZ2V0TGlzdCogUGFzdGVib2FyZEhlbHBlckd0azo6Z2V0UAogICAgIHJl dHVybiB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3Bhc3RlX3RhcmdldF9saXN0KHdlYlZpZXcpOwogfQog CitnaW50IFBhc3RlYm9hcmRIZWxwZXJHdGs6OmdldFdlYlZpZXdUYXJnZXRJbmZvSHRtbCgpIGNv bnN0Cit7CisgICAgcmV0dXJuIFdFQktJVF9XRUJfVklFV19UQVJHRVRfSU5GT19IVE1MOworfQor CiB9CkluZGV4OiBXZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L1Bhc3RlYm9hcmRIZWxwZXJHdGsu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L1Bhc3RlYm9hcmRIZWxw ZXJHdGsuaAkocmV2aXNpb24gNDU3MDcpCisrKyBXZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L1Bh c3RlYm9hcmRIZWxwZXJHdGsuaAkod29ya2luZyBjb3B5KQpAQCAtNDUsNiArNDUsNyBAQCBwdWJs aWM6CiAgICAgdmlydHVhbCBHdGtDbGlwYm9hcmQqIGdldFByaW1hcnkoRnJhbWUqKSBjb25zdDsK ICAgICB2aXJ0dWFsIEd0a1RhcmdldExpc3QqIGdldENvcHlUYXJnZXRMaXN0KEZyYW1lKikgY29u c3Q7CiAgICAgdmlydHVhbCBHdGtUYXJnZXRMaXN0KiBnZXRQYXN0ZVRhcmdldExpc3QoRnJhbWUq KSBjb25zdDsKKyAgICB2aXJ0dWFsIGdpbnQgZ2V0V2ViVmlld1RhcmdldEluZm9IdG1sKCkgY29u c3Q7CiB9OwogCiB9Cg== 33043 2009-07-19 06:16:54 -0700 2009-07-19 13:00:38 -0700 use the enum in webkitwebview.h webkitgtk-fix-clipboard-targets.patch text/plain 3963 jhuangjiahua SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDQ2MTAz KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMDktMDct MTkgIEppYWh1YSBIdWFuZyAgPGpodWFuZ2ppYWh1YUBnbWFpbC5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2d0a10gUGFzdGVib2FyZC9HdGtD bGlwYm9hcmQgY2FuJ3QgaGFuZGxlIHRoZSAidGV4dC9odG1sIiB0YXJnZXQuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzAyOAorCisgICAgICAgIEFk ZCB3ZWJjb3JlX2NwcGZsYWdzICs9IC1JJChzcmNkaXIpL1dlYktpdC9ndGsvIGluIEdOVW1ha2Vm aWxlLmFtCisKKyAgICAgICAgKiBHTlVtYWtlZmlsZS5hbToKKwogMjAwOS0wNy0xNiAgRnVtaXRv c2hpIFVrYWkgIDx1a2FpQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXZp ZCBMZXZpbi4KSW5kZXg6IEdOVW1ha2VmaWxlLmFtCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEdOVW1ha2VmaWxl LmFtCShyZXZpc2lvbiA0NjEwMykKKysrIEdOVW1ha2VmaWxlLmFtCSh3b3JraW5nIGNvcHkpCkBA IC0xOTMsNiArMTkzLDkgQEAgbGliV2ViQ29yZV9sYV9TT1VSQ0VTID0gXAogCSQod2ViY29yZV9z b3VyY2VzKSBcCiAJJCh3ZWJjb3JlZ3RrX3NvdXJjZXMpCiAKK3dlYmNvcmVfY3BwZmxhZ3MgKz0g XAorCS1JJChzcmNkaXIpL1dlYktpdC9ndGsvCisKIGxpYldlYkNvcmVfbGFfQ1hYRkxBR1MgPSBc CiAJJChnbG9iYWxfY3h4ZmxhZ3MpIFwKIAkkKGNvcmVraXRfY2ZsYWdzKQpJbmRleDogV2ViQ29y ZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDQ2 MTAzKQorKysgV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxOSBA QAorMjAwOS0wNy0xOSAgSmlhaHVhIEh1YW5nICA8amh1YW5namlhaHVhQGdtYWlsLmNvbT4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbZ3RrXSBQYXN0 ZWJvYXJkL0d0a0NsaXBib2FyZCBjYW4ndCBoYW5kbGUgdGhlICJ0ZXh0L2h0bWwiIHRhcmdldC4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI3MDI4CisK KyAgICAgICAgUmVtb3ZlIHRoZSBpbXByb3BlciBzZXQgb2YgZW51bSBXZWJLaXRXZWJWaWV3VGFy Z2V0SW5mbworICAgICAgICBpbiBwbGF0Zm9ybS9ndGsvUGFzdGVib2FyZEd0ay5jcHAsCisgICAg ICAgIGFuZCB1c2UgdGhlIGVudW0gaW4gd2Via2l0d2Vidmlldy5oCisKKyAgICAgICAgQWRkIG1h bnVhbC10ZXN0cy9ndGsvY29weS1odG1sdGV4dC5odG1sCisKKyAgICAgICAgKiBtYW51YWwtdGVz dHMvZ3RrL2NvcHktaHRtbHRleHQuaHRtbDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3Rr L1Bhc3RlYm9hcmRHdGsuY3BwOgorCiAyMDA5LTA3LTE5ICBUaGllcnJ5IEJhc3RpYW4gPHRoaWVy cnkuYmFzdGlhbkBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gSGF1c21h bm4uCkluZGV4OiBXZWJDb3JlL21hbnVhbC10ZXN0cy9ndGsvY29weS1odG1sdGV4dC5odG1sCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvbWFudWFsLXRlc3RzL2d0ay9jb3B5LWh0bWx0ZXh0Lmh0bWwJ KHJldmlzaW9uIDApCisrKyBXZWJDb3JlL21hbnVhbC10ZXN0cy9ndGsvY29weS1odG1sdGV4dC5o dG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDI0IEBACis8IURPQ1RZUEUgSFRNTCBQVUJMSUMg Ii0vL1czQy8vRFREIEhUTUwgNC4wMSBUcmFuc2l0aW9uYWwvL0VOIj4KKzxodG1sPgorICAgIDxo ZWFkPgorICAgICAgICA8bWV0YSBodHRwLWVxdWl2PSJDb250ZW50LVR5cGUiIGNvbnRlbnQ9InRl eHQvaHRtbDsgY2hhcnNldD11dGYtOCIgLz4KKyAgICAgICAgPHRpdGxlPkNvcHkgSFRNTCBjb250 ZW50PC90aXRsZT4KKyAgICA8L2hlYWQ+CisgICAgPGJvZHk+CisgICAgICAgIDxoMT5Db3B5IEhU TUwgY29udGVudCBmcm9tIGN1cnJlbnRseSBlZGl0YWJsZSBhcmVhPC9oMT4KKyAgICAgICAgPGRp diB0aXRsZT0iRWRpdGFibGVBcmVhIiBjb250ZW50RWRpdGFibGU9InRydWUiIAorICAgICAgICAg ICAgc3R5bGU9ImRpc3BsYXk6IGJsb2NrOyBib3JkZXI6IDJweCBzb2xpZCBibGFjazsgbWFyZ2lu OiA1cHg7IHBhZGRpbmc6IDE1cHg7Ij4KKyAgICAgICAgICAgIEhlcmUgaXMgYSBFZGl0YWJsZSBB cmVhLDxiciAvPgorICAgICAgICAgICAgPGltZyB0aXRsZT0iSXQncyB0aGUgdGVzdCBpbWFnZSIg c3JjPSJodHRwOi8vd2Via2l0Lm9yZy9pbWFnZXMvaWNvbi1nb2xkLnBuZyIgLz48YnIgLz48YnIg Lz4KKyAgICAgICAgICAgIDxiPlNURVBTIFRPIFRFU1Q6PC9iPjxiciAvPgorICAgICAgICAgICAg PG9sPgorICAgICAgICAgICAgICAgIDxsaT5TZWxlY3QgYWxsIHRoYXQgdGV4dCBvciBwaWN0dXJl IGluIHRoaXMgZWRpdGFibGUgYXJlYSAodHlwZSA8Yj5DdHJsLUE8L2I+IC8gT3B0aW9uLUEpPC9s aT4KKyAgICAgICAgICAgICAgICA8bGk+PGI+Q29weTwvYj4gdGhlbSB1c2UgPGI+Q3RybC1DPC9i PiAvIE9wdGlvbi1DPC9saT4KKyAgICAgICAgICAgICAgICA8bGk+TW92ZSB0aGUgY3Vyc29yIHRv IGEgYmxhbmsgbGluZSBiZWxvdzwvbGk+CisgICAgICAgICAgICAgICAgPGxpPlBhc3RlIHRoZW0g dXNlIDxiPkN0cmwtVjwvYj4gLyBPcHRpb24tVjwvbGk+CisgICAgICAgICAgICA8L29sPgorICAg ICAgICAgICAgPHA+PGI+RW5zdXJlPC9iPiB0aGF0IHRleHQgYW5kIGltYWdlIGhhcyBiZWVuIHBh c3RlZCB3aXRoIGZvcm1hdHMgYW5kIG5vIGdhcmJsZWQuPC9wPgorICAgICAgICAgICAgPGJyIC8+ IDxiciAvPiA8YnIgLz4gPGJyIC8+IDxiciAvPiA8YnIgLz4gPGJyIC8+IDxiciAvPiA8YnIgLz4g PGJyIC8+CisgICAgICAgIDwvZGl2PiAgICAgICAKKyAgICA8L2JvZHk+Cis8L2h0bWw+CkluZGV4 OiBXZWJDb3JlL3BsYXRmb3JtL2d0ay9QYXN0ZWJvYXJkR3RrLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3BsYXRmb3JtL2d0ay9QYXN0ZWJvYXJkR3RrLmNwcAkocmV2aXNpb24gNDYxMDMpCisr KyBXZWJDb3JlL3BsYXRmb3JtL2d0ay9QYXN0ZWJvYXJkR3RrLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMzAsMTggKzMwLDEyIEBACiAjaW5jbHVkZSAiUmVuZGVySW1hZ2UuaCIKICNpbmNsdWRlICJL VVJMLmgiCiAjaW5jbHVkZSAibWFya3VwLmgiCisjaW5jbHVkZSAid2Via2l0L3dlYmtpdHdlYnZp ZXcuaCIKIAogI2luY2x1ZGUgPGd0ay9ndGsuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi0v KiBGSVhNRTogd2UgbXVzdCBnZXQgcmlkIG9mIHRoaXMgYW5kIHVzZSB0aGUgZW51bSBpbiB3ZWJr aXR3ZWJ2aWV3Lmggc29tZXdheSAqLwotdHlwZWRlZiBlbnVtCi17Ci0gICAgV0VCS0lUX1dFQl9W SUVXX1RBUkdFVF9JTkZPX0hUTUwgPSAtIDEsCi0gICAgV0VCS0lUX1dFQl9WSUVXX1RBUkdFVF9J TkZPX1RFWFQgPSAtIDIKLX0gV2ViS2l0V2ViVmlld1RhcmdldEluZm87Ci0KIGNsYXNzIFBhc3Rl Ym9hcmRTZWxlY3Rpb25EYXRhIHsKIHB1YmxpYzoKICAgICBQYXN0ZWJvYXJkU2VsZWN0aW9uRGF0 YShnY2hhciogdGV4dCwgZ2NoYXIqIG1hcmt1cCkK