equal
deleted
inserted
replaced
1 <<<<<<< HEAD |
1 2009-11-03 Dan Bernstein <mitz@apple.com> |
2 ======= |
2 |
|
3 Reviewed by Dave Hyatt. |
|
4 |
|
5 Allow a frame to go back to copy-on-scroll when it ceases being overlapped |
|
6 |
|
7 The code was not testing slow-scrolling frames for overlappedness, thinking the answer |
|
8 would not matter. That is not the case if the only reason for the slow-scrolling is |
|
9 being overlapped. |
|
10 |
|
11 * page/FrameView.cpp: |
|
12 (WebCore::FrameView::useSlowRepaintsIfNotOverlapped): Added. Returns whether there is any |
|
13 reason besides being overlapped that the frame would need to fully repaint on scroll. |
|
14 * page/FrameView.h: |
|
15 * rendering/RenderWidget.cpp: |
|
16 (WebCore::RenderWidget::paint): Use useSlowRepaintsIfNotOverlapped(). |
|
17 |
3 2010-04-09 David Leong <david.leong@nokia.com> |
18 2010-04-09 David Leong <david.leong@nokia.com> |
4 |
19 |
5 Reviewed by Simon Hausmann. |
20 Reviewed by Simon Hausmann. |
6 |
21 |
7 [Qt] Symbian apps crash on exit due to a bad qObject_cast. |
22 [Qt] Symbian apps crash on exit due to a bad qObject_cast. |
25 https://bugs.webkit.org/show_bug.cgi?id=31475 |
40 https://bugs.webkit.org/show_bug.cgi?id=31475 |
26 |
41 |
27 * platform/text/StringHash.h: |
42 * platform/text/StringHash.h: |
28 (WebCore::StringHash::equal): |
43 (WebCore::StringHash::equal): |
29 |
44 |
30 >>>>>>> 8f75ee7... Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 14feb62c96ffe2c37e3e2fdac4e370fdbc76ef62 ) |
|
31 2010-03-25 yael aharon <yael.aharon@nokia.com> |
45 2010-03-25 yael aharon <yael.aharon@nokia.com> |
32 |
46 |
33 Reviewed by Laszlo Gombos. |
47 Reviewed by Laszlo Gombos. |
34 |
48 |
35 [Qt] Windowed netscape plugins don't work with QGraphicsWebView on Symbian |
49 [Qt] Windowed netscape plugins don't work with QGraphicsWebView on Symbian |