Title: [127387] trunk/Source/WebCore
Revision
127387
Author
[email protected]
Date
2012-09-02 01:34:17 -0700 (Sun, 02 Sep 2012)

Log Message

Don't create access error strings if there is no access error
https://bugs.webkit.org/show_bug.cgi?id=95652

Reviewed by Adam Barth.
        
This undoes the 50% performance regression in pdfjs caused by
http://trac.webkit.org/changeset/126165

No new tests because behavior is unchanged.

* bindings/js/JSDOMBinding.cpp:
(WebCore::shouldAllowAccessToFrame):
(WebCore::shouldAllowAccessToDOMWindow):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (127386 => 127387)


--- trunk/Source/WebCore/ChangeLog	2012-09-02 05:51:56 UTC (rev 127386)
+++ trunk/Source/WebCore/ChangeLog	2012-09-02 08:34:17 UTC (rev 127387)
@@ -1,3 +1,19 @@
+2012-09-02  Filip Pizlo  <[email protected]>
+
+        Don't create access error strings if there is no access error
+        https://bugs.webkit.org/show_bug.cgi?id=95652
+
+        Reviewed by Adam Barth.
+        
+        This undoes the 50% performance regression in pdfjs caused by
+        http://trac.webkit.org/changeset/126165
+
+        No new tests because behavior is unchanged.
+
+        * bindings/js/JSDOMBinding.cpp:
+        (WebCore::shouldAllowAccessToFrame):
+        (WebCore::shouldAllowAccessToDOMWindow):
+
 2012-08-31  Dirk Schulze  <[email protected]>
 
         Use -webkit-clip-path shapes to clip SVG elements

Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp (127386 => 127387)


--- trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp	2012-09-02 05:51:56 UTC (rev 127386)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp	2012-09-02 08:34:17 UTC (rev 127387)
@@ -221,20 +221,22 @@
 {
     if (!frame)
         return false;
-    bool result = BindingSecurity::shouldAllowAccessToFrame(exec, frame, DoNotReportSecurityError);
+    if (BindingSecurity::shouldAllowAccessToFrame(exec, frame, DoNotReportSecurityError))
+        return true;
     // FIXME: The following line of code should move somewhere that it can be shared with immediatelyReportUnsafeAccessTo.
     message = frame->document()->domWindow()->crossDomainAccessErrorMessage(activeDOMWindow(exec));
-    return result;
+    return false;
 }
 
 bool shouldAllowAccessToDOMWindow(ExecState* exec, DOMWindow* target, String& message)
 {
     if (!target)
         return false;
-    bool result = BindingSecurity::shouldAllowAccessToDOMWindow(exec, target, DoNotReportSecurityError);
+    if (BindingSecurity::shouldAllowAccessToDOMWindow(exec, target, DoNotReportSecurityError))
+        return true;
     // FIXME: The following line of code should move somewhere that it can be shared with immediatelyReportUnsafeAccessTo.
     message = target->crossDomainAccessErrorMessage(activeDOMWindow(exec));
-    return result;
+    return false;
 }
 
 void printErrorMessageForFrame(Frame* frame, const String& message)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to