summaryrefslogtreecommitdiffstats
path: root/WebKit/mac/WebView/WebRenderNode.mm
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-04-27 16:31:00 +0100
committerSteve Block <steveblock@google.com>2010-05-11 14:42:12 +0100
commitdcc8cf2e65d1aa555cce12431a16547e66b469ee (patch)
tree92a8d65cd5383bca9749f5327fb5e440563926e6 /WebKit/mac/WebView/WebRenderNode.mm
parentccac38a6b48843126402088a309597e682f40fe6 (diff)
downloadexternal_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.zip
external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.gz
external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.bz2
Merge webkit.org at r58033 : Initial merge by git
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
Diffstat (limited to 'WebKit/mac/WebView/WebRenderNode.mm')
-rw-r--r--WebKit/mac/WebView/WebRenderNode.mm9
1 files changed, 8 insertions, 1 deletions
diff --git a/WebKit/mac/WebView/WebRenderNode.mm b/WebKit/mac/WebView/WebRenderNode.mm
index 4a839a5..eff1929 100644
--- a/WebKit/mac/WebView/WebRenderNode.mm
+++ b/WebKit/mac/WebView/WebRenderNode.mm
@@ -118,8 +118,15 @@ static WebRenderNode *copyRenderNode(RenderObject* node)
IntRect box = text->linesBoundingBox();
width = box.width();
height = box.height();
+ } else if (node->isRenderInline()) {
+ RenderBoxModelObject* inlineFlow = toRenderBoxModelObject(node);
+ IntRect boundingBox = inlineFlow->borderBoundingBox();
+ x = boundingBox.x();
+ y = boundingBox.y();
+ width = boundingBox.width();
+ height = boundingBox.height();
}
-
+
WebRenderNode *result = [[WebRenderNode alloc] _initWithName:name
position:absPos rect:NSMakeRect(x, y, width, height)
coreFrame:frame children:children];