<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[175030] releases/WebKitGTK/webkit-2.4/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/175030">175030</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-22 02:45:25 -0700 (Wed, 22 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/174104">r174104</a> - [GTK] The remote web inspector shows the HTML content as plain text
https://bugs.webkit.org/show_bug.cgi?id=137250
Reviewed by Gustavo Noronha Silva.
Use GResource API directly to get the resource data, instead of
using the GFile API, and use g_content_type_guess() to get the
MIME Type.
* UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp:
(WebKit::WebInspectorServer::platformResourceForPath):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2UIProcessInspectorServergtkWebInspectorServerGtkcpp">releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog (175029 => 175030)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-10-22 09:39:10 UTC (rev 175029)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-10-22 09:45:25 UTC (rev 175030)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-09-30 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] The remote web inspector shows the HTML content as plain text
+ https://bugs.webkit.org/show_bug.cgi?id=137250
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Use GResource API directly to get the resource data, instead of
+ using the GFile API, and use g_content_type_guess() to get the
+ MIME Type.
+
+ * UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp:
+ (WebKit::WebInspectorServer::platformResourceForPath):
+
</ins><span class="cx"> 2014-09-03 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [SOUP] Race condition when downloading a file due to the intermediate temporary file
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2UIProcessInspectorServergtkWebInspectorServerGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp (175029 => 175030)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp 2014-10-22 09:39:10 UTC (rev 175029)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp 2014-10-22 09:45:25 UTC (rev 175030)
</span><span class="lines">@@ -49,36 +49,34 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Point the default path to a formatted page that queries the page list and display them.
</span><del>- CString resourceURI = makeString("resource:///org/webkitgtk/inspector/UserInterface", ((path == "/") ? "/inspectorPageIndex.html" : path)).utf8();
- if (resourceURI.isNull())
</del><ins>+ CString resourcePath = makeString("/org/webkitgtk/inspector/UserInterface", (path == "/" ? "/inspectorPageIndex.html" : path)).utf8();
+ if (resourcePath.isNull())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- GRefPtr<GFile> file = adoptGRef(g_file_new_for_uri(resourceURI.data()));
</del><span class="cx"> GUniqueOutPtr<GError> error;
</span><del>- GRefPtr<GFileInfo> fileInfo = adoptGRef(g_file_query_info(file.get(), G_FILE_ATTRIBUTE_STANDARD_SIZE "," G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, 0, &error.outPtr()));
- if (!fileInfo) {
</del><ins>+ GRefPtr<GBytes> resourceBytes = adoptGRef(g_resources_lookup_data(resourcePath.data(), G_RESOURCE_LOOKUP_FLAGS_NONE, &error.outPtr()));
+ if (!resourceBytes) {
</ins><span class="cx"> StringBuilder builder;
</span><span class="cx"> builder.appendLiteral("<!DOCTYPE html><html><head></head><body>Error: ");
</span><span class="cx"> builder.appendNumber(error->code);
</span><span class="cx"> builder.appendLiteral(", ");
</span><span class="cx"> builder.append(error->message);
</span><span class="cx"> builder.appendLiteral(" occurred during fetching inspector resource files.</body></html>");
</span><del>- CString cstr = builder.toString().utf8();
- data.append(cstr.data(), cstr.length());
</del><ins>+
+ CString errorHTML = builder.toString().utf8();
+ data.append(errorHTML.data(), errorHTML.length());
</ins><span class="cx"> contentType = "text/html; charset=utf-8";
</span><del>- g_warning("Error fetching webinspector resource files: %d, %s", error->code, error->message);
- return true;
- }
</del><span class="cx">
</span><del>- GRefPtr<GFileInputStream> inputStream = adoptGRef(g_file_read(file.get(), 0, 0));
- if (!inputStream)
</del><ins>+ WTFLogAlways("Error fetching webinspector resource files: %d, %s", error->code, error->message);
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><del>- data.grow(g_file_info_get_size(fileInfo.get()));
- if (!g_input_stream_read_all(G_INPUT_STREAM(inputStream.get()), data.data(), data.size(), 0, 0, 0))
- return false;
</del><ins>+ gsize resourceDataSize;
+ gconstpointer resourceData = g_bytes_get_data(resourceBytes.get(), &resourceDataSize);
+ data.append(static_cast<const char*>(resourceData), resourceDataSize);
</ins><span class="cx">
</span><del>- contentType = GUniquePtr<gchar>(g_file_info_get_attribute_as_string(fileInfo.get(), G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE)).get();
</del><ins>+ GUniquePtr<gchar> mimeType(g_content_type_guess(resourcePath.data(), static_cast<const guchar*>(resourceData), resourceDataSize, nullptr));
+ contentType = mimeType.get();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>