Changeset 149831 in webkit

Timestamp:

May 9, 2013 12:00:22 PM (11 years ago)

Author:

mifenton@rim.com

Message:

[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:

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/InRegionScroller.cpp (modified) (1 diff)
• Api/InRegionScroller_p.h (modified) (1 diff)
• Api/WebKitTextCodec.cpp (modified) (1 diff)
• Api/WebPageCompositor.cpp (modified) (2 diffs)
• Api/WebPageCompositor.h (modified) (1 diff)
• Api/WebPageCompositor_p.h (modified) (2 diffs)
• Api/WebSettings_p.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp

@@ -135 +135 @@
 
     // 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()));

trunk/Source/WebKit/blackberry/Api/InRegionScroller_p.h

@@ -20 +20 @@
 #define InRegionScroller_p_h
 
+#include "IntPoint.h"
 #include "IntSize.h"
-#include "IntPoint.h"
 
 #include <interaction/ScrollViewBase.h>

trunk/Source/WebKit/blackberry/Api/WebKitTextCodec.cpp

@@ -71 +71 @@
 }
 
-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);

trunk/Source/WebKit/blackberry/Api/WebPageCompositor.cpp

@@ -22 +22 @@
 
 #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"
 
@@ -396 +395 @@
 
 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&)
 {
 }

trunk/Source/WebKit/blackberry/Api/WebPageCompositor.h

@@ -52 +52 @@
 
     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*);

trunk/Source/WebKit/blackberry/Api/WebPageCompositor_p.h

@@ -60 +60 @@
     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; }
@@ -97 +97 @@
 
     WebPagePrivate* page() const { return m_webPage; }
-    void setPage(WebPagePrivate* page);
+    void setPage(WebPagePrivate*);
     void detach();
     WebPageCompositorClient* client() const { return m_client; }

trunk/Source/WebKit/blackberry/Api/WebSettings_p.h

@@ -26 +26 @@
 
 #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 {

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-05-09  Mike Fenton  <mifenton@rim.com>
+
+        [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  <mfeil@rim.com>