Diff
Modified: trunk/Source/WebCore/ChangeLog (106090 => 106091)
--- trunk/Source/WebCore/ChangeLog 2012-01-27 07:02:18 UTC (rev 106090)
+++ trunk/Source/WebCore/ChangeLog 2012-01-27 07:05:45 UTC (rev 106091)
@@ -1,3 +1,32 @@
+2012-01-26 Kevin Ollivier <[email protected]>
+
+ [wx] Unreviewed. Build fixes.
+ - Remove some constructors not generated by CPP bindings
+ from being added to CPP binding headers
+ - Keyboard event fixes after modifier changes
+ - Add stubs for Language and RunLoop platform methods
+
+ * bindings/scripts/CodeGeneratorCPP.pm:
+ (GetNamespaceForClass):
+ (GenerateImplementation):
+ * platform/mac/WebCoreSystemInterface.h:
+ * platform/wx/KeyboardEventWx.cpp:
+ (WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent):
+ * platform/wx/LanguageWx.cpp: Added.
+ (WebCore):
+ (WebCore::platformLanguage):
+ (WebCore::platformUserPreferredLanguages):
+ * platform/wx/RunLoopWx.cpp: Added.
+ (WebCore):
+ (WebCore::RunLoop::run):
+ (WebCore::RunLoop::stop):
+ (WebCore::RunLoop::RunLoop):
+ (WebCore::RunLoop::~RunLoop):
+ (WebCore::RunLoop::wakeUp):
+ * storage/DOMWindowSQLDatabase.idl:
+ * webaudio/DOMWindowWebAudio.idl:
+ * websockets/DOMWindowWebSocket.idl:
+
2012-01-26 Sheriff Bot <[email protected]>
Unreviewed, rolling out r105486.
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm (106090 => 106091)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm 2012-01-27 07:02:18 UTC (rev 106090)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm 2012-01-27 07:05:45 UTC (rev 106091)
@@ -319,7 +319,7 @@
{
my $type = shift;
return "WTF" if (($type eq "ArrayBuffer") or ($type eq "ArrayBufferView"));
- return "WTF" if (($type eq "Uint8Array") or ($type eq "Uint16Array") or ($type eq "Uint32Array"));
+ return "WTF" if (($type eq "Uint8Array") or ($type eq "Uint8ClampedArray") or ($type eq "Uint16Array") or ($type eq "Uint32Array"));
return "WTF" if (($type eq "Int8Array") or ($type eq "Int16Array") or ($type eq "Int32Array"));
return "WTF" if (($type eq "Float32Array") or ($type eq "Float64Array"));
return "WebCore";
@@ -834,7 +834,7 @@
my $implementedBy = $function->signature->extendedAttributes->{"ImplementedBy"};
$implIncludes{"${implementedBy}.h"} = 1;
unshift(@parameterNames, "impl()");
- $content = "${implementedBy}::" . $codeGenerator->WK_lcfirst($functionName) . "(" . join(", ", @parameterNames) . ")";
+ $content = "WebCore::${implementedBy}::" . $codeGenerator->WK_lcfirst($functionName) . "(" . join(", ", @parameterNames) . ")";
} else {
$content = "impl()->" . $codeGenerator->WK_lcfirst($functionName) . "(" . join(", ", @parameterNames) . ")";
}
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (106090 => 106091)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2012-01-27 07:02:18 UTC (rev 106090)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2012-01-27 07:05:45 UTC (rev 106091)
@@ -228,8 +228,10 @@
extern CTTypesetterRef (*wkCreateCTTypesetterWithUniCharProviderAndOptions)(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*, CFDictionaryRef options);
+#if PLATFORM(MAC) && USE(CA)
extern CGContextRef (*wkIOSurfaceContextCreate)(IOSurfaceRef surface, unsigned width, unsigned height, CGColorSpaceRef colorSpace);
extern CGImageRef (*wkIOSurfaceContextCreateImage)(CGContextRef context);
+#endif
extern int (*wkRecommendedScrollerStyle)(void);
Modified: trunk/Source/WebCore/platform/wx/KeyboardEventWx.cpp (106090 => 106091)
--- trunk/Source/WebCore/platform/wx/KeyboardEventWx.cpp 2012-01-27 07:02:18 UTC (rev 106090)
+++ trunk/Source/WebCore/platform/wx/KeyboardEventWx.cpp 2012-01-27 07:05:45 UTC (rev 106091)
@@ -364,10 +364,20 @@
m_windowsVirtualKeyCode = windowsKeyCodeForKeyEvent(event.GetKeyCode());
m_nativeVirtualKeyCode = event.GetKeyCode();
m_isKeypad = (event.GetKeyCode() >= WXK_NUMPAD_SPACE) && (event.GetKeyCode() <= WXK_NUMPAD_DIVIDE);
- m_shiftKey = event.ShiftDown();
- m_ctrlKey = event.CmdDown();
- m_altKey = event.AltDown();
- m_metaKey = event.MetaDown();
+
+ m_modifiers = 0;
+ if (event.ShiftDown())
+ m_modifiers |= ShiftKey;
+
+ if (event.CmdDown())
+ m_modifiers |= CtrlKey;
+
+ if (event.AltDown())
+ m_modifiers |= AltKey;
+
+ if (event.MetaDown())
+ m_modifiers |= MetaKey;
+
m_timestamp = WTF::currentTime();
}
Added: trunk/Source/WebCore/platform/wx/LanguageWx.cpp (0 => 106091)
--- trunk/Source/WebCore/platform/wx/LanguageWx.cpp (rev 0)
+++ trunk/Source/WebCore/platform/wx/LanguageWx.cpp 2012-01-27 07:05:45 UTC (rev 106091)
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2012 Kevin Ollivier <[email protected]>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "Language.h"
+
+#include "NotImplemented.h"
+#include "PlatformString.h"
+
+namespace WebCore {
+
+static String platformLanguage()
+{
+ notImplemented();
+ return String();
+}
+
+Vector<String> platformUserPreferredLanguages()
+{
+ notImplemented();
+ Vector<String> userPreferredLanguages;
+ return userPreferredLanguages;
+}
+
+}
Added: trunk/Source/WebCore/platform/wx/RunLoopWx.cpp (0 => 106091)
--- trunk/Source/WebCore/platform/wx/RunLoopWx.cpp (rev 0)
+++ trunk/Source/WebCore/platform/wx/RunLoopWx.cpp 2012-01-27 07:05:45 UTC (rev 106091)
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2012 Kevin Ollivier <[email protected]>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "RunLoop.h"
+
+#include "NotImplemented.h"
+
+namespace WebCore {
+
+void RunLoop::run()
+{
+ notImplemented();
+}
+
+void RunLoop::stop()
+{
+ notImplemented();
+}
+
+RunLoop::RunLoop()
+{
+ notImplemented();
+}
+
+RunLoop::~RunLoop()
+{
+}
+
+void RunLoop::wakeUp()
+{
+ notImplemented();
+}
+
+} // namespace WebCore
Modified: trunk/Source/WebCore/storage/DOMWindowSQLDatabase.idl (106090 => 106091)
--- trunk/Source/WebCore/storage/DOMWindowSQLDatabase.idl 2012-01-27 07:02:18 UTC (rev 106090)
+++ trunk/Source/WebCore/storage/DOMWindowSQLDatabase.idl 2012-01-27 07:05:45 UTC (rev 106091)
@@ -36,7 +36,9 @@
] DOMWindowSQLDatabase {
[EnabledAtRuntime] Database openDatabase(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize, in [Callback, Optional] DatabaseCallback creationCallback)
raises(DOMException);
+#if !defined(LANGUAGE_CPP) || !LANGUAGE_CPP
attribute SQLExceptionConstructor SQLException;
+#endif
};
}
Modified: trunk/Source/WebCore/webaudio/DOMWindowWebAudio.idl (106090 => 106091)
--- trunk/Source/WebCore/webaudio/DOMWindowWebAudio.idl 2012-01-27 07:02:18 UTC (rev 106090)
+++ trunk/Source/WebCore/webaudio/DOMWindowWebAudio.idl 2012-01-27 07:05:45 UTC (rev 106091)
@@ -23,10 +23,12 @@
Conditional=WEB_AUDIO,
Supplemental=DOMWindow
] DOMWindowWebAudio {
+#if !defined(LANGUAGE_CPP) || !LANGUAGE_CPP
attribute [JSCCustomGetter, EnabledAtRuntime] AudioContextConstructor webkitAudioContext;
attribute AudioPannerNodeConstructor webkitAudioPannerNode;
attribute AudioProcessingEventConstructor AudioProcessingEvent;
attribute OfflineAudioCompletionEventConstructor OfflineAudioCompletionEvent;
+#endif
};
-}
\ No newline at end of file
+}
Modified: trunk/Source/WebCore/websockets/DOMWindowWebSocket.idl (106090 => 106091)
--- trunk/Source/WebCore/websockets/DOMWindowWebSocket.idl 2012-01-27 07:02:18 UTC (rev 106090)
+++ trunk/Source/WebCore/websockets/DOMWindowWebSocket.idl 2012-01-27 07:05:45 UTC (rev 106091)
@@ -34,8 +34,10 @@
Conditional=WEB_SOCKETS,
Supplemental=DOMWindow
] DOMWindowWebSocket {
+#if !defined(LANGUAGE_CPP) || !LANGUAGE_CPP
attribute CloseEventConstructor CloseEvent;
attribute [JSCCustomGetter, EnabledAtRuntime] WebSocketConstructor WebSocket; // Usable with the new operator
+#endif
};
}
