<!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>[150263] trunk/Source/WebCore</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/150263">150263</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-05-17 09:07:05 -0700 (Fri, 17 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fix code that expects Page::chrome() to return a pointer
https://bugs.webkit.org/show_bug.cgi?id=116313

Patch by Alberto Garcia &lt;agarcia@igalia.com&gt; on 2013-05-17
Reviewed by Darin Adler.

Page::chrome() returns a reference after <a href="http://trac.webkit.org/projects/webkit/changeset/150214">r150214</a>.

* platform/network/blackberry/NetworkManager.cpp:
(WebCore::NetworkManager::startJob):
* platform/network/blackberry/SocketStreamHandleBlackBerry.cpp:
(WebCore::SocketStreamHandle::SocketStreamHandle):
* testing/Internals.cpp:
(WebCore::Internals::resetToConsistentState):
(WebCore::Internals::setEnableMockPagePopup):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkblackberryNetworkManagercpp">trunk/Source/WebCore/platform/network/blackberry/NetworkManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkblackberrySocketStreamHandleBlackBerrycpp">trunk/Source/WebCore/platform/network/blackberry/SocketStreamHandleBlackBerry.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (150262 => 150263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-05-17 16:00:02 UTC (rev 150262)
+++ trunk/Source/WebCore/ChangeLog        2013-05-17 16:07:05 UTC (rev 150263)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2013-05-17  Alberto Garcia  &lt;agarcia@igalia.com&gt;
</span><span class="cx"> 
</span><ins>+        Fix code that expects Page::chrome() to return a pointer
+        https://bugs.webkit.org/show_bug.cgi?id=116313
+
+        Reviewed by Darin Adler.
+
+        Page::chrome() returns a reference after r150214.
+
+        * platform/network/blackberry/NetworkManager.cpp:
+        (WebCore::NetworkManager::startJob):
+        * platform/network/blackberry/SocketStreamHandleBlackBerry.cpp:
+        (WebCore::SocketStreamHandle::SocketStreamHandle):
+        * testing/Internals.cpp:
+        (WebCore::Internals::resetToConsistentState):
+        (WebCore::Internals::setEnableMockPagePopup):
+
+2013-05-17  Alberto Garcia  &lt;agarcia@igalia.com&gt;
+
</ins><span class="cx">         [BlackBerry] ImageBlackBerry: add missing BlendMode parameter
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=116316
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkblackberryNetworkManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/blackberry/NetworkManager.cpp (150262 => 150263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/blackberry/NetworkManager.cpp        2013-05-17 16:00:02 UTC (rev 150262)
+++ trunk/Source/WebCore/platform/network/blackberry/NetworkManager.cpp        2013-05-17 16:07:05 UTC (rev 150263)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> {
</span><span class="cx">     Page* page = frame-&gt;page();
</span><span class="cx">     ASSERT(page);
</span><del>-    BlackBerry::Platform::NetworkStreamFactory* streamFactory = page-&gt;chrome()-&gt;platformPageClient()-&gt;networkStreamFactory();
</del><ins>+    BlackBerry::Platform::NetworkStreamFactory* streamFactory = page-&gt;chrome().platformPageClient()-&gt;networkStreamFactory();
</ins><span class="cx">     return startJob(playerId, page-&gt;groupName(), job, request, streamFactory, frame, defersLoading ? 1 : 0);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkblackberrySocketStreamHandleBlackBerrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/blackberry/SocketStreamHandleBlackBerry.cpp (150262 => 150263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/blackberry/SocketStreamHandleBlackBerry.cpp        2013-05-17 16:00:02 UTC (rev 150262)
+++ trunk/Source/WebCore/platform/network/blackberry/SocketStreamHandleBlackBerry.cpp        2013-05-17 16:07:05 UTC (rev 150263)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx">     int playerId = static_cast&lt;FrameLoaderClientBlackBerry*&gt;(page-&gt;mainFrame()-&gt;loader()-&gt;client())-&gt;playerId();
</span><span class="cx"> 
</span><span class="cx">     // Create a platform socket stream
</span><del>-    BlackBerry::Platform::NetworkStreamFactory* factory = page-&gt;chrome()-&gt;platformPageClient()-&gt;networkStreamFactory();
</del><ins>+    BlackBerry::Platform::NetworkStreamFactory* factory = page-&gt;chrome().platformPageClient()-&gt;networkStreamFactory();
</ins><span class="cx">     ASSERT(factory);
</span><span class="cx"> 
</span><span class="cx">     // Open the socket
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (150262 => 150263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp        2013-05-17 16:00:02 UTC (rev 150262)
+++ trunk/Source/WebCore/testing/Internals.cpp        2013-05-17 16:07:05 UTC (rev 150263)
</span><span class="lines">@@ -273,8 +273,7 @@
</span><span class="cx"> #if ENABLE(PAGE_POPUP)
</span><span class="cx">     delete s_pagePopupDriver;
</span><span class="cx">     s_pagePopupDriver = 0;
</span><del>-    if (page-&gt;chrome())
-        page-&gt;chrome().client()-&gt;resetPagePopupDriver();
</del><ins>+    page-&gt;chrome().client()-&gt;resetPagePopupDriver();
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(INSPECTOR) &amp;&amp; ENABLE(JAVASCRIPT_DEBUGGER)
</span><span class="cx">     if (page-&gt;inspectorController())
</span><span class="lines">@@ -771,7 +770,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(PAGE_POPUP)
</span><span class="cx">     Document* document = contextDocument();
</span><del>-    if (!document || !document-&gt;page() || !document-&gt;page()-&gt;chrome())
</del><ins>+    if (!document || !document-&gt;page())
</ins><span class="cx">         return;
</span><span class="cx">     Page* page = document-&gt;page();
</span><span class="cx">     if (!enabled) {
</span></span></pre>
</div>
</div>

</body>
</html>