<!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>[151241] trunk/Source/WebKit/blackberry</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/151241">151241</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-06-05 14:42:30 -0700 (Wed, 05 Jun 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>[BlackBerry] Deleting the pendingSelectionCandidate on the wrong thread causes an assert.
https://bugs.webkit.org/show_bug.cgi?id=117276

Patch by Genevieve Mak &lt;gmak@rim.com&gt; on 2013-06-05
Reviewed by Rob Buis.

Reviewed Internally by Nima Ghanavatian.
PR #342399
Store and delete the selectionScrollView in webkit which is what we already do for
scrolling subframes.

* Api/InRegionScroller.cpp:
(BlackBerry::WebKit::InRegionScrollerPrivate::InRegionScrollerPrivate):
(BlackBerry::WebKit::InRegionScrollerPrivate::resetSelectionScrollView):
(WebKit):
(BlackBerry::WebKit::InRegionScrollerPrivate::clearDocumentData):
(BlackBerry::WebKit::InRegionScrollerPrivate::calculateInRegionScrollableAreasForPoint):
(BlackBerry::WebKit::InRegionScrollerPrivate::updateSelectionScrollView):
(BlackBerry::WebKit::InRegionScrollerPrivate::firstScrollableInRegionForNode):
* Api/InRegionScroller_p.h:
(InRegionScrollerPrivate):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitblackberryApiInRegionScrollercpp">trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp</a></li>
<li><a href="#trunkSourceWebKitblackberryApiInRegionScroller_ph">trunk/Source/WebKit/blackberry/Api/InRegionScroller_p.h</a></li>
<li><a href="#trunkSourceWebKitblackberryChangeLog">trunk/Source/WebKit/blackberry/ChangeLog</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitblackberryApiInRegionScrollercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp (151240 => 151241)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp        2013-06-05 21:40:19 UTC (rev 151240)
+++ trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp        2013-06-05 21:42:30 UTC (rev 151241)
</span><span class="lines">@@ -79,6 +79,7 @@
</span><span class="cx"> InRegionScrollerPrivate::InRegionScrollerPrivate(WebPagePrivate* webPagePrivate)
</span><span class="cx">     : m_webPage(webPagePrivate)
</span><span class="cx">     , m_needsActiveScrollableAreaCalculation(false)
</span><ins>+    , m_selectionScrollView(0)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -94,6 +95,16 @@
</span><span class="cx">     m_activeInRegionScrollableAreas.clear();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void InRegionScrollerPrivate::resetSelectionScrollView()
+{
+    m_webPage-&gt;m_client-&gt;notifySelectionScrollView(0);
+    m_webPage-&gt;m_selectionHandler-&gt;setSelectionSubframeViewportRect(WebCore::IntRect());
+    if (m_selectionScrollView) {
+        delete m_selectionScrollView;
+        m_selectionScrollView = 0;
+    }
+}
+
</ins><span class="cx"> bool InRegionScrollerPrivate::isActive() const
</span><span class="cx"> {
</span><span class="cx">     return m_activeInRegionScrollableAreas.size() &gt; 0;
</span><span class="lines">@@ -101,12 +112,17 @@
</span><span class="cx"> 
</span><span class="cx"> void InRegionScrollerPrivate::clearDocumentData(const Document* documentGoingAway)
</span><span class="cx"> {
</span><ins>+    InRegionScrollableArea* scrollableArea = static_cast&lt;InRegionScrollableArea*&gt;(m_selectionScrollView);
+    ASSERT(scrollableArea);
+    if (scrollableArea-&gt;document() == documentGoingAway)
+        resetSelectionScrollView();
+
</ins><span class="cx">     if (m_needsActiveScrollableAreaCalculation) {
</span><span class="cx">         reset();
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    InRegionScrollableArea* scrollableArea = static_cast&lt;InRegionScrollableArea*&gt;(m_activeInRegionScrollableAreas[0]);
</del><ins>+    scrollableArea = static_cast&lt;InRegionScrollableArea*&gt;(m_activeInRegionScrollableAreas[0]);
</ins><span class="cx">     ASSERT(scrollableArea);
</span><span class="cx">     if (scrollableArea-&gt;document() == documentGoingAway)
</span><span class="cx">         reset();
</span><span class="lines">@@ -240,7 +256,6 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(m_activeInRegionScrollableAreas.empty());
</span><span class="cx">     m_needsActiveScrollableAreaCalculation = false;
</span><del>-
</del><span class="cx">     const HitTestResult&amp; result = m_webPage-&gt;hitTestResult(documentPoint);
</span><span class="cx">     Node* node = result.innerNonSharedNode();
</span><span class="cx">     if (!node || !node-&gt;renderer())
</span><span class="lines">@@ -303,11 +318,10 @@
</span><span class="cx"> void InRegionScrollerPrivate::updateSelectionScrollView(const Node* node)
</span><span class="cx"> {
</span><span class="cx">     // TODO: don't notify the client if the node didn't change.
</span><del>-    // Deleting the scrollview is handled by the client.
-    Platform::ScrollViewBase* selectionScrollView = firstScrollableInRegionForNode(node);
-    m_webPage-&gt;m_client-&gt;notifySelectionScrollView(selectionScrollView);
</del><ins>+    m_selectionScrollView = firstScrollableInRegionForNode(node);
+    m_webPage-&gt;m_client-&gt;notifySelectionScrollView(m_selectionScrollView);
</ins><span class="cx">     // If there's no subframe set an empty rect so that we default to the main frame.
</span><del>-    m_webPage-&gt;m_selectionHandler-&gt;setSelectionSubframeViewportRect(selectionScrollView ? WebCore::IntRect(selectionScrollView-&gt;documentViewportRect()) : WebCore::IntRect());
</del><ins>+    m_webPage-&gt;m_selectionHandler-&gt;setSelectionSubframeViewportRect(m_selectionScrollView ? WebCore::IntRect(m_selectionScrollView-&gt;documentViewportRect()) : WebCore::IntRect());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> Platform::ScrollViewBase* InRegionScrollerPrivate::firstScrollableInRegionForNode(const Node* node)
</span><span class="lines">@@ -325,7 +339,7 @@
</span><span class="cx">             if (RenderView* renderView = toRenderView(renderer)) {
</span><span class="cx">                 FrameView* view = renderView-&gt;frameView();
</span><span class="cx">                 if (!view) {
</span><del>-                    reset();
</del><ins>+                    resetSelectionScrollView();
</ins><span class="cx">                     return 0;
</span><span class="cx">                 }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitblackberryApiInRegionScroller_ph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/blackberry/Api/InRegionScroller_p.h (151240 => 151241)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/blackberry/Api/InRegionScroller_p.h        2013-06-05 21:40:19 UTC (rev 151240)
+++ trunk/Source/WebKit/blackberry/Api/InRegionScroller_p.h        2013-06-05 21:42:30 UTC (rev 151241)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx">     InRegionScrollerPrivate(WebPagePrivate*);
</span><span class="cx"> 
</span><span class="cx">     void reset();
</span><ins>+    void resetSelectionScrollView();
</ins><span class="cx">     bool isActive() const;
</span><span class="cx"> 
</span><span class="cx">     bool setScrollPositionCompositingThread(unsigned camouflagedLayer, const WebCore::IntPoint&amp; scrollPosition);
</span><span class="lines">@@ -77,6 +78,7 @@
</span><span class="cx">     bool isValidScrollableNode(WebCore::Node*) const;
</span><span class="cx">     WebCore::IntRect clipToRect(const WebCore::IntRect&amp;, InRegionScrollableArea*);
</span><span class="cx">     std::vector&lt;Platform::ScrollViewBase*&gt; m_activeInRegionScrollableAreas;
</span><ins>+    Platform::ScrollViewBase* m_selectionScrollView;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitblackberryChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/blackberry/ChangeLog (151240 => 151241)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/blackberry/ChangeLog        2013-06-05 21:40:19 UTC (rev 151240)
+++ trunk/Source/WebKit/blackberry/ChangeLog        2013-06-05 21:42:30 UTC (rev 151241)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2013-06-05  Genevieve Mak  &lt;gmak@rim.com&gt;
+
+        [BlackBerry] Deleting the pendingSelectionCandidate on the wrong thread causes an assert.
+        https://bugs.webkit.org/show_bug.cgi?id=117276
+
+        Reviewed by Rob Buis.
+
+        Reviewed Internally by Nima Ghanavatian.
+        PR #342399
+        Store and delete the selectionScrollView in webkit which is what we already do for
+        scrolling subframes.
+
+        * Api/InRegionScroller.cpp:
+        (BlackBerry::WebKit::InRegionScrollerPrivate::InRegionScrollerPrivate):
+        (BlackBerry::WebKit::InRegionScrollerPrivate::resetSelectionScrollView):
+        (WebKit):
+        (BlackBerry::WebKit::InRegionScrollerPrivate::clearDocumentData):
+        (BlackBerry::WebKit::InRegionScrollerPrivate::calculateInRegionScrollableAreasForPoint):
+        (BlackBerry::WebKit::InRegionScrollerPrivate::updateSelectionScrollView):
+        (BlackBerry::WebKit::InRegionScrollerPrivate::firstScrollableInRegionForNode):
+        * Api/InRegionScroller_p.h:
+        (InRegionScrollerPrivate):
+
</ins><span class="cx"> 2013-06-05  Tiancheng Jiang  &lt;tijiang@rim.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [BlackBerry] Make image clickable when it has anchor as parent node.
</span></span></pre>
</div>
</div>

</body>
</html>