| Index: third_party/WebKit/Source/web/WebPluginContainerImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp b/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp
|
| index d1f412fec1a9c16b95a395df08b8b8dd374ae201..351bbbe9de40ec0b7b218ee7c872f49ec70e84db 100644
|
| --- a/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp
|
| @@ -910,7 +910,7 @@ void WebPluginContainerImpl::computeClipRectsForPlugin(
|
| windowRect = frameRect();
|
| // Map up to the root frame.
|
| LayoutRect layoutWindowRect =
|
| - LayoutRect(m_element->document().view()->layoutView()->localToAbsoluteQuad(FloatQuad(FloatRect(frameRect())), TraverseDocumentBoundaries).boundingBox());
|
| + LayoutRect(m_element->document().view()->layoutViewItem().localToAbsoluteQuad(FloatQuad(FloatRect(frameRect())), TraverseDocumentBoundaries).boundingBox());
|
| // Finally, adjust for scrolling of the root frame, which the above does not take into account.
|
| layoutWindowRect.moveBy(-rootView->viewRect().location());
|
| windowRect = pixelSnappedIntRect(layoutWindowRect);
|
| @@ -933,7 +933,7 @@ void WebPluginContainerImpl::calculateGeometry(IntRect& windowRect, IntRect& cli
|
| // document().layoutView() can be null when we receive messages from the
|
| // plugins while we are destroying a frame.
|
| // FIXME: Can we just check m_element->document().isActive() ?
|
| - if (m_element->layoutObject()->document().layoutView()) {
|
| + if (!m_element->layoutObject()->document().layoutViewItem().isNull()) {
|
| // Take our element and get the clip rect from the enclosing layer and
|
| // frame view.
|
| computeClipRectsForPlugin(m_element, windowRect, clipRect, unobscuredRect);
|
|
|