Merge WebKit at r76408: Initial merge by git.

Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53

5 files changed, 33 insertions, 3 deletions

diff --git a/Source/WebKit/gtk/ChangeLog b/Source/WebKit/gtk/ChangeLog
index ef1f2aa..912c948 100644
--- a/Source/WebKit/gtk/ChangeLog
+++ b/Source/WebKit/gtk/ChangeLog
@@ -1,3 +1,28 @@
+2011-01-21  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Show caps lock indicator in password fields
+        https://bugs.webkit.org/show_bug.cgi?id=52878
+
+        Test: manual-tests/password-caps-lock.html
+
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_key_release_event): Call
+        capsLockStateMayHaveChanged() when caps lock key is pressed.
+
+2011-01-19  Joone Hur  <joone.hur@collabora.co.uk>
+
+        Reviewed by Andreas Kling.
+
+        [GTK] No need to invalidate empty areas in ChromeClient::invalidateContentsAndWindow
+        https://bugs.webkit.org/show_bug.cgi?id=52702
+
+        Don't call gdk_window_invalidate_rect if an updated rectangle is empty.
+
+        * WebCoreSupport/ChromeClientGtk.cpp:
+        (WebKit::ChromeClient::invalidateContentsAndWindow): 
+
 2011-01-17  Philippe Normand  <pnormand@igalia.com>
 
         Unreviewed, build fix for 2 GTK tests html file paths.
diff --git a/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp b/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
index 8b6a483..04ee8ba 100644
--- a/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
+++ b/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
@@ -377,7 +377,7 @@ void ChromeClient::invalidateContentsAndWindow(const IntRect& updateRect, bool i
     GdkRectangle rect = updateRect;
     GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(m_webView));
 
-    if (window) {
+    if (window && !updateRect.isEmpty()) {
         gdk_window_invalidate_rect(window, &rect, FALSE);
         // We don't currently do immediate updates since they delay other UI elements.
         //if (immediate)
diff --git a/Source/WebKit/gtk/WebCoreSupport/FullscreenVideoController.h b/Source/WebKit/gtk/WebCoreSupport/FullscreenVideoController.h
index d4bbea2..3fb8b16 100644
--- a/Source/WebKit/gtk/WebCoreSupport/FullscreenVideoController.h
+++ b/Source/WebKit/gtk/WebCoreSupport/FullscreenVideoController.h
@@ -27,7 +27,8 @@
 #include "HTMLMediaElement.h"
 #include <wtf/RefPtr.h>
 
-class FullscreenVideoController : public Noncopyable {
+class FullscreenVideoController {
+    WTF_MAKE_NONCOPYABLE(FullscreenVideoController);
 public:
     FullscreenVideoController();
     virtual ~FullscreenVideoController();
diff --git a/Source/WebKit/gtk/webkit/webkitdownload.cpp b/Source/WebKit/gtk/webkit/webkitdownload.cpp
index 60b8e6d..a7890c1 100644
--- a/Source/WebKit/gtk/webkit/webkitdownload.cpp
+++ b/Source/WebKit/gtk/webkit/webkitdownload.cpp
@@ -57,7 +57,8 @@ using namespace WebCore;
  * out what is to be downloaded, and do it itself.
  */
 
-class DownloadClient : public Noncopyable, public ResourceHandleClient {
+class DownloadClient : public ResourceHandleClient {
+    WTF_MAKE_NONCOPYABLE(DownloadClient);
     public:
         DownloadClient(WebKitDownload*);
 
diff --git a/Source/WebKit/gtk/webkit/webkitwebview.cpp b/Source/WebKit/gtk/webkit/webkitwebview.cpp
index e5d5b84..c855507 100644
--- a/Source/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/Source/WebKit/gtk/webkit/webkitwebview.cpp
@@ -790,6 +790,9 @@ static gboolean webkit_web_view_key_release_event(GtkWidget* widget, GdkEventKey
     if (!frame->view())
         return FALSE;
 
+    if (event->keyval == GDK_Caps_Lock)
+        frame->eventHandler()->capsLockStateMayHaveChanged();
+
     PlatformKeyboardEvent keyboardEvent(event);
     if (frame->eventHandler()->keyEvent(keyboardEvent))
         return TRUE;