Changeset 116724 in webkit

Timestamp:

May 10, 2012 9:00:34 PM (12 years ago)

Author:

tkent@chromium.org

Message:

Unreviewed, rolling out r116715.
​http://trac.webkit.org/changeset/116715
​https://bugs.webkit.org/show_bug.cgi?id=86172

Broke http/tests/security/cross-frame-access-selection.html
(Requested by tkent on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-05-10

• dom/Document.cpp:

(WebCore):
(WebCore::Document::getSelection):

• dom/Document.h:

(Document):

• dom/ShadowRoot.cpp:

(WebCore::ShadowRoot::selection):

• dom/TreeScope.cpp:

(WebCore::TreeScope::~TreeScope):

• dom/TreeScope.h:

(WebCore):
(TreeScope):

• page/DOMSelection.cpp:

(WebCore::DOMSelection::DOMSelection):

• page/DOMSelection.h:

(WebCore):
(WebCore::DOMSelection::create):
(DOMSelection):

• page/DOMWindow.cpp:

(WebCore::DOMWindow::~DOMWindow):
(WebCore::DOMWindow::clearDOMWindowProperties):
(WebCore::DOMWindow::getSelection):

• page/DOMWindow.h:

(DOMWindow):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (2 diffs)
• dom/Document.h (modified) (1 diff)
• dom/ShadowRoot.cpp (modified) (1 diff)
• dom/TreeScope.cpp (modified) (4 diffs)
• dom/TreeScope.h (modified) (3 diffs)
• page/DOMSelection.cpp (modified) (1 diff)
• page/DOMSelection.h (modified) (3 diffs)
• page/DOMWindow.cpp (modified) (3 diffs)
• page/DOMWindow.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-10  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r116715.
+        http://trac.webkit.org/changeset/116715
+        https://bugs.webkit.org/show_bug.cgi?id=86172
+
+        Broke http/tests/security/cross-frame-access-selection.html
+        (Requested by tkent on #webkit).
+
+        * dom/Document.cpp:
+        (WebCore):
+        (WebCore::Document::getSelection):
+        * dom/Document.h:
+        (Document):
+        * dom/ShadowRoot.cpp:
+        (WebCore::ShadowRoot::selection):
+        * dom/TreeScope.cpp:
+        (WebCore::TreeScope::~TreeScope):
+        * dom/TreeScope.h:
+        (WebCore):
+        (TreeScope):
+        * page/DOMSelection.cpp:
+        (WebCore::DOMSelection::DOMSelection):
+        * page/DOMSelection.h:
+        (WebCore):
+        (WebCore::DOMSelection::create):
+        (DOMSelection):
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::~DOMWindow):
+        (WebCore::DOMWindow::clearDOMWindowProperties):
+        (WebCore::DOMWindow::getSelection):
+        * page/DOMWindow.h:
+        (DOMWindow):
+
 2012-05-10  Hajime Morrita  <morrita@google.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -47 +47 @@
 #include "CookieJar.h"
 #include "DOMImplementation.h"
-#include "DOMSelection.h"
 #include "DOMWindow.h"
 #include "DateComponents.h"
@@ -5094 +5093 @@
 }
 
+// FF method for accessing the selection added for compatibility.
+DOMSelection* Document::getSelection() const
+{
+    return frame() ? frame()->domWindow()->getSelection() : 0;
+}
+
 void Document::attachRange(Range* range)
 {

trunk/Source/WebCore/dom/Document.h

@@ -970 +970 @@
     void cancelFocusAppearanceUpdate();
         
+    // FF method for accessing the selection added for compatibility.
+    DOMSelection* getSelection() const;
+    
     // Extension for manipulating canvas drawing contexts for use in CSS
     CanvasRenderingContext* getCSSCanvasContext(const String& type, const String& name, int width, int height);

trunk/Source/WebCore/dom/ShadowRoot.cpp

@@ -152 +152 @@
 DOMSelection* ShadowRoot::selection()
 {
-    if (document())
-        return document()->getSelection();
+    if (document() && document()->domWindow())
+        return document()->domWindow()->getSelection();
     return 0;
 }

trunk/Source/WebCore/dom/TreeScope.cpp

@@ -28 +28 @@
 
 #include "ContainerNode.h"
-#include "DOMSelection.h"
 #include "Document.h"
 #include "Element.h"
@@ -38 +37 @@
 #include "HTMLNames.h"
 #include "Page.h"
-#include "RuntimeEnabledFeatures.h"
 #include "TreeScopeAdopter.h"
 #include <wtf/text/AtomicString.h>
@@ -57 +55 @@
 TreeScope::~TreeScope()
 {
-    if (m_selection) {
-        m_selection->clearTreeScope();
-        m_selection = 0;
-    }
 }
 
@@ -121 +115 @@
         return static_cast<HTMLMapElement*>(m_imageMapsByName.getElementByLowercasedMapName(AtomicString(name.lower()).impl(), this));
     return static_cast<HTMLMapElement*>(m_imageMapsByName.getElementByMapName(AtomicString(name).impl(), this));
-}
-
-DOMSelection* TreeScope::getSelection() const
-{
-    if (!rootNode()->document()->frame())
-        return 0;
-
-    if (m_selection)
-        return m_selection.get();
-
-    m_selection = DOMSelection::create(rootNode()->document());
-    return m_selection.get();
 }
 

trunk/Source/WebCore/dom/TreeScope.h

@@ -34 +34 @@
 
 class ContainerNode;
-class DOMSelection;
 class Element;
 class HTMLMapElement;
@@ -64 +63 @@
     bool hasNodeListCaches() const { return m_numNodeListCaches; }
 
-    DOMSelection* getSelection() const;
-
     // Find first anchor with the given name.
     // First searches for an element with the given ID, but if that fails, then looks
@@ -94 +91 @@
 
     unsigned m_numNodeListCaches;
-
-    mutable RefPtr<DOMSelection> m_selection;
 };
 

trunk/Source/WebCore/page/DOMSelection.cpp

@@ -59 +59 @@
 }
 
-DOMSelection::DOMSelection(const TreeScope* treeScope)
-    : m_treeScope(treeScope)
-    , m_frame(treeScope->rootNode()->document()->frame())
-{
-}
-
-void DOMSelection::clearTreeScope()
-{
-    m_frame = 0;
-    m_treeScope = 0;
+DOMSelection::DOMSelection(Frame* frame)
+    : DOMWindowProperty(frame)
+{
 }
 

trunk/Source/WebCore/page/DOMSelection.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2007 Apple Inc.  All rights reserved.
- * Copyright (C) 2012 Google Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -40 +39 @@
 
     class Frame;
+    class Range;
     class Node;
-    class Range;
-    class TreeScope;
     class VisibleSelection;
 
     typedef int ExceptionCode;
 
-    class DOMSelection : public RefCounted<DOMSelection> {
+    class DOMSelection : public RefCounted<DOMSelection>, public DOMWindowProperty {
     public:
-        static PassRefPtr<DOMSelection> create(const TreeScope* treeScope) { return adoptRef(new DOMSelection(treeScope)); }
-
-        void clearTreeScope();
+        static PassRefPtr<DOMSelection> create(Frame* frame) { return adoptRef(new DOMSelection(frame)); }
 
         // Safari Selection Object API
@@ -89 +85 @@
         String toString();
 
-        Frame* frame() const { return m_frame; }
-
         // Microsoft Selection Object API
         void empty();
 
     private:
-        const TreeScope* m_treeScope;
-        Frame* m_frame;
-
-        explicit DOMSelection(const TreeScope*);
+        explicit DOMSelection(Frame*);
 
         // Convenience method for accessors, does not NULL check m_frame.

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -400 +400 @@
     if (!m_suspendedForPageCache) {
         ASSERT(!m_screen);
+        ASSERT(!m_selection);
         ASSERT(!m_history);
         ASSERT(!m_crypto);
@@ -572 +573 @@
 
     m_screen = 0;
+    m_selection = 0;
     m_history = 0;
     m_crypto = 0;
@@ -885 +887 @@
 DOMSelection* DOMWindow::getSelection()
 {
-    if (!isCurrentlyDisplayedInFrame() || !m_frame)
-        return 0;
-
-    return m_frame->document()->getSelection();
+    if (!isCurrentlyDisplayedInFrame())
+        return 0;
+    if (!m_selection)
+        m_selection = DOMSelection::create(m_frame);
+    return m_selection.get();
 }
 

trunk/Source/WebCore/page/DOMWindow.h

@@ -429 +429 @@
 
         mutable RefPtr<Screen> m_screen;
+        mutable RefPtr<DOMSelection> m_selection;
         mutable RefPtr<History> m_history;
         mutable RefPtr<Crypto>  m_crypto;