Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (128501 => 128502)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-09-13 20:26:24 UTC (rev 128501)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-09-13 20:43:55 UTC (rev 128502)
@@ -1,3 +1,32 @@
+2012-09-13 Rob Buis <[email protected]>
+
+ [BlackBerry] Rename InspectorOverlay in blackberry/WebKitSupport
+ https://bugs.webkit.org/show_bug.cgi?id=96689
+
+ Reviewed by Antonio Gomes.
+
+ Rename to InspectorClientBlackBerry to avoid include problems.
+
+ * WebCoreSupport/InspectorClientBlackBerry.h:
+ * WebKitSupport/InspectorOverlayBlackBerry.cpp: Renamed from Source/WebKit/blackberry/WebKitSupport/InspectorOverlay.cpp.
+ (WebKit):
+ (BlackBerry::WebKit::InspectorOverlay::create):
+ (BlackBerry::WebKit::InspectorOverlay::InspectorOverlay):
+ (BlackBerry::WebKit::InspectorOverlay::notifySyncRequired):
+ (BlackBerry::WebKit::InspectorOverlay::paintContents):
+ (BlackBerry::WebKit::InspectorOverlay::showDebugBorders):
+ (BlackBerry::WebKit::InspectorOverlay::showRepaintCounter):
+ (BlackBerry::WebKit::InspectorOverlay::~InspectorOverlay):
+ (BlackBerry::WebKit::InspectorOverlay::clear):
+ (BlackBerry::WebKit::InspectorOverlay::update):
+ * WebKitSupport/InspectorOverlayBlackBerry.h: Renamed from Source/WebKit/blackberry/WebKitSupport/InspectorOverlay.h.
+ (WebCore):
+ (WebKit):
+ (InspectorOverlay):
+ (InspectorOverlayClient):
+ (BlackBerry::WebKit::InspectorOverlay::setClient):
+ (BlackBerry::WebKit::InspectorOverlay::notifyAnimationStarted):
+
2012-09-13 Antonio Gomes <[email protected]>
Unreviewed, warning fix left over from r128456 (bug 96645)
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.h (128501 => 128502)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.h 2012-09-13 20:26:24 UTC (rev 128501)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.h 2012-09-13 20:43:55 UTC (rev 128502)
@@ -22,7 +22,7 @@
#include "InspectorClient.h"
#include "InspectorFrontendChannel.h"
-#include "InspectorOverlay.h"
+#include "InspectorOverlayBlackBerry.h"
#include <wtf/HashMap.h>
#include <wtf/text/WTFString.h>
Deleted: trunk/Source/WebKit/blackberry/WebKitSupport/InspectorOverlay.cpp (128501 => 128502)
--- trunk/Source/WebKit/blackberry/WebKitSupport/InspectorOverlay.cpp 2012-09-13 20:26:24 UTC (rev 128501)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InspectorOverlay.cpp 2012-09-13 20:43:55 UTC (rev 128502)
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2012 Research In Motion Limited. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-
-#include "InspectorOverlay.h"
-
-#include "Frame.h"
-#include "FrameView.h"
-#include "GraphicsContext.h"
-#include "GraphicsLayer.h"
-#include "WebPage_p.h"
-
-
-namespace BlackBerry {
-namespace WebKit {
-
-PassOwnPtr<InspectorOverlay> InspectorOverlay::create(WebPagePrivate* page, InspectorOverlayClient* client)
-{
- return adoptPtr(new InspectorOverlay(page, client));
-}
-
-InspectorOverlay::InspectorOverlay(WebPagePrivate* page, InspectorOverlayClient* client)
- : m_webPage(page)
- , m_client(client)
-{
-}
-
-#if USE(ACCELERATED_COMPOSITING)
-void InspectorOverlay::notifySyncRequired(const WebCore::GraphicsLayer* layer)
-{
- m_webPage->notifySyncRequired(layer);
-}
-
-void InspectorOverlay::paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext& context, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect& inClip)
-{
- context.save();
- WebCore::IntPoint scrollPosition = m_webPage->focusedOrMainFrame()->view()->scrollPosition();
- context.translate(scrollPosition.x(), scrollPosition.y());
- m_client->paintInspectorOverlay(context);
- context.restore();
-}
-
-bool InspectorOverlay::showDebugBorders(const WebCore::GraphicsLayer* layer) const
-{
- return m_webPage->showDebugBorders(layer);
-}
-
-bool InspectorOverlay::showRepaintCounter(const WebCore::GraphicsLayer* layer) const
-{
- return m_webPage->showRepaintCounter(layer);
-}
-#endif
-
-InspectorOverlay::~InspectorOverlay() { }
-
-void InspectorOverlay::clear()
-{
-#if USE(ACCELERATED_COMPOSITING)
- if (m_overlay) {
- m_overlay->removeFromParent();
- m_overlay = nullptr;
- }
-#endif
-}
-
-void InspectorOverlay::update()
-{
-#if USE(ACCELERATED_COMPOSITING)
- if (!m_overlay) {
- m_overlay = adoptPtr(new WebOverlay(this));
- const WebCore::IntSize size = m_webPage->contentsSize();
- m_overlay->setSize(WebCore::FloatSize(size.width(), size.height()));
- m_webPage->m_webPage->addOverlay(m_overlay.get());
- }
-
- m_overlay->setDrawsContent(true);
- m_overlay->setOpacity(1.0);
- m_overlay->invalidate();
-#endif
-}
-
-}
-}
Deleted: trunk/Source/WebKit/blackberry/WebKitSupport/InspectorOverlay.h (128501 => 128502)
--- trunk/Source/WebKit/blackberry/WebKitSupport/InspectorOverlay.h 2012-09-13 20:26:24 UTC (rev 128501)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InspectorOverlay.h 2012-09-13 20:43:55 UTC (rev 128502)
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2012 Research In Motion Limited. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef InspectorOverlay_h
-#define InspectorOverlay_h
-
-#include "WebOverlay.h"
-#include <GraphicsLayerClient.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
-
-namespace WebCore {
-class GraphicsContext;
-class GraphicsLayer;
-}
-
-namespace BlackBerry {
-namespace WebKit {
-class WebPagePrivate;
-
-class InspectorOverlay : public WebCore::GraphicsLayerClient {
-public:
- class InspectorOverlayClient {
- public:
- virtual void paintInspectorOverlay(WebCore::GraphicsContext&) = 0;
- };
-
- static PassOwnPtr<InspectorOverlay> create(WebPagePrivate*, InspectorOverlayClient*);
-
- ~InspectorOverlay();
-
- void setClient(InspectorOverlayClient* client) { m_client = client; }
-
- void clear();
- void update();
- void paintWebFrame(WebCore::GraphicsContext&);
-
-#if USE(ACCELERATED_COMPOSITING)
- virtual void notifyAnimationStarted(const WebCore::GraphicsLayer*, double time) { }
- virtual void notifySyncRequired(const WebCore::GraphicsLayer*);
- virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect& inClip);
- virtual bool showDebugBorders(const WebCore::GraphicsLayer*) const;
- virtual bool showRepaintCounter(const WebCore::GraphicsLayer*) const;
-#endif
-
-private:
- InspectorOverlay(WebPagePrivate*, InspectorOverlayClient*);
- void invalidateWebFrame();
-
- WebPagePrivate* m_webPage;
- InspectorOverlayClient* m_client;
- OwnPtr<WebOverlay> m_overlay;
-};
-
-} // namespace WebKit
-} // namespace BlackBerry
-
-#endif /* InspectorOverlay_h */
Copied: trunk/Source/WebKit/blackberry/WebKitSupport/InspectorOverlayBlackBerry.cpp (from rev 128501, trunk/Source/WebKit/blackberry/WebKitSupport/InspectorOverlay.cpp) (0 => 128502)
--- trunk/Source/WebKit/blackberry/WebKitSupport/InspectorOverlayBlackBerry.cpp (rev 0)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InspectorOverlayBlackBerry.cpp 2012-09-13 20:43:55 UTC (rev 128502)
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2012 Research In Motion Limited. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+
+#include "InspectorOverlayBlackBerry.h"
+
+#include "Frame.h"
+#include "FrameView.h"
+#include "GraphicsContext.h"
+#include "GraphicsLayer.h"
+#include "WebPage_p.h"
+
+
+namespace BlackBerry {
+namespace WebKit {
+
+PassOwnPtr<InspectorOverlay> InspectorOverlay::create(WebPagePrivate* page, InspectorOverlayClient* client)
+{
+ return adoptPtr(new InspectorOverlay(page, client));
+}
+
+InspectorOverlay::InspectorOverlay(WebPagePrivate* page, InspectorOverlayClient* client)
+ : m_webPage(page)
+ , m_client(client)
+{
+}
+
+#if USE(ACCELERATED_COMPOSITING)
+void InspectorOverlay::notifySyncRequired(const WebCore::GraphicsLayer* layer)
+{
+ m_webPage->notifySyncRequired(layer);
+}
+
+void InspectorOverlay::paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext& context, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect& inClip)
+{
+ context.save();
+ WebCore::IntPoint scrollPosition = m_webPage->focusedOrMainFrame()->view()->scrollPosition();
+ context.translate(scrollPosition.x(), scrollPosition.y());
+ m_client->paintInspectorOverlay(context);
+ context.restore();
+}
+
+bool InspectorOverlay::showDebugBorders(const WebCore::GraphicsLayer* layer) const
+{
+ return m_webPage->showDebugBorders(layer);
+}
+
+bool InspectorOverlay::showRepaintCounter(const WebCore::GraphicsLayer* layer) const
+{
+ return m_webPage->showRepaintCounter(layer);
+}
+#endif
+
+InspectorOverlay::~InspectorOverlay() { }
+
+void InspectorOverlay::clear()
+{
+#if USE(ACCELERATED_COMPOSITING)
+ if (m_overlay) {
+ m_overlay->removeFromParent();
+ m_overlay = nullptr;
+ }
+#endif
+}
+
+void InspectorOverlay::update()
+{
+#if USE(ACCELERATED_COMPOSITING)
+ if (!m_overlay) {
+ m_overlay = adoptPtr(new WebOverlay(this));
+ const WebCore::IntSize size = m_webPage->contentsSize();
+ m_overlay->setSize(WebCore::FloatSize(size.width(), size.height()));
+ m_webPage->m_webPage->addOverlay(m_overlay.get());
+ }
+
+ m_overlay->setDrawsContent(true);
+ m_overlay->setOpacity(1.0);
+ m_overlay->invalidate();
+#endif
+}
+
+}
+}
Copied: trunk/Source/WebKit/blackberry/WebKitSupport/InspectorOverlayBlackBerry.h (from rev 128501, trunk/Source/WebKit/blackberry/WebKitSupport/InspectorOverlay.h) (0 => 128502)
--- trunk/Source/WebKit/blackberry/WebKitSupport/InspectorOverlayBlackBerry.h (rev 0)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InspectorOverlayBlackBerry.h 2012-09-13 20:43:55 UTC (rev 128502)
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2012 Research In Motion Limited. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef InspectorOverlayBlackBerry_h
+#define InspectorOverlayBlackBerry_h
+
+#include "WebOverlay.h"
+#include <GraphicsLayerClient.h>
+#include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
+
+namespace WebCore {
+class GraphicsContext;
+class GraphicsLayer;
+}
+
+namespace BlackBerry {
+namespace WebKit {
+class WebPagePrivate;
+
+class InspectorOverlay : public WebCore::GraphicsLayerClient {
+public:
+ class InspectorOverlayClient {
+ public:
+ virtual void paintInspectorOverlay(WebCore::GraphicsContext&) = 0;
+ };
+
+ static PassOwnPtr<InspectorOverlay> create(WebPagePrivate*, InspectorOverlayClient*);
+
+ ~InspectorOverlay();
+
+ void setClient(InspectorOverlayClient* client) { m_client = client; }
+
+ void clear();
+ void update();
+ void paintWebFrame(WebCore::GraphicsContext&);
+
+#if USE(ACCELERATED_COMPOSITING)
+ virtual void notifyAnimationStarted(const WebCore::GraphicsLayer*, double time) { }
+ virtual void notifySyncRequired(const WebCore::GraphicsLayer*);
+ virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect& inClip);
+ virtual bool showDebugBorders(const WebCore::GraphicsLayer*) const;
+ virtual bool showRepaintCounter(const WebCore::GraphicsLayer*) const;
+#endif
+
+private:
+ InspectorOverlay(WebPagePrivate*, InspectorOverlayClient*);
+ void invalidateWebFrame();
+
+ WebPagePrivate* m_webPage;
+ InspectorOverlayClient* m_client;
+ OwnPtr<WebOverlay> m_overlay;
+};
+
+} // namespace WebKit
+} // namespace BlackBerry
+
+#endif /* InspectorOverlayBlackBerry_h */
