Changeset 100182 in webkit

Timestamp:

Nov 14, 2011, 12:58:30 PM (15 years ago)

Author:

abarth@webkit.org

Message:

Remove the concept of an empty SecurityOrigin
​https://bugs.webkit.org/show_bug.cgi?id=72287

Reviewed by Eric Seidel.

Source/WebCore:

This concept is fragile and doesn't exist in the specs. Previous
patches have removed most of the code relying upon this function. This
patch removes a couple stragglers.

• page/DOMWindow.cpp:

(WebCore::DOMWindow::postMessage):

• This check should really be about unique origins because it doesn't make sense to target postMessages at unique origins, as explained in the comment.

• page/SecurityOrigin.cpp:
• page/SecurityOrigin.h:

Source/WebKit/chromium:

I'll rename the API in a subsequent patch.

• src/WebSecurityOrigin.cpp:

(WebKit::WebSecurityOrigin::isEmpty):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/DOMWindow.cpp (modified) (1 diff)
• WebCore/page/SecurityOrigin.cpp (modified) (1 diff)
• WebCore/page/SecurityOrigin.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/WebSecurityOrigin.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-14  Adam Barth  <abarth@webkit.org>
+
+        Remove the concept of an empty SecurityOrigin
+        https://bugs.webkit.org/show_bug.cgi?id=72287
+
+        Reviewed by Eric Seidel.
+
+        This concept is fragile and doesn't exist in the specs.  Previous
+        patches have removed most of the code relying upon this function.  This
+        patch removes a couple stragglers.
+
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::postMessage):
+            - This check should really be about unique origins because it
+              doesn't make sense to target postMessages at unique origins, as
+              explained in the comment.
+        * page/SecurityOrigin.cpp:
+        * page/SecurityOrigin.h:
+
 2011-11-14  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -879 +879 @@
     if (targetOrigin != "*") {
         target = SecurityOrigin::createFromString(targetOrigin);
-        if (target->isEmpty()) {
+        // It doesn't make sense target a postMessage at a unique origin
+        // because there's no way to represent a unique origin in a string.
+        if (target->isUnique()) {
             ec = SYNTAX_ERR;
             return;

trunk/Source/WebCore/page/SecurityOrigin.cpp

@@ -133 +133 @@
     , m_enforceFilePathSeparation(other->m_enforceFilePathSeparation)
 {
-}
-
-bool SecurityOrigin::isEmpty() const
-{
-    ASSERT(!m_protocol.isEmpty() || m_isUnique);
-    return m_protocol.isEmpty();
 }
 

trunk/Source/WebCore/page/SecurityOrigin.h

@@ -135 +135 @@
     bool isUnique() const { return m_isUnique; }
 
-    // The empty SecurityOrigin is a unique security orign (in the sense of
-    // isUnique above) that was created for a "blank" document, such about
-    // about:blank. Empty origins differ from unique origins in that they can
-    // sometimes be replaced by non-empty origins, for example when an
-    // about:blank iframe inherits its security origin from its parent frame.
-    bool isEmpty() const;
-
     // Marks a file:// origin as being in a domain defined by its path.
     void enforceFilePathSeparation();

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-11-14  Adam Barth  <abarth@webkit.org>
+
+        Remove the concept of an empty SecurityOrigin
+        https://bugs.webkit.org/show_bug.cgi?id=72287
+
+        Reviewed by Eric Seidel.
+
+        I'll rename the API in a subsequent patch.
+
+        * src/WebSecurityOrigin.cpp:
+        (WebKit::WebSecurityOrigin::isEmpty):
+
 2011-11-14  Vincent Scheib  <scheib@chromium.org>
 

trunk/Source/WebKit/chromium/src/WebSecurityOrigin.cpp

@@ -91 +91 @@
 }
 
+// FIXME: Rename this API to isUnique.
 bool WebSecurityOrigin::isEmpty() const
 {
     ASSERT(m_private);
-    return m_private->isEmpty();
+    return m_private->isUnique();
 }