Permalink
Browse files

Merge from master.

  • Loading branch information...
1 parent 0a282b1 commit 52ba5b642f8b18b7ab23312799803965d8cfdb47 Martin Robinson committed Oct 21, 2009
Showing 2,012 changed files with 76,160 additions and 17,954 deletions.
View
@@ -1,3 +1,22 @@
+2009-10-17 Alexey Proskuryakov <ap@apple.com>
+
+ Reviewed by Eric Carlson.
+
+ https://bugs.webkit.org/show_bug.cgi?id=30470
+ Make marking a bug as duplicate easier
+
+ * js/field.js: (setResolutionToDuplicate): Focus the edit field, too.
+
+2009-10-16 Alexey Proskuryakov <ap@apple.com>
+
+ Reviewed by Mark Rowe.
+
+ https://bugs.webkit.org/show_bug.cgi?id=30470
+ Make marking a bug as duplicate easier
+
+ * js/field.js: (setResolutionToDuplicate): Show edit field right away, don't make the user
+ click again.
+
2009-09-09 David Kilzer <ddkilzer@apple.com>
Update data/params parameters
View
@@ -325,6 +325,14 @@ function setResolutionToDuplicate(e, duplicate_or_move_bug_status) {
status.value = duplicate_or_move_bug_status;
resolution.value = "DUPLICATE";
showHideStatusItems("", ["",""]);
+
+ // Show edit field for bug number, so that the user doesn't have to click on "(edit)".
+ YAHOO.util.Dom.setStyle('dup_id', 'display', 'inline');
+ YAHOO.util.Dom.setStyle('dup_id_container', 'display', 'none');
+ var dup_id = document.getElementById('dup_id');
+ dup_id.focus();
+ dup_id.select();
+
YAHOO.util.Event.preventDefault(e);
}
View
@@ -1,3 +1,80 @@
+2009-10-18 Jan Michael Alonzo <jmalonzo@webkit.org>
+
+ Reviewed by Holger Freyther.
+
+ [GTK] Add MathML to the build system
+ https://bugs.webkit.org/show_bug.cgi?id=30487
+
+ Add --enable-mathml to configure.
+
+ * configure.ac:
+
+2009-10-15 Jan Michael Alonzo <jmalonzo@webkit.org>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] marshal stamp files are not cleaned after a distclean
+ https://bugs.webkit.org/show_bug.cgi?id=30156
+
+ Add the stamp files directly to cleanfiles. Also rearrange the
+ variable declarations so we don't miss any files that need to be
+ cleaned up during the clean targets.
+
+ * GNUmakefile.am:
+
+2009-10-15 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
+
+ Unreviewed. Help text fix - Web Sockets default is no, not yes.
+
+ * configure.ac:
+
+2009-10-12 Jan Michael Alonzo <jmalonzo@webkit.org>
+
+ Rubberstamped by Eric Seidel.
+
+ [Gtk] Fix icu CFLAG for Darwin
+ https://bugs.webkit.org/show_bug.cgi?id=29517
+
+ Don't escape the srcdir variable. Also use $host instead of the
+ os_foo variables.
+
+ * autotools/webkit.m4:
+
+2009-10-12 Jan Michael Alonzo <jmalonzo@webkit.org>
+
+ Reviewed by Gustavo Noronha.
+
+ [Gtk] Use the SQLite3 headers from WebKitLibraries if sqlite3 is undetected
+ https://bugs.webkit.org/show_bug.cgi?id=29518
+
+ * configure.ac:
+
+2009-10-05 Zoltan Horvath <zoltan@webkit.org>
+
+ Reviewed by Simon Hausmann.
+
+ [Qt] Disable TCmalloc for Windows port at the present, because MinGW
+ hasn't got built-in pthread library.
+
+ * WebKit.pri:
+
+2009-10-02 Prasanth Ullattil <prasanth.ullattil@nokia.com>
+
+ Reviewed by Simon Hausmann.
+
+ Disable a few more harmless MSVC warnings.
+
+ * WebKit.pri:
+
+2009-10-01 Laszlo Gombos <laszlo.1.gombos@nokia.com>
+
+ Unreviewed, build fix.
+
+ [Qt] Symbian build break after r48976.
+ unix is set for Symbian in the Qt build system.
+
+ * WebKit.pri:
+
2009-10-01 Zoltan Horvath <zoltan@webkit.org>
Reviewed by Simon Hausmann.
View
@@ -75,6 +75,10 @@ global_cflags :=
global_cxxflags :=
corekit_cflags :=
corekit_cppflags :=
+BUILT_SOURCES :=
+CLEANFILES :=
+DISTCLEANFILES :=
+MAINTAINERCLEANFILES :=
# CFLAGS/CXXFLAGS used by WebCore and WebKit
#
@@ -398,21 +402,20 @@ webkitgtk_cppflags += \
-I$(top_builddir)/WebKit/gtk/webkit
webkitgtk_cleanfiles += \
+ $(top_builddir)/stamp-webkitmarshal.cpp \
+ $(top_builddir)/stamp-webkitmarshal.h \
+ $(top_builddir)/stamp-webkitenumtypes.cpp \
+ $(top_builddir)/stamp-webkitenumtypes.h \
+ $(top_builddir)/Programs/GtkLauncher \
$(top_builddir)/WebKit/gtk/docs/version.xml \
$(top_builddir)/WebKit/gtk/docs/GNUmakefile \
- $(top_builddir)/Programs/GtkLauncher \
$(top_builddir)/WebKit/gtk/webkit-1.0.pc \
$(top_builddir)/WebKit/gtk/webkit/webkitenumtypes.h \
$(top_builddir)/WebKit/gtk/webkit/webkitversion.h
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc
-# Files that will be cleaned
-MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile doltlibtool
-DISTCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile doltlibtool
-CLEANFILES := $(stamp_files) $(BUILT_SOURCES)
-
if ENABLE_INTROSPECTION
JSCORE_GIRSOURCES = $(srcdir)/WebKit/gtk/JSCore-1.0.gir # JSCore-1.0.gir is handwritten
WEBKIT_GIRSOURCES = WebKit-1.0.gir
@@ -448,12 +451,6 @@ CLEANFILES += $(WEBKIT_GIRSOURCES) $(typelibs_DATA)
endif
-stamp_files := \
- stamp-webkitmarshal.cpp \
- stamp-webkitmarshal.h \
- stamp-webkitenumtypes.cpp \
- stamp-webkitenumtypes.h
-
WEBKIT_MARSHAL = $(GENSOURCES)/webkitmarshal
WEBKIT_MARSHAL_LIST = $(top_srcdir)/WebKit/gtk/webkitmarshal.list
@@ -660,7 +657,7 @@ Programs_unittests_testkeyevents_LDADD = $(webkit_tests_ldadd)
Programs_unittests_testkeyevents_LDFLAGS = $(webkit_tests_ldflags)
# Autogenerated sources
-BUILT_SOURCES := \
+BUILT_SOURCES += \
$(javascriptcore_built_sources) \
$(javascriptcore_built_nosources) \
$(webcore_built_sources) \
@@ -669,10 +666,20 @@ BUILT_SOURCES := \
$(webkitgtk_built_nosources)
# Project-wide clean rules
+# Files that will be cleaned
CLEANFILES += \
+ $(BUILT_SOURCES) \
$(webkitgtk_cleanfiles)
+DISTCLEANFILES += \
+ $(CLEANFILES) \
+ $(builddir)/doltcompile \
+ $(builddir)/doltlibtool
+
MAINTAINERCLEANFILES += \
+ $(CLEANFILES) \
+ $(builddir)/doltcompile \
+ $(builddir)/doltlibtool \
$(srcdir)/aconfig.h.in \
$(srcdir)/autotools/config.* \
$(srcdir)/autotools/compile \
@@ -27,6 +27,7 @@
#define APICast_h
#include "JSAPIValueWrapper.h"
+#include "JSGlobalObject.h"
#include "JSValue.h"
#include <wtf/Platform.h>
#include <wtf/UnusedParam.h>
@@ -118,6 +119,7 @@ inline JSContextRef toRef(JSC::ExecState* e)
inline JSGlobalContextRef toGlobalRef(JSC::ExecState* e)
{
+ ASSERT(e == e->lexicalGlobalObject()->globalExec());
return reinterpret_cast<JSGlobalContextRef>(e);
}
@@ -41,9 +41,12 @@ class JSCallbackConstructor : public JSObject {
static PassRefPtr<Structure> createStructure(JSValue proto)
{
- return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance | HasStandardGetOwnPropertySlot | HasDefaultMark | HasDefaultGetPropertyNames));
+ return Structure::create(proto, TypeInfo(ObjectType, StructureFlags));
}
+protected:
+ static const unsigned StructureFlags = ImplementsHasInstance | JSObject::StructureFlags;
+
private:
virtual ConstructType getConstructData(ConstructData&);
virtual const ClassInfo* classInfo() const { return &info; }
@@ -41,7 +41,7 @@ class JSCallbackFunction : public InternalFunction {
// refactor the code so this override isn't necessary
static PassRefPtr<Structure> createStructure(JSValue proto)
{
- return Structure::create(proto, TypeInfo(ObjectType, HasStandardGetOwnPropertySlot | HasDefaultMark));
+ return Structure::create(proto, TypeInfo(ObjectType, StructureFlags));
}
private:
@@ -50,9 +50,12 @@ class JSCallbackObject : public Base {
static PassRefPtr<Structure> createStructure(JSValue proto)
{
- return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance | OverridesHasInstance));
+ return Structure::create(proto, TypeInfo(ObjectType, StructureFlags));
}
+protected:
+ static const unsigned StructureFlags = OverridesGetOwnPropertySlot | ImplementsHasInstance | OverridesHasInstance | OverridesMarkChildren | OverridesGetPropertyNames | Base::StructureFlags;
+
private:
virtual UString className() const;
@@ -25,6 +25,7 @@
#include "config.h"
#include "JSContextRef.h"
+#include "JSContextRefPrivate.h"
#include "APICast.h"
#include "InitializeThreading.h"
@@ -152,3 +153,12 @@ JSContextGroupRef JSContextGetGroup(JSContextRef ctx)
ExecState* exec = toJS(ctx);
return toRef(&exec->globalData());
}
+
+JSGlobalContextRef JSContextGetGlobalContext(JSContextRef ctx)
+{
+ ExecState* exec = toJS(ctx);
+ exec->globalData().heap.registerThread();
+ JSLock lock(exec);
+
+ return toGlobalRef(exec->lexicalGlobalObject()->globalExec());
+}
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2009 Apple Computer, Inc. All rights reserved.
+ *
+ * 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.
+ */
+
+#ifndef JSContextRefPrivate_h
+#define JSContextRefPrivate_h
+
+#include <JavaScriptCore/JSObjectRef.h>
+#include <JavaScriptCore/JSValueRef.h>
+#include <JavaScriptCore/WebKitAvailability.h>
+
+#ifndef __cplusplus
+#include <stdbool.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!
+@function
+@abstract Gets the global context of a JavaScript execution context.
+@param ctx The JSContext whose global context you want to get.
+@result ctx's global context.
+*/
+JS_EXPORT JSGlobalContextRef JSContextGetGlobalContext(JSContextRef ctx);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* JSContextRefPrivate_h */
@@ -25,6 +25,7 @@
#include "JavaScriptCore.h"
#include "JSBasePrivate.h"
+#include "JSContextRefPrivate.h"
#include <math.h>
#define ASSERT_DISABLED 0
#include <wtf/Assertions.h>
@@ -41,8 +42,8 @@ static double nan(const char*)
#endif
-static JSGlobalContextRef context = 0;
-static int failed = 0;
+static JSGlobalContextRef context;
+static int failed;
static void assertEqualsAsBoolean(JSValueRef value, bool expectedValue)
{
if (JSValueToBoolean(context, value) != expectedValue) {
@@ -618,14 +619,16 @@ static JSClassRef Derived_class(JSContextRef context)
return jsClass;
}
-static JSValueRef print_callAsFunction(JSContextRef context, JSObjectRef functionObject, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+static JSValueRef print_callAsFunction(JSContextRef ctx, JSObjectRef functionObject, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
{
UNUSED_PARAM(functionObject);
UNUSED_PARAM(thisObject);
UNUSED_PARAM(exception);
+
+ ASSERT(JSContextGetGlobalContext(ctx) == context);
if (argumentCount > 0) {
- JSStringRef string = JSValueToStringCopy(context, arguments[0], NULL);
+ JSStringRef string = JSValueToStringCopy(ctx, arguments[0], NULL);
size_t sizeUTF8 = JSStringGetMaximumUTF8CStringSize(string);
char* stringUTF8 = (char*)malloc(sizeUTF8);
JSStringGetUTF8CString(string, stringUTF8, sizeUTF8);
@@ -634,7 +637,7 @@ static JSValueRef print_callAsFunction(JSContextRef context, JSObjectRef functio
JSStringRelease(string);
}
- return JSValueMakeUndefined(context);
+ return JSValueMakeUndefined(ctx);
}
static JSObjectRef myConstructor_callAsConstructor(JSContextRef context, JSObjectRef constructorObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
@@ -760,6 +763,7 @@ int main(int argc, char* argv[])
JSGlobalContextRetain(context);
JSGlobalContextRelease(context);
+ ASSERT(JSContextGetGlobalContext(context) == context);
JSReportExtraMemoryCost(context, 0);
JSReportExtraMemoryCost(context, 1);
Oops, something went wrong.

0 comments on commit 52ba5b6

Please sign in to comment.