WebKit roll 50756:50820.

BUG=none
TEST=none 
Review URL: http://codereview.chromium.org/391019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31715 0039d316-1c4b-4281-b951-d872f2087c98

13 files changed, 49 insertions, 86 deletions

diff --git a/DEPS b/DEPS
index 312bf45..963b50d 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
 vars = {
   "webkit_trunk":
     "http://svn.webkit.org/repository/webkit/trunk",
-  "webkit_revision": "50756",
+  "webkit_revision": "50820",
   "ffmpeg_revision": "30374",
 }
 
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index e325e34..245b6f5 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -3066,8 +3066,6 @@ void RenderView::OnDragSourceEndedOrMoved(const gfx::Point& client_point,
                                           WebDragOperation op) {
   if (ended) {
     webview()->dragSourceEndedAt(client_point, screen_point, op);
-  } else {
-    webview()->dragSourceMovedTo(client_point, screen_point);
   }
 }
 
diff --git a/webkit/api/public/WebSocketStreamHandleClient.h b/webkit/api/public/WebSocketStreamHandleClient.h
index 7dcf9a5..82f328c 100644
--- a/webkit/api/public/WebSocketStreamHandleClient.h
+++ b/webkit/api/public/WebSocketStreamHandleClient.h
@@ -43,9 +43,6 @@ class WebURL;
 class WebSocketStreamHandleClient {
 public:
 
-    // Called when WebSocketStreamHandle is going to open the URL.
-    virtual void willOpenStream(WebSocketStreamHandle*, const WebURL&) = 0;
-
     // Called when Socket Stream is opened.
     virtual void didOpenStream(WebSocketStreamHandle*, int /* maxPendingSendAllowed */) = 0;
 
diff --git a/webkit/api/public/WebView.h b/webkit/api/public/WebView.h
index 2ad1364..8261afc 100644
--- a/webkit/api/public/WebView.h
+++ b/webkit/api/public/WebView.h
@@ -167,11 +167,6 @@ public:
         const WebPoint& clientPoint, const WebPoint& screenPoint,
         WebDragOperation operation) = 0;
 
-    // Notifies the WebView that a drag and drop operation is in progress, with
-    // dropable items over the view.
-    virtual void dragSourceMovedTo(
-        const WebPoint& clientPoint, const WebPoint& screenPoint) = 0;
-
     // Notfies the WebView that the system drag and drop operation has ended.
     virtual void dragSourceSystemDragEnded() = 0;
 
diff --git a/webkit/api/src/SocketStreamHandle.cpp b/webkit/api/src/SocketStreamHandle.cpp
index 356733c..f31f16c 100644
--- a/webkit/api/src/SocketStreamHandle.cpp
+++ b/webkit/api/src/SocketStreamHandle.cpp
@@ -60,8 +60,6 @@ public:
     int send(const char*, int);
     void close();
 
-    virtual void willOpenStream(WebSocketStreamHandle*, const WebURL&);
-
     virtual void didOpenStream(WebSocketStreamHandle*, int);
     virtual void didSendData(WebSocketStreamHandle*, int);
     virtual void didReceiveData(WebSocketStreamHandle*, const WebData&);
@@ -110,8 +108,6 @@ int SocketStreamHandleInternal::send(const char* data, int len)
     if (m_socket->send(webdata)) {
         m_pendingAmountSent += len;
         LOG(Network, "sent");
-        if (m_handle && m_handle->m_client)
-            m_handle->m_client->willSendData(m_handle, webdata.data(), webdata.size());
         return len;
     }
     LOG(Network, "busy. buffering");
@@ -124,16 +120,6 @@ void SocketStreamHandleInternal::close()
     m_socket->close();
 }
 
-void SocketStreamHandleInternal::willOpenStream(WebSocketStreamHandle* socketHandle, const WebURL& url)
-{
-    LOG(Network, "willOpenStream");
-    if (m_handle && m_socket.get()) {
-        ASSERT(socketHandle == m_socket.get());
-        if (m_handle->m_client)
-            m_handle->m_client->willOpenStream(m_handle, url);
-    }
-}
-
 void SocketStreamHandleInternal::didOpenStream(WebSocketStreamHandle* socketHandle, int maxPendingSendAllowed)
 {
     LOG(Network, "SocketStreamHandleInternal::didOpen %d",
@@ -245,12 +231,6 @@ void SocketStreamHandle::receivedRequestToContinueWithoutCredential(const Authen
     notImplemented();
 }
 
-void SocketStreamHandle::receivedCancellation(const AuthenticationChallenge& challenge)
-{
-    if (m_client)
-        m_client->receivedCancellation(this, challenge);
-}
-
 }  // namespace WebCore
 
 #endif  // ENABLE(WEB_SOCKETS)
diff --git a/webkit/api/src/WebFrameImpl.cpp b/webkit/api/src/WebFrameImpl.cpp
index 19f7d42..6d51235 100644
--- a/webkit/api/src/WebFrameImpl.cpp
+++ b/webkit/api/src/WebFrameImpl.cpp
@@ -1561,7 +1561,7 @@ void WebFrameImpl::paint(WebCanvas* canvas, const WebRect& rect)
         frameView()->paint(&gc, dirtyRect);
         m_frame->page()->inspectorController()->drawNodeHighlight(gc);
     } else
-        gc.fillRect(dirtyRect, Color::white);
+        gc.fillRect(dirtyRect, Color::white, DeviceColorSpace);
     gc.restore();
 }
 
diff --git a/webkit/api/src/WebViewImpl.cpp b/webkit/api/src/WebViewImpl.cpp
index 0192c5d..3a569a9 100644
--- a/webkit/api/src/WebViewImpl.cpp
+++ b/webkit/api/src/WebViewImpl.cpp
@@ -1337,17 +1337,6 @@ void WebViewImpl::dragSourceEndedAt(
         static_cast<DragOperation>(operation));
 }
 
-void WebViewImpl::dragSourceMovedTo(
-    const WebPoint& clientPoint,
-    const WebPoint& screenPoint)
-{
-    PlatformMouseEvent pme(clientPoint,
-                           screenPoint,
-                           LeftButton, MouseEventMoved, 0, false, false, false,
-                           false, 0);
-    m_page->mainFrame()->eventHandler()->dragSourceMovedTo(pme);
-}
-
 void WebViewImpl::dragSourceSystemDragEnded()
 {
     // It's possible for us to get this callback while not doing a drag if
diff --git a/webkit/api/src/WebViewImpl.h b/webkit/api/src/WebViewImpl.h
index 0668904..2b83a8e 100644
--- a/webkit/api/src/WebViewImpl.h
+++ b/webkit/api/src/WebViewImpl.h
@@ -127,9 +127,6 @@ public:
         const WebPoint& clientPoint,
         const WebPoint& screenPoint,
         WebDragOperation operation);
-    virtual void dragSourceMovedTo(
-        const WebPoint& clientPoint,
-        const WebPoint& screenPoint);
     virtual void dragSourceSystemDragEnded();
     virtual WebDragOperation dragTargetDragEnter(
         const WebDragData& dragData, int identity,
diff --git a/webkit/glue/websocketstreamhandle_impl.cc b/webkit/glue/websocketstreamhandle_impl.cc
index 5952850..8847a8d 100644
--- a/webkit/glue/websocketstreamhandle_impl.cc
+++ b/webkit/glue/websocketstreamhandle_impl.cc
@@ -42,7 +42,6 @@ class WebSocketStreamHandleImpl::Context
   void Detach();
 
   // WebSocketStreamHandleDelegate methods:
-  virtual void WillOpenStream(WebKit::WebSocketStreamHandle*, const GURL&);
   virtual void DidOpenStream(WebKit::WebSocketStreamHandle*, int);
   virtual void DidSendData(WebKit::WebSocketStreamHandle*, int);
   virtual void DidReceiveData(
@@ -104,13 +103,6 @@ void WebSocketStreamHandleImpl::Context::Detach() {
     bridge_->Close();
 }
 
-void WebSocketStreamHandleImpl::Context::WillOpenStream(
-    WebKit::WebSocketStreamHandle* web_handle, const GURL& url) {
-  LOG(INFO) << "WillOpenStream url=" << url;
-  if (client_)
-    client_->willOpenStream(handle_, url);
-}
-
 void WebSocketStreamHandleImpl::Context::DidOpenStream(
     WebKit::WebSocketStreamHandle* web_handle, int max_amount_send_allowed) {
   LOG(INFO) << "DidOpen";
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 4569678..0957369 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -112,7 +112,6 @@ BUG24182 WIN RELEASE SLOW : LayoutTests/http/tests/xmlhttprequest/connection-err
 BUG24182 WIN RELEASE SLOW : LayoutTests/http/tests/loading/onload-vs-immediate-refresh.pl = PASS
 BUG24182 SLOW DEBUG : LayoutTests/editing/selection/extend-selection.html = PASS
 BUG24182 SLOW WIN : LayoutTests/fast/backgrounds/svg-as-background-5.html = PASS
-BUG24182 SLOW DEBUG : LayoutTests/svg/css/getComputedStyle-basic.xhtml = PASS
 
 // --- collecting results for supported-xml-content-types.html ---
 BUG24182 SLOW WIN RELEASE : LayoutTests/http/tests/xmlhttprequest/supported-xml-content-types.html = PASS
@@ -3114,3 +3113,28 @@ BUG27418 MAC DEBUG : LayoutTests/plugins/netscape-identifier-conversion.html = P
 BUG27418 MAC : LayoutTests/plugins/open-and-close-window-with-plugin.html = PASS TEXT
 BUG27418 MAC : LayoutTests/transitions/shorthand-border-transitions.html = PASS TEXT
 
+// Webkit merge 50756:50820
+BUG_JAPHET : LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer.html = TEXT
+BUG_JAPHET : LayoutTests/fast/css/getComputedStyle/computed-style.html = TEXT
+BUG_JAPHET : LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-hash.html = TEXT
+BUG_JAPHET : LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-host.html = TEXT
+BUG_JAPHET : LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-hostname.html = TEXT
+BUG_JAPHET : LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-pathname.html = TEXT
+BUG_JAPHET : LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-port.html = TEXT
+BUG_JAPHET : LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-protocol.html = TEXT
+BUG_JAPHET : LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-search.html = TEXT
+BUG_JAPHET : LayoutTests/fast/events/drag-in-frames.html = TEXT
+BUG_JAPHET : LayoutTests/svg/css/getComputedStyle-basic.xhtml = TEXT
+// Add this expectation back in when passing again
+// BUG24182 SLOW DEBUG : LayoutTests/svg/css/getComputedStyle-basic.xhtml = PASS
+BUG_JAPHET : LayoutTests/fast/css/color-correction-backgrounds-and-text.html = FAIL
+BUG_JAPHET : LayoutTests/fast/css/color-correction-on-backgrounds.html = FAIL
+BUG_JAPHET : LayoutTests/fast/css/color-correction-on-text.html = FAIL
+BUG_JAPHET : LayoutTests/fast/css/color-correction.html = FAIL
+BUG_JAPHET WIN : LayoutTests/fast/css/shadow-multiple.html = IMAGE
+BUG_JAPHET WIN MAC : LayoutTests/fast/text/atsui-partial-selection.html = IMAGE
+BUG_JAPHET MAC : LayoutTests/traversal/acid3-test-2.html = TEXT
+
+BUG_JAPHET SKIP WIN LINUX : LayoutTests/fast/websockets = FAIL
+BUG_JAPHET SKIP WIN LINUX : LayoutTests/websocket = FAIL
+
diff --git a/webkit/tools/test_shell/drag_delegate.cc b/webkit/tools/test_shell/drag_delegate.cc
index f0247ca..ec530af 100644
--- a/webkit/tools/test_shell/drag_delegate.cc
+++ b/webkit/tools/test_shell/drag_delegate.cc
@@ -39,10 +39,3 @@ void TestDragDelegate::OnDragSourceDrop() {
   webview_->dragSourceEndedAt(client, screen, WebKit::WebDragOperationCopy);
   // TODO(snej): Pass the real drag operation instead
 }
-
-void TestDragDelegate::OnDragSourceMove() {
-  gfx::Point client;
-  gfx::Point screen;
-  GetCursorPositions(source_hwnd_, &client, &screen);
-  webview_->dragSourceMovedTo(client, screen);
-}
diff --git a/webkit/tools/test_shell/event_sending_controller.cc b/webkit/tools/test_shell/event_sending_controller.cc
index e0b24bd..6ee3b1a 100644
--- a/webkit/tools/test_shell/event_sending_controller.cc
+++ b/webkit/tools/test_shell/event_sending_controller.cc
@@ -363,7 +363,6 @@ void EventSendingController::DoMouseUp(const WebMouseEvent& e) {
     WebPoint client_point(e.x, e.y);
     WebPoint screen_point(e.globalX, e.globalY);
 
-    webview()->dragSourceMovedTo(client_point, screen_point);
     current_drag_effect = webview()->dragTargetDragOver(
         client_point, screen_point, current_drag_effects_allowed);
     if (current_drag_effect) {
@@ -415,7 +414,6 @@ void EventSendingController::DoMouseMove(const WebMouseEvent& e) {
     WebPoint client_point(e.x, e.y);
     WebPoint screen_point(e.globalX, e.globalY);
 
-    webview()->dragSourceMovedTo(client_point, screen_point);
     current_drag_effect = webview()->dragTargetDragOver(
         client_point, screen_point, current_drag_effects_allowed);
   }
diff --git a/webkit/tools/webcore_unit_tests/TransparencyWin_unittest.cpp b/webkit/tools/webcore_unit_tests/TransparencyWin_unittest.cpp
index 868d410..18535e6 100644
--- a/webkit/tools/webcore_unit_tests/TransparencyWin_unittest.cpp
+++ b/webkit/tools/webcore_unit_tests/TransparencyWin_unittest.cpp
@@ -315,10 +315,10 @@ TEST(TransparencyWin, OpaqueCompositeLayerPixel)
     OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), DeviceRGB));
 
     FloatRect fullRect(0, 0, 16, 16);
-    src->context()->fillRect(fullRect, red);
+    src->context()->fillRect(fullRect, red, DeviceColorSpace);
     src->context()->beginTransparencyLayer(0.5);
     FloatRect rightHalf(8, 0, 8, 16);
-    src->context()->fillRect(rightHalf, green);
+    src->context()->fillRect(rightHalf, green, DeviceColorSpace);
 
     // Make a transparency layer inset by one pixel, and fill it inset by
     // another pixel with 50% black.
@@ -330,7 +330,7 @@ TEST(TransparencyWin, OpaqueCompositeLayerPixel)
                     IntRect(1, 1, 14, 14));
 
         FloatRect inner(2, 2, 12, 12);
-        helper.context()->fillRect(inner, Color(0x7f000000));
+        helper.context()->fillRect(inner, Color(0x7f000000), DeviceColorSpace);
         // These coordinates are relative to the layer, whish is inset by 1x1
         // pixels from the top left. So we're actually clearing (2, 2) and
         // (13,13), which are the extreme corners of the black area (and which
@@ -368,7 +368,7 @@ TEST(TransparencyWin, TranslateOpaqueCompositeLayer)
     OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), DeviceRGB));
     Color white(0xFFFFFFFF);
     FloatRect fullRect(0, 0, 16, 16);
-    src->context()->fillRect(fullRect, white);
+    src->context()->fillRect(fullRect, white, DeviceColorSpace);
 
     // Scroll down by 8 (coordinate system goes up).
     src->context()->save();
@@ -388,7 +388,7 @@ TEST(TransparencyWin, TranslateOpaqueCompositeLayer)
         // Draw a red pixel at (15, 15). This should be the at (15, 7) after
         // the transform.
         FloatRect bottomRight(15, 15, 1, 1);
-        helper.context()->fillRect(bottomRight, green);
+        helper.context()->fillRect(bottomRight, green, DeviceColorSpace);
         helper.composite();
     }
 
@@ -407,7 +407,7 @@ TEST(TransparencyWin, RotateOpaqueCompositeLayer)
     // The background is white.
     Color white(0xFFFFFFFF);
     FloatRect fullRect(0, 0, 16, 16);
-    src->context()->fillRect(fullRect, white);
+    src->context()->fillRect(fullRect, white, DeviceColorSpace);
 
     // Rotate the image by 90 degrees. This matrix is the same as
     // cw90.rotate(90); but avoids rounding errors. Rounding errors can cause
@@ -428,7 +428,7 @@ TEST(TransparencyWin, RotateOpaqueCompositeLayer)
     src->context()->beginTransparencyLayer(0.5);
     FloatRect blackRect(0, -9, 16, 2);
     Color black(0xFF000000);
-    src->context()->fillRect(blackRect, black);
+    src->context()->fillRect(blackRect, black, DeviceColorSpace);
 
     // Now draw 50% red square.
     {
@@ -442,7 +442,7 @@ TEST(TransparencyWin, RotateOpaqueCompositeLayer)
                     IntRect(1, -15, 14, 14));
 
         // Fill with red.
-        helper.context()->fillRect(helper.drawRect(), Color(0x7f7f0000));
+        helper.context()->fillRect(helper.drawRect(), Color(0x7f7f0000), DeviceColorSpace);
         clearTopLayerAlphaChannel(helper.context());
         helper.composite();
     }
@@ -489,10 +489,10 @@ TEST(TransparencyWin, TranslateScaleOpaqueCompositeLayer)
     // The background is white on top with red on bottom.
     Color white(0xFFFFFFFF);
     FloatRect topRect(0, 0, 16, 8);
-    src->context()->fillRect(topRect, white);
+    src->context()->fillRect(topRect, white, DeviceColorSpace);
     Color red(0xFFFF0000);
     FloatRect bottomRect(0, 8, 16, 8);
-    src->context()->fillRect(bottomRect, red);
+    src->context()->fillRect(bottomRect, red, DeviceColorSpace);
 
     src->context()->save();
 
@@ -522,7 +522,7 @@ TEST(TransparencyWin, TranslateScaleOpaqueCompositeLayer)
                     IntRect(1, -15, 14, 14));
 
         // Fill with red.
-        helper.context()->fillRect(helper.drawRect(), Color(0x7f7f0000));
+        helper.context()->fillRect(helper.drawRect(), Color(0x7f7f0000), DeviceColorSpace);
         clearTopLayerAlphaChannel(helper.context());
         helper.composite();
     }
@@ -534,7 +534,7 @@ TEST(TransparencyWin, Scale)
     // Create an opaque white buffer.
     OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), DeviceRGB));
     FloatRect fullBuffer(0, 0, 16, 16);
-    src->context()->fillRect(fullBuffer, Color::white);
+    src->context()->fillRect(fullBuffer, Color::white, DeviceColorSpace);
 
     // Scale by 2x.
     src->context()->save();
@@ -589,13 +589,13 @@ TEST(TransparencyWin, ScaleTransparency)
     // Create an opaque white buffer.
     OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), DeviceRGB));
     FloatRect fullBuffer(0, 0, 16, 16);
-    src->context()->fillRect(fullBuffer, Color::white);
+    src->context()->fillRect(fullBuffer, Color::white, DeviceColorSpace);
 
     // Make another layer (which duplicates how WebKit will make this). We fill
     // the top half with red, and have the layer be 50% opaque.
     src->context()->beginTransparencyLayer(0.5);
     FloatRect topHalf(0, 0, 16, 8);
-    src->context()->fillRect(topHalf, Color(0xFFFF0000));
+    src->context()->fillRect(topHalf, Color(0xFFFF0000), DeviceColorSpace);
 
     // Scale by 2x.
     src->context()->save();
@@ -612,7 +612,7 @@ TEST(TransparencyWin, ScaleTransparency)
                     TransparencyWin::ScaleTransform,
                     IntRect(1, 1, 6, 6));
 
-        helper.context()->fillRect(helper.drawRect(), Color(0x7f000000));
+        helper.context()->fillRect(helper.drawRect(), Color(0x7f000000), DeviceColorSpace);
         clearTopLayerAlphaChannel(helper.context());
         helper.composite();
     }
@@ -661,21 +661,21 @@ TEST(TransparencyWin, Text)
         // Write several different squares to simulate ClearType. These should
         // all reduce to 2/3 coverage.
         FloatRect pixel(0, 0, 1, 1);
-        helper.context()->fillRect(pixel, 0xFFFF0000);
+        helper.context()->fillRect(pixel, 0xFFFF0000, DeviceColorSpace);
         pixel.move(1.0f, 0.0f);
-        helper.context()->fillRect(pixel, 0xFF00FF00);
+        helper.context()->fillRect(pixel, 0xFF00FF00, DeviceColorSpace);
         pixel.move(1.0f, 0.0f);
-        helper.context()->fillRect(pixel, 0xFF0000FF);
+        helper.context()->fillRect(pixel, 0xFF0000FF, DeviceColorSpace);
         pixel.move(1.0f, 0.0f);
-        helper.context()->fillRect(pixel, 0xFF008080);
+        helper.context()->fillRect(pixel, 0xFF008080, DeviceColorSpace);
         pixel.move(1.0f, 0.0f);
-        helper.context()->fillRect(pixel, 0xFF800080);
+        helper.context()->fillRect(pixel, 0xFF800080, DeviceColorSpace);
         pixel.move(1.0f, 0.0f);
-        helper.context()->fillRect(pixel, 0xFF808000);
+        helper.context()->fillRect(pixel, 0xFF808000, DeviceColorSpace);
 
         // Try one with 100% coverage (opaque black).
         pixel.move(1.0f, 0.0f);
-        helper.context()->fillRect(pixel, 0xFF000000);
+        helper.context()->fillRect(pixel, 0xFF000000, DeviceColorSpace);
 
         // Now mess with the alpha channel.
         clearTopLayerAlphaChannel(helper.context());