Merge webkit.org at r60469 : Initial merge by git.

Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234

1 files changed, 105 insertions, 0 deletions

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 69d7ea9..2979556 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,108 @@
+2010-05-30  Daniel Bates  <dbates@rim.com>
+
+        Unreviewed, attempt to fix the build after http://trac.webkit.org/changeset/60418.
+
+        * WebFrame.cpp:
+        (WebFrame::elementWithName):
+        (WebFrame::controlsInForm):
+
+2010-05-22  Jer Noble  <jer.noble@apple.com>
+
+        Reviewed by Adam Roben.
+
+        Full screen doesn't work for video elements
+        https://bugs.webkit.org/show_bug.cgi?id=39557
+        rdar://problem/8011813
+        
+        Modified FullscreenVideoController to work with MediaPlayerPrivateFullscreenWindow.  The FullscreenVideoController
+        is now MediaPlayerPrivate agnostic..
+
+        * FullscreenVideoController.cpp:
+        (FullscreenVideoController::LayoutClient::LayoutClient): New helper class which implements WKCACFLayerLayoutClient.
+        (FullscreenVideoController::LayoutClient::layoutSublayersOfLayer):
+        (FullscreenVideoController::FullscreenVideoController):
+        (FullscreenVideoController::~FullscreenVideoController):
+        (FullscreenVideoController::enterFullscreen):
+        (FullscreenVideoController::exitFullscreen):
+        (FullscreenVideoController::fullscreenClientWndProc): Handle WM_KEYDOWN.
+        (FullscreenVideoController::createHUDWindow):
+        (FullscreenVideoController::hudWndProc):  Handle WM_KEYDOWN.
+        (FullscreenVideoController::onChar):
+        (FullscreenVideoController::onKeyDown):  New function: handles the VK_ESCAPE case more reliably than WM_CHAR.
+        * FullscreenVideoController.h:
+        * WebView.h: 
+        (WebView::viewWindow): Added a simple viewWindow() accessor.
+
+2010-05-25  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Database origins aren't populated at launch (missing db in prefs sheet, possible other symptoms)
+        <rdar://problem/8013233> and https://bugs.webkit.org/show_bug.cgi?id=39486
+
+        * WebDatabaseManager.cpp:
+        (WebKitInitializeWebDatabasesIfNecessary): Call initializeTracker() instead of trying to set the path on
+          an already created tracker that already has its origins populated.
+        * WebDatabaseManager.h:
+
+        * WebView.cpp:
+        (WebView::initWithFrame): Call a renamed method instead.
+
+2010-05-25  Ada Chan  <adachan@apple.com>
+
+        Reviewed by Steve Falkenburg.
+
+        https://bugs.webkit.org/show_bug.cgi?id=39651
+        
+        Make m_closeWindowTimer a SuspendableTimer, so it is properly suspended
+        when page loading is deferred.
+
+        * WebView.cpp:
+        (WebView::WebView): m_closeWindowTimer is now a pointer to a SuspendableTimer.
+        (WindowCloseTimer::create):
+        (WindowCloseTimer::WindowCloseTimer):
+        (WindowCloseTimer::contextDestroyed): Make sure we delete the WindowCloseTimer in the end.
+        (WindowCloseTimer::fired):
+        (WebView::closeWindowSoon):
+        (WebView::closeWindowTimerFired):
+        (WebView::notifyPreferencesChanged): Can just check for the existence m_closeWindowTimer, since
+        we only create it when we need to start the timer.
+        * WebView.h:
+
+2010-05-24  Darin Adler  <darin@apple.com>
+
+        Reviewed by Eric Seidel.
+
+        Move view-related functions from Frame to FrameView
+        https://bugs.webkit.org/show_bug.cgi?id=39366
+
+        * WebFrame.cpp:
+        (WebFrame::setTextSizeMultiplier): Call function on FrameView.
+        * WebView.cpp:
+        (WebView::setZoomMultiplier): Ditto.
+
+2010-05-24  Anders Carlsson  <andersca@apple.com>
+
+        Yet another Windows build fix.
+        
+        * WebView.cpp:
+        (WebView::canShowMIMEType):
+        Use the right capitalizatinon of 'MIME' (which also happens to be incorrect according to our guidelines).
+
+2010-05-24  Anders Carlsson  <andersca@apple.com>
+
+        Another Windows build fix.
+
+        * WebView.cpp:
+        Don't include PlugInInfoStore.h, instead include PluginData.h
+
+2010-05-24  Anders Carlsson  <andersca@apple.com>
+
+        Fix Windows build.
+
+        * WebView.cpp:
+        (WebView::canShowMIMEType):
+
 2010-05-21  Steve Block  <steveblock@google.com>
 
         Reviewed by Jeremy Orlow.