Title: [128735] trunk/Source/WebKit2
- Revision
- 128735
- Author
- [email protected]
- Date
- 2012-09-17 02:55:29 -0700 (Mon, 17 Sep 2012)
Log Message
[Qt] Remove 'using namespace WebCore' from header file
Broke the build on Mac OS X by causing clashes between Fixed from
/usr/include/MacTypes.h and Source/WebCore/platform/Length.h.
Reviewed by Simon Hausmann.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (128734 => 128735)
--- trunk/Source/WebKit2/ChangeLog 2012-09-17 09:50:16 UTC (rev 128734)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-17 09:55:29 UTC (rev 128735)
@@ -1,3 +1,21 @@
+2012-09-17 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Remove 'using namespace WebCore' from header file
+
+ Broke the build on Mac OS X by causing clashes between Fixed from
+ /usr/include/MacTypes.h and Source/WebCore/platform/Length.h.
+
+ Reviewed by Simon Hausmann..
+
+ * UIProcess/PageViewportController.cpp:
+ * UIProcess/PageViewportController.h:
+ (PageViewportController):
+ (WebKit::PageViewportController::contentsLayoutSize):
+ (WebKit):
+ * UIProcess/qt/PageViewportControllerClientQt.cpp:
+ * UIProcess/qt/PageViewportControllerClientQt.h:
+ (PageViewportControllerClientQt):
+
2012-09-15 Vivek Galatage <[email protected]>
WinCairo build fix due to missing symbols for setImagesEnabled and setStorageBlockingPolicy
Modified: trunk/Source/WebKit2/UIProcess/PageViewportController.cpp (128734 => 128735)
--- trunk/Source/WebKit2/UIProcess/PageViewportController.cpp 2012-09-17 09:50:16 UTC (rev 128734)
+++ trunk/Source/WebKit2/UIProcess/PageViewportController.cpp 2012-09-17 09:55:29 UTC (rev 128735)
@@ -28,6 +28,8 @@
#include <WebCore/FloatSize.h>
#include <wtf/MathExtras.h>
+using namespace WebCore;
+
namespace WebKit {
static inline float bound(float min, float value, float max)
Modified: trunk/Source/WebKit2/UIProcess/PageViewportController.h (128734 => 128735)
--- trunk/Source/WebKit2/UIProcess/PageViewportController.h 2012-09-17 09:50:16 UTC (rev 128734)
+++ trunk/Source/WebKit2/UIProcess/PageViewportController.h 2012-09-17 09:55:29 UTC (rev 128735)
@@ -32,8 +32,6 @@
class IntSize;
}
-using namespace WebCore;
-
namespace WebKit {
class WebPageProxy;
@@ -76,11 +74,11 @@
void suspendContent();
void resumeContent();
- FloatRect positionRangeForContentAtScale(float viewportScale) const;
+ WebCore::FloatRect positionRangeForContentAtScale(float viewportScale) const;
float convertFromViewport(float value) const { return value / m_devicePixelRatio; }
float convertToViewport(float value) const { return value * m_devicePixelRatio; }
- FloatRect convertToViewport(const FloatRect&) const;
+ WebCore::FloatRect convertToViewport(const WebCore::FloatRect&) const;
float innerBoundedContentsScale(float) const;
float outerBoundedContentsScale(float) const;
@@ -89,7 +87,7 @@
bool hadUserInteraction() const { return m_hadUserInteraction; }
bool allowsUserScaling() const { return m_allowsUserScaling; }
- FloatSize contentsLayoutSize() const { return m_rawAttributes.layoutSize; }
+ WebCore::FloatSize contentsLayoutSize() const { return m_rawAttributes.layoutSize; }
float devicePixelRatio() const { return m_devicePixelRatio; }
float minimumContentsScale() const { return m_minimumScale; }
float maximumContentsScale() const { return m_maximumScale; }
@@ -98,21 +96,21 @@
void setHadUserInteraction(bool didUserInteract) { m_hadUserInteraction = didUserInteract; }
// Notifications to the WebProcess.
- void setViewportSize(const FloatSize& newSize);
- void setVisibleContentsRect(const FloatRect& visibleContentsRect, float viewportScale, const FloatPoint& trajectoryVector = FloatPoint::zero());
+ void setViewportSize(const WebCore::FloatSize& newSize);
+ void setVisibleContentsRect(const WebCore::FloatRect& visibleContentsRect, float viewportScale, const WebCore::FloatPoint& trajectoryVector = WebCore::FloatPoint::zero());
// Notifications from the WebProcess.
- void didChangeContentsSize(const IntSize& newSize);
- void didChangeViewportAttributes(const ViewportAttributes&);
- void pageDidRequestScroll(const IntPoint& cssPosition);
+ void didChangeContentsSize(const WebCore::IntSize& newSize);
+ void didChangeViewportAttributes(const WebCore::ViewportAttributes&);
+ void pageDidRequestScroll(const WebCore::IntPoint& cssPosition);
private:
- void syncVisibleContents(const FloatPoint &trajectoryVector = FloatPoint::zero());
+ void syncVisibleContents(const WebCore::FloatPoint &trajectoryVector = WebCore::FloatPoint::zero());
WebPageProxy* const m_webPageProxy;
PageViewportControllerClient* m_client;
- ViewportAttributes m_rawAttributes;
+ WebCore::ViewportAttributes m_rawAttributes;
bool m_allowsUserScaling;
float m_minimumScale;
@@ -123,16 +121,16 @@
bool m_hasSuspendedContent;
bool m_hadUserInteraction;
- FloatSize m_viewportSize;
- FloatSize m_contentsSize;
- FloatRect m_visibleContentsRect;
+ WebCore::FloatSize m_viewportSize;
+ WebCore::FloatSize m_contentsSize;
+ WebCore::FloatRect m_visibleContentsRect;
float m_effectiveScale; // Should always be cssScale * devicePixelRatio.
friend class ViewportUpdateDeferrer;
};
bool fuzzyCompare(float, float, float epsilon);
-FloatPoint boundPosition(const FloatPoint minPosition, const FloatPoint& position, const FloatPoint& maxPosition);
+WebCore::FloatPoint boundPosition(const WebCore::FloatPoint minPosition, const WebCore::FloatPoint& position, const WebCore::FloatPoint& maxPosition);
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp (128734 => 128735)
--- trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp 2012-09-17 09:50:16 UTC (rev 128734)
+++ trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp 2012-09-17 09:55:29 UTC (rev 128735)
@@ -32,6 +32,8 @@
#include <WebCore/FloatRect.h>
#include <WebCore/FloatSize.h>
+using namespace WebCore;
+
namespace WebKit {
static const int kScaleAnimationDurationMillis = 250;
Modified: trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.h (128734 => 128735)
--- trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.h 2012-09-17 09:50:16 UTC (rev 128734)
+++ trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.h 2012-09-17 09:55:29 UTC (rev 128735)
@@ -47,7 +47,7 @@
PageViewportControllerClientQt(QQuickWebView*, QQuickWebPage*);
~PageViewportControllerClientQt();
- virtual void setContentsPosition(const FloatPoint& localPoint);
+ virtual void setContentsPosition(const WebCore::FloatPoint& localPoint);
virtual void setContentsScale(float localScale, bool treatAsInitialValue);
virtual void didResumeContent();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
