Review Request: [PATCH] Change HTML thumbnail generator to use kdewebkit to fix bug 248478

Maksim Orlovich mo85 at cornell.edu
Sat May 28 16:02:39 BST 2011


Or you could just do this 1-line + comments change:
commit 4c65ecb9fb5ca6aba393189a818e2cfcb414b228
Author: Maks Orlovich <maksim at kde.org>
Date:   Sat May 28 11:01:16 2011 -0400

    Don't ask KHTMLRun to handle embedding cases with
onlyLocalReferences, we want to
    swallow them ourselves given what the mode is for.

    Fixes what #248478 turned to (original issue got fixed
organically, follow up
    comments are technically unrelated)

    BUG: 248478

diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp
index ec89b0c..817e606 100644
--- a/khtml/khtml_part.cpp
+++ b/khtml/khtml_part.cpp
@@ -4299,11 +4297,12 @@ bool KHTMLPart::processObjectRequest(
khtml::ChildFrame *child, const KUrl &_url
     // though -> the reference becomes invalid -> crash is likely
     KUrl url( _url );

-    // If we are not permitting anything remote, or khtmlrun called us with
-    // empty url + mimetype to indicate a loading error, we obviosuly failed
+    // khtmlrun called us with empty url + mimetype to indicate a
loading error,
+    // we obviosuly failed; but we can return true here since we don't want it
+    // doing anything more, while childLoadFailure is enough to notify our kid.
     if ( d->m_onlyLocalReferences || ( url.isEmpty() &&
mimetype.isEmpty() ) ) {
         childLoadFailure(child);
-        return false;
+        return true;
     }

     // we also want to ignore any spurious requests due to closing
when parser is being cleared. These should be



On 5/27/11, Dawit Alemayehu <adawit at kde.org> wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/101365/
> -----------------------------------------------------------
>
> (Updated May 27, 2011, 9:57 p.m.)
>
>
> Review request for KDE Runtime.
>
>
> Summary (updated)
> -------
>
> The attached patch fixes the html thumbnail generator so that it won't show
> the "Open With" dialog box whenever it encounters frames and other content
> such as flash.
>
> Please note that I changed the engine not because of ideological preference,
> but rather because I cannot figure out how to fix it with khtml.
>
>
> This addresses bug 248478.
>     http://bugs.kde.org/show_bug.cgi?id=248478
>
>
> Diffs
> -----
>
>   kioslave/thumbnail/CMakeLists.txt 9789109
>   kioslave/thumbnail/htmlcreator.h 6903db7
>   kioslave/thumbnail/htmlcreator.cpp c623606
>
> Diff: http://git.reviewboard.kde.org/r/101365/diff
>
>
> Testing
> -------
>
>
> Thanks,
>
> Dawit
>
>




More information about the kde-core-devel mailing list