[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
tony at chromium.org
tony at chromium.org
Wed Dec 22 17:49:36 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 86630a6f03a9790131f94512de83d052f6b7b092
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 30 23:55:46 2010 +0000
2010-11-30 Tony Chang <tony at chromium.org>
Reviewed by Adam Barth.
[chromium] fix get-int-identifier-special-values.html using TestNetscapePlugIn
https://bugs.webkit.org/show_bug.cgi?id=49036
No new tests: Covered by plugins/npruntime/get-int-identifier-special-values.html
In http://codereview.chromium.org/11574, the forked chromium test
plugin changed how it testGetIntIdentifier to work around a change
caused by a silverlight specific plugin fix:
http://codereview.chromium.org/11569/diff/1/2
It's not clear to me that this change is needed anymore since
silverlight has had multiple releases, testing without this patch
works on a test windows build, and safari win seems to run silverlight
without this either. Since there's no test for this behavior, I'm
rolling it out so we can match the upstream test.
* bindings/v8/V8NPUtils.cpp:
(WebCore::convertV8ObjectToNPVariant):
2010-11-30 Tony Chang <tony at chromium.org>
Reviewed by Adam Barth.
[chromium] fix get-int-identifier-special-values.html using TestNetscapePlugIn
https://bugs.webkit.org/show_bug.cgi?id=49036
* DumpRenderTree/chromium/LayoutTestController.cpp: Use IsNumber instead of IsInt32
for CppVariants.
(LayoutTestController::cppVariantToBool):
(LayoutTestController::cppVariantToInt32):
(LayoutTestController::setDatabaseQuota):
(LayoutTestController::evaluateInWebInspector):
(LayoutTestController::setMockGeolocationError):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72974 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 89d005b..3ff2196 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -742,7 +742,6 @@ BUG38353 : http/tests/plugins/plugin-document-has-focus.html = TEXT TIMEOUT
BUG_TONY WIN : plugins/geturlnotify-during-document-teardown.html = CRASH
BUGWK48655 : plugins/js-from-destroy.html = CRASH
BUG_TONY WIN : plugins/mouse-events.html = TEXT
-BUGWK49036 : plugins/npruntime/get-int-identifier-special-values.html = TEXT
BUG_TONY WIN : plugins/plugin-initiate-popup-window.html = TIMEOUT
// This test is failing because the plugin is currently named
// WebKitTestNetscapePlugin because the fork in the Chromium repo is named
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 239da88..7e05bc8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,26 @@
+2010-11-30 Tony Chang <tony at chromium.org>
+
+ Reviewed by Adam Barth.
+
+ [chromium] fix get-int-identifier-special-values.html using TestNetscapePlugIn
+ https://bugs.webkit.org/show_bug.cgi?id=49036
+
+ No new tests: Covered by plugins/npruntime/get-int-identifier-special-values.html
+
+ In http://codereview.chromium.org/11574, the forked chromium test
+ plugin changed how it testGetIntIdentifier to work around a change
+ caused by a silverlight specific plugin fix:
+ http://codereview.chromium.org/11569/diff/1/2
+
+ It's not clear to me that this change is needed anymore since
+ silverlight has had multiple releases, testing without this patch
+ works on a test windows build, and safari win seems to run silverlight
+ without this either. Since there's no test for this behavior, I'm
+ rolling it out so we can match the upstream test.
+
+ * bindings/v8/V8NPUtils.cpp:
+ (WebCore::convertV8ObjectToNPVariant):
+
2010-11-30 Chris Guillory <chris.guillory at google.com>
Reviewed by Chris Fleizach.
diff --git a/WebCore/bindings/v8/V8NPUtils.cpp b/WebCore/bindings/v8/V8NPUtils.cpp
index 8fa19d7..65c30a0 100644
--- a/WebCore/bindings/v8/V8NPUtils.cpp
+++ b/WebCore/bindings/v8/V8NPUtils.cpp
@@ -53,9 +53,7 @@ void convertV8ObjectToNPVariant(v8::Local<v8::Value> object, NPObject* owner, NP
if (object.IsEmpty())
return;
- if (object->IsInt32())
- INT32_TO_NPVARIANT(object->NumberValue(), *result);
- else if (object->IsNumber())
+ if (object->IsNumber())
DOUBLE_TO_NPVARIANT(object->NumberValue(), *result);
else if (object->IsBoolean())
BOOLEAN_TO_NPVARIANT(object->BooleanValue(), *result);
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 004ace2..1a8aad0 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2010-11-30 Tony Chang <tony at chromium.org>
+
+ Reviewed by Adam Barth.
+
+ [chromium] fix get-int-identifier-special-values.html using TestNetscapePlugIn
+ https://bugs.webkit.org/show_bug.cgi?id=49036
+
+ * DumpRenderTree/chromium/LayoutTestController.cpp: Use IsNumber instead of IsInt32
+ for CppVariants.
+ (LayoutTestController::cppVariantToBool):
+ (LayoutTestController::cppVariantToInt32):
+ (LayoutTestController::setDatabaseQuota):
+ (LayoutTestController::evaluateInWebInspector):
+ (LayoutTestController::setMockGeolocationError):
+
2010-11-30 Eric Seidel <eric at webkit.org>
Reviewed by Tony Chang.
diff --git a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
index e51ebb3..a55070e 100644
--- a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
@@ -1174,7 +1174,7 @@ bool LayoutTestController::cppVariantToBool(const CppVariant& value)
{
if (value.isBool())
return value.toBoolean();
- if (value.isInt32())
+ if (value.isNumber())
return value.toInt32();
if (value.isString()) {
string valueString = value.toString();
@@ -1189,7 +1189,7 @@ bool LayoutTestController::cppVariantToBool(const CppVariant& value)
int32_t LayoutTestController::cppVariantToInt32(const CppVariant& value)
{
- if (value.isInt32())
+ if (value.isNumber())
return value.toInt32();
if (value.isString()) {
string stringSource = value.toString();
@@ -1342,7 +1342,7 @@ void LayoutTestController::clearAllDatabases(const CppArgumentList& arguments, C
void LayoutTestController::setDatabaseQuota(const CppArgumentList& arguments, CppVariant* result)
{
result->setNull();
- if ((arguments.size() >= 1) && arguments[0].isInt32())
+ if ((arguments.size() >= 1) && arguments[0].isNumber())
webkit_support::SetDatabaseQuota(arguments[0].toInt32());
}
@@ -1444,7 +1444,7 @@ void LayoutTestController::setTimelineProfilingEnabled(const CppArgumentList& ar
void LayoutTestController::evaluateInWebInspector(const CppArgumentList& arguments, CppVariant* result)
{
result->setNull();
- if (arguments.size() < 2 || !arguments[0].isInt32() || !arguments[1].isString())
+ if (arguments.size() < 2 || !arguments[0].isNumber() || !arguments[1].isString())
return;
m_shell->drtDevToolsAgent()->evaluateInWebInspector(arguments[0].toInt32(), arguments[1].toString());
}
@@ -1527,7 +1527,7 @@ void LayoutTestController::setMockGeolocationPosition(const CppArgumentList& arg
void LayoutTestController::setMockGeolocationError(const CppArgumentList& arguments, CppVariant* result)
{
result->setNull();
- if (arguments.size() < 2 || !arguments[0].isInt32() || !arguments[1].isString())
+ if (arguments.size() < 2 || !arguments[0].isNumber() || !arguments[1].isString())
return;
WebGeolocationServiceMock::setMockGeolocationError(arguments[0].toInt32(), cppVariantToWebString(arguments[1]));
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list