1 <<<<<<< HEAD

     2 =======

     3 2010-04-09  David Leong  <david.leong@nokia.com>

     4 

     5         Reviewed by Simon Hausmann.

     6 

     7         [Qt] Symbian apps crash on exit due to a bad qObject_cast.

     8 

     9         https://bugs.webkit.org/show_bug.cgi?id=37303

    10 

    11         Added check for NULL to avoid the crash.

    12 

    13         * plugins/symbian/PluginViewSymbian.cpp:

    14         (WebCore::PluginView::platformDestroy):

    15 

    16 2009-11-15  Dave Tapuska  <dtapuska@rim.com>

    17 

    18         Reviewed by George Staikos.

    19         

    20         Compare UChars single unit at a time as opposed to the uint32_t

    21         approach as casting to unaligned addresses may cause a bus failure

    22         on ARMv5 and below. This change replicates the same defines that

    23         exists in AtomicString.cpp

    24 

    25         https://bugs.webkit.org/show_bug.cgi?id=31475

    26         

    27         * platform/text/StringHash.h:

    28         (WebCore::StringHash::equal):

    29 

    30 >>>>>>> 8f75ee7... Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 14feb62c96ffe2c37e3e2fdac4e370fdbc76ef62 )