Attachment 343468 Details for Bug 186978 – More Logging

[patch] More Logging

MoreLogging.diff (text/plain), 3.16 KB, created by Daniel Bates on 2018-06-24 09:23:57 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Bates

Created: 2018-06-24 09:23:57 PDT

Size: 3.16 KB

patch

obsolete

>diff --git a/LayoutTests/http/tests/workers/resources/worker-importScripts-banned-mimetype.php b/LayoutTests/http/tests/workers/resources/worker-importScripts-banned-mimetype.php
>index 3a59f335de0..887e5aaa638 100644
>--- a/LayoutTests/http/tests/workers/resources/worker-importScripts-banned-mimetype.php
>+++ b/LayoutTests/http/tests/workers/resources/worker-importScripts-banned-mimetype.php
>@@ -24,12 +24,14 @@ description("Test that an external JavaScript script is blocked if has a banned
> 
> for (let mimeType of bannedMIMETypes) {
>     try {
>+        debug(`Testing ${mimeType}:`);
>         importScripts(`../../security/contentTypeOptions/resources/script-with-header.pl?mime=${mimeType}&no-content-type-options=1`);
>     } catch (e) { }
> }
> 
> try {
>     // For some reason this causes "SyntaxError: Invalid character '\ufffd'" when non-script MIME types are allowed to be executed.
>+    debug("Testing abe-that-increments-scriptsSuccessfullyLoaded.jpg");
>     importScripts("../../security/resources/abe-that-increments-scriptsSuccessfullyLoaded.jpg");
> } catch (e) { }
> 
>diff --git a/LayoutTests/http/tests/workers/worker-importScripts-banned-mimetype-expected.txt b/LayoutTests/http/tests/workers/worker-importScripts-banned-mimetype-expected.txt
>index 711987e0ab7..0950c7dfe98 100644
>--- a/LayoutTests/http/tests/workers/worker-importScripts-banned-mimetype-expected.txt
>+++ b/LayoutTests/http/tests/workers/worker-importScripts-banned-mimetype-expected.txt
>@@ -4,6 +4,18 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
> 
> 
> Starting worker: resources/worker-importScripts-banned-mimetype.php
>+[Worker] Testing audio/mp4:
>+[Worker] Testing audio/mpeg:
>+[Worker] Testing audio/ogg:
>+[Worker] Testing audio/wav:
>+[Worker] Testing audio/x-aiff:
>+[Worker] Testing image/gif:
>+[Worker] Testing image/png:
>+[Worker] Testing text/csv:
>+[Worker] Testing video/mpeg:
>+[Worker] Testing video/ogg:
>+[Worker] Testing video/quicktime:
>+[Worker] Testing abe-that-increments-scriptsSuccessfullyLoaded.jpg
> PASS [Worker] self.scriptsSuccessfullyLoaded is 0
> PASS successfullyParsed is true
> 
>diff --git a/Tools/lldb/lldb_webkit.py b/Tools/lldb/lldb_webkit.py
>index e97ef9a6551..daad54cf79b 100644
>--- a/Tools/lldb/lldb_webkit.py
>+++ b/Tools/lldb/lldb_webkit.py
>@@ -231,16 +231,17 @@ def lstring_to_string(valobj, error, length=None):
> 
> class WTFStringImplProvider:
>     def __init__(self, valobj, dict):
>-        self.valobj = valobj
>+        string_impl_shape_ptr_type = valobj.GetTarget().FindFirstType('WTF::StringImplShape').GetPointerType()
>+        self.valobj = valobj.Cast(string_impl_shape_ptr_type)
> 
>     def get_length(self):
>         return self.valobj.GetChildMemberWithName('m_length').GetValueAsUnsigned(0)
> 
>     def get_data8(self):
>-        return self.valobj.GetChildAtIndex(0).GetChildAtIndex(2).GetChildMemberWithName('m_data8')
>+        return self.valobj.GetChildAtIndex(2).GetChildMemberWithName('m_data8')
> 
>     def get_data16(self):
>-        return self.valobj.GetChildAtIndex(0).GetChildAtIndex(2).GetChildMemberWithName('m_data16')
>+        return self.valobj.GetChildAtIndex(2).GetChildMemberWithName('m_data16')
> 
>     def to_string(self):
>         error = lldb.SBError()

Actions: View | Formatted Diff | Diff

Attachments on bug 186978: 343468