Changeset 155228 in webkit


Ignore:
Timestamp:
Sep 6, 2013, 7:08:06 PM (12 years ago)
Author:
rniwa@webkit.org
Message:

Range::ownerDocument should return Document&
​https://bugs.webkit.org/show_bug.cgi?id=120908

Reviewed by Andreas Kling.

Source/WebCore:

Return Document& in Range::ownerDocument(). Also make setDocument take Document& so that this invariant is self-evident.

  • bindings/objc/DOM.mm:

(-[DOMRange boundingBox]):
(-[DOMRange renderedImageForcingBlackText:]):
(-[DOMRange textRects]):

  • dom/Range.cpp:

(WebCore::Range::setDocument):
(WebCore::Range::setStart):
(WebCore::Range::setEnd):
(WebCore::Range::selectNode):
(WebCore::Range::selectNodeContents):

  • dom/Range.h:

(WebCore::Range::ownerDocument):

  • editing/AlternativeTextController.cpp:

(WebCore::AlternativeTextController::handleAlternativeTextUIResult):

  • editing/Editor.cpp:

(WebCore::Editor::avoidIntersectionWithDeleteButtonController):
(WebCore::isFrameInRange):
(WebCore::Editor::countMatchesForText):

  • editing/EditorCommand.cpp:

(WebCore::unionDOMRanges):

  • editing/TextCheckingHelper.cpp:

(WebCore::TextCheckingHelper::unifiedTextCheckerEnabled):

  • editing/TextIterator.cpp:

(WebCore::plainText):
(WebCore::findPlainText):

  • editing/htmlediting.cpp:

(WebCore::extendRangeToWrappingNodes):

  • editing/markup.cpp:

(WebCore::createMarkup):
(WebCore::createFragmentFromText):

  • page/DragController.cpp:

(WebCore::documentFragmentFromDragData):
(WebCore::DragController::concludeEditDrag):

  • page/Page.cpp:

(WebCore::Page::rangeOfString):

  • rendering/RenderObject.cpp:

(WebCore::RenderObject::absoluteBoundingBoxRectForRange):

  • testing/Internals.cpp:

(WebCore::Internals::addTextMatchMarker):

Source/WebKit/blackberry:

  • WebKitSupport/InPageSearchManager.cpp:

(BlackBerry::WebKit::InPageSearchManager::findNextString):
(BlackBerry::WebKit::InPageSearchManager::findAndMarkText):
(BlackBerry::WebKit::InPageSearchManager::clearTextMatches):
(BlackBerry::WebKit::InPageSearchManager::setActiveMatchAndMarker):
(BlackBerry::WebKit::InPageSearchManager::frameUnloaded):
(BlackBerry::WebKit::InPageSearchManager::scopeStringMatches):

Source/WebKit/mac:

  • WebView/WebPDFView.mm:

(isFrameInRange):

Source/WebKit2:

  • WebProcess/InjectedBundle/API/mac/WKDOMRange.mm:

(-[WKDOMRange textRects]):

Location:
trunk/Source
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r155226 r155228  
     12013-09-06  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Range::ownerDocument should return Document&
     4        https://bugs.webkit.org/show_bug.cgi?id=120908
     5
     6        Reviewed by Andreas Kling.
     7
     8        Return Document& in Range::ownerDocument(). Also make setDocument take Document& so that this invariant is self-evident.
     9
     10        * bindings/objc/DOM.mm:
     11        (-[DOMRange boundingBox]):
     12        (-[DOMRange renderedImageForcingBlackText:]):
     13        (-[DOMRange textRects]):
     14        * dom/Range.cpp:
     15        (WebCore::Range::setDocument):
     16        (WebCore::Range::setStart):
     17        (WebCore::Range::setEnd):
     18        (WebCore::Range::selectNode):
     19        (WebCore::Range::selectNodeContents):
     20        * dom/Range.h:
     21        (WebCore::Range::ownerDocument):
     22        * editing/AlternativeTextController.cpp:
     23        (WebCore::AlternativeTextController::handleAlternativeTextUIResult):
     24        * editing/Editor.cpp:
     25        (WebCore::Editor::avoidIntersectionWithDeleteButtonController):
     26        (WebCore::isFrameInRange):
     27        (WebCore::Editor::countMatchesForText):
     28        * editing/EditorCommand.cpp:
     29        (WebCore::unionDOMRanges):
     30        * editing/TextCheckingHelper.cpp:
     31        (WebCore::TextCheckingHelper::unifiedTextCheckerEnabled):
     32        * editing/TextIterator.cpp:
     33        (WebCore::plainText):
     34        (WebCore::findPlainText):
     35        * editing/htmlediting.cpp:
     36        (WebCore::extendRangeToWrappingNodes):
     37        * editing/markup.cpp:
     38        (WebCore::createMarkup):
     39        (WebCore::createFragmentFromText):
     40        * page/DragController.cpp:
     41        (WebCore::documentFragmentFromDragData):
     42        (WebCore::DragController::concludeEditDrag):
     43        * page/Page.cpp:
     44        (WebCore::Page::rangeOfString):
     45        * rendering/RenderObject.cpp:
     46        (WebCore::RenderObject::absoluteBoundingBoxRectForRange):
     47        * testing/Internals.cpp:
     48        (WebCore::Internals::addTextMatchMarker):
     49
    1502013-09-06  Brent Fulgham  <bfulgham@apple.com>
    251

  • trunk/Source/WebCore/bindings/objc/DOM.mm

    r154877 r155228  
    320320{
    321321    // FIXME: The call to updateLayoutIgnorePendingStylesheets should be moved into WebCore::Range.
    322     core(self)->ownerDocument()->updateLayoutIgnorePendingStylesheets();
     322    core(self)->ownerDocument().updateLayoutIgnorePendingStylesheets();
    323323    return core(self)->boundingBox();
    324324}
    … …  
    327327{
    328328    WebCore::Range* range = core(self);
    329     WebCore::Frame* frame = range->ownerDocument()->frame();
     329    WebCore::Frame* frame = range->ownerDocument().frame();
    330330    if (!frame)
    331331        return nil;
    … …  
    338338    // FIXME: The call to updateLayoutIgnorePendingStylesheets should be moved into WebCore::Range.
    339339    Vector<WebCore::IntRect> rects;
    340     core(self)->ownerDocument()->updateLayoutIgnorePendingStylesheets();
     340    core(self)->ownerDocument().updateLayoutIgnorePendingStylesheets();
    341341    core(self)->textRects(rects);
    342342    return kit(rects);

  • trunk/Source/WebCore/dom/Range.cpp

    r154877 r155228  
    117117}
    118118
    119 void Range::setDocument(Document* document)
    120 {
    121     ASSERT(m_ownerDocument != document);
     119void Range::setDocument(Document& document)
     120{
     121    ASSERT(m_ownerDocument != &document);
    122122    if (m_ownerDocument)
    123123        m_ownerDocument->detachRange(this);
    124     m_ownerDocument = document;
    125     m_start.setToStartOfNode(document);
    126     m_end.setToStartOfNode(document);
     124    m_ownerDocument = &document;
     125    m_start.setToStartOfNode(&document);
     126    m_end.setToStartOfNode(&document);
    127127    m_ownerDocument->attachRange(this);
    128128}
    … …  
    225225    bool didMoveDocument = false;
    226226    if (&refNode->document() != m_ownerDocument) {
    227         setDocument(&refNode->document());
     227        setDocument(refNode->document());
    228228        didMoveDocument = true;
    229229    }
    … …  
    254254    bool didMoveDocument = false;
    255255    if (&refNode->document() != m_ownerDocument) {
    256         setDocument(&refNode->document());
     256        setDocument(refNode->document());
    257257        didMoveDocument = true;
    258258    }
    … …  
    13451345
    13461346    if (m_ownerDocument != &refNode->document())
    1347         setDocument(&refNode->document());
     1347        setDocument(refNode->document());
    13481348
    13491349    ec = 0;
    … …  
    13901390
    13911391    if (m_ownerDocument != &refNode->document())
    1392         setDocument(&refNode->document());
     1392        setDocument(refNode->document());
    13931393
    13941394    m_start.setToStartOfNode(refNode);

  • trunk/Source/WebCore/dom/Range.h

    r148289 r155228  
    5454    ~Range();
    5555
    56     Document* ownerDocument() const { return m_ownerDocument.get(); }
     56    Document& ownerDocument() const { return *m_ownerDocument; }
    5757    Node* startContainer() const { return m_start.container(); }
    5858    int startOffset() const { return m_start.offset(); }
    … …  
    153153    Range(PassRefPtr<Document>, PassRefPtr<Node> startContainer, int startOffset, PassRefPtr<Node> endContainer, int endOffset);
    154154
    155     void setDocument(Document*);
     155    void setDocument(Document&);
    156156
    157157    Node* checkNodeWOffset(Node*, int offset, ExceptionCode&) const;

  • trunk/Source/WebCore/editing/AlternativeTextController.cpp

    r154877 r155228  
    398398{
    399399    Range* rangeWithAlternative = m_alternativeTextInfo.rangeWithAlternative.get();
    400     if (!rangeWithAlternative || m_frame.document() != rangeWithAlternative->ownerDocument())
     400    if (!rangeWithAlternative || m_frame.document() != &rangeWithAlternative->ownerDocument())
    401401        return;
    402402

  • trunk/Source/WebCore/editing/Editor.cpp

    r155211 r155228  
    111111        return 0;
    112112
    113     Document* document = range->ownerDocument();
    114 
    115113    Node* startContainer = range->startContainer();
    116114    int startOffset = range->startOffset();
    … …  
    135133    }
    136134
    137     return Range::create(document, startContainer, startOffset, endContainer, endOffset);
     135    return Range::create(&range->ownerDocument(), startContainer, startOffset, endContainer, endOffset);
    138136}
    139137
    … …  
    29202918    bool inRange = false;
    29212919    for (HTMLFrameOwnerElement* ownerElement = frame->ownerElement(); ownerElement; ownerElement = ownerElement->document().ownerElement()) {
    2922         if (&ownerElement->document() == range->ownerDocument()) {
     2920        if (&ownerElement->document() == &range->ownerDocument()) {
    29232921            inRange = range->intersectsNode(ownerElement, IGNORE_EXCEPTION);
    29242922            break;
    … …  
    29352933    RefPtr<Range> searchRange;
    29362934    if (range) {
    2937         if (range->ownerDocument() == m_frame.document())
     2935        if (&range->ownerDocument() == m_frame.document())
    29382936            searchRange = range;
    29392937        else if (!isFrameInRange(&m_frame, range))

  • trunk/Source/WebCore/editing/EditorCommand.cpp

    r154938 r155228  
    271271    Range* end = a->compareBoundaryPoints(Range::END_TO_END, b, ASSERT_NO_EXCEPTION) <= 0 ? b : a;
    272272
    273     return Range::create(a->ownerDocument(), start->startContainer(), start->startOffset(), end->endContainer(), end->endOffset());
     273    return Range::create(&a->ownerDocument(), start->startContainer(), start->startOffset(), end->endContainer(), end->endOffset());
    274274}
    275275

  • trunk/Source/WebCore/editing/TextCheckingHelper.cpp

    r154877 r155228  
    634634bool TextCheckingHelper::unifiedTextCheckerEnabled() const
    635635{
    636     if (!m_range)
    637         return false;
    638 
    639     Document* doc = m_range->ownerDocument();
    640     if (!doc)
    641         return false;
    642 
    643     return WebCore::unifiedTextCheckerEnabled(doc->frame());
     636    return m_range && WebCore::unifiedTextCheckerEnabled(m_range->ownerDocument().frame());
    644637}
    645638

  • trunk/Source/WebCore/editing/TextIterator.cpp

    r155211 r155228  
    25362536    String result = builder.toString();
    25372537
    2538     if (isDisplayString && r->ownerDocument())
    2539         r->ownerDocument()->displayStringModifiedByEncoding(result);
     2538    if (isDisplayString)
     2539        r->ownerDocument().displayStringModifiedByEncoding(result);
    25402540
    25412541    return result;
    … …  
    25582558    if (buffer.needsMoreContext()) {
    25592559        RefPtr<Range> startRange = it.range();
    2560         RefPtr<Range> beforeStartRange = startRange->ownerDocument()->createRange();
     2560        RefPtr<Range> beforeStartRange = startRange->ownerDocument().createRange();
    25612561        beforeStartRange->setEnd(startRange->startContainer(), startRange->startOffset(), IGNORE_EXCEPTION);
    25622562        for (SimplifiedBackwardsTextIterator backwardsIterator(beforeStartRange.get()); !backwardsIterator.atEnd(); backwardsIterator.advance()) {
    … …  
    25952595{
    25962596    // CharacterIterator requires renderers to be up-to-date
    2597     range->ownerDocument()->updateLayout();
     2597    range->ownerDocument().updateLayout();
    25982598
    25992599    // First, find the text.

  • trunk/Source/WebCore/editing/htmlediting.cpp

    r155211 r155228  
    572572
    573573    // Create new range with the highest editable node contained within the range
    574     RefPtr<Range> extendedRange = Range::create(range->ownerDocument());
     574    RefPtr<Range> extendedRange = Range::create(&range->ownerDocument());
    575575    extendedRange->selectNode(highestNode, IGNORE_EXCEPTION);
    576576    return extendedRange.release();

  • trunk/Source/WebCore/editing/markup.cpp

    r155019 r155228  
    638638        return emptyString();
    639639
    640     Document* document = range->ownerDocument();
    641     if (!document)
    642         return emptyString();
    643 
     640    Document& document = range->ownerDocument();
    644641    const Range* updatedRange = range;
    645642
    … …  
    647644    // Disable the delete button so it's elements are not serialized into the markup,
    648645    // but make sure neither endpoint is inside the delete user interface.
    649     Frame* frame = document->frame();
     646    Frame* frame = document.frame();
    650647    DeleteButtonControllerDisableScope deleteButtonControllerDisableScope(frame);
    651648
    … …  
    659656#endif
    660657
    661     return createMarkupInternal(document, range, updatedRange, nodes, shouldAnnotate, convertBlocksToInlines, shouldResolveURLs);
     658    return createMarkupInternal(&document, range, updatedRange, nodes, shouldAnnotate, convertBlocksToInlines, shouldResolveURLs);
    662659}
    663660
    … …  
    841838        return 0;
    842839
    843     Document* document = context->ownerDocument();
    844     RefPtr<DocumentFragment> fragment = document->createDocumentFragment();
     840    Document& document = context->ownerDocument();
     841    RefPtr<DocumentFragment> fragment = document.createDocumentFragment();
    845842   
    846843    if (text.isEmpty())
    … …  
    852849
    853850    if (contextPreservesNewline(*context)) {
    854         fragment->appendChild(document->createTextNode(string), ASSERT_NO_EXCEPTION);
     851        fragment->appendChild(document.createTextNode(string), ASSERT_NO_EXCEPTION);
    855852        if (string.endsWith('\n')) {
    856             RefPtr<Element> element = createBreakElement(document);
     853            RefPtr<Element> element = createBreakElement(&document);
    857854            element->setAttribute(classAttr, AppleInterchangeNewline);           
    858855            fragment->appendChild(element.release(), ASSERT_NO_EXCEPTION);
    … …  
    886883        if (s.isEmpty() && i + 1 == numLines) {
    887884            // For last line, use the "magic BR" rather than a P.
    888             element = createBreakElement(document);
     885            element = createBreakElement(&document);
    889886            element->setAttribute(classAttr, AppleInterchangeNewline);
    890887        } else if (useLineBreak) {
    891             element = createBreakElement(document);
     888            element = createBreakElement(&document);
    892889            fillContainerFromString(fragment.get(), s);
    893890        } else {
    … …  
    895892                element = block->cloneElementWithoutChildren();
    896893            else
    897                 element = createDefaultParagraphElement(document);
     894                element = createDefaultParagraphElement(&document);
    898895            fillContainerFromString(element.get(), s);
    899896        }

  • trunk/Source/WebCore/page/DragController.cpp

    r154939 r155228  
    124124}
    125125
    126 static PassRefPtr<DocumentFragment> documentFragmentFromDragData(DragData* dragData, Frame* frame, RefPtr<Range> context,
    127                                           bool allowPlainText, bool& chosePlainText)
     126static PassRefPtr<DocumentFragment> documentFragmentFromDragData(DragData* dragData, Frame* frame, PassRefPtr<Range> context, bool allowPlainText, bool& chosePlainText)
    128127{
    129128    ASSERT(dragData);
    130129    chosePlainText = false;
    131130
    132     Document* document = context->ownerDocument();
    133     ASSERT(document);
    134     if (document && dragData->containsCompatibleContent()) {
     131    Document& document = context->ownerDocument();
     132    if (dragData->containsCompatibleContent()) {
    135133        if (PassRefPtr<DocumentFragment> fragment = dragData->asFragment(frame, context, allowPlainText, chosePlainText))
    136134            return fragment;
    … …  
    140138            String url = dragData->asURL(frame, DragData::DoNotConvertFilenames, &title);
    141139            if (!url.isEmpty()) {
    142                 RefPtr<HTMLAnchorElement> anchor = HTMLAnchorElement::create(document);
     140                RefPtr<HTMLAnchorElement> anchor = HTMLAnchorElement::create(&document);
    143141                anchor->setHref(url);
    144142                if (title.isEmpty()) {
    … …  
    149147                        title = url;
    150148                }
    151                 RefPtr<Node> anchorText = document->createTextNode(title);
     149                RefPtr<Node> anchorText = document.createTextNode(title);
    152150                anchor->appendChild(anchorText, IGNORE_EXCEPTION);
    153                 RefPtr<DocumentFragment> fragment = document->createDocumentFragment();
     151                RefPtr<DocumentFragment> fragment = document.createDocumentFragment();
    154152                fragment->appendChild(anchor, IGNORE_EXCEPTION);
    155153                return fragment.get();
    … …  
    506504    if (!range)
    507505        return false;
    508     CachedResourceLoader* cachedResourceLoader = range->ownerDocument()->cachedResourceLoader();
     506    CachedResourceLoader* cachedResourceLoader = range->ownerDocument().cachedResourceLoader();
    509507    ResourceCacheValidationSuppressor validationSuppressor(cachedResourceLoader);
    510508    if (dragIsMove(innerFrame->selection(), dragData) || dragCaret.isContentRichlyEditable()) {

  • trunk/Source/WebCore/page/Page.cpp

    r155194 r155228  
    631631        return 0;
    632632
    633     if (referenceRange && referenceRange->ownerDocument()->page() != this)
     633    if (referenceRange && referenceRange->ownerDocument().page() != this)
    634634        return 0;
    635635
    636636    bool shouldWrap = options & WrapAround;
    637     Frame* frame = referenceRange ? referenceRange->ownerDocument()->frame() : &mainFrame();
     637    Frame* frame = referenceRange ? referenceRange->ownerDocument().frame() : &mainFrame();
    638638    Frame* startFrame = frame;
    639639    do {

  • trunk/Source/WebCore/rendering/RenderObject.cpp

    r155211 r155228  
    12601260        return FloatRect();
    12611261
    1262     if (range->ownerDocument())
    1263         range->ownerDocument()->updateLayout();
     1262    range->ownerDocument().updateLayout();
    12641263
    12651264    Vector<FloatQuad> quads;

  • trunk/Source/WebCore/testing/Internals.cpp

    r155183 r155228  
    844844void Internals::addTextMatchMarker(const Range* range, bool isActive)
    845845{
    846     range->ownerDocument()->updateLayoutIgnorePendingStylesheets();
    847     range->ownerDocument()->markers().addTextMatchMarker(range, isActive);
     846    range->ownerDocument().updateLayoutIgnorePendingStylesheets();
     847    range->ownerDocument().markers().addTextMatchMarker(range, isActive);
    848848}
    849849

  • trunk/Source/WebKit/blackberry/ChangeLog

    r154870 r155228  
     12013-09-06  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Range::ownerDocument should return Document&
     4        https://bugs.webkit.org/show_bug.cgi?id=120908
     5
     6        Reviewed by Andreas Kling.
     7
     8        * WebKitSupport/InPageSearchManager.cpp:
     9        (BlackBerry::WebKit::InPageSearchManager::findNextString):
     10        (BlackBerry::WebKit::InPageSearchManager::findAndMarkText):
     11        (BlackBerry::WebKit::InPageSearchManager::clearTextMatches):
     12        (BlackBerry::WebKit::InPageSearchManager::setActiveMatchAndMarker):
     13        (BlackBerry::WebKit::InPageSearchManager::frameUnloaded):
     14        (BlackBerry::WebKit::InPageSearchManager::scopeStringMatches):
     15
    1162013-08-30  Antti Koivisto  <antti@apple.com>
    217

  • trunk/Source/WebKit/blackberry/WebKitSupport/InPageSearchManager.cpp

    r154348 r155228  
    136136    }
    137137
    138     Frame* currentActiveMatchFrame = selection.isNone() && m_activeMatch ? m_activeMatch->ownerDocument()->frame() : m_webPage->focusedOrMainFrame();
     138    Frame* currentActiveMatchFrame = selection.isNone() && m_activeMatch ? m_activeMatch->ownerDocument().frame() : m_webPage->focusedOrMainFrame();
    139139
    140140    if (findAndMarkText(text, searchStartingPoint.get(), currentActiveMatchFrame, findOptions, newSearch, startFromSelection))
    … …  
    190190                // because scopeStringMatches does not add any markers, it only counts the number.
    191191                // No need to unmarkAllTextMatches, it is already done from the caller because of newSearch
    192                 m_activeMatch->ownerDocument()->markers().addTextMatchMarker(m_activeMatch.get(), true);
     192                m_activeMatch->ownerDocument().markers().addTextMatchMarker(m_activeMatch.get(), true);
    193193                frame->editor().setMarkedTextMatchesAreHighlighted(true /* highlight */);
    194194            }
    … …  
    223223            // all matches but count them.
    224224            m_webPage->m_page->unmarkAllTextMatches();
    225             m_activeMatch->ownerDocument()->markers().addTextMatchMarker(m_activeMatch.get(), true);
     225            m_activeMatch->ownerDocument().markers().addTextMatchMarker(m_activeMatch.get(), true);
    226226            frame->editor().setMarkedTextMatchesAreHighlighted(true /* highlight */);
    227227        }
    … …  
    236236    if (selectActiveMatchOnClear && m_activeMatch.get()) {
    237237        VisibleSelection selection(m_activeMatch.get());
    238         m_activeMatch->ownerDocument()->frame()->selection().setSelection(selection);
     238        m_activeMatch->ownerDocument().frame()->selection().setSelection(selection);
    239239    }
    240240    m_webPage->m_page->unmarkAllTextMatches();
    … …  
    247247{
    248248    // Clear the old marker, update our range, and highlight the new range.
    249     if (m_activeMatch.get()) {
    250         if (Document* doc = m_activeMatch->ownerDocument())
    251             doc->markers().setMarkersActive(m_activeMatch.get(), false);
    252     }
     249    if (m_activeMatch.get())
     250        m_activeMatch->ownerDocument().markers().setMarkersActive(m_activeMatch.get(), false);
    253251
    254252    m_activeMatch = range;
    255     if (m_activeMatch.get()) {
    256         if (Document* doc = m_activeMatch->ownerDocument())
    257             doc->markers().setMarkersActive(m_activeMatch.get(), true);
    258     }
     253    if (m_activeMatch.get())
     254        m_activeMatch->ownerDocument().markers().setMarkersActive(m_activeMatch.get(), true);
    259255}
    260256
    … …  
    274270    }
    275271
    276     Frame* currentActiveMatchFrame = m_activeMatch->ownerDocument()->frame();
     272    Frame* currentActiveMatchFrame = m_activeMatch->ownerDocument().frame();
    277273    if (currentActiveMatchFrame == frame) {
    278274        // FIXME: We need to re-scope this frame instead of cancelling all effort?
    … …  
    303299    }
    304300
    305     if (m_resumeScopingFromRange && scopingFrame != m_resumeScopingFromRange->ownerDocument()->frame())
     301    if (m_resumeScopingFromRange && scopingFrame != m_resumeScopingFromRange->ownerDocument().frame())
    306302        m_resumeScopingFromRange = 0;
    307303
    … …  
    344340        }
    345341        if (!locateActiveMatchOnly && m_highlightAllMatches)
    346             resultRange->ownerDocument()->markers().addTextMatchMarker(resultRange.get(), foundActiveMatch);
     342            resultRange->ownerDocument().markers().addTextMatchMarker(resultRange.get(), foundActiveMatch);
    347343
    348344        searchRange->setStart(resultRange->endContainer(ec), resultRange->endOffset(ec), ec);

  • trunk/Source/WebKit/mac/ChangeLog

    r155164 r155228  
     12013-09-06  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Range::ownerDocument should return Document&
     4        https://bugs.webkit.org/show_bug.cgi?id=120908
     5
     6        Reviewed by Andreas Kling.
     7
     8        * WebView/WebPDFView.mm:
     9        (isFrameInRange):
     10
    1112013-09-05  Andreas Kling  <akling@apple.com>
    212

  • trunk/Source/WebKit/mac/WebView/WebPDFView.mm

    r154877 r155228  
    638638    BOOL inRange = NO;
    639639    for (HTMLFrameOwnerElement* ownerElement = core(frame)->ownerElement(); ownerElement; ownerElement = ownerElement->document().frame()->ownerElement()) {
    640         if (&ownerElement->document() == core(range)->ownerDocument()) {
     640        if (&ownerElement->document() == &core(range)->ownerDocument()) {
    641641            inRange = [range intersectsNode:kit(ownerElement)];
    642642            break;

  • trunk/Source/WebKit2/ChangeLog

    r155163 r155228  
     12013-09-06  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Range::ownerDocument should return Document&
     4        https://bugs.webkit.org/show_bug.cgi?id=120908
     5
     6        Reviewed by Andreas Kling.
     7
     8        * WebProcess/InjectedBundle/API/mac/WKDOMRange.mm:
     9        (-[WKDOMRange textRects]):
     10
    1112013-09-05  Ryuan Choi  <ryuan.choi@samsung.com>
    212

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRange.mm

    r143111 r155228  
    143143- (NSArray *)textRects
    144144{
    145     _impl->ownerDocument()->updateLayoutIgnorePendingStylesheets();
     145    _impl->ownerDocument().updateLayoutIgnorePendingStylesheets();
    146146    Vector<WebCore::IntRect> rects;
    147147    _impl->textRects(rects);
Note: See TracChangeset for help on using the changeset viewer.