Commit 3fbe04f4 authored by rwlbuis's avatar rwlbuis

Reviewed by Hyatt.

        Fix Qt/Linux build.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@16660 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 61b29d73
......@@ -808,6 +808,7 @@ set(WebCore_SRCS
${SVG_SOURCES}
${XPATH_SOURCES}
editing/CommandByName.cpp
editing/InsertIntoTextNodeCommand.cpp
editing/WrapContentsInDummySpanCommand.cpp
editing/ReplaceSelectionCommand.cpp
......
2006-09-30 Nikolas Zimmermann <zimmermann@kde.org>
Reviewed by Hyatt.
Fix Qt/Linux build.
* CMakeLists.txt:
* platform/qt/ScrollViewQt.cpp:
(WebCore::ScrollView::convertToContainingWindow):
(WebCore::ScrollView::convertFromContainingWindow):
* platform/qt/TemporaryLinkStubs.cpp:
(WebCore::signedPublicKeyAndChallengeString):
* platform/qt/WidgetQt.cpp:
(WebCore::Widget::convertToContainingWindow):
(WebCore::Widget::convertFromContainingWindow):
2006-09-29 Sam Weinig <sam.weinig@gmail.com>
Reviewed by Tim H.
......@@ -130,16 +130,15 @@ int ScrollView::contentsHeight() const
return m_area->widget()->height();
}
IntPoint ScrollView::viewportToContents(const IntPoint& viewportPoint)
IntPoint ScrollView::convertToContainingWindow(const IntPoint& point) const
{
// Qt already handles this in the coordinates we get from the mouse events...
return viewportPoint;
return point - scrollOffset();
}
IntPoint ScrollView::contentsToViewport(const IntPoint& contentsPoint)
IntPoint ScrollView::convertFromContainingWindow(const IntPoint& point) const
{
// Qt already handles this in the coordinates we get from the mouse events...
return contentsPoint;
return point + scrollOffset();
}
IntSize ScrollView::scrollOffset() const
......
......@@ -187,7 +187,7 @@ bool WebCore::PlugInInfoStore::supportsMIMEType(const WebCore::String&) { return
namespace WebCore {
DeprecatedStringList supportedKeySizes() { notImplemented(); return DeprecatedStringList(); }
DeprecatedString signedPublicKeyAndChallengeString(unsigned keySizeIndex, const DeprecatedString &challengeString, const KURL &url) { return DeprecatedString(); }
String signedPublicKeyAndChallengeString(unsigned keySizeIndex, const String &challengeString, const KURL &url) { return String(); }
}
......
......@@ -75,6 +75,16 @@ WidgetClient* Widget::client() const
return 0;
}
IntPoint Widget::convertToContainingWindow(const IntPoint& point) const
{
return point;
}
IntPoint Widget::convertFromContainingWindow(const IntPoint& point) const
{
return point;
}
IntRect Widget::frameGeometry() const
{
if (!data->m_widget)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment