Diff
Modified: trunk/LayoutTests/ChangeLog (94429 => 94430)
--- trunk/LayoutTests/ChangeLog 2011-09-02 17:24:03 UTC (rev 94429)
+++ trunk/LayoutTests/ChangeLog 2011-09-02 17:33:10 UTC (rev 94430)
@@ -1,3 +1,15 @@
+2011-09-02 Anders Carlsson <[email protected]>
+
+ Move private browsing test to a PluginTest subclass
+ https://bugs.webkit.org/show_bug.cgi?id=67498
+
+ Reviewed by Darin Adler.
+
+ Set the 'test' attribute to 'private-browsing'.
+
+ * plugins/private-browsing-mode-2.html:
+ * plugins/private-browsing-mode.html:
+
2011-09-02 Alexander Pavlov <[email protected]>
[Chromium] Unreviewed, update expectations after r94420.
Modified: trunk/LayoutTests/plugins/private-browsing-mode-2.html (94429 => 94430)
--- trunk/LayoutTests/plugins/private-browsing-mode-2.html 2011-09-02 17:24:03 UTC (rev 94429)
+++ trunk/LayoutTests/plugins/private-browsing-mode-2.html 2011-09-02 17:33:10 UTC (rev 94430)
@@ -15,6 +15,7 @@
plugin1 = document.createElement("embed");
plugin1.type = "application/x-webkit-test-netscape";
+ plugin1.setAttribute('test', 'private-browsing');
document.body.appendChild(plugin1);
shouldBe("plugin1.privateBrowsingEnabled", "false");
@@ -26,6 +27,7 @@
plugin2 = document.createElement("embed");
plugin2.type = "application/x-webkit-test-netscape";
+ plugin2.setAttribute('test', 'private-browsing');
document.body.appendChild(plugin2);
shouldBe("plugin2.privateBrowsingEnabled", "true");
Modified: trunk/LayoutTests/plugins/private-browsing-mode.html (94429 => 94430)
--- trunk/LayoutTests/plugins/private-browsing-mode.html 2011-09-02 17:24:03 UTC (rev 94429)
+++ trunk/LayoutTests/plugins/private-browsing-mode.html 2011-09-02 17:33:10 UTC (rev 94430)
@@ -15,6 +15,7 @@
plugin1 = document.createElement("embed");
plugin1.type = "application/x-webkit-test-netscape";
+ plugin1.setAttribute('test', 'private-browsing');
document.body.appendChild(plugin1);
shouldBe("plugin1.privateBrowsingEnabled", "false");
@@ -28,6 +29,7 @@
plugin2 = document.createElement("embed");
plugin2.type = "application/x-webkit-test-netscape";
+ plugin2.setAttribute('test', 'private-browsing');
document.body.appendChild(plugin2);
shouldBe("plugin2.privateBrowsingEnabled", "true");
Modified: trunk/Tools/ChangeLog (94429 => 94430)
--- trunk/Tools/ChangeLog 2011-09-02 17:24:03 UTC (rev 94429)
+++ trunk/Tools/ChangeLog 2011-09-02 17:33:10 UTC (rev 94430)
@@ -1,3 +1,35 @@
+2011-09-02 Anders Carlsson <[email protected]>
+
+ Move private browsing test to a PluginTest subclass
+ https://bugs.webkit.org/show_bug.cgi?id=67498
+
+ Reviewed by Darin Adler.
+
+ * DumpRenderTree/DumpRenderTree.gypi:
+ * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
+ * DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp:
+ (pluginGetProperty):
+ * DumpRenderTree/TestNetscapePlugIn/PluginObject.h:
+ * DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp:
+ (PluginTest::NPP_SetValue):
+ * DumpRenderTree/TestNetscapePlugIn/PluginTest.h:
+ * DumpRenderTree/TestNetscapePlugIn/Tests/PrivateBrowsing.cpp: Added.
+ (PrivateBrowsing::PrivateBrowsing):
+ (PrivateBrowsing::privateBrowsingEnabled):
+ (PrivateBrowsing::cachedPrivateBrowsingEnabled):
+ (PrivateBrowsing::ScriptableObject::hasProperty):
+ (PrivateBrowsing::ScriptableObject::getProperty):
+ (PrivateBrowsing::ScriptableObject::pluginTest):
+ (PrivateBrowsing::NPP_New):
+ (PrivateBrowsing::NPP_GetValue):
+ (PrivateBrowsing::NPP_SetValue):
+ * DumpRenderTree/TestNetscapePlugIn/main.cpp:
+ (NPP_New):
+ (NPP_SetValue):
+ * DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.vcproj:
+ * DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro:
+ * GNUmakefile.am:
+
2011-09-02 Csaba Osztrogonác <[email protected]>
[Qt] Build dependency problems
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.gypi (94429 => 94430)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.gypi 2011-09-02 17:24:03 UTC (rev 94429)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.gypi 2011-09-02 17:33:10 UTC (rev 94430)
@@ -64,6 +64,7 @@
'TestNetscapePlugIn/Tests/NullNPPGetValuePointer.cpp',
'TestNetscapePlugIn/Tests/PassDifferentNPPStruct.cpp',
'TestNetscapePlugIn/Tests/PluginScriptableNPObjectInvokeDefault.cpp',
+ 'TestNetscapePlugIn/Tests/PrivateBrowsing.cpp',
'TestNetscapePlugIn/main.cpp',
],
'conditions': [
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (94429 => 94430)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2011-09-02 17:24:03 UTC (rev 94429)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2011-09-02 17:33:10 UTC (rev 94430)
@@ -33,6 +33,7 @@
141BF453096A45EB00E0753C /* PluginObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 141BF447096A45C800E0753C /* PluginObject.h */; };
14770FE20A22ADF7009342EE /* GCController.h in Headers */ = {isa = PBXBuildFile; fileRef = 14770FE00A22ADF7009342EE /* GCController.h */; };
1A14C8A51406DE0400B254F7 /* SupportsCarbonEventModel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A14C8A31406DE0400B254F7 /* SupportsCarbonEventModel.cpp */; };
+ 1A1E4298141141C400388758 /* PrivateBrowsing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1E4296141141C400388758 /* PrivateBrowsing.cpp */; };
1A215A8111F2609C008AD0F5 /* PluginTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A215A7F11F2609C008AD0F5 /* PluginTest.cpp */; };
1A215A8211F2609C008AD0F5 /* PluginTest.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A215A8011F2609C008AD0F5 /* PluginTest.h */; };
1A215BE711F27658008AD0F5 /* DocumentOpenInDestroyStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A215A7511F26072008AD0F5 /* DocumentOpenInDestroyStream.cpp */; };
@@ -216,6 +217,7 @@
141BF448096A45C800E0753C /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = Info.plist; path = mac/Info.plist; sourceTree = "<group>"; };
14770FE00A22ADF7009342EE /* GCController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCController.h; sourceTree = "<group>"; };
1A14C8A31406DE0400B254F7 /* SupportsCarbonEventModel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SupportsCarbonEventModel.cpp; sourceTree = "<group>"; };
+ 1A1E4296141141C400388758 /* PrivateBrowsing.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PrivateBrowsing.cpp; sourceTree = "<group>"; };
1A215A7511F26072008AD0F5 /* DocumentOpenInDestroyStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentOpenInDestroyStream.cpp; sourceTree = "<group>"; };
1A215A7F11F2609C008AD0F5 /* PluginTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginTest.cpp; sourceTree = "<group>"; };
1A215A8011F2609C008AD0F5 /* PluginTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginTest.h; sourceTree = "<group>"; };
@@ -513,6 +515,7 @@
C0EC3C9B12787F0500939164 /* NullNPPGetValuePointer.cpp */,
C06F9ABB1267A7060058E1F6 /* PassDifferentNPPStruct.cpp */,
1AD9D2FD12028409001A70D1 /* PluginScriptableNPObjectInvokeDefault.cpp */,
+ 1A1E4296141141C400388758 /* PrivateBrowsing.cpp */,
);
path = Tests;
sourceTree = "<group>";
@@ -831,6 +834,7 @@
1AFF66BC137DEFD200791696 /* GetURLNotifyWithURLThatFailsToLoad.cpp in Sources */,
4AD6A11413C8124000EA9737 /* FormValue.cpp in Sources */,
1A14C8A51406DE0400B254F7 /* SupportsCarbonEventModel.cpp in Sources */,
+ 1A1E4298141141C400388758 /* PrivateBrowsing.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp (94429 => 94430)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp 2011-09-02 17:24:03 UTC (rev 94429)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp 2011-09-02 17:33:10 UTC (rev 94430)
@@ -141,8 +141,6 @@
ID_PROPERTY_LOG_DESTROY,
ID_PROPERTY_RETURN_ERROR_FROM_NEWSTREAM,
ID_PROPERTY_RETURN_NEGATIVE_ONE_FROM_WRITE,
- ID_PROPERTY_PRIVATE_BROWSING_ENABLED,
- ID_PROPERTY_CACHED_PRIVATE_BROWSING_ENABLED,
ID_PROPERTY_THROW_EXCEPTION_PROPERTY,
ID_LAST_SET_WINDOW_ARGUMENTS,
ID_PROPERTY_WINDOWED_PLUGIN,
@@ -159,8 +157,6 @@
"logDestroy",
"returnErrorFromNewStream",
"returnNegativeOneFromWrite",
- "privateBrowsingEnabled",
- "cachedPrivateBrowsingEnabled",
"testThrowExceptionProperty",
"lastSetWindowArguments",
"windowedPlugin",
@@ -318,16 +314,6 @@
BOOLEAN_TO_NPVARIANT(plugin->returnNegativeOneFromWrite, *result);
return true;
}
- if (name == pluginPropertyIdentifiers[ID_PROPERTY_PRIVATE_BROWSING_ENABLED]) {
- NPBool privateBrowsingEnabled = FALSE;
- browser->getvalue(plugin->npp, NPNVprivateModeBool, &privateBrowsingEnabled);
- BOOLEAN_TO_NPVARIANT(privateBrowsingEnabled, *result);
- return true;
- }
- if (name == pluginPropertyIdentifiers[ID_PROPERTY_CACHED_PRIVATE_BROWSING_ENABLED]) {
- BOOLEAN_TO_NPVARIANT(plugin->cachedPrivateBrowsingMode, *result);
- return true;
- }
if (name == pluginPropertyIdentifiers[ID_PROPERTY_THROW_EXCEPTION_PROPERTY]) {
browser->setexception(obj, "plugin object testThrowExceptionProperty SUCCESS");
return true;
Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginObject.h (94429 => 94430)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginObject.h 2011-09-02 17:24:03 UTC (rev 94429)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginObject.h 2011-09-02 17:33:10 UTC (rev 94430)
@@ -53,7 +53,6 @@
NPBool logDestroy;
NPBool returnNegativeOneFromWrite;
NPBool returnErrorFromNewStream;
- NPBool cachedPrivateBrowsingMode;
NPObject* testObject;
NPObject* rememberedObject;
NPStream* stream;
Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp (94429 => 94430)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp 2011-09-02 17:24:03 UTC (rev 94429)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp 2011-09-02 17:33:10 UTC (rev 94430)
@@ -135,6 +135,11 @@
return NPERR_GENERIC_ERROR;
}
+NPError PluginTest::NPP_SetValue(NPNVariable, void *value)
+{
+ return NPERR_GENERIC_ERROR;
+}
+
// NPN functions.
NPError PluginTest::NPN_GetURL(const char* url, const char* target)
Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.h (94429 => 94430)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.h 2011-09-02 17:24:03 UTC (rev 94429)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.h 2011-09-02 17:33:10 UTC (rev 94430)
@@ -69,6 +69,7 @@
virtual int16_t NPP_HandleEvent(void* event);
virtual bool NPP_URLNotify(const char* url, NPReason, void* notifyData);
virtual NPError NPP_GetValue(NPPVariable, void* value);
+ virtual NPError NPP_SetValue(NPNVariable, void *value);
// NPN functions.
NPError NPN_GetURL(const char* url, const char* target);
Added: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/PrivateBrowsing.cpp (0 => 94430)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/PrivateBrowsing.cpp (rev 0)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/PrivateBrowsing.cpp 2011-09-02 17:33:10 UTC (rev 94430)
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2011 Apple 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 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 "PluginTest.h"
+
+using namespace std;
+
+class PrivateBrowsing : public PluginTest {
+public:
+ PrivateBrowsing(NPP npp, const string& identifier)
+ : PluginTest(npp, identifier)
+ , m_cachedPrivateBrowsingEnabled(false)
+ {
+ }
+
+private:
+ bool privateBrowsingEnabled()
+ {
+ NPBool privateBrowsingEnabled = FALSE;
+ NPN_GetValue(NPNVprivateModeBool, &privateBrowsingEnabled);
+ return privateBrowsingEnabled;
+ }
+
+ bool cachedPrivateBrowsingEnabled()
+ {
+ return m_cachedPrivateBrowsingEnabled;
+ }
+
+ class ScriptableObject : public Object<ScriptableObject> {
+ public:
+ bool hasProperty(NPIdentifier propertyName)
+ {
+ return identifierIs(propertyName, "privateBrowsingEnabled")
+ || identifierIs(propertyName, "cachedPrivateBrowsingEnabled");
+ }
+
+ bool getProperty(NPIdentifier propertyName, NPVariant* result)
+ {
+ if (identifierIs(propertyName, "privateBrowsingEnabled")) {
+ BOOLEAN_TO_NPVARIANT(pluginTest()->privateBrowsingEnabled(), *result);
+ return true;
+ }
+ if (identifierIs(propertyName, "cachedPrivateBrowsingEnabled")) {
+ BOOLEAN_TO_NPVARIANT(pluginTest()->cachedPrivateBrowsingEnabled(), *result);
+ return true;
+ }
+ return false;
+ }
+
+ private:
+ PrivateBrowsing* pluginTest() const { return static_cast<PrivateBrowsing*>(Object::pluginTest()); }
+ };
+
+ virtual NPError NPP_New(NPMIMEType pluginType, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData *saved)
+ {
+ m_cachedPrivateBrowsingEnabled = privateBrowsingEnabled();
+ return NPERR_NO_ERROR;
+ }
+
+ virtual NPError NPP_GetValue(NPPVariable variable, void* value)
+ {
+ if (variable != NPPVpluginScriptableNPObject)
+ return NPERR_GENERIC_ERROR;
+
+ *(NPObject**)value = ScriptableObject::create(this);
+
+ return NPERR_NO_ERROR;
+ }
+
+ virtual NPError NPP_SetValue(NPNVariable variable, void* value)
+ {
+ switch (variable) {
+ case NPNVprivateModeBool:
+ m_cachedPrivateBrowsingEnabled = *(NPBool*)value;
+ return NPERR_NO_ERROR;
+ default:
+ return NPERR_GENERIC_ERROR;
+ }
+
+ }
+ bool m_cachedPrivateBrowsingEnabled;
+};
+
+static PluginTest::Register<PrivateBrowsing> privateBrowsing("private-browsing");
Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp (94429 => 94430)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp 2011-09-02 17:24:03 UTC (rev 94429)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp 2011-09-02 17:33:10 UTC (rev 94430)
@@ -274,8 +274,6 @@
obj->coreAnimationLayer = createCoreAnimationLayer();
#endif
- browser->getvalue(instance, NPNVprivateModeBool, (void *)&obj->cachedPrivateBrowsingMode);
-
obj->pluginTest = PluginTest::create(instance, testIdentifier);
if (!obj->pluginTest) {
@@ -817,14 +815,7 @@
NPError NPP_SetValue(NPP instance, NPNVariable variable, void *value)
{
PluginObject* obj = static_cast<PluginObject*>(instance->pdata);
-
- switch (variable) {
- case NPNVprivateModeBool:
- obj->cachedPrivateBrowsingMode = *(NPBool*)value;
- return NPERR_NO_ERROR;
- default:
- return NPERR_GENERIC_ERROR;
- }
+ return obj->pluginTest->NPP_SetValue(variable, value);
}
#ifdef XP_UNIX
Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.vcproj (94429 => 94430)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.vcproj 2011-09-02 17:24:03 UTC (rev 94429)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.vcproj 2011-09-02 17:33:10 UTC (rev 94430)
@@ -449,6 +449,10 @@
RelativePath="..\Tests\PluginScriptableNPObjectInvokeDefault.cpp"
>
</File>
+ <File
+ RelativePath="..\Tests\PrivateBrowsing.cpp"
+ >
+ </File>
<Filter
Name="win"
>
Modified: trunk/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro (94429 => 94430)
--- trunk/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro 2011-09-02 17:24:03 UTC (rev 94429)
+++ trunk/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro 2011-09-02 17:33:10 UTC (rev 94430)
@@ -42,7 +42,8 @@
Tests/NPRuntimeRemoveProperty.cpp \
Tests/NullNPPGetValuePointer.cpp \
Tests/PassDifferentNPPStruct.cpp \
- Tests/PluginScriptableNPObjectInvokeDefault.cpp
+ Tests/PluginScriptableNPObjectInvokeDefault.cpp \
+ Tests/PrivateBrowsing.cpp
mac {
OBJECTIVE_SOURCES += PluginObjectMac.mm
Modified: trunk/Tools/GNUmakefile.am (94429 => 94430)
--- trunk/Tools/GNUmakefile.am 2011-09-02 17:24:03 UTC (rev 94429)
+++ trunk/Tools/GNUmakefile.am 2011-09-02 17:33:10 UTC (rev 94430)
@@ -258,6 +258,7 @@
Tools/DumpRenderTree/TestNetscapePlugIn/Tests/NullNPPGetValuePointer.cpp \
Tools/DumpRenderTree/TestNetscapePlugIn/Tests/PassDifferentNPPStruct.cpp \
Tools/DumpRenderTree/TestNetscapePlugIn/Tests/PluginScriptableNPObjectInvokeDefault.cpp \
+ Tools/DumpRenderTree/TestNetscapePlugIn/Tests/PrivateBrowsing.cpp \
Tools/DumpRenderTree/TestNetscapePlugIn/Tests/x11/CallInvalidateRectWithNullNPPArgument.cpp \
Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp \
Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.h \
