Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(620)

Side by Side Diff: Source/core/rendering/RenderObject.cpp

Issue 126443005: Use TreeScope::completeURL and baseURL instead of the Document versions (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased again, passes tests Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/HitTestResult.cpp ('k') | Source/core/rendering/shapes/ShapeInfo.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 1153 matching lines...) Expand 10 before | Expand all | Expand 10 after
1164 void RenderObject::addPDFURLRect(GraphicsContext* context, const LayoutRect& rec t) 1164 void RenderObject::addPDFURLRect(GraphicsContext* context, const LayoutRect& rec t)
1165 { 1165 {
1166 if (rect.isEmpty()) 1166 if (rect.isEmpty())
1167 return; 1167 return;
1168 Node* n = node(); 1168 Node* n = node();
1169 if (!n || !n->isLink() || !n->isElementNode()) 1169 if (!n || !n->isLink() || !n->isElementNode())
1170 return; 1170 return;
1171 const AtomicString& href = toElement(n)->getAttribute(hrefAttr); 1171 const AtomicString& href = toElement(n)->getAttribute(hrefAttr);
1172 if (href.isNull()) 1172 if (href.isNull())
1173 return; 1173 return;
1174 KURL url = n->document().completeURL(href); 1174 KURL url = n->treeScope().completeURL(href);
1175 if (!url.isValid()) 1175 if (!url.isValid())
1176 return; 1176 return;
1177 if (context->supportsURLFragments() && url.hasFragmentIdentifier() && equalI gnoringFragmentIdentifier(url, n->document().baseURL())) { 1177 if (context->supportsURLFragments() && url.hasFragmentIdentifier() && equalI gnoringFragmentIdentifier(url, n->treeScope().baseURL())) {
1178 String name = url.fragmentIdentifier(); 1178 String name = url.fragmentIdentifier();
1179 if (document().findAnchor(name)) 1179 if (document().findAnchor(name))
1180 context->setURLFragmentForRect(name, pixelSnappedIntRect(rect)); 1180 context->setURLFragmentForRect(name, pixelSnappedIntRect(rect));
1181 return; 1181 return;
1182 } 1182 }
1183 context->setURLForRect(url, pixelSnappedIntRect(rect)); 1183 context->setURLForRect(url, pixelSnappedIntRect(rect));
1184 } 1184 }
1185 1185
1186 void RenderObject::paintOutline(PaintInfo& paintInfo, const LayoutRect& paintRec t) 1186 void RenderObject::paintOutline(PaintInfo& paintInfo, const LayoutRect& paintRec t)
1187 { 1187 {
(...skipping 2219 matching lines...) Expand 10 before | Expand all | Expand 10 after
3407 { 3407 {
3408 if (object1) { 3408 if (object1) {
3409 const WebCore::RenderObject* root = object1; 3409 const WebCore::RenderObject* root = object1;
3410 while (root->parent()) 3410 while (root->parent())
3411 root = root->parent(); 3411 root = root->parent();
3412 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3412 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3413 } 3413 }
3414 } 3414 }
3415 3415
3416 #endif 3416 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/HitTestResult.cpp ('k') | Source/core/rendering/shapes/ShapeInfo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698