Diff
Modified: trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp (149830 => 149831)
--- trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp 2013-05-09 18:49:03 UTC (rev 149830)
+++ trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp 2013-05-09 19:00:22 UTC (rev 149831)
@@ -134,8 +134,7 @@
bounds = scrollLayer->bounds();
// Position is offset on the layer by the layer anchor point.
- FloatPoint layerPosition(-scrollPosition.x() + anchor.x() * bounds.width(),
- -scrollPosition.y() + anchor.y() * bounds.height());
+ FloatPoint layerPosition(-scrollPosition.x() + anchor.x() * bounds.width(), -scrollPosition.y() + anchor.y() * bounds.height());
scrollLayer->override()->setPosition(FloatPoint(layerPosition.x(), layerPosition.y()));
Modified: trunk/Source/WebKit/blackberry/Api/InRegionScroller_p.h (149830 => 149831)
--- trunk/Source/WebKit/blackberry/Api/InRegionScroller_p.h 2013-05-09 18:49:03 UTC (rev 149830)
+++ trunk/Source/WebKit/blackberry/Api/InRegionScroller_p.h 2013-05-09 19:00:22 UTC (rev 149831)
@@ -19,8 +19,8 @@
#ifndef InRegionScroller_p_h
#define InRegionScroller_p_h
+#include "IntPoint.h"
#include "IntSize.h"
-#include "IntPoint.h"
#include <interaction/ScrollViewBase.h>
#include <vector>
Modified: trunk/Source/WebKit/blackberry/Api/WebKitTextCodec.cpp (149830 => 149831)
--- trunk/Source/WebKit/blackberry/Api/WebKitTextCodec.cpp 2013-05-09 18:49:03 UTC (rev 149830)
+++ trunk/Source/WebKit/blackberry/Api/WebKitTextCodec.cpp 2013-05-09 19:00:22 UTC (rev 149831)
@@ -70,7 +70,7 @@
return false;
}
-TranscodeResult transcode(const char* sourceEncoding, const char* targetEncoding, const char*& sourceStart, int sourceLength, char*& targetStart, unsigned int targetLength)
+TranscodeResult transcode(const char* sourceEncoding, const char* targetEncoding, const char*& sourceStart, int sourceLength, char*& targetStart, unsigned targetLength)
{
TextEncoding textEncodingSource(sourceEncoding);
if (!textEncodingSource.isValid())
Modified: trunk/Source/WebKit/blackberry/Api/WebPageCompositor.cpp (149830 => 149831)
--- trunk/Source/WebKit/blackberry/Api/WebPageCompositor.cpp 2013-05-09 18:49:03 UTC (rev 149830)
+++ trunk/Source/WebKit/blackberry/Api/WebPageCompositor.cpp 2013-05-09 19:00:22 UTC (rev 149831)
@@ -21,12 +21,11 @@
#include "WebPageCompositor.h"
#if USE(ACCELERATED_COMPOSITING)
-#include "WebPageCompositorClient.h"
-#include "WebPageCompositor_p.h"
-
#include "BackingStore_p.h"
#include "LayerWebKitThread.h"
#include "WebOverlay_p.h"
+#include "WebPageCompositorClient.h"
+#include "WebPageCompositor_p.h"
#include "WebPage_p.h"
#include <BlackBerryPlatformDebugMacros.h>
@@ -395,11 +394,11 @@
}
void WebPageCompositor::render(Platform::Graphics::GLES2Context*,
- const Platform::IntRect&,
- const Platform::IntRect&,
- const Platform::TransformationMatrix&,
- const Platform::FloatRect&,
- const Platform::FloatRect&)
+ const Platform::IntRect&,
+ const Platform::IntRect&,
+ const Platform::TransformationMatrix&,
+ const Platform::FloatRect&,
+ const Platform::FloatRect&)
{
}
Modified: trunk/Source/WebKit/blackberry/Api/WebPageCompositor.h (149830 => 149831)
--- trunk/Source/WebKit/blackberry/Api/WebPageCompositor.h 2013-05-09 18:49:03 UTC (rev 149830)
+++ trunk/Source/WebKit/blackberry/Api/WebPageCompositor.h 2013-05-09 19:00:22 UTC (rev 149831)
@@ -51,11 +51,11 @@
void prepareFrame(Platform::Graphics::GLES2Context*, double animationTime);
void render(Platform::Graphics::GLES2Context*,
- const Platform::IntRect& targetRect,
- const Platform::IntRect& clipRect,
- const Platform::TransformationMatrix&,
- const Platform::FloatRect& documentContents,
- const Platform::FloatRect& viewport);
+ const Platform::IntRect& targetRect,
+ const Platform::IntRect& clipRect,
+ const Platform::TransformationMatrix&,
+ const Platform::FloatRect& documentContents,
+ const Platform::FloatRect& viewport);
void cleanup(Platform::Graphics::GLES2Context*);
Modified: trunk/Source/WebKit/blackberry/Api/WebPageCompositor_p.h (149830 => 149831)
--- trunk/Source/WebKit/blackberry/Api/WebPageCompositor_p.h 2013-05-09 18:49:03 UTC (rev 149830)
+++ trunk/Source/WebKit/blackberry/Api/WebPageCompositor_p.h 2013-05-09 19:00:22 UTC (rev 149831)
@@ -59,10 +59,10 @@
void setChildWindowPlacement(WebPageCompositor::ChildWindowPlacement placement) { m_childWindowPlacement = placement; }
void prepareFrame(double animationTime);
void render(const WebCore::IntRect& targetRect,
- const WebCore::IntRect& clipRect,
- const WebCore::TransformationMatrix&,
- const WebCore::FloatRect& documentContents,
- const WebCore::FloatRect& viewport);
+ const WebCore::IntRect& clipRect,
+ const WebCore::TransformationMatrix&,
+ const WebCore::FloatRect& documentContents,
+ const WebCore::FloatRect& viewport);
Platform::Graphics::GLES2Context* context() const { return m_context; }
void setContext(Platform::Graphics::GLES2Context*);
@@ -96,7 +96,7 @@
void releaseLayerResources();
WebPagePrivate* page() const { return m_webPage; }
- void setPage(WebPagePrivate* page);
+ void setPage(WebPagePrivate*);
void detach();
WebPageCompositorClient* client() const { return m_client; }
void compositorDestroyed();
Modified: trunk/Source/WebKit/blackberry/Api/WebSettings_p.h (149830 => 149831)
--- trunk/Source/WebKit/blackberry/Api/WebSettings_p.h 2013-05-09 18:49:03 UTC (rev 149830)
+++ trunk/Source/WebKit/blackberry/Api/WebSettings_p.h 2013-05-09 19:00:22 UTC (rev 149831)
@@ -25,26 +25,26 @@
#include <wtf/text/StringHash.h>
#define synthesizeAccessorsForPrimitiveValuePrefixAndType(prefix, type) \
- void set##prefix(const String& key, type newValue) { \
- ASSERT(impl); \
- if (get##prefix(key) == newValue) \
+ void set##prefix(const String& key, type newValue) { \
+ ASSERT(impl); \
+ if (get##prefix(key) == newValue) \
return; \
- if (copyOnWrite) { \
+ if (copyOnWrite) { \
copyOnWrite = false; \
impl = new WebSettingsPrivateImpl(*impl); \
- } \
- PrimitiveValue primitiveValue; \
- primitiveValue.prefix##Value = newValue; \
- impl->primitiveValues.set(key, primitiveValue); \
- if (delegate) \
+ } \
+ PrimitiveValue primitiveValue; \
+ primitiveValue.prefix##Value = newValue; \
+ impl->primitiveValues.set(key, primitiveValue); \
+ if (delegate) \
delegate->didChangeSettings(sender); \
- } \
- type get##prefix(const String& key) const { \
- ASSERT(impl); \
- if (!impl->primitiveValues.contains(key)) \
- return static_cast<type>(false); \
- return impl->primitiveValues.get(key).prefix##Value; \
- }
+ } \
+ type get##prefix(const String& key) const { \
+ ASSERT(impl); \
+ if (!impl->primitiveValues.contains(key)) \
+ return static_cast<type>(false); \
+ return impl->primitiveValues.get(key).prefix##Value; \
+ }
namespace BlackBerry {
namespace WebKit {
Modified: trunk/Source/WebKit/blackberry/ChangeLog (149830 => 149831)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-05-09 18:49:03 UTC (rev 149830)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-05-09 19:00:22 UTC (rev 149831)
@@ -1,3 +1,25 @@
+2013-05-09 Mike Fenton <[email protected]>
+
+ [BlackBerry] Style updates required based on new check-webkit-style
+ https://bugs.webkit.org/show_bug.cgi?id=115857
+
+ Reviewed by Rob Buis.
+
+ Update iInRegionScroller, WebKitTextCodec and WebPageCompositor
+ to match check-webkit-style updates.
+
+ * Api/InRegionScroller.cpp:
+ (BlackBerry::WebKit::InRegionScrollerPrivate::setScrollPositionCompositingThread):
+ * Api/InRegionScroller_p.h:
+ * Api/WebKitTextCodec.cpp:
+ (BlackBerry::WebKit::transcode):
+ * Api/WebPageCompositor.cpp:
+ (BlackBerry::WebKit::WebPageCompositor::render):
+ * Api/WebPageCompositor.h:
+ * Api/WebPageCompositor_p.h:
+ (WebPageCompositorPrivate):
+ * Api/WebSettings_p.h:
+
2013-05-09 Max Feil <[email protected]>
shouldUsePluginDocument() needs to be respected when a document is created
