Diff
Modified: trunk/LayoutTests/ChangeLog (126079 => 126080)
--- trunk/LayoutTests/ChangeLog 2012-08-20 22:23:54 UTC (rev 126079)
+++ trunk/LayoutTests/ChangeLog 2012-08-20 22:24:35 UTC (rev 126080)
@@ -1,3 +1,16 @@
+2012-08-20 Adam Klein <[email protected]>
+
+ Remove redundant TOUCH_LISTENER event type
+ https://bugs.webkit.org/show_bug.cgi?id=94524
+
+ Reviewed by Ryosuke Niwa.
+
+ Removed tests for hasTouchEventListener as they're redundant
+ with tests for touchEventHandlerCount.
+
+ * fast/events/touch/touch-handler-count-expected.txt:
+ * fast/events/touch/touch-handler-count.html:
+
2012-08-20 Kenneth Russell <[email protected]>
Reftest fast/text-autosizing/nested-em-line-height.html needs updating after r126058
Modified: trunk/LayoutTests/fast/events/touch/touch-handler-count-expected.txt (126079 => 126080)
--- trunk/LayoutTests/fast/events/touch/touch-handler-count-expected.txt 2012-08-20 22:23:54 UTC (rev 126079)
+++ trunk/LayoutTests/fast/events/touch/touch-handler-count-expected.txt 2012-08-20 22:24:35 UTC (rev 126080)
@@ -5,9 +5,7 @@
Test addEventListener/removeEventListener on the document.
PASS window.internals.touchEventHandlerCount(document) is 0
-PASS window.internals.hasTouchEventListener(document) is false
PASS window.internals.touchEventHandlerCount(document) is 1
-PASS window.internals.hasTouchEventListener(document) is true
PASS window.internals.touchEventHandlerCount(document) is 2
PASS window.internals.touchEventHandlerCount(document) is 3
PASS window.internals.touchEventHandlerCount(document) is 2
@@ -15,22 +13,16 @@
PASS window.internals.touchEventHandlerCount(document) is 1
PASS window.internals.touchEventHandlerCount(document) is 1
PASS window.internals.touchEventHandlerCount(document) is 0
-PASS window.internals.hasTouchEventListener(document) is false
Test setting touch handlers on the document.
PASS window.internals.touchEventHandlerCount(document) is 0
-PASS window.internals.hasTouchEventListener(document) is false
PASS window.internals.touchEventHandlerCount(document) is 4
-PASS window.internals.hasTouchEventListener(document) is true
PASS window.internals.touchEventHandlerCount(document) is 4
PASS window.internals.touchEventHandlerCount(document) is 3
PASS window.internals.touchEventHandlerCount(document) is 3
PASS window.internals.touchEventHandlerCount(document) is 0
-PASS window.internals.hasTouchEventListener(document) is false
Test addEventListener/removeEventListener on the window.
PASS window.internals.touchEventHandlerCount(document) is 0
-PASS window.internals.hasTouchEventListener(document) is false
PASS window.internals.touchEventHandlerCount(document) is 1
-PASS window.internals.hasTouchEventListener(document) is true
PASS window.internals.touchEventHandlerCount(document) is 2
PASS window.internals.touchEventHandlerCount(document) is 3
PASS window.internals.touchEventHandlerCount(document) is 2
@@ -38,22 +30,16 @@
PASS window.internals.touchEventHandlerCount(document) is 1
PASS window.internals.touchEventHandlerCount(document) is 1
PASS window.internals.touchEventHandlerCount(document) is 0
-PASS window.internals.hasTouchEventListener(document) is false
Test setting touch handlers on the window.
PASS window.internals.touchEventHandlerCount(document) is 0
-PASS window.internals.hasTouchEventListener(document) is false
PASS window.internals.touchEventHandlerCount(document) is 4
-PASS window.internals.hasTouchEventListener(document) is true
PASS window.internals.touchEventHandlerCount(document) is 4
PASS window.internals.touchEventHandlerCount(document) is 3
PASS window.internals.touchEventHandlerCount(document) is 3
PASS window.internals.touchEventHandlerCount(document) is 0
-PASS window.internals.hasTouchEventListener(document) is false
Test addEventListener/removeEventListener on a div.
PASS window.internals.touchEventHandlerCount(document) is 0
-PASS window.internals.hasTouchEventListener(document) is false
PASS window.internals.touchEventHandlerCount(document) is 1
-PASS window.internals.hasTouchEventListener(document) is true
PASS window.internals.touchEventHandlerCount(document) is 2
PASS window.internals.touchEventHandlerCount(document) is 3
PASS window.internals.touchEventHandlerCount(document) is 2
@@ -61,38 +47,28 @@
PASS window.internals.touchEventHandlerCount(document) is 1
PASS window.internals.touchEventHandlerCount(document) is 1
PASS window.internals.touchEventHandlerCount(document) is 0
-PASS window.internals.hasTouchEventListener(document) is false
Test setting touch handlers on a div.
PASS window.internals.touchEventHandlerCount(document) is 0
-PASS window.internals.hasTouchEventListener(document) is false
PASS window.internals.touchEventHandlerCount(document) is 4
-PASS window.internals.hasTouchEventListener(document) is true
PASS window.internals.touchEventHandlerCount(document) is 4
PASS window.internals.touchEventHandlerCount(document) is 3
PASS window.internals.touchEventHandlerCount(document) is 3
PASS window.internals.touchEventHandlerCount(document) is 0
-PASS window.internals.hasTouchEventListener(document) is false
Test addEventListener/removeEventListener on a new div.
PASS window.internals.touchEventHandlerCount(document) is 0
-PASS window.internals.hasTouchEventListener(document) is false
PASS window.internals.touchEventHandlerCount(document) is 2
-PASS window.internals.hasTouchEventListener(document) is true
PASS window.internals.touchEventHandlerCount(document) is 2
PASS window.internals.touchEventHandlerCount(document) is 3
PASS window.internals.touchEventHandlerCount(document) is 2
PASS window.internals.touchEventHandlerCount(document) is 2
PASS window.internals.touchEventHandlerCount(document) is 2
PASS window.internals.touchEventHandlerCount(document) is 0
-PASS window.internals.hasTouchEventListener(document) is false
Test setting touch handlers on a new div.
PASS window.internals.touchEventHandlerCount(document) is 0
-PASS window.internals.hasTouchEventListener(document) is false
PASS window.internals.touchEventHandlerCount(document) is 2
-PASS window.internals.hasTouchEventListener(document) is true
PASS window.internals.touchEventHandlerCount(document) is 2
PASS window.internals.touchEventHandlerCount(document) is 3
PASS window.internals.touchEventHandlerCount(document) is 2
PASS window.internals.touchEventHandlerCount(document) is 2
PASS window.internals.touchEventHandlerCount(document) is 0
-PASS window.internals.hasTouchEventListener(document) is false
Modified: trunk/LayoutTests/fast/events/touch/touch-handler-count.html (126079 => 126080)
--- trunk/LayoutTests/fast/events/touch/touch-handler-count.html 2012-08-20 22:23:54 UTC (rev 126079)
+++ trunk/LayoutTests/fast/events/touch/touch-handler-count.html 2012-08-20 22:24:35 UTC (rev 126080)
@@ -8,10 +8,8 @@
var listener = function() { }
shouldBe('window.internals.touchEventHandlerCount(document)', '0');
- shouldBe('window.internals.hasTouchEventListener(document)', 'false');
document.addEventListener('touchstart', listener, true);
shouldBe('window.internals.touchEventHandlerCount(document)', '1');
- shouldBe('window.internals.hasTouchEventListener(document)', 'true');
document.addEventListener('touchmove', listener, true);
shouldBe('window.internals.touchEventHandlerCount(document)', '2');
document.addEventListener('touchstart', listener, false);
@@ -29,19 +27,16 @@
document.removeEventListener('touchstart', listener, false);
shouldBe('window.internals.touchEventHandlerCount(document)', '0');
- shouldBe('window.internals.hasTouchEventListener(document)', 'false');
})();
debug("Test setting touch handlers on the document.");
(function() {
shouldBe('window.internals.touchEventHandlerCount(document)', '0');
- shouldBe('window.internals.hasTouchEventListener(document)', 'false');
document._ontouchstart_ = function() { }
document._ontouchmove_ = function() {}
document._ontouchend_ = function() {}
document._ontouchcancel_ = function() {}
shouldBe('window.internals.touchEventHandlerCount(document)', '4');
- shouldBe('window.internals.hasTouchEventListener(document)', 'true');
document._ontouchstart_ = function() { }
shouldBe('window.internals.touchEventHandlerCount(document)', '4');
document._ontouchstart_ = null;
@@ -52,7 +47,6 @@
document._ontouchend_ = null;
document._ontouchcancel_ = null;
shouldBe('window.internals.touchEventHandlerCount(document)', '0');
- shouldBe('window.internals.hasTouchEventListener(document)', 'false');
})();
debug("Test addEventListener/removeEventListener on the window.");
@@ -60,10 +54,8 @@
var listener = function() { }
shouldBe('window.internals.touchEventHandlerCount(document)', '0');
- shouldBe('window.internals.hasTouchEventListener(document)', 'false');
window.addEventListener('touchstart', listener, true);
shouldBe('window.internals.touchEventHandlerCount(document)', '1');
- shouldBe('window.internals.hasTouchEventListener(document)', 'true');
window.addEventListener('touchmove', listener, true);
shouldBe('window.internals.touchEventHandlerCount(document)', '2');
window.addEventListener('touchstart', listener, false);
@@ -81,19 +73,16 @@
window.removeEventListener('touchstart', listener, false);
shouldBe('window.internals.touchEventHandlerCount(document)', '0');
- shouldBe('window.internals.hasTouchEventListener(document)', 'false');
})();
debug("Test setting touch handlers on the window.");
(function() {
shouldBe('window.internals.touchEventHandlerCount(document)', '0');
- shouldBe('window.internals.hasTouchEventListener(document)', 'false');
window._ontouchstart_ = function() { }
window._ontouchmove_ = function() {}
window._ontouchend_ = function() {}
window._ontouchcancel_ = function() {}
shouldBe('window.internals.touchEventHandlerCount(document)', '4');
- shouldBe('window.internals.hasTouchEventListener(document)', 'true');
window._ontouchstart_ = function() { }
shouldBe('window.internals.touchEventHandlerCount(document)', '4');
window._ontouchstart_ = null;
@@ -104,7 +93,6 @@
window._ontouchend_ = null;
window._ontouchcancel_ = null;
shouldBe('window.internals.touchEventHandlerCount(document)', '0');
- shouldBe('window.internals.hasTouchEventListener(document)', 'false');
})();
debug("Test addEventListener/removeEventListener on a div.");
@@ -113,10 +101,8 @@
var div = document.getElementById('touchtarget');
shouldBe('window.internals.touchEventHandlerCount(document)', '0');
- shouldBe('window.internals.hasTouchEventListener(document)', 'false');
div.addEventListener('touchstart', listener, true);
shouldBe('window.internals.touchEventHandlerCount(document)', '1');
- shouldBe('window.internals.hasTouchEventListener(document)', 'true');
div.addEventListener('touchmove', listener, true);
shouldBe('window.internals.touchEventHandlerCount(document)', '2');
div.addEventListener('touchstart', listener, false);
@@ -134,7 +120,6 @@
div.removeEventListener('touchstart', listener, false);
shouldBe('window.internals.touchEventHandlerCount(document)', '0');
- shouldBe('window.internals.hasTouchEventListener(document)', 'false');
})();
debug("Test setting touch handlers on a div.");
@@ -142,13 +127,11 @@
var div = document.getElementById('touchtarget');
shouldBe('window.internals.touchEventHandlerCount(document)', '0');
- shouldBe('window.internals.hasTouchEventListener(document)', 'false');
div._ontouchstart_ = function() { }
div._ontouchmove_ = function() { }
div._ontouchend_ = function() { }
div._ontouchcancel_ = function() { }
shouldBe('window.internals.touchEventHandlerCount(document)', '4');
- shouldBe('window.internals.hasTouchEventListener(document)', 'true');
div._ontouchstart_ = function() { }
shouldBe('window.internals.touchEventHandlerCount(document)', '4');
div._ontouchstart_ = null;
@@ -159,7 +142,6 @@
div._ontouchend_ = null;
div._ontouchcancel_ = null;
shouldBe('window.internals.touchEventHandlerCount(document)', '0');
- shouldBe('window.internals.hasTouchEventListener(document)', 'false');
})();
debug("Test addEventListener/removeEventListener on a new div.");
@@ -169,12 +151,10 @@
var listener = function() { }
shouldBe('window.internals.touchEventHandlerCount(document)', '0');
- shouldBe('window.internals.hasTouchEventListener(document)', 'false');
div.addEventListener('touchstart', listener, true);
div.addEventListener('touchmove', listener, true);
shouldBe('window.internals.touchEventHandlerCount(document)', '2');
- shouldBe('window.internals.hasTouchEventListener(document)', 'true');
touchtarget.appendChild(div);
shouldBe('window.internals.touchEventHandlerCount(document)', '2');
@@ -194,7 +174,6 @@
div.removeEventListener('touchmove', listener, true);
div.removeEventListener('touchend', listener, true);
shouldBe('window.internals.touchEventHandlerCount(document)', '0');
- shouldBe('window.internals.hasTouchEventListener(document)', 'false');
})();
debug("Test setting touch handlers on a new div.");
@@ -203,12 +182,10 @@
var touchtarget = document.getElementById('touchtarget');
shouldBe('window.internals.touchEventHandlerCount(document)', '0');
- shouldBe('window.internals.hasTouchEventListener(document)', 'false');
div._ontouchstart_ = function() { }
div._ontouchmove_ = function() { }
shouldBe('window.internals.touchEventHandlerCount(document)', '2');
- shouldBe('window.internals.hasTouchEventListener(document)', 'true');
touchtarget.appendChild(div);
shouldBe('window.internals.touchEventHandlerCount(document)', '2');
@@ -225,7 +202,6 @@
div._ontouchend_ = null;
div._ontouchmove_ = null;
shouldBe('window.internals.touchEventHandlerCount(document)', '0');
- shouldBe('window.internals.hasTouchEventListener(document)', 'false');
})();
</script>
Modified: trunk/Source/WebCore/ChangeLog (126079 => 126080)
--- trunk/Source/WebCore/ChangeLog 2012-08-20 22:23:54 UTC (rev 126079)
+++ trunk/Source/WebCore/ChangeLog 2012-08-20 22:24:35 UTC (rev 126080)
@@ -1,3 +1,37 @@
+2012-08-20 Adam Klein <[email protected]>
+
+ Remove redundant TOUCH_LISTENER event type
+ https://bugs.webkit.org/show_bug.cgi?id=94524
+
+ Reviewed by Ryosuke Niwa.
+
+ Code that needs to determine whether there are touch listeners
+ can instead call Document::touchEventHandlerCount(), added in r107832.
+ TOUCH_LISTENER didn't fit very well into the hasListenerType() model
+ anyway, as there's not a 1:1 correspondance between the enum value and
+ an event.
+
+ * dom/Document.cpp:
+ (WebCore::Document::addListenerTypeIfNeeded): Remove two bits of code:
+ the bookkeeping for TOUCH_LISTENER, and the notification into
+ ChromeClient (which is handled by calls to didAddTouchEventHandler in
+ all the places that call addListenerTypeIfNeeded).
+ (WebCore::Document::didRemoveTouchEventHandler): Remove bookkeeping for TOUCH_LISTENER.
+ * dom/Document.h:
+ * history/CachedFrame.cpp:
+ (WebCore::CachedFrameBase::restore): Call touchEventHandlerCount instead of hasListenerType.
+ * html/HTMLInputElement.cpp:
+ (WebCore::HTMLInputElement::updateType): ditto
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::handleTouchEvent): ditto
+ * page/Frame.cpp:
+ (WebCore::Frame::setDocument): ditto
+ * testing/Internals.cpp: Remove hasTouchEventListener method since its
+ data source no longer exists.
+ * testing/Internals.h: ditto
+ (Internals):
+ * testing/Internals.idl: ditto
+
2012-08-16 James Robinson <[email protected]>
[chromium] Change WebLayer from a concrete type to a pure virtual interface
Modified: trunk/Source/WebCore/dom/Document.cpp (126079 => 126080)
--- trunk/Source/WebCore/dom/Document.cpp 2012-08-20 22:23:54 UTC (rev 126079)
+++ trunk/Source/WebCore/dom/Document.cpp 2012-08-20 22:24:35 UTC (rev 126080)
@@ -4149,16 +4149,6 @@
addListenerType(TRANSITIONEND_LISTENER);
else if (eventType == eventNames().beforeloadEvent)
addListenerType(BEFORELOAD_LISTENER);
-#if ENABLE(TOUCH_EVENTS)
- else if (eventType == eventNames().touchstartEvent
- || eventType == eventNames().touchmoveEvent
- || eventType == eventNames().touchendEvent
- || eventType == eventNames().touchcancelEvent) {
- addListenerType(TOUCH_LISTENER);
- if (Page* page = this->page())
- page->chrome()->client()->needTouchEvents(true);
- }
-#endif
else if (eventType == eventNames().scrollEvent)
addListenerType(SCROLL_LISTENER);
}
@@ -5986,7 +5976,6 @@
if (m_touchEventHandlerCount)
return;
- m_listenerTypes &= ~TOUCH_LISTENER;
Page* page = this->page();
if (!page)
return;
Modified: trunk/Source/WebCore/dom/Document.h (126079 => 126080)
--- trunk/Source/WebCore/dom/Document.h 2012-08-20 22:23:54 UTC (rev 126079)
+++ trunk/Source/WebCore/dom/Document.h 2012-08-20 22:24:35 UTC (rev 126080)
@@ -803,8 +803,7 @@
ANIMATIONITERATION_LISTENER = 0x400,
TRANSITIONEND_LISTENER = 0x800,
BEFORELOAD_LISTENER = 0x1000,
- TOUCH_LISTENER = 0x2000,
- SCROLL_LISTENER = 0x4000
+ SCROLL_LISTENER = 0x2000
};
bool hasListenerType(ListenerType listenerType) const { return (m_listenerTypes & listenerType); }
Modified: trunk/Source/WebCore/history/CachedFrame.cpp (126079 => 126080)
--- trunk/Source/WebCore/history/CachedFrame.cpp 2012-08-20 22:23:54 UTC (rev 126079)
+++ trunk/Source/WebCore/history/CachedFrame.cpp 2012-08-20 22:24:35 UTC (rev 126080)
@@ -134,7 +134,7 @@
m_document->enqueuePopstateEvent(historyItem && historyItem->stateObject() ? historyItem->stateObject() : SerializedScriptValue::nullValue());
#if ENABLE(TOUCH_EVENTS)
- if (m_document->hasListenerType(Document::TOUCH_LISTENER))
+ if (m_document->touchEventHandlerCount())
m_document->page()->chrome()->client()->needTouchEvents(true);
#endif
Modified: trunk/Source/WebCore/html/HTMLInputElement.cpp (126079 => 126080)
--- trunk/Source/WebCore/html/HTMLInputElement.cpp 2012-08-20 22:23:54 UTC (rev 126079)
+++ trunk/Source/WebCore/html/HTMLInputElement.cpp 2012-08-20 22:24:35 UTC (rev 126080)
@@ -444,10 +444,9 @@
#if ENABLE(TOUCH_EVENTS)
bool hasTouchEventHandler = m_inputType->hasTouchEventHandler();
if (hasTouchEventHandler != m_hasTouchEventHandler) {
- if (hasTouchEventHandler) {
+ if (hasTouchEventHandler)
document()->didAddTouchEventHandler();
- document()->addListenerType(Document::TOUCH_LISTENER);
- } else
+ else
document()->didRemoveTouchEventHandler();
m_hasTouchEventHandler = hasTouchEventHandler;
}
Modified: trunk/Source/WebCore/page/EventHandler.cpp (126079 => 126080)
--- trunk/Source/WebCore/page/EventHandler.cpp 2012-08-20 22:23:54 UTC (rev 126079)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2012-08-20 22:24:35 UTC (rev 126080)
@@ -3590,7 +3590,7 @@
Document* doc = node->document();
if (!doc)
continue;
- if (!doc->hasListenerType(Document::TOUCH_LISTENER))
+ if (!doc->touchEventHandlerCount())
continue;
m_originatingTouchPointTargets.set(touchPointTargetKey, node);
@@ -3610,7 +3610,7 @@
Document* doc = touchTarget->toNode()->document();
if (!doc)
continue;
- if (!doc->hasListenerType(Document::TOUCH_LISTENER))
+ if (!doc->touchEventHandlerCount())
continue;
Frame* targetFrame = doc->frame();
if (!targetFrame)
Modified: trunk/Source/WebCore/page/Frame.cpp (126079 => 126080)
--- trunk/Source/WebCore/page/Frame.cpp 2012-08-20 22:23:54 UTC (rev 126079)
+++ trunk/Source/WebCore/page/Frame.cpp 2012-08-20 22:24:35 UTC (rev 126080)
@@ -312,7 +312,7 @@
if (m_page && m_page->mainFrame() == this) {
notifyChromeClientWheelEventHandlerCountChanged();
#if ENABLE(TOUCH_EVENTS)
- if (m_doc && m_doc->hasListenerType(Document::TOUCH_LISTENER))
+ if (m_doc && m_doc->touchEventHandlerCount())
m_page->chrome()->client()->needTouchEvents(true);
#endif
}
Modified: trunk/Source/WebCore/testing/Internals.cpp (126079 => 126080)
--- trunk/Source/WebCore/testing/Internals.cpp 2012-08-20 22:23:54 UTC (rev 126079)
+++ trunk/Source/WebCore/testing/Internals.cpp 2012-08-20 22:24:35 UTC (rev 126080)
@@ -965,17 +965,6 @@
return document->touchEventHandlerCount();
}
-bool Internals::hasTouchEventListener(Document* document, ExceptionCode& ec)
-{
- if (!document) {
- ec = INVALID_ACCESS_ERR;
- return 0;
- }
-
- return document->hasListenerType(Document::TOUCH_LISTENER);
-}
-
-
PassRefPtr<NodeList> Internals::nodesFromRect(Document* document, int x, int y, unsigned topPadding, unsigned rightPadding,
unsigned bottomPadding, unsigned leftPadding, bool ignoreClipping, bool allowShadowContent, ExceptionCode& ec) const
{
Modified: trunk/Source/WebCore/testing/Internals.h (126079 => 126080)
--- trunk/Source/WebCore/testing/Internals.h 2012-08-20 22:23:54 UTC (rev 126079)
+++ trunk/Source/WebCore/testing/Internals.h 2012-08-20 22:24:35 UTC (rev 126080)
@@ -158,7 +158,6 @@
unsigned wheelEventHandlerCount(Document*, ExceptionCode&);
unsigned touchEventHandlerCount(Document*, ExceptionCode&);
- bool hasTouchEventListener(Document*, ExceptionCode&);
PassRefPtr<NodeList> nodesFromRect(Document*, int x, int y, unsigned topPadding, unsigned rightPadding,
unsigned bottomPadding, unsigned leftPadding, bool ignoreClipping, bool allowShadowContent, ExceptionCode&) const;
Modified: trunk/Source/WebCore/testing/Internals.idl (126079 => 126080)
--- trunk/Source/WebCore/testing/Internals.idl 2012-08-20 22:23:54 UTC (rev 126079)
+++ trunk/Source/WebCore/testing/Internals.idl 2012-08-20 22:24:35 UTC (rev 126080)
@@ -135,7 +135,6 @@
unsigned long wheelEventHandlerCount(in Document document) raises (DOMException);
unsigned long touchEventHandlerCount(in Document document) raises (DOMException);
- boolean hasTouchEventListener(in Document document) raises (DOMException);
NodeList nodesFromRect(in Document document, in long x, in long y,
in unsigned long topPadding, in unsigned long rightPadding, in unsigned long bottomPadding, in unsigned long leftPadding,
Modified: trunk/Source/WebKit/chromium/ChangeLog (126079 => 126080)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-08-20 22:23:54 UTC (rev 126079)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-08-20 22:24:35 UTC (rev 126080)
@@ -1,3 +1,14 @@
+2012-08-20 Adam Klein <[email protected]>
+
+ Remove redundant TOUCH_LISTENER event type
+ https://bugs.webkit.org/show_bug.cgi?id=94524
+
+ Reviewed by Ryosuke Niwa.
+
+ * src/WebPluginContainerImpl.cpp:
+ (WebKit::WebPluginContainerImpl::setIsAcceptingTouchEvents): Remove
+ bookkeeping for TOUCH_LISTENER.
+
2012-08-16 James Robinson <[email protected]>
[chromium] Change WebLayer from a concrete type to a pure virtual interface
Modified: trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp (126079 => 126080)
--- trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp 2012-08-20 22:23:54 UTC (rev 126079)
+++ trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp 2012-08-20 22:24:35 UTC (rev 126080)
@@ -512,10 +512,9 @@
if (m_isAcceptingTouchEvents == acceptingTouchEvents)
return;
m_isAcceptingTouchEvents = acceptingTouchEvents;
- if (m_isAcceptingTouchEvents) {
+ if (m_isAcceptingTouchEvents)
m_element->document()->didAddTouchEventHandler();
- m_element->document()->addListenerType(Document::TOUCH_LISTENER);
- } else
+ else
m_element->document()->didRemoveTouchEventHandler();
}
