Title: [137246] trunk/Source/WebKit/win
- Revision
- 137246
- Author
- commit-qu...@webkit.org
- Date
- 2012-12-10 21:17:49 -0800 (Mon, 10 Dec 2012)
Log Message
ASSERTION failed in Windows: css3/css3-modsel-33.html
https://bugs.webkit.org/show_bug.cgi?id=104472
Patch by Xueqing Huang <huangxueq...@baidu.com> on 2012-12-10
Reviewed by Tim Horton.
In WebFrameLoaderClient::dispatchDidLayout, milestones maybe
DidFirstLayout & DidFirstVisualNonEmptyLayout, we should
use seperate COMPtrs for the two cases rather than reuse one.
* WebCoreSupport/WebFrameLoaderClient.cpp:
(WebFrameLoaderClient::dispatchDidLayout):
Modified Paths
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (137245 => 137246)
--- trunk/Source/WebKit/win/ChangeLog 2012-12-11 04:44:19 UTC (rev 137245)
+++ trunk/Source/WebKit/win/ChangeLog 2012-12-11 05:17:49 UTC (rev 137246)
@@ -1,3 +1,17 @@
+2012-12-10 Xueqing Huang <huangxueq...@baidu.com>
+
+ ASSERTION failed in Windows: css3/css3-modsel-33.html
+ https://bugs.webkit.org/show_bug.cgi?id=104472
+
+ Reviewed by Tim Horton.
+
+ In WebFrameLoaderClient::dispatchDidLayout, milestones maybe
+ DidFirstLayout & DidFirstVisualNonEmptyLayout, we should
+ use seperate COMPtrs for the two cases rather than reuse one.
+
+ * WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebFrameLoaderClient::dispatchDidLayout):
+
2012-12-08 Seokju Kwon <seokju.k...@gmail.com>
Remove unused headers
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (137245 => 137246)
--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2012-12-11 04:44:19 UTC (rev 137245)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2012-12-11 05:17:49 UTC (rev 137246)
@@ -419,14 +419,15 @@
void WebFrameLoaderClient::dispatchDidLayout(LayoutMilestones milestones)
{
WebView* webView = m_webFrame->webView();
- COMPtr<IWebFrameLoadDelegatePrivate> frameLoadDelegatePrivate;
if (milestones & DidFirstLayout) {
+ COMPtr<IWebFrameLoadDelegatePrivate> frameLoadDelegatePrivate;
if (SUCCEEDED(webView->frameLoadDelegatePrivate(&frameLoadDelegatePrivate)) && frameLoadDelegatePrivate)
frameLoadDelegatePrivate->didFirstLayoutInFrame(webView, m_webFrame);
}
if (milestones & DidFirstVisuallyNonEmptyLayout) {
+ COMPtr<IWebFrameLoadDelegatePrivate> frameLoadDelegatePrivate;
if (SUCCEEDED(webView->frameLoadDelegatePrivate(&frameLoadDelegatePrivate)) && frameLoadDelegatePrivate)
frameLoadDelegatePrivate->didFirstVisuallyNonEmptyLayoutInFrame(webView, m_webFrame);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
