Merge webkit.org at r54340 : Initial merge by git

Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44

1 files changed, 37 insertions, 0 deletions

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 205583a..8bbd4de 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1 +1,38 @@
+2010-02-01  Shinichiro Hamaji  <hamaji@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Provide a way to get page number with layoutTestController
+        https://bugs.webkit.org/show_bug.cgi?id=33840
+
+        * Misc/WebCoreStatistics.h:
+        * Misc/WebCoreStatistics.mm:
+        (-[WebFrame pageNumberForElement:element:pageWidth:]):
+
+2010-01-29  Gavin Barraclough  <barraclough@apple.com>
+
+        Reviewed by Sam Weinig + Oliver Hunt.
+
+        Bug 34346 - With JSC bindings, make processingUserGesture work with events in Isolated Worlds
+
+        Pass processeing user gensture flag to media play/pause methods.
+
+        * WebView/WebVideoFullscreenHUDWindowController.mm:
+        (-[WebVideoFullscreenHUDWindowController setPlaying:]):
+
+2010-02-01  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        <rdar://problem/7044385> Crash at NetscapePlugInStreamLoader::didReceiveResponse()
+
+        The crash was caused by having two streams with a streamID of 1.
+
+        * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
+        (WebKit::NetscapePluginInstanceProxy::NetscapePluginInstanceProxy): Fixed a typo. Now
+        correctly increments m_currentURLRequestID to account for the manual stream.
+        (WebKit::NetscapePluginInstanceProxy::disconnectStream): If the stream is the manual stream,
+        null it out instead of trying to remove it from the map. Added an assertion.
+        (WebKit::NetscapePluginInstanceProxy::loadRequest): Added an assertion.
+
 == Rolled over to ChangeLog-2010-01-29 ==