Title: [145604] branches/safari-536.30-branch/Source/WebCore
- Revision
- 145604
- Author
- [email protected]
- Date
- 2013-03-12 16:04:38 -0700 (Tue, 12 Mar 2013)
Log Message
Merged r131110. <rdar://problem/13334883>
Modified Paths
Diff
Modified: branches/safari-536.30-branch/Source/WebCore/ChangeLog (145603 => 145604)
--- branches/safari-536.30-branch/Source/WebCore/ChangeLog 2013-03-12 22:49:56 UTC (rev 145603)
+++ branches/safari-536.30-branch/Source/WebCore/ChangeLog 2013-03-12 23:04:38 UTC (rev 145604)
@@ -1,5 +1,21 @@
2013-03-12 Lucas Forschler <[email protected]>
+ Merge r131110
+
+ 2012-10-11 Adam Barth <[email protected]>
+
+ Incorrect/Illegal static cast in FrameView.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=98943
+
+ Reviewed by Eric Seidel.
+
+ HTMLFrameElementBase is the common base class for <frame> and <iframe>.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::init):
+
+2013-03-12 Lucas Forschler <[email protected]>
+
Merge r129583
2012-09-25 Justin Schuh <[email protected]>
Modified: branches/safari-536.30-branch/Source/WebCore/page/FrameView.cpp (145603 => 145604)
--- branches/safari-536.30-branch/Source/WebCore/page/FrameView.cpp 2013-03-12 22:49:56 UTC (rev 145603)
+++ branches/safari-536.30-branch/Source/WebCore/page/FrameView.cpp 2013-03-12 23:04:38 UTC (rev 145604)
@@ -294,7 +294,7 @@
// Propagate the marginwidth/height and scrolling modes to the view.
Element* ownerElement = m_frame ? m_frame->ownerElement() : 0;
if (ownerElement && (ownerElement->hasTagName(frameTag) || ownerElement->hasTagName(iframeTag))) {
- HTMLFrameElement* frameElt = static_cast<HTMLFrameElement*>(ownerElement);
+ HTMLFrameElementBase* frameElt = static_cast<HTMLFrameElementBase*>(ownerElement);
if (frameElt->scrollingMode() == ScrollbarAlwaysOff)
setCanHaveScrollbars(false);
LayoutUnit marginWidth = frameElt->marginWidth();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
