[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 15:47:19 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 3585c5052cdabb19ad8eb10c58b1fdbd01df98ad
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 12 10:39:34 2010 +0000
2010-11-12 Ilya Sherman <isherman at chromium.org>
Reviewed by Eric Seidel.
Remove some trailing whitespace
https://bugs.webkit.org/show_bug.cgi?id=49433
* platform/PopupMenuClient.h:
* platform/chromium/PopupMenuChromium.cpp:
(WebCore::PopupContainer::show):
(WebCore::PopupListBox::paintRow):
(WebCore::PopupListBox::scrollToRevealRow):
* platform/chromium/PopupMenuChromium.h:
* platform/chromium/SearchPopupMenuChromium.cpp:
* rendering/RenderMenuList.h:
(WebCore::RenderMenuList::toRenderMenuList):
* rendering/RenderTextControlSingleLine.h:
(WebCore::toRenderTextControlSingleLine):
2010-11-12 Ilya Sherman <isherman at chromium.org>
Reviewed by Eric Seidel.
Remove some trailing whitespace
https://bugs.webkit.org/show_bug.cgi?id=49433
* src/ChromeClientImpl.cpp:
(WebKit::ChromeClientImpl::createPopupMenu):
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::scrollRootLayerRect):
(WebKit::WebViewImpl::invalidateRootLayerRect):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71900 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6efa9fc..a612a10 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-11-12 Ilya Sherman <isherman at chromium.org>
+
+ Reviewed by Eric Seidel.
+
+ Remove some trailing whitespace
+ https://bugs.webkit.org/show_bug.cgi?id=49433
+
+ * platform/PopupMenuClient.h:
+ * platform/chromium/PopupMenuChromium.cpp:
+ (WebCore::PopupContainer::show):
+ (WebCore::PopupListBox::paintRow):
+ (WebCore::PopupListBox::scrollToRevealRow):
+ * platform/chromium/PopupMenuChromium.h:
+ * platform/chromium/SearchPopupMenuChromium.cpp:
+ * rendering/RenderMenuList.h:
+ (WebCore::RenderMenuList::toRenderMenuList):
+ * rendering/RenderTextControlSingleLine.h:
+ (WebCore::toRenderTextControlSingleLine):
+
2010-11-12 Ryosuke Niwa <rniwa at webkit.org>
Reviewed by Csaba Osztrogonác.
diff --git a/WebCore/platform/PopupMenuClient.h b/WebCore/platform/PopupMenuClient.h
index 2b41380..45912a1 100644
--- a/WebCore/platform/PopupMenuClient.h
+++ b/WebCore/platform/PopupMenuClient.h
@@ -62,10 +62,10 @@ public:
virtual bool shouldPopOver() const = 0;
virtual bool valueShouldChangeOnHotTrack() const = 0;
virtual void setTextFromItem(unsigned listIndex) = 0;
-
+
virtual FontSelector* fontSelector() const = 0;
virtual HostWindow* hostWindow() const = 0;
-
+
virtual PassRefPtr<Scrollbar> createScrollbar(ScrollbarClient*, ScrollbarOrientation, ScrollbarControlSize) = 0;
};
diff --git a/WebCore/platform/chromium/PopupMenuChromium.cpp b/WebCore/platform/chromium/PopupMenuChromium.cpp
index d7899ba..56a5aa9 100644
--- a/WebCore/platform/chromium/PopupMenuChromium.cpp
+++ b/WebCore/platform/chromium/PopupMenuChromium.cpp
@@ -1,11 +1,11 @@
/*
* Copyright (c) 2008, 2009, Google Inc. All rights reserved.
* Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
- *
+ *
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
@@ -15,7 +15,7 @@
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -113,7 +113,7 @@ public:
// Updates our internal list to match the client.
void updateFromElement();
- // Frees any allocated resources used in a particular popup session.
+ // Frees any allocated resources used in a particular popup session.
void clear();
// Sets the index of the option that is displayed in the <select> widget in the page
@@ -194,10 +194,10 @@ private:
void scrollToRevealRow(int index);
void scrollToRevealSelection() { scrollToRevealRow(m_selectedIndex); }
- // Invalidates the row at the given index.
+ // Invalidates the row at the given index.
void invalidateRow(int index);
- // Get the bounds of a row.
+ // Get the bounds of a row.
IntRect getRowBounds(int index);
// Converts a point to an index of the row the point is over
@@ -224,11 +224,11 @@ private:
PopupContainerSettings m_settings;
// This is the index of the item marked as "selected" - i.e. displayed in the widget on the
- // page.
+ // page.
int m_originalIndex;
- // This is the index of the item that the user is hovered over or has selected using the
- // keyboard in the list. They have not confirmed this selection by clicking or pressing
+ // This is the index of the item that the user is hovered over or has selected using the
+ // keyboard in the list. They have not confirmed this selection by clicking or pressing
// enter yet however.
int m_selectedIndex;
@@ -240,7 +240,7 @@ private:
// This is the number of rows visible in the popup. The maximum number visible at a time is
// defined as being kMaxVisibleRows. For a scrolled popup, this can be thought of as the
- // page size in data units.
+ // page size in data units.
int m_visibleRows;
// Our suggested width, not including scrollbar.
@@ -538,7 +538,7 @@ ChromeClientChromium* PopupContainer::chromeClientChromium()
void PopupContainer::show(const IntRect& r, FrameView* v, int index)
{
// The rect is the size of the select box. It's usually larger than we need.
- // subtract border size so that usually the container will be displayed
+ // subtract border size so that usually the container will be displayed
// exactly the same width as the select box.
listBox()->setBaseWidth(max(r.width() - kBorderSize * 2, 0));
@@ -897,7 +897,7 @@ void PopupListBox::paintRow(GraphicsContext* gc, const IntRect& rect, int rowInd
gc->fillRect(rowRect, Color::white, ColorSpaceDeviceRGB);
gc->fillRect(rowRect, backColor, ColorSpaceDeviceRGB);
-
+
if (m_popupClient->itemIsSeparator(rowIndex)) {
IntRect separatorRect(
rowRect.x() + separatorPadding,
@@ -906,7 +906,7 @@ void PopupListBox::paintRow(GraphicsContext* gc, const IntRect& rect, int rowInd
gc->fillRect(separatorRect, textColor, ColorSpaceDeviceRGB);
return;
}
-
+
if (!style.isVisible())
return;
@@ -1125,7 +1125,7 @@ void PopupListBox::scrollToRevealRow(int index)
return;
IntRect rowRect = getRowBounds(index);
-
+
if (rowRect.y() < scrollY()) {
// Row is above current scroll position, scroll up.
ScrollView::setScrollPosition(IntPoint(0, rowRect.y()));
@@ -1358,10 +1358,10 @@ bool PopupListBox::isPointInBounds(const IntPoint& point)
///////////////////////////////////////////////////////////////////////////////
// PopupMenuChromium implementation
-//
-// Note: you cannot add methods to this class, since it is defined above the
+//
+// Note: you cannot add methods to this class, since it is defined above the
// portability layer. To access methods and properties on the
-// popup widgets, use |popupWindow| above.
+// popup widgets, use |popupWindow| above.
PopupMenuChromium::PopupMenuChromium(PopupMenuClient* client)
: m_popupClient(client)
diff --git a/WebCore/platform/chromium/PopupMenuChromium.h b/WebCore/platform/chromium/PopupMenuChromium.h
index 0d0e23c..bd885ba 100644
--- a/WebCore/platform/chromium/PopupMenuChromium.h
+++ b/WebCore/platform/chromium/PopupMenuChromium.h
@@ -1,10 +1,10 @@
/*
* Copyright (c) 2008, 2009, Google Inc. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
- *
+ *
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
@@ -14,7 +14,7 @@
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
diff --git a/WebCore/platform/chromium/SearchPopupMenuChromium.cpp b/WebCore/platform/chromium/SearchPopupMenuChromium.cpp
index dc06b5a..ca5bebe 100644
--- a/WebCore/platform/chromium/SearchPopupMenuChromium.cpp
+++ b/WebCore/platform/chromium/SearchPopupMenuChromium.cpp
@@ -1,11 +1,11 @@
/*
* Copyright (c) 2008, 2009, Google Inc. All rights reserved.
* Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
- *
+ *
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
@@ -15,7 +15,7 @@
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
diff --git a/WebCore/rendering/RenderMenuList.h b/WebCore/rendering/RenderMenuList.h
index 7faa372..2c99b1e 100644
--- a/WebCore/rendering/RenderMenuList.h
+++ b/WebCore/rendering/RenderMenuList.h
@@ -137,7 +137,7 @@ private:
};
inline RenderMenuList* toRenderMenuList(RenderObject* object)
-{
+{
ASSERT(!object || object->isMenuList());
return static_cast<RenderMenuList*>(object);
}
diff --git a/WebCore/rendering/RenderTextControlSingleLine.h b/WebCore/rendering/RenderTextControlSingleLine.h
index 0deb063..6bb1e01 100644
--- a/WebCore/rendering/RenderTextControlSingleLine.h
+++ b/WebCore/rendering/RenderTextControlSingleLine.h
@@ -161,7 +161,7 @@ private:
};
inline RenderTextControlSingleLine* toRenderTextControlSingleLine(RenderObject* object)
-{
+{
ASSERT(!object || object->isTextField());
return static_cast<RenderTextControlSingleLine*>(object);
}
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index b887246..8a3f63d 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-12 Ilya Sherman <isherman at chromium.org>
+
+ Reviewed by Eric Seidel.
+
+ Remove some trailing whitespace
+ https://bugs.webkit.org/show_bug.cgi?id=49433
+
+ * src/ChromeClientImpl.cpp:
+ (WebKit::ChromeClientImpl::createPopupMenu):
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::scrollRootLayerRect):
+ (WebKit::WebViewImpl::invalidateRootLayerRect):
+
2010-11-11 MORITA Hajime <morrita at google.com>
Unreviewed another attempt to fx windows build.
diff --git a/WebKit/chromium/src/ChromeClientImpl.cpp b/WebKit/chromium/src/ChromeClientImpl.cpp
index 18f7a02..c43a0b0 100644
--- a/WebKit/chromium/src/ChromeClientImpl.cpp
+++ b/WebKit/chromium/src/ChromeClientImpl.cpp
@@ -841,7 +841,7 @@ PassRefPtr<PopupMenu> ChromeClientImpl::createPopupMenu(PopupMenuClient* client)
{
if (WebViewImpl::useExternalPopupMenus())
return adoptRef(new ExternalPopupMenu(client, m_webView->client()));
-
+
return adoptRef(new PopupMenuChromium(client));
}
diff --git a/WebKit/chromium/src/WebViewImpl.cpp b/WebKit/chromium/src/WebViewImpl.cpp
index 6e16352..95d63e3 100644
--- a/WebKit/chromium/src/WebViewImpl.cpp
+++ b/WebKit/chromium/src/WebViewImpl.cpp
@@ -2346,7 +2346,7 @@ void WebViewImpl::scrollRootLayerRect(const IntSize& scrollDelta, const IntRect&
// Move the damage
innerDamage.move(scrollDelta.width(), scrollDelta.height());
-
+
// Merge it back into the damaged rect
m_rootLayerDirtyRect.unite(innerDamage);
}
@@ -2366,7 +2366,7 @@ void WebViewImpl::invalidateRootLayerRect(const IntRect& rect)
if (!page())
return;
- // FIXME: add a smarter damage aggregation logic and/or unify with
+ // FIXME: add a smarter damage aggregation logic and/or unify with
// LayerChromium's damage logic
m_rootLayerDirtyRect.unite(rect);
setRootLayerNeedsDisplay();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list