Attachment 137898 Details for Bug 84339 – Patch

[patch] Patch

bug-84339-20120419102501.patch (text/plain), 5.42 KB, created by Mark Pilgrim (Google) on 2012-04-19 07:25:15 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Pilgrim (Google)

Created: 2012-04-19 07:25:15 PDT

Size: 5.42 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 114629)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,18 @@
>+2012-04-19  Mark Pilgrim  <pilgrim@chromium.org>
>+
>+        [Chromium] Call sampleGamepads directly
>+        https://bugs.webkit.org/show_bug.cgi?id=84339
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Part of a refactoring series. See tracking bug 82948.
>+
>+        * platform/chromium/GamepadsChromium.cpp:
>+        (WebCore::sampleGamepads):
>+        * platform/chromium/PlatformSupport.h:
>+        (WebCore):
>+        (PlatformSupport):
>+
> 2012-04-19  Vsevolod Vlasov  <vsevik@chromium.org>
> 
>         Web Inspector: x-frame security errors logged when typing in the console are annoying.
>Index: Source/WebCore/platform/chromium/GamepadsChromium.cpp
>===================================================================
>--- Source/WebCore/platform/chromium/GamepadsChromium.cpp	(revision 114629)
>+++ Source/WebCore/platform/chromium/GamepadsChromium.cpp	(working copy)
>@@ -29,7 +29,8 @@
> #if ENABLE(GAMEPAD)
> 
> #include "GamepadList.h"
>-#include "PlatformSupport.h"
>+
>+#include <public/Platform.h>
> 
> namespace WebCore {
> 
>@@ -37,7 +38,25 @@ class GamepadList;
> 
> void sampleGamepads(GamepadList* into)
> {
>-    PlatformSupport::sampleGamepads(into);
>+    WebKit::WebGamepads gamepads;
>+
>+    WebKit::Platform::current()->sampleGamepads(gamepads);
>+
>+    for (unsigned i = 0; i < WebKit::WebGamepads::itemsLengthCap; ++i) {
>+        WebKit::WebGamepad& webGamepad = gamepads.items[i];
>+        if (i < gamepads.length && webGamepad.connected) {
>+            RefPtr<Gamepad> gamepad = into->item(i);
>+            if (!gamepad)
>+                gamepad = Gamepad::create();
>+            gamepad->id(webGamepad.id);
>+            gamepad->index(i);
>+            gamepad->timestamp(webGamepad.timestamp);
>+            gamepad->axes(webGamepad.axesLength, webGamepad.axes);
>+            gamepad->buttons(webGamepad.buttonsLength, webGamepad.buttons);
>+            into->set(i, gamepad);
>+        } else
>+            into->set(i, 0);
>+    }
> }
> 
> }
>Index: Source/WebCore/platform/chromium/PlatformSupport.h
>===================================================================
>--- Source/WebCore/platform/chromium/PlatformSupport.h	(revision 114629)
>+++ Source/WebCore/platform/chromium/PlatformSupport.h	(working copy)
>@@ -72,7 +72,6 @@ class Color;
> class Cursor;
> class Document;
> class Frame;
>-class GamepadList;
> class GeolocationServiceBridge;
> class GeolocationServiceChromium;
> class GraphicsContext;
>@@ -188,9 +187,6 @@ public:
>     // Injects key via keyPath into value. Returns true on success.
>     static PassRefPtr<SerializedScriptValue> injectIDBKeyIntoSerializedValue(PassRefPtr<IDBKey>, PassRefPtr<SerializedScriptValue>, const String& keyPath);
> 
>-    // Gamepad -----------------------------------------------------------
>-    static void sampleGamepads(GamepadList* into);
>-
>     // JavaScript ---------------------------------------------------------
>     static void notifyJSOutOfMemory(Frame*);
>     static bool allowScriptDespiteSettings(const KURL& documentURL);
>Index: Source/WebKit/chromium/ChangeLog
>===================================================================
>--- Source/WebKit/chromium/ChangeLog	(revision 114629)
>+++ Source/WebKit/chromium/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+2012-04-19  Mark Pilgrim  <pilgrim@chromium.org>
>+
>+        [Chromium] Call sampleGamepads directly
>+        https://bugs.webkit.org/show_bug.cgi?id=84339
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Part of a refactoring series. See tracking bug 82948.
>+
>+        * src/PlatformSupport.cpp:
>+        (WebCore::PlatformSupport::injectIDBKeyIntoSerializedValue):
>+
> 2012-04-18  Nico Weber  <thakis@chromium.org>
> 
>         [chromium/mac] Fix build.
>Index: Source/WebKit/chromium/src/PlatformSupport.cpp
>===================================================================
>--- Source/WebKit/chromium/src/PlatformSupport.cpp	(revision 114629)
>+++ Source/WebKit/chromium/src/PlatformSupport.cpp	(working copy)
>@@ -92,7 +92,6 @@
> #include "Cookie.h"
> #include "Document.h"
> #include "FrameView.h"
>-#include "GamepadList.h"
> #include "GraphicsContext.h"
> #include "IDBFactoryBackendProxy.h"
> #include "KURL.h"
>@@ -540,31 +539,6 @@ PassRefPtr<SerializedScriptValue> Platfo
>     return webKitPlatformSupport()->injectIDBKeyIntoSerializedValue(key, value, keyPath);
> }
> 
>-// Gamepad --------------------------------------------------------------------
>-
>-void PlatformSupport::sampleGamepads(GamepadList* into)
>-{
>-    WebGamepads gamepads;
>-
>-    webKitPlatformSupport()->sampleGamepads(gamepads);
>-
>-    for (unsigned i = 0; i < WebKit::WebGamepads::itemsLengthCap; ++i) {
>-        WebGamepad& webGamepad = gamepads.items[i];
>-        if (i < gamepads.length && webGamepad.connected) {
>-            RefPtr<Gamepad> gamepad = into->item(i);
>-            if (!gamepad)
>-                gamepad = Gamepad::create();
>-            gamepad->id(webGamepad.id);
>-            gamepad->index(i);
>-            gamepad->timestamp(webGamepad.timestamp);
>-            gamepad->axes(webGamepad.axesLength, webGamepad.axes);
>-            gamepad->buttons(webGamepad.buttonsLength, webGamepad.buttons);
>-            into->set(i, gamepad);
>-        } else
>-            into->set(i, 0);
>-    }
>-}
>-
> // Keygen ---------------------------------------------------------------------
> 
> String PlatformSupport::signedPublicKeyAndChallengeString(

Actions: View | Formatted Diff | Diff

Attachments on bug 84339: 137898