[webkit-changes] [142796] trunk/Source/WebCore

Wed, 13 Feb 2013 14:01:44 -0800

Title: [142796] trunk/Source/WebCore
Revision
142796
Author
[email protected]
Date
2013-02-13 14:03:44 -0800 (Wed, 13 Feb 2013)

Log Message

Clean up some style nits in HTMLPreloadScanner
https://bugs.webkit.org/show_bug.cgi?id=109738

Reviewed by Tony Gentilcore.

This patch just fixes a few style nits I noticed when reading through
the code.

* html/parser/HTMLPreloadScanner.cpp:
(WebCore::StartTagScanner::StartTagScanner):
(WebCore::HTMLPreloadScanner::processPossibleStyleTag):
(WebCore::HTMLPreloadScanner::processPossibleBaseTag):
* html/parser/HTMLResourcePreloader.cpp:
(WebCore::PreloadRequest::isSafeToSendToAnotherThread):
* html/parser/HTMLResourcePreloader.h:
(PreloadRequest):
(WebCore::PreloadRequest::PreloadRequest):
(WebCore::HTMLResourcePreloader::HTMLResourcePreloader):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (142795 => 142796)


--- trunk/Source/WebCore/ChangeLog	2013-02-13 22:02:51 UTC (rev 142795)
+++ trunk/Source/WebCore/ChangeLog	2013-02-13 22:03:44 UTC (rev 142796)
@@ -1,3 +1,24 @@
+2013-02-13  Adam Barth  <[email protected]>
+
+        Clean up some style nits in HTMLPreloadScanner
+        https://bugs.webkit.org/show_bug.cgi?id=109738
+
+        Reviewed by Tony Gentilcore.
+
+        This patch just fixes a few style nits I noticed when reading through
+        the code.
+
+        * html/parser/HTMLPreloadScanner.cpp:
+        (WebCore::StartTagScanner::StartTagScanner):
+        (WebCore::HTMLPreloadScanner::processPossibleStyleTag):
+        (WebCore::HTMLPreloadScanner::processPossibleBaseTag):
+        * html/parser/HTMLResourcePreloader.cpp:
+        (WebCore::PreloadRequest::isSafeToSendToAnotherThread):
+        * html/parser/HTMLResourcePreloader.h:
+        (PreloadRequest):
+        (WebCore::PreloadRequest::PreloadRequest):
+        (WebCore::HTMLResourcePreloader::HTMLResourcePreloader):
+
 2013-02-13  Sheriff Bot  <[email protected]>
 
         Unreviewed, rolling out r142747.

Modified: trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp (142795 => 142796)


--- trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp	2013-02-13 22:02:51 UTC (rev 142795)
+++ trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp	2013-02-13 22:03:44 UTC (rev 142796)
@@ -55,7 +55,7 @@
 
 class StartTagScanner {
 public:
-    explicit StartTagScanner(const AtomicString& tagName, const HTMLToken::AttributeList& attributes)
+    StartTagScanner(const AtomicString& tagName, const HTMLToken::AttributeList& attributes)
         : m_tagName(tagName)
         , m_linkIsStyleSheet(false)
         , m_linkMediaAttributeIsScreen(true)
@@ -245,34 +245,36 @@
 bool HTMLPreloadScanner::processPossibleStyleTag(const AtomicString& tagName, const HTMLToken& token)
 {
     ASSERT(isStartOrEndTag(token));
-    if (tagName == styleTag) {
-        m_inStyle = isStartTag(token);
-        if (!m_inStyle)
-            m_cssScanner.reset();
-        return true;
-    }
-    return false;
+    if (tagName != styleTag)
+        return false;
+
+    m_inStyle = isStartTag(token);
+
+    if (!m_inStyle)
+        m_cssScanner.reset();
+
+    return true;
 }
 
 bool HTMLPreloadScanner::processPossibleBaseTag(const AtomicString& tagName, const HTMLToken& token)
 {
     ASSERT(isStartTag(token));
-    if (tagName == baseTag) {
-        // The first <base> element is the one that wins.
-        if (!m_predictedBaseElementURL.isEmpty())
-            return true;
+    if (tagName != baseTag)
+        return false;
 
-        for (HTMLToken::AttributeList::const_iterator iter = token.attributes().begin(); iter != token.attributes().end(); ++iter) {
-            AtomicString attributeName(iter->name);
-            if (attributeName == hrefAttr) {
-                String hrefValue = StringImpl::create8BitIfPossible(iter->value);
-                m_predictedBaseElementURL = KURL(m_documentURL, stripLeadingAndTrailingHTMLSpaces(hrefValue));
-                break;
-            }
+    // The first <base> element is the one that wins.
+    if (!m_predictedBaseElementURL.isEmpty())
+        return true;
+
+    for (HTMLToken::AttributeList::const_iterator iter = token.attributes().begin(); iter != token.attributes().end(); ++iter) {
+        AtomicString attributeName(iter->name);
+        if (attributeName == hrefAttr) {
+            String hrefValue = StringImpl::create8BitIfPossible(iter->value);
+            m_predictedBaseElementURL = KURL(m_documentURL, stripLeadingAndTrailingHTMLSpaces(hrefValue));
+            break;
         }
-        return true;
     }
-    return false;
+    return true;
 }
 
 void HTMLPreloadScanner::processToken(const HTMLToken& token, Vector<OwnPtr<PreloadRequest> >& requests)

Modified: trunk/Source/WebCore/html/parser/HTMLResourcePreloader.cpp (142795 => 142796)


--- trunk/Source/WebCore/html/parser/HTMLResourcePreloader.cpp	2013-02-13 22:02:51 UTC (rev 142795)
+++ trunk/Source/WebCore/html/parser/HTMLResourcePreloader.cpp	2013-02-13 22:03:44 UTC (rev 142796)
@@ -31,24 +31,12 @@
 
 namespace WebCore {
 
-static bool isStringSafeToSendToAnotherThread(const String& string)
-{
-    StringImpl* impl = string.impl();
-    if (!impl)
-        return true;
-    if (impl->hasOneRef())
-        return true;
-    if (string.isEmpty())
-        return true;
-    return false;
-}
-
 bool PreloadRequest::isSafeToSendToAnotherThread() const
 {
-    return isStringSafeToSendToAnotherThread(m_initiator)
-        && isStringSafeToSendToAnotherThread(m_charset)
-        && isStringSafeToSendToAnotherThread(m_resourceURL)
-        && isStringSafeToSendToAnotherThread(m_baseURL.string());
+    return m_initiator.isSafeToSendToAnotherThread()
+        && m_charset.isSafeToSendToAnotherThread()
+        && m_resourceURL.isSafeToSendToAnotherThread()
+        && m_baseURL.isSafeToSendToAnotherThread();
 }
 
 KURL PreloadRequest::completeURL(Document* document)

Modified: trunk/Source/WebCore/html/parser/HTMLResourcePreloader.h (142795 => 142796)


--- trunk/Source/WebCore/html/parser/HTMLResourcePreloader.h	2013-02-13 22:02:51 UTC (rev 142795)
+++ trunk/Source/WebCore/html/parser/HTMLResourcePreloader.h	2013-02-13 22:03:44 UTC (rev 142796)
@@ -37,6 +37,7 @@
     {
         return adoptPtr(new PreloadRequest(initiator, resourceURL, baseURL, resourceType));
     }
+
     bool isSafeToSendToAnotherThread() const;
 
     CachedResourceRequest resourceRequest(Document*);
@@ -53,7 +54,8 @@
         , m_baseURL(baseURL)
         , m_resourceType(resourceType)
         , m_crossOriginModeAllowsCookies(false)
-    { }
+    {
+    }
 
     KURL completeURL(Document*);
 
@@ -71,7 +73,8 @@
     explicit HTMLResourcePreloader(Document* document)
         : m_document(document)
         , m_weakFactory(this)
-    { }
+    {
+    }
 
     void preload(PassOwnPtr<PreloadRequest>);
 

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to