summaryrefslogtreecommitdiffstats
path: root/o3d
diff options
context:
space:
mode:
authormaf@chromium.org <maf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-06 00:34:44 +0000
committermaf@chromium.org <maf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-06 00:34:44 +0000
commitde4817b40830c7d3af8c63e1f5ae14dde042fed0 (patch)
treeb80166553c03e360613a122c56b919187fe2bece /o3d
parenta14e56a9987689db99734d808768ed3be6a182da (diff)
downloadchromium_src-de4817b40830c7d3af8c63e1f5ae14dde042fed0.zip
chromium_src-de4817b40830c7d3af8c63e1f5ae14dde042fed0.tar.gz
chromium_src-de4817b40830c7d3af8c63e1f5ae14dde042fed0.tar.bz2
Deleting trailing spaces, add ending newline where missing to make lint happy. Also delete some commented out CSS, etc.
Review URL: http://codereview.chromium.org/3083012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55162 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
-rw-r--r--o3d/collada_edge/cross/collada_edge.cpp2
-rw-r--r--o3d/collada_edge/cross/conditioner.cpp13
-rw-r--r--o3d/converter/cross/renderer_stub.cc4
-rw-r--r--o3d/core/cross/gl/primitive_gl.cc2
-rw-r--r--o3d/core/cross/message_queue.cc2
-rw-r--r--o3d/core/cross/primitive.cc2
-rw-r--r--o3d/core/cross/stream_bank.h2
-rw-r--r--o3d/documentation/DoxygenLayout.xml4
-rw-r--r--o3d/import/cross/archive_processor.cc2
-rw-r--r--o3d/import/cross/archive_request.cc2
-rw-r--r--o3d/plugin/cross/plugin_metrics.h2
-rw-r--r--o3d/plugin/mac/graphics_utils_mac.mm4
-rw-r--r--o3d/plugin/mac/o3d_layer.h6
-rw-r--r--o3d/samples/iframeit.html5
-rw-r--r--o3d/samples/interactive_sampler_assets/styles.css14
-rw-r--r--o3d/samples/interactive_sampler_assets/styles_ie.css16
-rw-r--r--o3d/samples/io/ui/io.css4
-rw-r--r--o3d/samples/o3d-webgl-samples/customcamera.html8
-rw-r--r--o3d/samples/o3d-webgl/clear_buffer.js2
-rw-r--r--o3d/samples/o3d-webgl/draw_context.js2
-rw-r--r--o3d/samples/o3d-webgl/draw_element.js2
-rw-r--r--o3d/samples/o3d-webgl/file_request.js8
-rw-r--r--o3d/samples/o3d-webgl/material.js2
-rw-r--r--o3d/samples/o3d-webgl/named_object.js2
-rw-r--r--o3d/samples/o3d-webgl/raw_data.js6
-rw-r--r--o3d/samples/o3d-webgl/render_surface.js2
-rw-r--r--o3d/samples/o3d-webgl/stream.js2
-rw-r--r--o3d/samples/third_party/codemirror/js/parsejavascript.js12
-rw-r--r--o3d/samples/third_party/codemirror/js/parsesparql.js2
-rw-r--r--o3d/samples/third_party/codemirror/js/parsexml.js4
-rw-r--r--o3d/samples/third_party/codemirror/js/select.js2
-rw-r--r--o3d/samples/third_party/codemirror/js/tokenize.js2
-rw-r--r--o3d/samples/third_party/lightbox/lightbox-iframe.js44
-rw-r--r--o3d/samples/third_party/xmljs/COPYING6
-rw-r--r--o3d/samples/third_party/xmljs/tinyxmlsax.js2
35 files changed, 96 insertions, 100 deletions
diff --git a/o3d/collada_edge/cross/collada_edge.cpp b/o3d/collada_edge/cross/collada_edge.cpp
index 81bb477..effb592 100644
--- a/o3d/collada_edge/cross/collada_edge.cpp
+++ b/o3d/collada_edge/cross/collada_edge.cpp
@@ -28,7 +28,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
+
// collada_edge.cpp : Defines the entry point for the console application.
#include "precompile.h"
#include "conditioner.h"
diff --git a/o3d/collada_edge/cross/conditioner.cpp b/o3d/collada_edge/cross/conditioner.cpp
index e1592b4..b9efb1a 100644
--- a/o3d/collada_edge/cross/conditioner.cpp
+++ b/o3d/collada_edge/cross/conditioner.cpp
@@ -27,7 +27,7 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
#include "precompile.h"
#include "conditioner.h"
@@ -70,7 +70,7 @@ Edge::Edge(Point3 p1, Point3 p2, uint32 i1, uint32 i2) {
}
}
-// less than operator overload, necessary function for edge-triangle map.
+// Less than operator overload, necessary function for edge-triangle map.
bool operator<(const Edge& left, const Edge& right) {
// compare two edges by their actually coordinates.
if (dist(left.pts[0], right.pts[0]) < kEpsilon) {
@@ -92,7 +92,7 @@ bool operator<(const Edge& left, const Edge& right) {
}
}
-// go through triangles who share this edge. And check whether
+// Go through triangles who share this edge. And check whether
// the max normal angle is larger than the threshold.
void CheckSharpEdge(const Edge& shared_edge,
const std::vector<Triangle>& triangle_list,
@@ -139,7 +139,7 @@ void CheckSharpEdge(const Edge& shared_edge,
}
}
-// insert edge-triangle pair to edge triangle map.
+// Insert edge-triangle pair to edge triangle map.
void InsertEdgeTrianglePair(const Edge& edge, const Triangle& triangle,
std::map<Edge, std::vector<Triangle>>* et_map) {
std::map<Edge, std::vector<Triangle>>::iterator iter1 =
@@ -164,7 +164,7 @@ NodeInstance* CreateInstanceTree(FCDSceneNode *node) {
return instance;
}
-// go through all polygons in geom_instance, and add all sharp edges
+// Go through all polygons in geom_instance, and add all sharp edges
// as a new polygon in geom. And also, add material and effect based
// on the given sharpEdgeColor option.
void BuildSharpEdge(FCDocument* doc, FCDGeometryInstance* geom_instance,
@@ -367,4 +367,5 @@ bool Condition(const wchar_t* in_filename, const wchar_t* out_filename,
}
FCollada::Release();
return retval;
-} \ No newline at end of file
+}
+
diff --git a/o3d/converter/cross/renderer_stub.cc b/o3d/converter/cross/renderer_stub.cc
index 0f11826..ba0ffd8 100644
--- a/o3d/converter/cross/renderer_stub.cc
+++ b/o3d/converter/cross/renderer_stub.cc
@@ -192,9 +192,9 @@ bool RendererStub::CancelFullscreen(const DisplayWindow& display,
int width, int height) {
return false;
}
-
+
bool RendererStub::fullscreen() const { return false; }
-
+
void RendererStub::GetDisplayModes(std::vector<DisplayMode> *modes) {
modes->clear();
}
diff --git a/o3d/core/cross/gl/primitive_gl.cc b/o3d/core/cross/gl/primitive_gl.cc
index 61ed5d8..5c7eb73 100644
--- a/o3d/core/cross/gl/primitive_gl.cc
+++ b/o3d/core/cross/gl/primitive_gl.cc
@@ -85,7 +85,7 @@ void PrimitiveGL::PlatformSpecificRender(Renderer* renderer,
EffectGL* effect_gl = down_cast<EffectGL*>(material->effect());
DLOG_ASSERT(effect_gl);
StreamBankGL* stream_bank_gl = down_cast<StreamBankGL*>(stream_bank());
- DLOG_ASSERT(stream_bank_gl);
+ DLOG_ASSERT(stream_bank_gl);
ParamCacheGL* param_cache_gl = down_cast<ParamCacheGL*>(param_cache);
ParamCacheGL::VaryingParameterMap& varying_map =
diff --git a/o3d/core/cross/message_queue.cc b/o3d/core/cross/message_queue.cc
index 06e39c8..42f46804 100644
--- a/o3d/core/cross/message_queue.cc
+++ b/o3d/core/cross/message_queue.cc
@@ -190,7 +190,7 @@ String MessageQueue::GetSocketAddress() const {
// Checks the message queue for an incoming message. If one is found
// then it processes it, otherwise it just returns.
bool MessageQueue::CheckForNewMessages(bool* has_new_texture) {
- // The flag will be set to true if we receive a new texture in
+ // The flag will be set to true if we receive a new texture in
// ProcessMessageUpdateTexture2DRect() or
// ProcessMessageUpdateTexture2D()
has_new_texture_ = false;
diff --git a/o3d/core/cross/primitive.cc b/o3d/core/cross/primitive.cc
index e2dad14..876fa71b 100644
--- a/o3d/core/cross/primitive.cc
+++ b/o3d/core/cross/primitive.cc
@@ -131,7 +131,7 @@ void Primitive::Render(Renderer* renderer,
return;
}
- PlatformSpecificRender(renderer, draw_element, material, override,
+ PlatformSpecificRender(renderer, draw_element, material, override,
param_cache);
}
diff --git a/o3d/core/cross/stream_bank.h b/o3d/core/cross/stream_bank.h
index 1c62d7d..c5d6bd9 100644
--- a/o3d/core/cross/stream_bank.h
+++ b/o3d/core/cross/stream_bank.h
@@ -58,7 +58,7 @@ class StreamBank : public VertexSource {
return change_count_;
}
- // True if all the streams on this streambank are renderable.
+ // True if all the streams on this streambank are renderable.
bool renderable() const {
return renderable_;
}
diff --git a/o3d/documentation/DoxygenLayout.xml b/o3d/documentation/DoxygenLayout.xml
index 53ba75e..17ccc77 100644
--- a/o3d/documentation/DoxygenLayout.xml
+++ b/o3d/documentation/DoxygenLayout.xml
@@ -10,7 +10,7 @@
</tab>
<tab type="classes" visible="yes" title="">
<tab type="classes" visible="yes" title=""/>
- <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/>
+ <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/>
<tab type="hierarchy" visible="yes" title=""/>
<tab type="classmembers" visible="yes" title=""/>
</tab>
@@ -19,7 +19,7 @@
<tab type="globals" visible="yes" title=""/>
</tab>
<tab type="dirs" visible="yes" title=""/>
- <tab type="examples" visible="yes" title=""/>
+ <tab type="examples" visible="yes" title=""/>
</navindex>
<!-- Layout definition for a class page -->
diff --git a/o3d/import/cross/archive_processor.cc b/o3d/import/cross/archive_processor.cc
index 674579f..47b3d35 100644
--- a/o3d/import/cross/archive_processor.cc
+++ b/o3d/import/cross/archive_processor.cc
@@ -75,7 +75,7 @@ StreamProcessor::Status ArchiveProcessor::ProcessFile(const char *filename) {
// progressive streaming system
FILE *fp = fopen(filename, "rb");
if (!fp) return FAILURE; // can't open file!
- if (static_cast<size_t>(file_length) !=
+ if (static_cast<size_t>(file_length) !=
fread(p, sizeof(uint8), file_length, fp))
return FAILURE;
if (0 != fclose(fp)) return FAILURE;
diff --git a/o3d/import/cross/archive_request.cc b/o3d/import/cross/archive_request.cc
index 4c6a42e..3de246a 100644
--- a/o3d/import/cross/archive_request.cc
+++ b/o3d/import/cross/archive_request.cc
@@ -169,7 +169,7 @@ void ArchiveRequest::ReceiveFileHeader(const ArchiveFileInfo &file_info) {
bool ArchiveRequest::ReceiveFileData(MemoryReadStream *input_stream,
size_t nbytes) {
// hold on to ourselves in case we are freed in the callback.
- ArchiveRequest::Ref temp(this);
+ ArchiveRequest::Ref temp(this);
assert(input_stream->GetRemainingByteCount() >= nbytes);
assert(file_memory_stream_.GetRemainingByteCount() >= nbytes);
diff --git a/o3d/plugin/cross/plugin_metrics.h b/o3d/plugin/cross/plugin_metrics.h
index 97e9807..0fcb5e6 100644
--- a/o3d/plugin/cross/plugin_metrics.h
+++ b/o3d/plugin/cross/plugin_metrics.h
@@ -103,7 +103,7 @@ DECLARE_METRIC_integer(browser_type);
DECLARE_METRIC_integer(browser_major_version);
DECLARE_METRIC_integer(browser_minor_version);
DECLARE_METRIC_integer(browser_bugfix_version);
-
+
// Running time for instance of plugin
DECLARE_METRIC_count(uptime_seconds);
DECLARE_METRIC_count(cpu_time_seconds);
diff --git a/o3d/plugin/mac/graphics_utils_mac.mm b/o3d/plugin/mac/graphics_utils_mac.mm
index 34bb36f..ee1aa3f 100644
--- a/o3d/plugin/mac/graphics_utils_mac.mm
+++ b/o3d/plugin/mac/graphics_utils_mac.mm
@@ -82,11 +82,11 @@ bool IsMacOSTenFiveOrHigher() {
}
return result;
}
-
+
// Returns whether OS is 10.6 (Snow Leopard) or higher.
bool IsMacOSTenSixOrHigher() {
static bool isCached = false, result = false;
-
+
if (!isCached) {
SInt32 major = 0;
SInt32 minor = 0;
diff --git a/o3d/plugin/mac/o3d_layer.h b/o3d/plugin/mac/o3d_layer.h
index 7d8cc69..8b71ea0 100644
--- a/o3d/plugin/mac/o3d_layer.h
+++ b/o3d/plugin/mac/o3d_layer.h
@@ -48,14 +48,14 @@ using glue::_o3d::PluginObject;
- (CGLContextObj)glContext;
-- (void)drawInCGLContext:(CGLContextObj)ctx
+- (void)drawInCGLContext:(CGLContextObj)ctx
pixelFormat:(CGLPixelFormatObj)pf
- forLayerTime:(CFTimeInterval)t
+ forLayerTime:(CFTimeInterval)t
displayTime:(const CVTimeStamp *)ts;
- (void)setPluginObject:(PluginObject *)obj;
-- (void)setWidth:(int)width
+- (void)setWidth:(int)width
height:(int)height;
@end
diff --git a/o3d/samples/iframeit.html b/o3d/samples/iframeit.html
index 85bc776..ad29079 100644
--- a/o3d/samples/iframeit.html
+++ b/o3d/samples/iframeit.html
@@ -68,13 +68,12 @@ function changeOverlayZIndex() {
var newZ;
if (typeof lastZ != 'undefined') {
newZ = parseInt(lastZ) - 1;
-
} else {
newZ = 4999;
}
-
+
parent.iframeZindex = newZ;
-
+
var overlay = parent.document.getElementById('overlay');
overlay.style.zIndex = newZ;
}
diff --git a/o3d/samples/interactive_sampler_assets/styles.css b/o3d/samples/interactive_sampler_assets/styles.css
index 18d6645..32eb347 100644
--- a/o3d/samples/interactive_sampler_assets/styles.css
+++ b/o3d/samples/interactive_sampler_assets/styles.css
@@ -20,10 +20,6 @@ div {
height: 50px;
}
-/*#footer {
- width: 100%;
-
-}*/
#selectSample {
width: 30%;
@@ -228,7 +224,7 @@ td.footer {
}
#googleLogoTD {
- text-align:right;
+ text-align:right;
vertical-align:middle;
padding-right: 7px;
}
@@ -262,19 +258,19 @@ td.footer {
background: #D0E4F6 url(interactive_sampler_assets/images/lb_tr.png) no-repeat top right;
}
-.db_top div, .db_top,
+.db_top div, .db_top,
.lb_top div, .lb_top {
height: 5px;
font-size: 1px;
}
.lb_roundedcornr_content,
-.db_roundedcornr_content {
- padding: 0px 10px;
+.db_roundedcornr_content {
+ padding: 0px 10px;
font-size: 80%;
}
.lb_roundedcornr_content {
- background-color: #D0E4F6;
+ background-color: #D0E4F6;
}
.db_roundedcornr_content {
diff --git a/o3d/samples/interactive_sampler_assets/styles_ie.css b/o3d/samples/interactive_sampler_assets/styles_ie.css
index 9fe30ab..cdc46cb 100644
--- a/o3d/samples/interactive_sampler_assets/styles_ie.css
+++ b/o3d/samples/interactive_sampler_assets/styles_ie.css
@@ -6,7 +6,7 @@ body {
width: 100%;
margin:0pt auto;
max-width:1024px;
- width:expression(
+ width:expression(
document.body.clientWidth > 1024 ?
"1024px":
"auto" );
@@ -26,7 +26,7 @@ div {
/*#footer {
width: 100%;
-
+
}*/
#selectSample {
@@ -232,7 +232,7 @@ td.footer {
}
#lbinner {
- width:expression(
+ width:expression(
document.body.clientWidth > 1100 ?
"1100px":
"auto" );
@@ -247,7 +247,7 @@ td.footer {
}
#googleLogoTD {
- text-align:right;
+ text-align:right;
vertical-align:middle;
}
@@ -281,19 +281,19 @@ td.footer {
background: #D0E4F6 url(interactive_sampler_assets/images/lb_tr.png) no-repeat top right;
}
-.db_top div, .db_top,
+.db_top div, .db_top,
.lb_top div, .lb_top {
height: 5px;
font-size: 1px;
}
.lb_roundedcornr_content,
-.db_roundedcornr_content {
- padding: 0px 10px;
+.db_roundedcornr_content {
+ padding: 0px 10px;
font-size: 80%;
}
.lb_roundedcornr_content {
- background-color: #D0E4F6;
+ background-color: #D0E4F6;
}
.db_roundedcornr_content {
diff --git a/o3d/samples/io/ui/io.css b/o3d/samples/io/ui/io.css
index 03918ad..3f2ef61 100644
--- a/o3d/samples/io/ui/io.css
+++ b/o3d/samples/io/ui/io.css
@@ -30,7 +30,7 @@
*/
-BODY {
+BODY {
overflow: hidden;
background-image: url(../ui/bgtile.jpg);
padding: 0px;
@@ -79,7 +79,7 @@ BODY {
border: 0px;
}
#book-left {
- background-image: url(../ui/scrollwork.gif);
+ background-image: url(../ui/scrollwork.gif);
background-repeat: repeat-x;
background-position: right 40px;
text-align: right;
diff --git a/o3d/samples/o3d-webgl-samples/customcamera.html b/o3d/samples/o3d-webgl-samples/customcamera.html
index 49a5003..6bb6f595 100644
--- a/o3d/samples/o3d-webgl-samples/customcamera.html
+++ b/o3d/samples/o3d-webgl-samples/customcamera.html
@@ -327,7 +327,7 @@ set the position of the camera.
<div id="o3d" style="width: 100%; height: 100%;"></div>
<!-- End of g_o3d plugin -->
</td></tr></table>
-
+
<!-- Don't render the textarea -->
<div style="display:none">
<!-- Start of effect -->
@@ -335,14 +335,14 @@ set the position of the camera.
// World View Projection matrix that will transform the input vertices
// to screen space.
uniform mat4 worldViewProjection;
-
+
// input parameters for our vertex shader
attribute vec4 position;
attribute vec4 color;
-
+
// passing color to the fragment shader
varying vec4 fragmentColor;
-
+
/**
* The vertex shader simply transforms the input vertices to screen space.
*/
diff --git a/o3d/samples/o3d-webgl/clear_buffer.js b/o3d/samples/o3d-webgl/clear_buffer.js
index ba4d36a..f4f82aa 100644
--- a/o3d/samples/o3d-webgl/clear_buffer.js
+++ b/o3d/samples/o3d-webgl/clear_buffer.js
@@ -33,7 +33,7 @@
/**
* A ClearBuffer is a render node that clears the color buffer, zbuffer and/or
* stencil buffer of the current render target.
- *
+ *
* @constructor
*/
o3d.ClearBuffer = function() {
diff --git a/o3d/samples/o3d-webgl/draw_context.js b/o3d/samples/o3d-webgl/draw_context.js
index bd40a25..0b4967c 100644
--- a/o3d/samples/o3d-webgl/draw_context.js
+++ b/o3d/samples/o3d-webgl/draw_context.js
@@ -35,7 +35,7 @@
* It contains two 4-by-4 matrix params, view and
* projection. These correspond to the viewing and projection transformation
* matrices.
- *
+ *
* @param {!o3d.Matrix4} opt_view The view matrix for this DrawContext.
* @param {!o3d.Matrix4} opt_projection The projection matrix
* for this DrawContext.
diff --git a/o3d/samples/o3d-webgl/draw_element.js b/o3d/samples/o3d-webgl/draw_element.js
index aa31d51..cb4ac48 100644
--- a/o3d/samples/o3d-webgl/draw_element.js
+++ b/o3d/samples/o3d-webgl/draw_element.js
@@ -34,7 +34,7 @@
* A DrawElement causes an Element to be Drawn with a particular material.
* You can override other Effect parameters by adding corresponding params to
* the DrawElement.
- *
+ *
* @param {!o3d.Material} opt_material The material used to render this element.
* @constructor
*/
diff --git a/o3d/samples/o3d-webgl/file_request.js b/o3d/samples/o3d-webgl/file_request.js
index d759613..c0de059 100644
--- a/o3d/samples/o3d-webgl/file_request.js
+++ b/o3d/samples/o3d-webgl/file_request.js
@@ -35,23 +35,23 @@
* to be loaded. Its use parallels that of XMLHttpRequest; you create one, call
* open, set the onreadystatechange callback, and call send.
* Note that unlike XMLHttpRequests, FileRequests cannot be reused.
- *
+ *
* For RawData loads, on success the RawData will be stored in the data field
* on the FileRequest itself. It is only valid until the FileRequest is freed by
* calling pack.removeObject(request).
- *
+ *
* var request = pack.createFileRequest("RAWDATA");
* request.open("GET", url, true);
* request.onreadystatechange = function() {
* if (request.done) {
* if (request.success) {
* var rawData = request.data;
- *
+ *
* ...
* } else {
* dump('Load of rawdata returned failure.');
* }
- *
+ *
* pack.removeObject(request);
* }
* };
diff --git a/o3d/samples/o3d-webgl/material.js b/o3d/samples/o3d-webgl/material.js
index 7dd1c8c..1597474 100644
--- a/o3d/samples/o3d-webgl/material.js
+++ b/o3d/samples/o3d-webgl/material.js
@@ -36,7 +36,7 @@
* The parameters needed on a Material will vary depending its Effect.
* Note that a material MUST have its drawList set in order for objects using it
* to render.
- *
+ *
* @param {!o3d.State} opt_state The State used by this material.
* @param {!o3d.Effect} opt_effect The Effect used by this material.
* @param {!o3d.DrawList} opt_draw_list The the DrawList used by this material.
diff --git a/o3d/samples/o3d-webgl/named_object.js b/o3d/samples/o3d-webgl/named_object.js
index 0fd1ec2..c272c1f 100644
--- a/o3d/samples/o3d-webgl/named_object.js
+++ b/o3d/samples/o3d-webgl/named_object.js
@@ -42,7 +42,7 @@ o3d.inherit('NamedObject', 'NamedObjectBase');
/**
* The object's name.
- *
+ *
* Setting this has no meaning to O3D, but is useful for debugging and for
* the functions Client.getObjects, Pack.getObject,
* RenderNode.getRenderNodesByNameInTree and
diff --git a/o3d/samples/o3d-webgl/raw_data.js b/o3d/samples/o3d-webgl/raw_data.js
index 80a3489f..c1b48df 100644
--- a/o3d/samples/o3d-webgl/raw_data.js
+++ b/o3d/samples/o3d-webgl/raw_data.js
@@ -33,14 +33,14 @@
/**
* A RawData object contains raw binary data which could contain
* image, audio, text, or other information.
- *
+ *
* var request = g_pack.createArchiveRequest();
- *
+ *
* request.onfileavailable = function(rawData) {
* var texture = g_pack.createTextureFromRawData(rawData, true);
* ...
* };
- *
+ *
* request.send();
* @constructor
*/
diff --git a/o3d/samples/o3d-webgl/render_surface.js b/o3d/samples/o3d-webgl/render_surface.js
index 8ace573..4eefa06 100644
--- a/o3d/samples/o3d-webgl/render_surface.js
+++ b/o3d/samples/o3d-webgl/render_surface.js
@@ -33,7 +33,7 @@
/**
* A RenderSurfaceBase is the base for RenderSurface and
* RenderDepthStencilSurface.
- *
+ *
* @param {number} width The width of this RenderSurface.
* @param {number} height The height of this RenderSurface.
* @param {o3d.Texture} texture The texture of this RenderSurface.
diff --git a/o3d/samples/o3d-webgl/stream.js b/o3d/samples/o3d-webgl/stream.js
index 0daeb39..2008f90 100644
--- a/o3d/samples/o3d-webgl/stream.js
+++ b/o3d/samples/o3d-webgl/stream.js
@@ -57,7 +57,7 @@ o3d.Stream.Semantic = goog.typedef;
* BINORMAL,
* COLOR,
* TEXCOORD
- *
+ *
* Semantics used when binding buffers to the streambank. They determine how
* the Stream links up to the shader inputs.
*/
diff --git a/o3d/samples/third_party/codemirror/js/parsejavascript.js b/o3d/samples/third_party/codemirror/js/parsejavascript.js
index afd5a29..412977f 100644
--- a/o3d/samples/third_party/codemirror/js/parsejavascript.js
+++ b/o3d/samples/third_party/codemirror/js/parsejavascript.js
@@ -68,7 +68,7 @@ var JSParser = Editor.Parser = (function() {
// below to communicate with the driver loop in the 'next'
// function.
var consume, marked;
-
+
// The iterator object.
var parser = {next: next, copy: copy};
@@ -105,7 +105,7 @@ var JSParser = Editor.Parser = (function() {
lexical.align = true;
// Execute actions until one 'consumes' the token and we can
- // return it. Marked is used to
+ // return it. Marked is used to
while(true){
consume = marked = false;
// Take and execute the topmost action.
@@ -131,7 +131,7 @@ var JSParser = Editor.Parser = (function() {
// between runs of the parser.
function copy(){
var _context = context, _lexical = lexical, _cc = cc.concat([]), _tokenState = tokens.state;
-
+
return function(input){
context = _context;
lexical = _lexical;
@@ -190,7 +190,7 @@ var JSParser = Editor.Parser = (function() {
}
return false;
}
-
+
// Push a new lexical context of the given type.
function pushlex(type){
var result = function(){
@@ -207,7 +207,7 @@ var JSParser = Editor.Parser = (function() {
// The 'lex' flag on these actions is used by the 'next' function
// to know they can (and have to) be ran before moving on to the
// next token.
-
+
// Creates an action that discards tokens until it finds one of
// the given type.
function expect(wanted){
@@ -314,7 +314,7 @@ var JSParser = Editor.Parser = (function() {
function funarg(type, value){
if (type == "variable"){register(value); cont();}
}
-
+
return parser;
}
diff --git a/o3d/samples/third_party/codemirror/js/parsesparql.js b/o3d/samples/third_party/codemirror/js/parsesparql.js
index 2f2b904..f1414d8 100644
--- a/o3d/samples/third_party/codemirror/js/parsesparql.js
+++ b/o3d/samples/third_party/codemirror/js/parsesparql.js
@@ -130,7 +130,7 @@ Editor.Parser = (function() {
else if (/[\]\}\)]/.test(content)) {
while (context && context.type == "pattern")
popContext();
- if (context && content == matching[context.type])
+ if (context && content == matching[context.type])
popContext();
}
else if (content == "." && context && context.type == "pattern") {
diff --git a/o3d/samples/third_party/codemirror/js/parsexml.js b/o3d/samples/third_party/codemirror/js/parsexml.js
index 73acd16..d38fa12 100644
--- a/o3d/samples/third_party/codemirror/js/parsexml.js
+++ b/o3d/samples/third_party/codemirror/js/parsexml.js
@@ -135,7 +135,7 @@ var XMLParser = Editor.Parser = (function() {
var tokenNr = 0, indented = 0;
var currentTag = null, context = null;
var consume, marked;
-
+
function push(fs) {
for (var i = fs.length - 1; i >= 0; i--)
cc.push(fs[i]);
@@ -267,7 +267,7 @@ var XMLParser = Editor.Parser = (function() {
copy: function(){
var _cc = cc.concat([]), _tokenState = tokens.state, _context = context;
var parser = this;
-
+
return function(input){
cc = _cc.concat([]);
tokenNr = indented = 0;
diff --git a/o3d/samples/third_party/codemirror/js/select.js b/o3d/samples/third_party/codemirror/js/select.js
index 383a7f1..4c6cb96 100644
--- a/o3d/samples/third_party/codemirror/js/select.js
+++ b/o3d/samples/third_party/codemirror/js/select.js
@@ -481,7 +481,7 @@ var select = {};
select.scrollToCursor = function(container) {
var body = container.ownerDocument.body, win = container.ownerDocument.defaultView;
var element = select.selectionTopNode(container, true) || container.firstChild;
-
+
// In Opera, BR elements *always* have a scrollTop property of zero. Go Opera.
while (element && !element.offsetTop)
element = element.previousSibling;
diff --git a/o3d/samples/third_party/codemirror/js/tokenize.js b/o3d/samples/third_party/codemirror/js/tokenize.js
index 379a12e..8bb700e 100644
--- a/o3d/samples/third_party/codemirror/js/tokenize.js
+++ b/o3d/samples/third_party/codemirror/js/tokenize.js
@@ -43,7 +43,7 @@ function tokenizer(source, state) {
source.next();
return this.take("whitespace");
}
-
+
if (source.applies(isWhiteSpace))
type = "whitespace";
else
diff --git a/o3d/samples/third_party/lightbox/lightbox-iframe.js b/o3d/samples/third_party/lightbox/lightbox-iframe.js
index 33e1889..bcf492f 100644
--- a/o3d/samples/third_party/lightbox/lightbox-iframe.js
+++ b/o3d/samples/third_party/lightbox/lightbox-iframe.js
@@ -68,7 +68,7 @@ lightbox.prototype = {
Event.observe(ctrl, 'click', this.activate.bindAsEventListener(this), false);
ctrl.onclick = function(){return false;};
},
-
+
// Turn everything on - mainly the IE fixes
activate: function(){
if (browser == 'Internet Explorer'){
@@ -79,18 +79,18 @@ lightbox.prototype = {
}
this.displayLightbox("block");
},
-
+
// Ie requires height to 100% and overflow hidden or else you can scroll down past the lightbox
prepareIE: function(height, overflow){
bod = document.getElementsByTagName('body')[0];
bod.style.height = height;
bod.style.overflow = overflow;
-
+
htm = document.getElementsByTagName('html')[0];
htm.style.height = height;
- htm.style.overflow = overflow;
+ htm.style.overflow = overflow;
},
-
+
// In IE, select elements hover on top of the lightbox
hideSelects: function(visibility){
selects = document.getElementsByTagName('select');
@@ -98,37 +98,37 @@ lightbox.prototype = {
selects[i].style.visibility = visibility;
}
},
-
+
// Taken from lightbox implementation found at http://www.huddletogether.com/projects/lightbox/
getScroll: function(){
if (self.pageYOffset) {
this.yPos = self.pageYOffset;
} else if (document.documentElement && document.documentElement.scrollTop){
- this.yPos = document.documentElement.scrollTop;
+ this.yPos = document.documentElement.scrollTop;
} else if (document.body) {
this.yPos = document.body.scrollTop;
}
},
-
+
setScroll: function(x, y){
- window.scrollTo(x, y);
+ window.scrollTo(x, y);
},
-
+
displayLightbox: function(display){
$('overlay').style.display = display;
$('lightbox').style.display = display;
if(display != 'none') this.loadInfo();
},
-
+
// Write an iFrame instead of using an AJAX call to pull the content
loadInfo: function() {
info = "<div id='lbContent'><center><a href='#' class='lbAction' rel='deactivate'>close (x)</a></center><iframe frameborder=\"0\" width=\"100%\" height=\"100%\" src=\"" + this.content + "\"</iframe></div>";
new Insertion.Before($('lbLoadMessage'), info)
- $('lightbox').className = "done";
- this.actions();
-
+ $('lightbox').className = "done";
+ this.actions();
+
},
-
+
// Search through new links within the lightbox, and attach click event
actions: function(){
lbActions = document.getElementsByClassName('lbAction');
@@ -139,29 +139,29 @@ lightbox.prototype = {
}
},
-
+
// Example of creating your own functionality once lightbox is initiated
insert: function(e){
link = Event.element(e).parentNode;
Element.remove($('lbContent'));
-
+
var myAjax = new Ajax.Request(
link.href,
{method: 'post', parameters: "", onComplete: this.processInfo.bindAsEventListener(this)}
);
-
+
},
-
+
// Example of creating your own functionality once lightbox is initiated
deactivate: function(){
Element.remove($('lbContent'));
-
+
if (browser == "Internet Explorer"){
this.setScroll(0,this.yPos);
this.prepareIE("auto", "auto");
this.hideSelects("visible");
}
-
+
this.displayLightbox("none");
}
}
@@ -196,4 +196,4 @@ function addLightboxMarkup() {
lbcontainer.appendChild(lb);
bod.appendChild(overlay);
bod.appendChild(lbcontainer);
-} \ No newline at end of file
+}
diff --git a/o3d/samples/third_party/xmljs/COPYING b/o3d/samples/third_party/xmljs/COPYING
index a5dee30..9875504 100644
--- a/o3d/samples/third_party/xmljs/COPYING
+++ b/o3d/samples/third_party/xmljs/COPYING
@@ -135,7 +135,7 @@ such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.
-
+
1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
@@ -472,8 +472,8 @@ convey the exclusion of warranty; and each file should have at least the
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ License along with this library; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307 USA.
Also add information on how to contact you by electronic and paper mail.
diff --git a/o3d/samples/third_party/xmljs/tinyxmlsax.js b/o3d/samples/third_party/xmljs/tinyxmlsax.js
index 1e0cc73..f45ba51 100644
--- a/o3d/samples/third_party/xmljs/tinyxmlsax.js
+++ b/o3d/samples/third_party/xmljs/tinyxmlsax.js
@@ -220,7 +220,7 @@ function __escapeString(str) { var escAmpRegEx = /&/g; var escLtRegEx = /</g; va
}
/**
- * function __unescapeString
+ * function __unescapeString
*
* author: David Joham djoham@yahoo.com
*