diff options
| -rw-r--r-- | webkit/api/src/WebPluginContainerImpl.cpp | 3 | ||||
| -rwxr-xr-x | webkit/tools/layout_tests/test_expectations.txt | 1 | ||||
| -rw-r--r-- | webkit/tools/npapi_layout_test_plugin/main.cpp | 5 |
3 files changed, 3 insertions, 6 deletions
diff --git a/webkit/api/src/WebPluginContainerImpl.cpp b/webkit/api/src/WebPluginContainerImpl.cpp index 96cbd90..0f839a9 100644 --- a/webkit/api/src/WebPluginContainerImpl.cpp +++ b/webkit/api/src/WebPluginContainerImpl.cpp @@ -211,8 +211,7 @@ void WebPluginContainerImpl::invalidateRect(const WebRect& rect) void WebPluginContainerImpl::reportGeometry() { - // We cannot compute geometry without an associated RenderObject. - if (!parent() || !m_element->renderer()) + if (!parent()) return; IntRect windowRect, clipRect; diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index a266923..0b1fbad 100755 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2317,6 +2317,7 @@ BUG21767 : LayoutTests/http/tests/security/cross-frame-access-enumeration.html = // WK roll to 48371 BUG21840 : LayoutTests/http/tests/loading/basic-auth-resend-wrong-credentials.html = FAIL BUG21840 : LayoutTests/http/tests/loading/basic-credentials-sent-automatically.html = FAIL +BUG21841 : LayoutTests/plugins/destroy-during-npp-new.html = FAIL // missing upstream baseline from 48368 BUG21842 SKIP WIN LINUX : LayoutTests/platform/win/accessibility/scroll-to-anchor.html = FAIL diff --git a/webkit/tools/npapi_layout_test_plugin/main.cpp b/webkit/tools/npapi_layout_test_plugin/main.cpp index b546efe..fbd9b82 100644 --- a/webkit/tools/npapi_layout_test_plugin/main.cpp +++ b/webkit/tools/npapi_layout_test_plugin/main.cpp @@ -143,8 +143,6 @@ void NPAPI NP_Shutdown(void) { } -static void executeScript(const PluginObject* obj, const char* script); - NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, char *argn[], char *argv[], NPSavedData *saved) { if (browser->version >= 14) { @@ -166,8 +164,7 @@ NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, ch fflush(stdout); } } - } else if (strcasecmp(argn[i], "cleardocumentduringnew") == 0) - executeScript(obj, "document.body.innerHTML = ''"); + } } instance->pdata = obj; |