[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
gyuyoung.kim at samsung.com
gyuyoung.kim at samsung.com
Wed Dec 22 15:25:43 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 95bcc9b6400eeacb11b0d2c266d7ebef8f2a89a3
Author: gyuyoung.kim at samsung.com <gyuyoung.kim at samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Nov 3 06:59:14 2010 +0000
2010-11-02 Gyuyoung Kim <gyuyoung.kim at samsung.com>
Unreviewed: Add myself to the list of Committers.
* Scripts/webkitpy/common/config/committers.py:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71215 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/fast/table/zero-colspan-crash.html b/LayoutTests/fast/table/zero-colspan-crash.html
index be2614c..04a596e 100644
--- a/LayoutTests/fast/table/zero-colspan-crash.html
+++ b/LayoutTests/fast/table/zero-colspan-crash.html
@@ -1,34 +1,34 @@
-<html>
- <head>
- <style type="text/css">
- table
- {
- table-layout: fixed;
- width: 1px;
- }
- </style>
- <script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
- }
- </script>
- </head>
- <body onload="finish()">
- This test is to ensure that we do not crash while rendering a fixed table layout.
- <div id="result"><span style='color: red;'>FAIL:</span> Did not complete test</div>
- <table>
- <td width="1"></td>
- <td colspan="65536"></td>
- </table>
- <script>
- function finish()
- {
- if (window.layoutTestController)
- layoutTestController.notifyDone();
- document.getElementById("result").innerHTML = "<span style='color: green;'>PASS:</span> Did not crash.";
- }
- </script>
- </body>
-</html>
-
+<html>
+ <head>
+ <style type="text/css">
+ table
+ {
+ table-layout: fixed;
+ width: 1px;
+ }
+ </style>
+ <script>
+ if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
+ }
+ </script>
+ </head>
+ <body onload="finish()">
+ This test is to ensure that we do not crash while rendering a fixed table layout.
+ <div id="result"><span style='color: red;'>FAIL:</span> Did not complete test</div>
+ <table>
+ <td width="1"></td>
+ <td colspan="65536"></td>
+ </table>
+ <script>
+ function finish()
+ {
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+ document.getElementById("result").innerHTML = "<span style='color: green;'>PASS:</span> Did not crash.";
+ }
+ </script>
+ </body>
+</html>
+
diff --git a/LayoutTests/storage/indexeddb/database-basics.html b/LayoutTests/storage/indexeddb/database-basics.html
index db2d289..31c887b 100644
--- a/LayoutTests/storage/indexeddb/database-basics.html
+++ b/LayoutTests/storage/indexeddb/database-basics.html
@@ -74,8 +74,8 @@ function createObjectStore()
shouldBeNull("db.objectStores[0]");
shouldBeNull("db.objectStores.item(0)");
- objectStore = evalAndLog('db.createObjectStore("test123")');
- checkObjectStore();
+ objectStore = evalAndLog('db.createObjectStore("test123")');
+ checkObjectStore();
commitAndContinue();
}
@@ -85,42 +85,42 @@ function checkObjectStore()
shouldBe("db.objectStores.length", "1");
shouldBe("db.objectStores.contains('')", "false");
shouldBe("db.objectStores.contains('test456')", "false");
- shouldBe("db.objectStores.contains('test123')", "true");
-}
-
-function commitAndContinue()
-{
+ shouldBe("db.objectStores.contains('test123')", "true");
+}
+
+function commitAndContinue()
+{
window.setTimeout(testSetVersionAbort, 0);
-}
-
-function testSetVersionAbort()
-{
- result = evalAndLog('db.setVersion("version c")');
- verifyResult(result);
- result.onsuccess = createAnotherObjectStore;
- result.onerror = unexpectedErrorCallback;
-}
-
-function createAnotherObjectStore()
-{
- verifySuccessEvent(event);
- shouldBeEqualToString("db.version", "version c");
- shouldBeEqualToString("db.name", "name");
- checkObjectStore();
-
- objectStore = evalAndLog('db.createObjectStore("test456")');
- var setVersionTrans = evalAndLog("setVersionTrans = event.result");
- shouldBeTrue("setVersionTrans !== null");
- setVersionTrans.oncomplete = unexpectedCompleteCallback;
- setVersionTrans.onabort = checkMetadata;
- setVersionTrans.abort();
-}
-
-function checkMetadata()
-{
- shouldBeEqualToString("db.version", "version b");
- checkObjectStore();
- done();
+}
+
+function testSetVersionAbort()
+{
+ result = evalAndLog('db.setVersion("version c")');
+ verifyResult(result);
+ result.onsuccess = createAnotherObjectStore;
+ result.onerror = unexpectedErrorCallback;
+}
+
+function createAnotherObjectStore()
+{
+ verifySuccessEvent(event);
+ shouldBeEqualToString("db.version", "version c");
+ shouldBeEqualToString("db.name", "name");
+ checkObjectStore();
+
+ objectStore = evalAndLog('db.createObjectStore("test456")');
+ var setVersionTrans = evalAndLog("setVersionTrans = event.result");
+ shouldBeTrue("setVersionTrans !== null");
+ setVersionTrans.oncomplete = unexpectedCompleteCallback;
+ setVersionTrans.onabort = checkMetadata;
+ setVersionTrans.abort();
+}
+
+function checkMetadata()
+{
+ shouldBeEqualToString("db.version", "version b");
+ checkObjectStore();
+ done();
}
test();
diff --git a/LayoutTests/storage/indexeddb/objectstore-basics.html b/LayoutTests/storage/indexeddb/objectstore-basics.html
index 99edc84..005247e 100644
--- a/LayoutTests/storage/indexeddb/objectstore-basics.html
+++ b/LayoutTests/storage/indexeddb/objectstore-basics.html
@@ -44,9 +44,9 @@ function setVersionSuccess()
deleteAllObjectStores(db, createObjectStore);
}
-
+
function createObjectStore()
-{
+{
debug("createObjectStore():");
window.store = evalAndLog("store = db.createObjectStore('storeName', null)");
var storeNames = evalAndLog("storeNames = db.objectStores");
@@ -65,19 +65,19 @@ function createObjectStore()
} catch (err) {
testPassed("Exception thrown.");
// FIXME: Verify the correct exception thrown.
- }
-
+ }
+
createIndex();
-}
-
-function createIndex()
-{
- debug("createIndex():");
- var index = evalAndLog("index = store.createIndex('indexName', 'x', true)"); // true == unique requirement.
- shouldBeTrue("index !== null");
- shouldBeTrue("store.indexNames.contains('indexName')");
- index = evalAndLog("index = store.index('indexName')");
- shouldBeTrue("index !== null");
+}
+
+function createIndex()
+{
+ debug("createIndex():");
+ var index = evalAndLog("index = store.createIndex('indexName', 'x', true)"); // true == unique requirement.
+ shouldBeTrue("index !== null");
+ shouldBeTrue("store.indexNames.contains('indexName')");
+ index = evalAndLog("index = store.index('indexName')");
+ shouldBeTrue("index !== null");
debug("Ask for an index that doesn't exist:");
try {
@@ -89,57 +89,57 @@ function createIndex()
// FIXME: Verify the correct exception thrown.
}
- commitAndContinue();
+ commitAndContinue();
}
-function commitAndContinue()
-{
- window.setTimeout(testSetVersionAbort, 0);
+function commitAndContinue()
+{
+ window.setTimeout(testSetVersionAbort, 0);
}
-function testSetVersionAbort()
-{
- result = evalAndLog('db.setVersion("version fail")');
- verifyResult(result);
- result.onsuccess = createAnotherIndex;
- result.onerror = unexpectedErrorCallback;
-}
-
-function createAnotherIndex()
-{
- verifySuccessEvent(event);
- shouldBeEqualToString("db.version", "version fail");
-
- var setVersionTrans = evalAndLog("setVersionTrans = event.result");
- shouldBeTrue("setVersionTrans !== null");
- setVersionTrans.oncomplete = unexpectedCompleteCallback;
- setVersionTrans.onabort = checkMetadata;
- window.store = evalAndLog("store = setVersionTrans.objectStore('storeName')");
- var index = evalAndLog("index = store.createIndex('indexFail', 'x')");
-
- setVersionTrans.abort();
-}
-
-function checkMetadata()
-{
- shouldBeEqualToString("db.version", "new version");
- shouldBe("store.indexNames", "['indexName']");
- shouldBe("store.indexNames.length", "1");
- shouldBe("store.indexNames.contains('')", "false");
- shouldBe("store.indexNames.contains('indexFail')", "false");
- shouldBe("store.indexNames.contains('indexName')", "true");
+function testSetVersionAbort()
+{
+ result = evalAndLog('db.setVersion("version fail")');
+ verifyResult(result);
+ result.onsuccess = createAnotherIndex;
+ result.onerror = unexpectedErrorCallback;
+}
+
+function createAnotherIndex()
+{
+ verifySuccessEvent(event);
+ shouldBeEqualToString("db.version", "version fail");
+
+ var setVersionTrans = evalAndLog("setVersionTrans = event.result");
+ shouldBeTrue("setVersionTrans !== null");
+ setVersionTrans.oncomplete = unexpectedCompleteCallback;
+ setVersionTrans.onabort = checkMetadata;
+ window.store = evalAndLog("store = setVersionTrans.objectStore('storeName')");
+ var index = evalAndLog("index = store.createIndex('indexFail', 'x')");
+
+ setVersionTrans.abort();
+}
+
+function checkMetadata()
+{
+ shouldBeEqualToString("db.version", "new version");
+ shouldBe("store.indexNames", "['indexName']");
+ shouldBe("store.indexNames.length", "1");
+ shouldBe("store.indexNames.contains('')", "false");
+ shouldBe("store.indexNames.contains('indexFail')", "false");
+ shouldBe("store.indexNames.contains('indexName')", "true");
shouldBeEqualToString("store.indexNames[0]", "indexName");
shouldBeNull("store.indexNames[1]");
shouldBeNull("store.indexNames[100]");
shouldBeNull("store.indexNames.item(1)");
shouldBeNull("store.indexNames.item(100)");
- addData();
-}
+ addData();
+}
function addData()
{
- var transaction = evalAndLog("transaction = db.transaction()");
+ var transaction = evalAndLog("transaction = db.transaction()");
transaction.onabort = unexpectedAbortCallback;
window.store = evalAndLog("store = transaction.objectStore('storeName')");
result = evalAndLog("store.add({x: 'value'}, 'key')");
diff --git a/LayoutTests/storage/indexeddb/resources/shared.js b/LayoutTests/storage/indexeddb/resources/shared.js
index 5a3f50f..01ec606 100644
--- a/LayoutTests/storage/indexeddb/resources/shared.js
+++ b/LayoutTests/storage/indexeddb/resources/shared.js
@@ -76,23 +76,23 @@ function unexpectedAbortCallback()
testFailed("Abort function called unexpectedly!");
debug("");
verifyAbortEvent(event);
- done();
-}
-
-function unexpectedCompleteCallback()
-{
- testFailed("oncomplete function called unexpectedly!");
- debug("");
- verifyCompleteEvent(event);
- done();
+ done();
+}
+
+function unexpectedCompleteCallback()
+{
+ testFailed("oncomplete function called unexpectedly!");
+ debug("");
+ verifyCompleteEvent(event);
+ done();
}
-// FIXME: remove the onfinished parameter.
-function deleteAllObjectStores(db, onfinished)
-{
- while (db.objectStores.length)
- db.removeObjectStore(db.objectStores.item(0));
-
- debug("Deleted all object stores.");
+// FIXME: remove the onfinished parameter.
+function deleteAllObjectStores(db, onfinished)
+{
+ while (db.objectStores.length)
+ db.removeObjectStore(db.objectStores.item(0));
+
+ debug("Deleted all object stores.");
onfinished();
}
diff --git a/WebCore/inspector/InspectorResourceAgent.cpp b/WebCore/inspector/InspectorResourceAgent.cpp
index 31be0c3..e121c60 100644
--- a/WebCore/inspector/InspectorResourceAgent.cpp
+++ b/WebCore/inspector/InspectorResourceAgent.cpp
@@ -352,10 +352,10 @@ static PassRefPtr<InspectorObject> buildObjectForFrame(Frame* frame)
RefPtr<InspectorObject> frameObject = InspectorObject::create();
frameObject->setNumber("id", frameId(frame));
frameObject->setNumber("parentId", frameId(frame->tree()->parent()));
- if (frame->ownerElement()) {
- String name = frame->ownerElement()->getAttribute(HTMLNames::nameAttr);
- if (name.isEmpty())
- name = frame->ownerElement()->getAttribute(HTMLNames::idAttr);
+ if (frame->ownerElement()) {
+ String name = frame->ownerElement()->getAttribute(HTMLNames::nameAttr);
+ if (name.isEmpty())
+ name = frame->ownerElement()->getAttribute(HTMLNames::idAttr);
frameObject->setString("name", name);
}
frameObject->setString("url", frame->loader()->url().string());
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 04952d0..501b160 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-02 Gyuyoung Kim <gyuyoung.kim at samsung.com>
+
+ Unreviewed: Add myself to the list of Committers.
+
+ * Scripts/webkitpy/common/config/committers.py:
+
2010-11-02 Anders Carlsson <andersca at apple.com>
Fix build.
diff --git a/WebKitTools/Scripts/webkitpy/common/config/committers.py b/WebKitTools/Scripts/webkitpy/common/config/committers.py
index 96fba03..f828a75 100644
--- a/WebKitTools/Scripts/webkitpy/common/config/committers.py
+++ b/WebKitTools/Scripts/webkitpy/common/config/committers.py
@@ -112,6 +112,7 @@ committers_unable_to_review = [
Committer("Girish Ramakrishnan", ["girish at forwardbias.in", "ramakrishnan.girish at gmail.com"]),
Committer("Graham Dennis", ["Graham.Dennis at gmail.com", "gdennis at webkit.org"]),
Committer("Greg Bolsinga", "bolsinga at apple.com"),
+ Committer("Gyuyoung Kim", ["gyuyoung.kim at samsung.com", "gyuyoung at gmail.com", "gyuyoung at webkit.org"], "gyuyoung"),
Committer("Hans Wennborg", "hans at chromium.org", "hwennborg"),
Committer("Hayato Ito", "hayato at chromium.org", "hayato"),
Committer("Hin-Chung Lam", ["hclam at google.com", "hclam at chromium.org"]),
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list