[webkit-changes] [117358] branches/chromium/1132

Wed, 16 May 2012 16:06:00 -0700

Title: [117358] branches/chromium/1132
Revision
117358
Author
jchaffr...@webkit.org
Date
2012-05-16 16:06:50 -0700 (Wed, 16 May 2012)

Log Message

Merge 117335 - layerX/layerY warning should be removed
https://bugs.webkit.org/show_bug.cgi?id=86264

Reviewed by James Robinson.

Source/WebCore:

Covered by: fast/dom/Window/window-xy-properties.html
            fast/events/init-events.html
            fast/events/mouse-relative-position.html
            fast/events/mouseclick-target-and-positioning.html
            fast/events/simulated-click-coords.html
            jquery/event.html

This change just removes the warning pending proper investigation.

Longer explanation: The layerX/layerY warning was added prematurely
as we didn't assess the web-compatibility potential breakage vs the
maintenance cost. There is also not readily available replacement.

* dom/MouseRelatedEvent.cpp:
(WebCore::MouseRelatedEvent::layerX):
(WebCore::MouseRelatedEvent::layerY):
* dom/UIEvent.cpp:
(WebCore::UIEvent::layerX):
(WebCore::UIEvent::layerY):
* dom/UIEvent.h:
Removed warnDeprecatedLayerXYUsage and all the associated calls.

LayoutTests:

Removed console message about layerX/layerY deprecation.

* fast/dom/Window/window-xy-properties-expected.txt:
* fast/events/init-events-expected.txt:
* fast/events/mouse-relative-position-expected.txt:
* fast/events/mouseclick-target-and-positioning-expected.txt:
* fast/events/simulated-click-coords-expected.txt:
* jquery/event-expected.txt:
* platform/qt/fast/events/mouse-relative-position-expected.txt:


TBR=jchaffr...@webkit.org

Modified Paths

Diff

Modified: branches/chromium/1132/LayoutTests/fast/dom/Window/window-xy-properties-expected.txt (117357 => 117358)


--- branches/chromium/1132/LayoutTests/fast/dom/Window/window-xy-properties-expected.txt	2012-05-16 22:56:29 UTC (rev 117357)
+++ branches/chromium/1132/LayoutTests/fast/dom/Window/window-xy-properties-expected.txt	2012-05-16 23:06:50 UTC (rev 117358)
@@ -1,11 +1,3 @@
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
 PASS event.clientX is 50
 PASS event.clientY is 50
 PASS event.pageX is 50

Modified: branches/chromium/1132/LayoutTests/fast/events/init-events-expected.txt (117357 => 117358)


--- branches/chromium/1132/LayoutTests/fast/events/init-events-expected.txt	2012-05-16 22:56:29 UTC (rev 117357)
+++ branches/chromium/1132/LayoutTests/fast/events/init-events-expected.txt	2012-05-16 23:06:50 UTC (rev 117358)
@@ -1,11 +1,3 @@
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
 This tests the init functions for all the event DOM classes that have them.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

Modified: branches/chromium/1132/LayoutTests/fast/events/mouse-relative-position-expected.txt (117357 => 117358)


--- branches/chromium/1132/LayoutTests/fast/events/mouse-relative-position-expected.txt	2012-05-16 22:56:29 UTC (rev 117357)
+++ branches/chromium/1132/LayoutTests/fast/events/mouse-relative-position-expected.txt	2012-05-16 23:06:50 UTC (rev 117358)
@@ -1,9 +1,3 @@
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
 span
 
 PASS simulateElementClick(testElement, [100, 100, 200, 200]); is '100, 100, 200, 200'

Modified: branches/chromium/1132/LayoutTests/fast/events/mouseclick-target-and-positioning-expected.txt (117357 => 117358)


--- branches/chromium/1132/LayoutTests/fast/events/mouseclick-target-and-positioning-expected.txt	2012-05-16 22:56:29 UTC (rev 117357)
+++ branches/chromium/1132/LayoutTests/fast/events/mouseclick-target-and-positioning-expected.txt	2012-05-16 23:06:50 UTC (rev 117358)
@@ -1,5 +1,3 @@
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
 This page tests whether a click event propogates with the correct target and positioning. See rdar://problem/4477126.
 
 click inside the red box:[]

Modified: branches/chromium/1132/LayoutTests/fast/events/simulated-click-coords-expected.txt (117357 => 117358)


--- branches/chromium/1132/LayoutTests/fast/events/simulated-click-coords-expected.txt	2012-05-16 22:56:29 UTC (rev 117357)
+++ branches/chromium/1132/LayoutTests/fast/events/simulated-click-coords-expected.txt	2012-05-16 23:06:50 UTC (rev 117358)
@@ -1,11 +1,3 @@
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
 Ensure that simulated click on label elements uses the original mouse coordinates.
 
  Click Me

Modified: branches/chromium/1132/LayoutTests/jquery/event-expected.txt (117357 => 117358)


--- branches/chromium/1132/LayoutTests/jquery/event-expected.txt	2012-05-16 22:56:29 UTC (rev 117357)
+++ branches/chromium/1132/LayoutTests/jquery/event-expected.txt	2012-05-16 23:06:50 UTC (rev 117358)
@@ -1,4 +1,2 @@
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
 ALERT: 376 tests of 376 passed, 0 failed.

Modified: branches/chromium/1132/LayoutTests/platform/qt/fast/events/mouse-relative-position-expected.txt (117357 => 117358)


--- branches/chromium/1132/LayoutTests/platform/qt/fast/events/mouse-relative-position-expected.txt	2012-05-16 22:56:29 UTC (rev 117357)
+++ branches/chromium/1132/LayoutTests/platform/qt/fast/events/mouse-relative-position-expected.txt	2012-05-16 23:06:50 UTC (rev 117358)
@@ -1,9 +1,3 @@
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
-CONSOLE MESSAGE: event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future.
 span
 
 PASS simulateElementClick(testElement, [100, 100, 200, 200]); is '100, 100, 200, 200'

Modified: branches/chromium/1132/Source/WebCore/dom/MouseRelatedEvent.cpp (117357 => 117358)


--- branches/chromium/1132/Source/WebCore/dom/MouseRelatedEvent.cpp	2012-05-16 22:56:29 UTC (rev 117357)
+++ branches/chromium/1132/Source/WebCore/dom/MouseRelatedEvent.cpp	2012-05-16 23:06:50 UTC (rev 117358)
@@ -196,7 +196,6 @@
 
 int MouseRelatedEvent::layerX()
 {
-    warnDeprecatedLayerXYUsage();
     if (!m_hasCachedRelativePosition)
         computeRelativePosition();
     return m_layerLocation.x();
@@ -204,7 +203,6 @@
 
 int MouseRelatedEvent::layerY()
 {
-    warnDeprecatedLayerXYUsage();
     if (!m_hasCachedRelativePosition)
         computeRelativePosition();
     return m_layerLocation.y();

Modified: branches/chromium/1132/Source/WebCore/dom/UIEvent.cpp (117357 => 117358)


--- branches/chromium/1132/Source/WebCore/dom/UIEvent.cpp	2012-05-16 22:56:29 UTC (rev 117357)
+++ branches/chromium/1132/Source/WebCore/dom/UIEvent.cpp	2012-05-16 23:06:50 UTC (rev 117358)
@@ -78,13 +78,11 @@
 
 int UIEvent::layerX()
 {
-    warnDeprecatedLayerXYUsage();
     return 0;
 }
 
 int UIEvent::layerY()
 {
-    warnDeprecatedLayerXYUsage();
     return 0;
 }
 
@@ -103,13 +101,6 @@
     return 0;
 }
 
-void UIEvent::warnDeprecatedLayerXYUsage()
-{
-    DEFINE_STATIC_LOCAL(String, consoleMessage , ("event.layerX and event.layerY are broken and deprecated in WebKit. They will be removed from the engine in the near future."));
-    if (m_view)
-        m_view->console()->addMessage(JSMessageSource, LogMessageType, WarningMessageLevel, consoleMessage);
-}
-
 PassRefPtr<FocusInEventDispatchMediator> FocusInEventDispatchMediator::create(PassRefPtr<Event> event, PassRefPtr<Node> oldFocusedNode)
 {
     return adoptRef(new FocusInEventDispatchMediator(event, oldFocusedNode));

Modified: branches/chromium/1132/Source/WebCore/dom/UIEvent.h (117357 => 117358)


--- branches/chromium/1132/Source/WebCore/dom/UIEvent.h	2012-05-16 22:56:29 UTC (rev 117357)
+++ branches/chromium/1132/Source/WebCore/dom/UIEvent.h	2012-05-16 23:06:50 UTC (rev 117358)
@@ -67,9 +67,6 @@
         UIEvent();
         UIEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<AbstractView>, int detail);
 
-        // layerX and layerY are deprecated. This reports a message to the console until we remove them.
-        void warnDeprecatedLayerXYUsage();
-
     private:
         RefPtr<AbstractView> m_view;
         int m_detail;

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to