Commit 5e1b7862 authored by leviw@chromium.org's avatar leviw@chromium.org
Browse files

2011-05-11 Levi Weintraub <leviw@chromium.org>

        Reviewed by Eric Seidel.

        Rename Widget::pos()
        https://bugs.webkit.org/show_bug.cgi?id=60575

        Renaming Widget::pos() to the more-descriptive location().

        No new tests as this is a simple rename

        * page/FrameView.cpp:
        (WebCore::FrameView::create):
        * platform/Widget.h:
        (WebCore::Widget::location):
        (WebCore::Widget::resize):
2011-05-11  Levi Weintraub  <leviw@chromium.org>

        Reviewed by Eric Seidel.

        Rename Widget::pos()
        https://bugs.webkit.org/show_bug.cgi?id=60575

        Renaming Widget::pos() to the more-descriptive location().

        * src/WebInputEventConversion.cpp:
        (WebKit::WebMouseEventBuilder::WebMouseEventBuilder):
        (WebKit::WebMouseWheelEventBuilder::WebMouseWheelEventBuilder):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@86312 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 7f0dffc7
2011-05-11 Levi Weintraub <leviw@chromium.org>
Reviewed by Eric Seidel.
Rename Widget::pos()
https://bugs.webkit.org/show_bug.cgi?id=60575
Renaming Widget::pos() to the more-descriptive location().
No new tests as this is a simple rename
* page/FrameView.cpp:
(WebCore::FrameView::create):
* platform/Widget.h:
(WebCore::Widget::location):
(WebCore::Widget::resize):
2011-05-10 MORITA Hajime <morrita@google.com>
 
Reviewed by Kent Tamura.
......@@ -159,7 +159,7 @@ PassRefPtr<FrameView> FrameView::create(Frame* frame)
PassRefPtr<FrameView> FrameView::create(Frame* frame, const IntSize& initialSize)
{
RefPtr<FrameView> view = adoptRef(new FrameView(frame));
view->Widget::setFrameRect(IntRect(view->pos(), initialSize));
view->Widget::setFrameRect(IntRect(view->location(), initialSize));
view->setInitialBoundsSize(initialSize);
view->show();
return view.release();
......
......@@ -150,7 +150,7 @@ public:
int width() const { return frameRect().width(); }
int height() const { return frameRect().height(); }
IntSize size() const { return frameRect().size(); }
IntPoint pos() const { return frameRect().location(); }
IntPoint location() const { return frameRect().location(); }
virtual void setFrameRect(const IntRect&);
virtual void setBoundsSize(const IntSize&);
......@@ -158,7 +158,7 @@ public:
IntRect boundsRect() const { return IntRect(0, 0, width(), height()); }
void resize(int w, int h) { setFrameRect(IntRect(x(), y(), w, h)); setBoundsSize(IntSize(w, h)); }
void resize(const IntSize& s) { setFrameRect(IntRect(pos(), s)); setBoundsSize(s); }
void resize(const IntSize& s) { setFrameRect(IntRect(location(), s)); setBoundsSize(s); }
void move(int x, int y) { setFrameRect(IntRect(x, y, width(), height())); }
void move(const IntPoint& p) { setFrameRect(IntRect(p, size())); }
......
2011-05-11 Levi Weintraub <leviw@chromium.org>
Reviewed by Eric Seidel.
Rename Widget::pos()
https://bugs.webkit.org/show_bug.cgi?id=60575
Renaming Widget::pos() to the more-descriptive location().
* src/WebInputEventConversion.cpp:
(WebKit::WebMouseEventBuilder::WebMouseEventBuilder):
(WebKit::WebMouseWheelEventBuilder::WebMouseWheelEventBuilder):
2011-05-11 Antoine Labour <piman@chromium.org>
Reviewed by David Levin.
......
......@@ -291,8 +291,8 @@ WebMouseEventBuilder::WebMouseEventBuilder(const Widget* widget, const MouseEven
globalY = event.screenY();
windowX = p.x();
windowY = p.y();
x = event.absoluteLocation().x() - widget->pos().x();
y = event.absoluteLocation().y() - widget->pos().y();
x = event.absoluteLocation().x() - widget->location().x();
y = event.absoluteLocation().y() - widget->location().y();
clickCount = event.detail();
}
......@@ -310,8 +310,8 @@ WebMouseWheelEventBuilder::WebMouseWheelEventBuilder(const Widget* widget, const
globalY = event.screenY();
windowX = p.x();
windowY = p.y();
x = event.absoluteLocation().x() - widget->pos().x();
y = event.absoluteLocation().y() - widget->pos().y();
x = event.absoluteLocation().x() - widget->location().x();
y = event.absoluteLocation().y() - widget->location().y();
deltaX = static_cast<float>(event.rawDeltaX());
deltaY = static_cast<float>(event.rawDeltaY());
// The 120 is from WheelEvent::initWheelEvent().
......
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