From 2bde8e466a4451c7319e3a072d118917957d6554 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 25 May 2011 19:08:45 +0100 Subject: Merge WebKit at r82507: Initial merge by git Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e --- Source/WebCore/html/shadow/SliderThumbElement.cpp | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'Source/WebCore/html/shadow/SliderThumbElement.cpp') diff --git a/Source/WebCore/html/shadow/SliderThumbElement.cpp b/Source/WebCore/html/shadow/SliderThumbElement.cpp index 2c049cb..d1aa15e 100644 --- a/Source/WebCore/html/shadow/SliderThumbElement.cpp +++ b/Source/WebCore/html/shadow/SliderThumbElement.cpp @@ -56,6 +56,8 @@ namespace WebCore { class RenderSliderThumb : public RenderBlock { public: RenderSliderThumb(Node*); + +private: virtual void layout(); }; @@ -85,6 +87,16 @@ void RenderSliderThumb::layout() RenderBlock::layout(); } +void SliderThumbElement::setPositionFromValue() +{ + // Since today the code to calculate position is in the RenderSlider layout + // path, we don't actually update the value here. Instead, we poke at the + // renderer directly to trigger layout. + // FIXME: Move the logic of positioning the thumb here. + if (renderer()) + renderer()->setNeedsLayout(true); +} + RenderObject* SliderThumbElement::createRenderer(RenderArena* arena, RenderStyle*) { return new (arena) RenderSliderThumb(this); @@ -92,11 +104,11 @@ RenderObject* SliderThumbElement::createRenderer(RenderArena* arena, RenderStyle void SliderThumbElement::dragFrom(const IntPoint& point) { - setPosition(point); + setPositionFromPoint(point); startDragging(); } -void SliderThumbElement::setPosition(const IntPoint& point) +void SliderThumbElement::setPositionFromPoint(const IntPoint& point) { HTMLInputElement* input = static_cast(shadowHost()); ASSERT(input); @@ -212,6 +224,7 @@ void SliderThumbElement::defaultEventHandler(Event* event) #endif ) { if (m_inDragMode) +<<<<<<< HEAD #if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS) { if (event->isMouseEvent()) { @@ -233,6 +246,9 @@ void SliderThumbElement::defaultEventHandler(Event* event) } #endif +======= + setPositionFromPoint(mouseEvent->absoluteLocation()); +>>>>>>> webkit.org at r82507 return; } -- cgit v1.1 From 74ee772b3c1ea8b557e5a596e9cbc655d1c0e161 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 8 Jun 2011 10:42:08 +0100 Subject: Merge WebKit at r82507: Fix conflicts - RenderLayerBacking.cpp Due to ANDROID_OVERFLOW_SCROLL http://trac.webkit.org/changeset/81715 - Document.cpp Due to domTreeVersion and ANDROID_STYLE_VERSION http://trac.webkit.org/changeset/80797 - CachedResourceLoader.cpp Due to temporary debugging and ANDROID_BLOCK_NETWORK_IMAGE http://trac.webkit.org/changeset/80695 - Settings.cpp/h http://trac.webkit.org/changeset/81289 http://trac.webkit.org/changeset/81635 - MediaPlayer.cpp Whitespace only http://trac.webkit.org/changeset/80874 - RenderBox.cpp Due to isHorizontalWritingMode http://trac.webkit.org/changeset/81716 - RenderLayer.cpp/h Due to ANDROID_OVERFLOW_SCROLL http://trac.webkit.org/changeset/81981 - CSSStyleSelector.cpp Due to ANDROID_CSS_RING http://trac.webkit.org/changeset/80582 http://trac.webkit.org/changeset/80993 http://trac.webkit.org/changeset/80998 http://trac.webkit.org/changeset/81684 http://trac.webkit.org/changeset/82378 - CSSParser.cpp Due to ANDROID_CSS_RING http://trac.webkit.org/changeset/80582 http://trac.webkit.org/changeset/81684 - StyleElement.cpp Due to cherry pick of http://trac.webkit.org/changeset/80787 http://trac.webkit.org/changeset/82054 - EventHandler.cpp Due to ANDROID_PLUGINS http://trac.webkit.org/changeset/81618 http://trac.webkit.org/changeset/81835 - SliderThumbElement.cpp Due to touch events http://trac.webkit.org/changeset/81216 - MediaControls.cpp Due to touch events http://trac.webkit.org/changeset/80857 Note that the WebKit history for this file is confusing as it was renamed in http://trac.webkit.org/changeset/83545 and then re-added in http://trac.webkit.org/changeset/84222 but trac is not smart enough to track history backwards from http://trac.webkit.org/changeset/84222. Change-Id: Ie1f80e09ae7c3befa7a18773cf846ff130e4354e --- Source/WebCore/html/shadow/SliderThumbElement.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'Source/WebCore/html/shadow/SliderThumbElement.cpp') diff --git a/Source/WebCore/html/shadow/SliderThumbElement.cpp b/Source/WebCore/html/shadow/SliderThumbElement.cpp index d1aa15e..6a6e901 100644 --- a/Source/WebCore/html/shadow/SliderThumbElement.cpp +++ b/Source/WebCore/html/shadow/SliderThumbElement.cpp @@ -224,13 +224,12 @@ void SliderThumbElement::defaultEventHandler(Event* event) #endif ) { if (m_inDragMode) -<<<<<<< HEAD #if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS) { if (event->isMouseEvent()) { MouseEvent* mouseEvent = static_cast(event); #endif - setPosition(mouseEvent->absoluteLocation()); + setPositionFromPoint(mouseEvent->absoluteLocation()); #if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS) } else if (event->isTouchEvent()) { TouchEvent* touchEvent = static_cast(event); @@ -238,7 +237,7 @@ void SliderThumbElement::defaultEventHandler(Event* event) IntPoint curPoint; curPoint.setX(touchEvent->touches()->item(0)->pageX()); curPoint.setY(touchEvent->touches()->item(0)->pageY()); - setPosition(curPoint); + setPositionFromPoint(curPoint); // Tell the webview that webkit will handle the following move events event->setDefaultPrevented(true); } @@ -246,9 +245,6 @@ void SliderThumbElement::defaultEventHandler(Event* event) } #endif -======= - setPositionFromPoint(mouseEvent->absoluteLocation()); ->>>>>>> webkit.org at r82507 return; } -- cgit v1.1