Attachment 858758 Details for Bug 1060845 – A patch to the rpm to include the backported fix

[patch] A patch to the rpm to include the backported fix

fix-upstream-127481.patch (text/plain), 4.55 KB, created by Sami Wagiaalla on 2014-02-03 17:59:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sami Wagiaalla

Created: 2014-02-03 17:59:15 UTC

Size: 4.55 KB

patch

obsolete

>diff --git a/webkit-fix-load_html-encoding-issue.patch b/webkit-fix-load_html-encoding-issue.patch
>new file mode 100644
>index 0000000..d994422
>--- /dev/null
>+++ b/webkit-fix-load_html-encoding-issue.patch
>@@ -0,0 +1,54 @@
>+diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
>+index 17eadf1..7565862 100644
>+--- a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
>++++ b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
>+@@ -941,6 +941,17 @@ void WebPage::loadDataImpl(PassRefPtr<SharedBuffer> sharedBuffer, const String&
>+     m_mainFrame->coreFrame()->loader().load(FrameLoadRequest(m_mainFrame->coreFrame(), request, substituteData));
>+ }
>+ 
>++void WebPage::loadString(const String& htmlString, const String& MIMEType, const KURL& baseURL, const KURL& unreachableURL, CoreIPC::MessageDecoder& decoder)
>++{
>++    if (htmlString.is8Bit()) {
>++        RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(htmlString.characters8()), htmlString.length() * sizeof(LChar));
>++        loadDataImpl(sharedBuffer, MIMEType, ASCIILiteral("utf-8"), baseURL, unreachableURL, decoder);
>++    } else {
>++        RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(htmlString.characters16()), htmlString.length() * sizeof(UChar));
>++        loadDataImpl(sharedBuffer, MIMEType, ASCIILiteral("utf-16"), baseURL, unreachableURL, decoder);
>++    }
>++}
>++
>+ void WebPage::loadData(const CoreIPC::DataReference& data, const String& MIMEType, const String& encodingName, const String& baseURLString, CoreIPC::MessageDecoder& decoder)
>+ {
>+     RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(data.data()), data.size());
>+@@ -950,17 +961,15 @@ void WebPage::loadData(const CoreIPC::DataReference& data, const String& MIMETyp
>+ 
>+ void WebPage::loadHTMLString(const String& htmlString, const String& baseURLString, CoreIPC::MessageDecoder& decoder)
>+ {
>+-    RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(htmlString.characters()), htmlString.length() * sizeof(UChar));
>+     KURL baseURL = baseURLString.isEmpty() ? blankURL() : KURL(KURL(), baseURLString);
>+-    loadDataImpl(sharedBuffer, "text/html", "utf-16", baseURL, KURL(), decoder);
>++    loadString(htmlString, ASCIILiteral("text/html"), baseURL, KURL(), decoder);
>+ }
>+ 
>+ void WebPage::loadAlternateHTMLString(const String& htmlString, const String& baseURLString, const String& unreachableURLString, CoreIPC::MessageDecoder& decoder)
>+ {
>+-    RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(htmlString.characters()), htmlString.length() * sizeof(UChar));
>+     KURL baseURL = baseURLString.isEmpty() ? blankURL() : KURL(KURL(), baseURLString);
>+     KURL unreachableURL = unreachableURLString.isEmpty() ? KURL() : KURL(KURL(), unreachableURLString);
>+-    loadDataImpl(sharedBuffer, "text/html", "utf-16", baseURL, unreachableURL, decoder);
>++    loadString(htmlString, ASCIILiteral("text/html"), baseURL, unreachableURL, decoder); 
>+ }
>+ 
>+ void WebPage::loadPlainTextString(const String& string, CoreIPC::MessageDecoder& decoder)
>+diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.h b/Source/WebKit2/WebProcess/WebPage/WebPage.h
>+index 4b3a5cf..65f4487 100644
>+--- a/Source/WebKit2/WebProcess/WebPage/WebPage.h
>++++ b/Source/WebKit2/WebProcess/WebPage/WebPage.h
>+@@ -700,6 +700,7 @@ private:
>+     void loadPlainTextString(const String&, CoreIPC::MessageDecoder&);
>+     void loadWebArchiveData(const CoreIPC::DataReference&, CoreIPC::MessageDecoder&);
>+     void linkClicked(const String& url, const WebMouseEvent&);
>++    void loadString(const String&, const String& MIMEType, const WebCore::KURL& baseURL, const WebCore::KURL& failingURL, CoreIPC::MessageDecoder&);
>+     void reload(bool reloadFromOrigin, const SandboxExtension::Handle&);
>+     void goForward(uint64_t);
>+     void goBack(uint64_t);
>diff --git a/webkitgtk3.spec b/webkitgtk3.spec
>index 58d8b50..d5d7cfe 100644
>--- a/webkitgtk3.spec
>+++ b/webkitgtk3.spec
>@@ -22,6 +22,7 @@ Patch0:         webkit-1.1.14-nspluginwrapper.patch
> Patch1:         webkitgtk-2.1.1-yarr.patch
> # https://bugs.webkit.org/show_bug.cgi?id=103128
> Patch4:         webkit-2.1.90-double2intsPPC32.patch
>+Patch5:         webkit-fix-load_html-encoding-issue.patch
> 
> BuildRequires:  at-spi2-core-devel
> BuildRequires:  bison
>@@ -96,6 +97,7 @@ This package contains developer documentation for %{name}.
> %ifarch ppc s390
> %patch4 -p1 -b .double2intsPPC32
> %endif
>+%patch5 -p1
> 
> %build
> # Use linker flags to reduce memory consumption

Actions: View | Diff

Attachments on bug 1060845: 858758