diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-22 23:28:20 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-22 23:28:20 +0000 |
| commit | 891c71789b6f3382a5edec024c8a478df523d7fd (patch) | |
| tree | a98920e94a0fc32e74e703810eec562e9179a5a5 /webkit/glue | |
| parent | 5a7362fefe60518a51593ddbf4649bc48493d459 (diff) | |
| download | chromium_src-891c71789b6f3382a5edec024c8a478df523d7fd.zip chromium_src-891c71789b6f3382a5edec024c8a478df523d7fd.tar.gz chromium_src-891c71789b6f3382a5edec024c8a478df523d7fd.tar.bz2 | |
Chrome side of webkit merge to 40124.
Not much here other than CanvasPixelArray being re-added
in webkit@r40089.
Changes:
http://trac.webkit.org/changeset?new=40124@trunk&old=40086@trunk
Review URL: http://codereview.chromium.org/16617
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8520 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/webframe_impl.cc | 6 | ||||
| -rw-r--r-- | webkit/glue/webplugin_impl.cc | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc index 1a124f3..e263a16 100644 --- a/webkit/glue/webframe_impl.cc +++ b/webkit/glue/webframe_impl.cc @@ -1755,8 +1755,10 @@ bool WebFrameImpl::SetPrintingMode(bool printing, pages_.clear(); // The document width is well hidden. - if (width) - *width = frame()->document()->renderer()->width(); + if (width) { + WebCore::RenderObject* obj = frame()->document()->renderer(); + *width = WebCore::RenderBox::toRenderBox(obj)->width(); + } return true; } diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc index 72234ad..811da21 100644 --- a/webkit/glue/webplugin_impl.cc +++ b/webkit/glue/webplugin_impl.cc @@ -33,6 +33,7 @@ MSVC_PUSH_WARNING_LEVEL(0); #include "PlatformContextSkia.h" #include "PlatformMouseEvent.h" #include "PlatformString.h" +#include "RenderBox.h" #include "ResourceHandle.h" #include "ResourceHandleClient.h" #include "ResourceResponse.h" @@ -633,7 +634,8 @@ void WebPluginImpl::windowCutoutRects( if (n && n->hasTagName(WebCore::HTMLNames::iframeTag)) { if (!ro->style() || ro->style()->visibility() == WebCore::VISIBLE) { WebCore::IntPoint point = roundedIntPoint(ro->localToAbsolute()); - WebCore::IntSize size(ro->width(), ro->height()); + WebCore::RenderBox* rbox = WebCore::RenderBox::toRenderBox(ro); + WebCore::IntSize size(rbox->width(), rbox->height()); cutouts->append(WebCore::IntRect(point, size)); } } |