Attachment 54325 Details for Bug 38135 – Initial patch

[patch] Initial patch

qt-rtef.patch (text/plain), 2.60 KB, created by Garret Kelly on 2010-04-26 13:08:14 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Garret Kelly

Created: 2010-04-26 13:08:14 PDT

Size: 2.60 KB

patch

obsolete

>diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
>index cd53a5d..a31b10a 100644
>--- a/WebCore/ChangeLog
>+++ b/WebCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2010-04-26  Garret Kelly  <gdk@chromium.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Include RuntimeEnabledFeatures in the Qt build.
>+        https://bugs.webkit.org/show_bug.cgi?id=38135
>+
>+        * WebCore.pro: Adding RuntimeEnabledFeatures sources and headers.
>+        * websockets/WebSocket.cpp: Removing V8-only guards.
>+        * websockets/WebSocket.h: Removing V8-only guards.
>+
> 2010-04-26  Roman Gershman  <romange@google.com>
> 
>         Reviewed by Adam Barth.
>diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
>index 38d96eb..03caa4c 100644
>--- a/WebCore/WebCore.pro
>+++ b/WebCore/WebCore.pro
>@@ -1018,6 +1018,7 @@ HEADERS += \
>     accessibility/AccessibilityTableHeaderContainer.h \
>     accessibility/AccessibilityTableRow.h \
>     accessibility/AXObjectCache.h \
>+    bindings/generic/RuntimeEnabledFeatures.h \
>     bindings/js/CachedScriptSourceProvider.h \
>     bindings/js/GCController.h \
>     bindings/js/DOMObjectHashTableMap.h \
>@@ -2036,6 +2037,7 @@ HEADERS += \
> 
> SOURCES += \
>     accessibility/qt/AccessibilityObjectQt.cpp \
>+    bindings/generic/RuntimeEnabledFeatures.cpp \
>     bindings/js/ScriptControllerQt.cpp \
>     bridge/qt/qt_class.cpp \
>     bridge/qt/qt_instance.cpp \
>diff --git a/WebCore/websockets/WebSocket.cpp b/WebCore/websockets/WebSocket.cpp
>index a820c2a..7838d2d 100644
>--- a/WebCore/websockets/WebSocket.cpp
>+++ b/WebCore/websockets/WebSocket.cpp
>@@ -78,9 +78,7 @@ static String encodeProtocolString(const String& protocol)
>     return builder.toString();
> }
> 
>-#if USE(V8)
>-
>-static bool webSocketsAvailable = false;
>+static bool webSocketsAvailable = true;
> 
> void WebSocket::setIsAvailable(bool available)
> {
>@@ -92,8 +90,6 @@ bool WebSocket::isAvailable()
>     return webSocketsAvailable;
> }
> 
>-#endif
>-
> WebSocket::WebSocket(ScriptExecutionContext* context)
>     : ActiveDOMObject(context, this)
>     , m_state(CONNECTING)
>diff --git a/WebCore/websockets/WebSocket.h b/WebCore/websockets/WebSocket.h
>index e91796f..0986c3f 100644
>--- a/WebCore/websockets/WebSocket.h
>+++ b/WebCore/websockets/WebSocket.h
>@@ -50,10 +50,8 @@ namespace WebCore {
> 
>     class WebSocket : public RefCounted<WebSocket>, public EventTarget, public ActiveDOMObject, public WebSocketChannelClient {
>     public:
>-#if USE(V8)
>         static void setIsAvailable(bool);
>         static bool isAvailable();
>-#endif
>         static PassRefPtr<WebSocket> create(ScriptExecutionContext* context) { return adoptRef(new WebSocket(context)); }
>         virtual ~WebSocket();
>

Flags:

levin: review-

Actions: View | Formatted Diff | Diff

Attachments on bug 38135: 54325