Commit 8a24645f authored by darin@apple.com's avatar darin@apple.com

WebCore:

        - restored some code I removed in the Range change; this code can't go
          until the rest of the Range fix is in

        * dom/Range.cpp:
        (WebCore::Range::commonAncestorContainer): Added back the check for 0
        that I removed erroneously in the Range patch.
        (WebCore::Range::processContents): Left in assertions I used to debug
        this.

LayoutTests:

        Reviewed by Beth Dakin.

        Update test to catch the SECURITY_ERR thrown by
        CanvasRenderingContext2D::getImageData() and
        HTMLCanvasElement::toDataURL() on a tainted canvas

        * http/tests/security/canvas-remote-read-remote-image-expected.txt:
        * http/tests/security/canvas-remote-read-remote-image.html:



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@30979 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent afa70063
2008-03-11 Darin Adler <darin@apple.com>
- update expected result changed by recent Range patch
* platform/mac/editing/execCommand/4920488-expected.txt: Removed incorrect exception log.
* platform/qt/editing/execCommand/4920488-expected.txt: Ditto.
2008-03-10 Sam Weinig <sam@webkit.org>
Reviewed by Beth Dakin.
CONSOLE MESSAGE: line 17: Error: WRONG_DOCUMENT_ERR: DOM Exception 4
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
......
CONSOLE MESSAGE: line 17: Error: WRONG_DOCUMENT_ERR: DOM Exception 4
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
......
2008-03-11 Darin Adler <darin@apple.com>
- restored some code I removed in the Range change; this code can't go
until the rest of the Range fix is in
* dom/Range.cpp:
(WebCore::Range::commonAncestorContainer): Added back the check for 0
that I removed erroneously in the Range patch.
(WebCore::Range::processContents): Left in assertions I used to debug
this.
2008-03-11 Darin Adler <darin@apple.com>
- fix Release build
......@@ -158,7 +158,10 @@ Node* Range::commonAncestorContainer(ExceptionCode& ec) const
return 0;
}
return commonAncestorContainer(m_start.container.get(), m_end.container.get());
Node* commonAncestor = commonAncestorContainer(m_start.container.get(), m_end.container.get());
if (!commonAncestor) // should never happen
ec = WRONG_DOCUMENT_ERR;
return commonAncestor;
}
Node* Range::commonAncestorContainer(Node* containerA, Node* containerB)
......@@ -625,6 +628,7 @@ PassRefPtr<DocumentFragment> Range::processContents ( ActionType action, Excepti
Node* commonRoot = commonAncestorContainer(ec);
if (ec)
return 0;
ASSERT(commonRoot);
// what is the highest node that partially selects the start of the range?
Node* partialStart = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment