Commit from review 373017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31313 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 52 insertions, 52 deletions

diff --git a/webkit/api/src/AutocompletePopupMenuClient.cpp b/webkit/api/src/AutocompletePopupMenuClient.cpp
index 96cccf5..e4d0ee5 100644
--- a/webkit/api/src/AutocompletePopupMenuClient.cpp
+++ b/webkit/api/src/AutocompletePopupMenuClient.cpp
@@ -31,8 +31,8 @@
 #include "config.h"
 #include "AutocompletePopupMenuClient.h"
 
-#include "CSSValueKeywords.h"
 #include "CSSStyleSelector.h"
+#include "CSSValueKeywords.h"
 #include "FrameView.h"
 #include "HTMLInputElement.h"
 #include "RenderTheme.h"
diff --git a/webkit/api/src/ChromeClientImpl.cpp b/webkit/api/src/ChromeClientImpl.cpp
index f7f16fc..f816315 100644
--- a/webkit/api/src/ChromeClientImpl.cpp
+++ b/webkit/api/src/ChromeClientImpl.cpp
@@ -36,11 +36,11 @@
 #include "CharacterNames.h"
 #include "Console.h"
 #include "Cursor.h"
+#include "DatabaseTracker.h"
 #include "Document.h"
 #include "DocumentLoader.h"
-#include "DatabaseTracker.h"
-#include "FloatRect.h"
 #include "FileChooser.h"
+#include "FloatRect.h"
 #include "FrameLoadRequest.h"
 #include "FrameView.h"
 #include "HitTestResult.h"
@@ -194,17 +194,17 @@ void ChromeClientImpl::takeFocus(FocusDirection direction)
 
 void ChromeClientImpl::focusedNodeChanged(Node* node)
 {
-  WebURL focus_url;
-  if (node && node->isLink()) {
-    // This HitTestResult hack is the easiest way to get a link URL out of a
-    // WebCore::Node.
-    HitTestResult hit_test(IntPoint(0, 0));
-    // This cast must be valid because of the isLink() check.
-    hit_test.setURLElement(reinterpret_cast<Element*>(node));
-    if (hit_test.isLiveLink())
-      focus_url = hit_test.absoluteLinkURL();
-  }
-  m_webView->client()->setKeyboardFocusURL(focus_url);
+    WebURL focus_url;
+    if (node && node->isLink()) {
+        // This HitTestResult hack is the easiest way to get a link URL out of a
+        // WebCore::Node.
+        HitTestResult hit_test(IntPoint(0, 0));
+        // This cast must be valid because of the isLink() check.
+        hit_test.setURLElement(reinterpret_cast<Element*>(node));
+        if (hit_test.isLiveLink())
+            focus_url = hit_test.absoluteLinkURL();
+    }
+    m_webView->client()->setKeyboardFocusURL(focus_url);
 }
 
 Page* ChromeClientImpl::createWindow(
@@ -272,12 +272,11 @@ void ChromeClientImpl::show()
     // If our default configuration was modified by a script or wasn't
     // created by a user gesture, then show as a popup. Else, let this
     // new window be opened as a toplevel window.
-    bool asPopup =
-        !m_toolbarsVisible ||
-        !m_statusbarVisible ||
-        !m_scrollbarsVisible ||
-        !m_menubarVisible ||
-        !m_resizable;
+    bool asPopup = !m_toolbarsVisible
+        || !m_statusbarVisible
+        || !m_scrollbarsVisible
+        || !m_menubarVisible
+        || !m_resizable;
 
     WebNavigationPolicy policy = WebNavigationPolicyNewForegroundTab;
     if (asPopup)
@@ -290,7 +289,7 @@ void ChromeClientImpl::show()
 
 bool ChromeClientImpl::canRunModal()
 {
-    return m_webView->client() != 0;
+    return !!m_webView->client();
 }
 
 void ChromeClientImpl::runModal()
@@ -364,7 +363,7 @@ void ChromeClientImpl::addMessageToConsole(MessageSource source,
 
 bool ChromeClientImpl::canRunBeforeUnloadConfirmPanel()
 {
-    return m_webView->client() != 0;
+    return !!m_webView->client();
 }
 
 bool ChromeClientImpl::runBeforeUnloadConfirmPanel(const String& message, Frame* frame)
@@ -491,7 +490,8 @@ IntPoint ChromeClientImpl::screenToWindow(const IntPoint&) const
     return IntPoint();
 }
 
-IntRect ChromeClientImpl::windowToScreen(const IntRect& rect) const {
+IntRect ChromeClientImpl::windowToScreen(const IntRect& rect) const
+{
     IntRect screenRect(rect);
 
     if (m_webView->client()) {
diff --git a/webkit/api/src/ChromiumBridge.cpp b/webkit/api/src/ChromiumBridge.cpp
index afd8eb5..72d37b8 100644
--- a/webkit/api/src/ChromiumBridge.cpp
+++ b/webkit/api/src/ChromiumBridge.cpp
@@ -48,8 +48,8 @@
 #include "WebPluginListBuilderImpl.h"
 #include "WebScreenInfo.h"
 #include "WebString.h"
-#include "WebVector.h"
 #include "WebURL.h"
+#include "WebVector.h"
 #include "WebViewClient.h"
 #include "WebViewImpl.h"
 #include "WebWorkerClientImpl.h"
@@ -71,9 +71,9 @@
 
 #include "BitmapImage.h"
 #include "Cookie.h"
+#include "FrameView.h"
 #include "GraphicsContext.h"
 #include "KURL.h"
-#include "FrameView.h"
 #include "NotImplemented.h"
 #include "PlatformContextSkia.h"
 #include "PluginData.h"
@@ -258,7 +258,7 @@ String ChromiumBridge::pathByAppendingComponent(const String& path, const String
 
 bool ChromiumBridge::makeAllDirectories(const String& path)
 {
-  return webKitClient()->makeAllDirectories(path);
+    return webKitClient()->makeAllDirectories(path);
 }
 
 String ChromiumBridge::getAbsolutePath(const String& path)
@@ -294,13 +294,12 @@ String ChromiumBridge::getFontFamilyForCharacters(const UChar* characters, size_
 {
     if (webKitClient()->sandboxSupport())
         return webKitClient()->sandboxSupport()->getFontFamilyForCharacters(characters, numCharacters);
-    else {
-        WebCString family = WebFontInfo::familyForChars(characters, numCharacters);
-        if (family.data())
-            return WebString::fromUTF8(family.data());
-        else
-            return WebString();
-    }
+
+    WebCString family = WebFontInfo::familyForChars(characters, numCharacters);
+    if (family.data())
+        return WebString::fromUTF8(family.data());
+
+    return WebString();
 }
 #endif
 
diff --git a/webkit/api/src/ContextMenuClientImpl.h b/webkit/api/src/ContextMenuClientImpl.h
index a19b247..8b5bab6 100644
--- a/webkit/api/src/ContextMenuClientImpl.h
+++ b/webkit/api/src/ContextMenuClientImpl.h
@@ -34,26 +34,27 @@
 #include "ContextMenuClient.h"
 
 namespace WebKit {
-    class WebViewImpl;
 
-    class ContextMenuClientImpl : public  WebCore::ContextMenuClient {
-    public:
-        ContextMenuClientImpl(WebViewImpl* webView) : m_webView(webView) {}
-        virtual ~ContextMenuClientImpl() {}
-        virtual void copyImageToClipboard(const WebCore::HitTestResult&) {}
-        virtual void contextMenuDestroyed() {}
-        virtual void contextMenuItemSelected(WebCore::ContextMenuItem*, const WebCore::ContextMenu*) {}
-        virtual void downloadURL(const WebCore::KURL&) {}
-        virtual WebCore::PlatformMenuDescription getCustomMenuFromDefaultItems(WebCore::ContextMenu*);
-        virtual bool isSpeaking() { return false; }
-        virtual void lookUpInDictionary(WebCore::Frame*) {}
-        virtual void searchWithGoogle(const WebCore::Frame*) {}
-        virtual bool shouldIncludeInspectElementItem() { return false; }
-        virtual void speak(const WebCore::String&) {}
-        virtual void stopSpeaking() {}
-    private:
-        WebViewImpl* m_webView;
-    };
+class WebViewImpl;
+
+class ContextMenuClientImpl : public  WebCore::ContextMenuClient {
+public:
+    ContextMenuClientImpl(WebViewImpl* webView) : m_webView(webView) {}
+    virtual ~ContextMenuClientImpl() {}
+    virtual void copyImageToClipboard(const WebCore::HitTestResult&) {}
+    virtual void contextMenuDestroyed() {}
+    virtual void contextMenuItemSelected(WebCore::ContextMenuItem*, const WebCore::ContextMenu*) {}
+    virtual void downloadURL(const WebCore::KURL&) {}
+    virtual WebCore::PlatformMenuDescription getCustomMenuFromDefaultItems(WebCore::ContextMenu*);
+    virtual bool isSpeaking() { return false; }
+    virtual void lookUpInDictionary(WebCore::Frame*) {}
+    virtual void searchWithGoogle(const WebCore::Frame*) {}
+    virtual bool shouldIncludeInspectElementItem() { return false; }
+    virtual void speak(const WebCore::String&) {}
+    virtual void stopSpeaking() {}
+private:
+    WebViewImpl* m_webView;
+};
 
 } // namespace WebKit