54 lines
2.9 KiB
Diff
54 lines
2.9 KiB
Diff
diff -ur qt-everywhere-opensource-src-4.6.3/src/3rdparty/webkit/WebCore/page/Frame.cpp qt-everywhere-opensource-src-4.6.3-CVE-2010-1397/src/3rdparty/webkit/WebCore/page/Frame.cpp
|
|
--- qt-everywhere-opensource-src-4.6.3/src/3rdparty/webkit/WebCore/page/Frame.cpp 2010-06-02 04:03:11.000000000 +0200
|
|
+++ qt-everywhere-opensource-src-4.6.3-CVE-2010-1397/src/3rdparty/webkit/WebCore/page/Frame.cpp 2010-06-10 20:41:45.295318418 +0200
|
|
@@ -552,12 +552,6 @@
|
|
toRenderTextControl(renderer)->selectionChanged(userTriggered);
|
|
}
|
|
|
|
-void Frame::invalidateSelection()
|
|
-{
|
|
- selection()->setNeedsLayout();
|
|
- selectionLayoutChanged();
|
|
-}
|
|
-
|
|
void Frame::setCaretVisible(bool flag)
|
|
{
|
|
if (m_caretVisible == flag)
|
|
diff -ur qt-everywhere-opensource-src-4.6.3/src/3rdparty/webkit/WebCore/page/Frame.h qt-everywhere-opensource-src-4.6.3-CVE-2010-1397/src/3rdparty/webkit/WebCore/page/Frame.h
|
|
--- qt-everywhere-opensource-src-4.6.3/src/3rdparty/webkit/WebCore/page/Frame.h 2010-06-02 04:03:11.000000000 +0200
|
|
+++ qt-everywhere-opensource-src-4.6.3-CVE-2010-1397/src/3rdparty/webkit/WebCore/page/Frame.h 2010-06-10 20:41:45.291318453 +0200
|
|
@@ -259,8 +259,6 @@
|
|
void selectionLayoutChanged();
|
|
void notifyRendererOfSelectionChange(bool userTriggered);
|
|
|
|
- void invalidateSelection();
|
|
-
|
|
void setCaretVisible(bool = true);
|
|
void paintCaret(GraphicsContext*, int tx, int ty, const IntRect& clipRect) const;
|
|
void paintDragCaret(GraphicsContext*, int tx, int ty, const IntRect& clipRect) const;
|
|
diff -ur qt-everywhere-opensource-src-4.6.3/src/3rdparty/webkit/WebCore/page/FrameView.cpp qt-everywhere-opensource-src-4.6.3-CVE-2010-1397/src/3rdparty/webkit/WebCore/page/FrameView.cpp
|
|
--- qt-everywhere-opensource-src-4.6.3/src/3rdparty/webkit/WebCore/page/FrameView.cpp 2010-06-02 04:03:11.000000000 +0200
|
|
+++ qt-everywhere-opensource-src-4.6.3-CVE-2010-1397/src/3rdparty/webkit/WebCore/page/FrameView.cpp 2010-06-10 20:41:45.293318191 +0200
|
|
@@ -642,7 +642,8 @@
|
|
root->view()->popLayoutState();
|
|
m_layoutRoot = 0;
|
|
|
|
- m_frame->invalidateSelection();
|
|
+ m_frame->selection()->setNeedsLayout();
|
|
+ m_frame->selectionLayoutChanged();
|
|
|
|
m_layoutSchedulingEnabled = true;
|
|
|
|
diff -ur qt-everywhere-opensource-src-4.6.3/src/3rdparty/webkit/WebCore/rendering/RenderLayer.cpp qt-everywhere-opensource-src-4.6.3-CVE-2010-1397/src/3rdparty/webkit/WebCore/rendering/RenderLayer.cpp
|
|
--- qt-everywhere-opensource-src-4.6.3/src/3rdparty/webkit/WebCore/rendering/RenderLayer.cpp 2010-06-02 04:03:11.000000000 +0200
|
|
+++ qt-everywhere-opensource-src-4.6.3-CVE-2010-1397/src/3rdparty/webkit/WebCore/rendering/RenderLayer.cpp 2010-06-10 20:41:45.297318506 +0200
|
|
@@ -1170,7 +1170,7 @@
|
|
// The caret rect needs to be invalidated after scrolling
|
|
Frame* frame = renderer()->document()->frame();
|
|
if (frame)
|
|
- frame->invalidateSelection();
|
|
+ frame->selection()->setNeedsLayout();
|
|
|
|
// Just schedule a full repaint of our object.
|
|
if (repaint)
|